206 files changed, 117867 insertions, 106825 deletions

diff --git a/ChangeLog b/ChangeLog
index dd04744e9..a789e53fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,6 +161,488 @@
 	* src/nautilus-application.c: (finish_startup): Initialize the
 	module interface.
 
+2004-01-06  Dave Camp  <dave@ximian.com>
+
+	* configure.in: Remove components/tree/Makefile from
+	AC_OUTPUT.
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	Patch from: Juerg Billeter <j@bitron.ch>
+
+	* components/Makefile.am:
+	* components/tree/
+	Remove tree component (moved to file-manager)
+	
+	* src/Nautilus_shell.server.in:
+	* src/file-manager/Makefile.am:
+	Move tree view here
+
+	* src/nautilus-application.c:
+	Tree view activation
+
+	* src/file-manager/fm-properties-window.[ch]:
+	* src/file-manager/fm-directory-view.c:
+	Make properties window take GtkWidget instead of DirectoryView.
+	
+	* src/file-manager/fm-tree-model.[ch]: 
+	* src/file-manager/fm-tree-view.[ch]:
+	Move tree view here, first cut at popup menus
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* src/file-manager/fm-list-view.c (button_press_callback): 
+	Pop up folder menu on right click in background
+	Patch from chris@gnome-de.org
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas.in:
+	Turn on home icon on desktop by default
+	
+	* libnautilus-private/nautilus-icon-dnd.c:
+	* src/nautilus-property-browser.c:
+	Handle new svg mime type
+	
+	* src/nautilus-navigation-window-ui.xml:
+	* src/nautilus-spatial-window-ui.xml:
+	Don't use computer icon for templates
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* src/file-manager/fm-directory-view.[ch]: 
+	Add get_item_count virtual method.
+	Add item count and free space to status bar
+
+	* src/file-manager/fm-icon-view.c (fm_icon_view_get_item_count): 
+	* src/file-manager/fm-list-view.c (fm_list_view_get_item_count): 
+	Implement get_iem_count
+
+	* src/file-manager/fm-list-model.[ch] (fm_list_model_get_length): 
+	Add new function.
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas.in: 
+	Make desktop font Sans 10 by default. This is the same as
+	the normal UI font default, and fits more stuff on the desktop. 
+
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-file-operations.c:
+	Don't translate duplication tests to avoid wasting
+	translator time. My guess is that nobody was running 
+	make check in different locales anyway.
+	
+2004-01-06  Alexander Larsson <alexl@redhat.com>
+
+	* test/test.h: 
+	Remove eel-string-picker.h
+
+2004-01-05  Martin Wehner  <martin.wehner@epost.de>
+
+	* libnautilus-private/nautilus-icon-container.c:
+	(icon_destroy): Nullify stretch_icon when the icon being
+	pointed to is removed. Fixes bug #128713.
+
+Sun Jan  4 14:39:49 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* cut-n-paste-code/gsequence/gsequence.c
+	(g_sequence_ptr_is_begin): Compare to ptr instead of NULL, since
+	g_sequence_node_prev() never returns NULL. (pointed out by
+	Jeffrey Yasskin).
+
+2004-01-04  Martin Wehner  <martin.wehner@epost.de>
+
+	* libnautilus-private/nautilus-file-operations-progress.[ch]:
+	Use GnomeVFSFileSize instead of gulong to store file sizes.
+	Prevents an overflow with transfers > 4GB. Fixes bug #96734.
+	
+2004-01-03  Anders Carlsson  <andersca@gnome.org>
+
+	* src/nautilus-location-bar.c: (nautilus_location_bar_init):
+	* src/nautilus-location-entry.c:
+	Don't use EelInputEventBox, we can use GtkEventBox now instead.
+	
+2004-01-03  Anders Carlsson  <andersca@gnome.org>
+
+	* components/adapter/nautilus-adapter.c: (nautilus_adapter_new):
+	* src/nautilus-navigation-bar.c:
+	* src/nautilus-navigation-bar.h:
+	* src/nautilus-navigation-window.c:
+	* src/nautilus-spatial-window.c:
+	(nautilus_spatial_window_instance_init):
+	* src/nautilus-view-frame.c:
+	* src/nautilus-view-frame.h:
+	* src/nautilus-window.c:
+	Remove use of EelGenerousBin, we can use a GtkBox with only one
+	child for that instead.
+	
+	* test/Makefile.am:
+	Don't use Eel stuff that no-one else uses.
+	
+2004-01-02  Dennis Cranston <dennis_cranston at yahoo com>
+ 
+ 	* src/nautilus-connect-server-dialog.c:
+ 	(nautilus_connect_server_dialog_init)
+ 	* src/nautilus-location-dialog.c:
+ 	(nautilus_location_dialog_init)
+ 	HIG fixes (add a missing mnemonic and correct the widget
+ 	padding) for the "Open Location" and "Connect to Server" 
+ 	dialogs.
+ 	
+2003-01-02  Diego Gonzalez Gonzalez  <diego@pemas.net>
+
+	* configure.in:
+	* component/text/Makefile.am: files in services directory are
+	  not used so they should not be installed.
+
+2004-01-02  Dave Camp  <dave@ximian.com>
+
+	* components/image_properties/nautilus-image-properties-view.c 
+	(append_exifdata_string): Fixed a typo in the Focal Length field.  
+	Patch from Stephane Wirtel <stephane.wirtel@belgacom.net>	
+
+2004-01-02  Martin Wehner  <martin.wehner@epost.de>
+
+	* libnautilus-private/nautilus-file-operations.c:
+	Ensure the source isn't deleted as partial copy
+	in a duplicate operation. Fixes bug #128095. 
+
+=== nautilus 2.5.4 ===
+
+2003-12-29  Alexander Larsson  <alexl@redhat.com>
+
+	* Makefile.am (EXTRA_DIST):
+	Add OrigTree.pm
+
+	* NEWS: 
+	* configure.in:
+	Update to 2.5.4
+
+2003-12-18  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-emblem-utils.c:
+	* libnautilus-private/nautilus-icon-factory.[ch]:
+	* src/nautilus-main.c:
+	* src/nautilus-server-connect.c:
+	* src/nautilus-window-manage-views.c:
+	Use GtkIconTheme instead of GnomeIconTheme
+
+2003-12-18  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in:
+	Require gtk/glib 2.3.0
+
+	* libnautilus-private/nautilus-directory.c:
+	Use gobject private data for details
+	
+	* libnautilus-private/nautilus-file-private.h:
+	* libnautilus-private/nautilus-file.[ch]:
+	Use gobject private data for details
+	Add has_open_window flag and setter/getter
+	
+	* libnautilus-private/nautilus-icon-container.[ch]:
+	* src/file-manager/fm-icon-container.c:
+	Support visiting modifier for icons with open windows
+	
+	* src/file-manager/fm-directory-view.c:
+	Don't use filename extension in templates name
+	
+	* src/file-manager/fm-list-model.c:
+	Support accept and visiting icon modifiers
+	
+	* src/file-manager/fm-list-view.c:
+	Always set the drag_view on the model so that the accept
+	modifier works
+	
+	* src/nautilus-window.c: (nautilus_window_set_viewed_file):
+	Set has_open_window on file
+
+2003-12-17  Alexander Larsson  <alexl@redhat.com>
+
+	* src/nautilus-window.h: 
+	* src/nautilus-window.c (nautilus_window_close):
+	Virtualize close_window
+
+	* src/nautilus-spatial-window.c (real_window_close):
+	Save geometry and scroll position on window close, not
+	on delete event. Also, since the timeout geometry save
+	isn't really needed anymore, up that to one second.
+
+2003-12-16  Alexander Larsson  <alexl@redhat.com>
+
+	* src/file-manager/fm-icon-view.c (play_file):
+	Check for new ogg mime-type.
+	Patch from Mattias Eriksson <mattias.eriksson@simovits.com>
+
+2003-12-15  Dennis Cranston <dennis_cranston at yahoo com>
+
+	* src/file-manager/fm-directory-view.c:  Do not add trash and
+	directory uris to the recent documents list. Fixes bug #125571.
+	
+2003-12-13  Alex Duggan  <aldug@astrolinux.com>
+
+	* src/nautilus-window.c (compute_default_title): 
+	canonicalize URI and add titles for burn:/// and themes:/// 
+
+2003-12-12  Vincent Untz  <vincent@vuntz.net>
+
+	* libnautilus-private/nautilus-desktop-link-monitor.c:
+	Add missing #include <gtk/gtkmessagedialog.h>
+
+2003-12-12  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-trash-directory.c:
+	Don't show the stupid looking for trash dialog.
+	We shouldn't be looking for trash for long these days.
+	Patch from William Lachance <wlach@nit.ca>
+	
+2003-12-12  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-file-operations.[ch]:
+	New function nautilus_file_operations_new_file.
+	
+	* libnautilus-private/nautilus-file-utilities.[ch]:
+	New template directory functions
+	
+	* src/nautilus-navigation-window-ui.xml:
+	* src/nautilus-spatial-window-ui.xml:
+	* src/nautilus-window-menus.c:
+	Add Templates in location menu
+	
+	* src/file-manager/fm-directory-view.[ch]:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	Implement the templates menu.
+	Fix issue that affected create new folder too,
+	sometimes the file has already been added before
+	we get the done callback.
+
+2003-12-12  Christian Neumair  <chris@gnome-de.org>
+
+	* components/Makefile.am
+	* components/hardware/*:
+	* configure.in:
+	Removed obsolete hardware view.
+
+2003-12-12  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-icon-container.c:
+	Range selection
+	Clear last double click icon if you click on background
+	Don't swallow alt-up
+	Ignore tripple clicks
+	Shift-double-click is open-close-parent (of the clicked icon only)
+	
+	* libnautilus-private/nautilus-icon-private.h:
+	Add range_selection_base_icon to icon container
+	
+	* src/file-manager/fm-directory-view.c:
+	handle shift-alt-down
+	
+	* src/file-manager/fm-list-model.c:
+	Implement fm_list_model_file_for_path
+	
+	* src/file-manager/fm-list-view.c:
+	Sync behaviour with icon view.
+	Allow shift-doubleclick
+	
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	* src/nautilus-spatial-window-ui.xml:
+	* src/nautilus-spatial-window.c:
+	Add alt-shift-up keybinding
+	
+	* src/nautilus-window-manage-views.c:
+	* src/nautilus-window-manage-views.h:
+	* src/nautilus-window-menus.c: (go_menu_up_callback):
+	* src/nautilus-window.c: (nautilus_window_go_up):
+	* src/nautilus-window.h:
+	Support for alt-shift-up
+	
+
+2003-12-11  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-dnd.c
+	(nautilus_drag_default_drop_action_for_icons):
+	Handle defaults for desktop drops like
+	normal directories.
+
+	* libnautilus-private/nautilus-desktop-link-monitor.c (nautilus_desktop_link_monitor_delete_link):
+	Don't allow deletion of standard desktop links.
+
+	* src/file-manager/fm-directory-view.c (fm_directory_view_confirm_deletion):
+	Don't need to confirm for desktop icons.
+
+2003-12-11  Alexander Larsson  <alexl@redhat.com>
+
+	* components/emblem/nautilus-emblem-view.c:
+	* components/music/nautilus-music-view.c:
+	* components/news/nautilus-news.c:
+	* libnautilus-private/nautilus-desktop-link-monitor.c:
+	* libnautilus-private/nautilus-emblem-utils.c:
+	* libnautilus-private/nautilus-file-operations.c:
+	* libnautilus-private/nautilus-icon-dnd.c:
+	* libnautilus-private/nautilus-program-chooser.c:
+	* libnautilus-private/nautilus-program-choosing.c:
+	* src/file-manager/fm-directory-view.c:
+	* src/file-manager/fm-error-reporting.c:
+	* src/file-manager/fm-icon-view.c:
+	* src/file-manager/fm-properties-window.c:
+	* src/file-manager/fm-search-list-view.c:
+	* src/file-manager/nautilus-indexing-info.c:
+	* src/nautilus-application.c:
+	* src/nautilus-connect-server-dialog.c:
+	* src/nautilus-information-panel.c:
+	* src/nautilus-location-bar.c:
+	* src/nautilus-navigation-window-menus.c:
+	* src/nautilus-navigation-window.c:
+	* src/nautilus-property-browser.c:
+	* src/nautilus-window-manage-views.c:
+	* src/nautilus-window.c:
+	Update error dialogs to be HIGy, and use the new
+	eel message dialog api.
+	Based on patch from dennis_cranston@yahoo.com
+
+2003-12-10  Federico Mena Quintero  <federico@ximian.com>
+
+	* src/nautilus-connect-server-dialog.c (response_callback): Use
+	GTK_RESPONSE_CANCEL, not a homegrown RESPONSE_CANCEL.  This way we
+	can close the dialog by pressing Escape.
+	(nautilus_connect_server_dialog_init): Likewise.
+
+	* src/nautilus-location-dialog.c (response_callback): Likewise.
+	(nautilus_location_dialog_init): Likewise.
+
+2003-12-10  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas.in:
+	s/directory/folder/
+	Patch by mpusalkar@novell.com
+
+2003-12-08  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* src/file-manager/fm-list-view.c (create_and-set_up_tree_view); Set
+	accessible name. Fixes bug #128525.
+
+=== nautilus 2.5.3 ===
+
+2003-12-08  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.5.3
+
+2003-12-04  Sivaiah Nallagatla  <snallagatla@novell.com>
+ 
+        * src/file-manager/fm-list-view.c(fm_list_view_remove_file): Place  the focus on next item
+        when an item is deleted from list view.
+ 
+2003-12-03  Alexander Larsson  <alexl@redhat.com>
+
+	* src/file-manager/fm-icon-container.c
+	(fm_icon_container_get_icon_description):
+	Fix const missing build failure.
+
+2003-12-03  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* libnautilus-private/nautilus-icon-canvas-item.c:
+	(nautilus_icon_canvas_item_accessible_action_set_description): Return
+	TRUE when function succeeds.
+	(nautilus_icon_canvas_item_accessible_get_name): If name has been set 
+	using atk_object_set_name return that.
+	(nautilus_icon_canvas_item_accessible_finalize): Free image description
+	or description if exists.
+	(nautilus_icon_canvas_item_accessible_get_image_description): Return
+	icon description, if it exists.
+	(nautilus_icon_canvas_item_accessible_set_image-description):
+	Implement this function.
+
+	* libnautilus-private/nautrilus-icon-container.[ch]:
+	(nautilus_icon_container_get_icon_description): New function.
+
+	* src/file-manager/fm-icon-container.c:
+	(fm_icon_container_get_icon_description): New function to implement
+	NautilusIconContainerClass's get_icon_description.
+
+	This fixes part of bug #126183.
+
+2003-12-01  David Bordoley  <bordoley@msu.edu>
+
+	* src/nautilus-application.c: (nautilus_application_close_parent_windows):
+	* src/nautilus-application.h:
+	* src/nautilus-spatial-window-ui.xml:
+	* src/nautilus-spatial-window.c: (file_menu_close_parent_windows_callback),
+	(real_merge_menus):
+	Change "close all parents" to be "close parent folders"
+	and change the behavior to match the label.
+
+2003-12-01 Sivaiah Nallagatla <snallagatla@novell.com>
+	
+	* src/nautilus-navigation-window.c (real_get_default_size) (nautilus_navigation_window_class_init)
+	* src/nautilus-spatial-window.c	(real_get_default_size) (nautilus_spatial_window_class_init)
+	* src/nautilus-window-private.h
+	* src/nautilus-window.c (set_initial_window_geometry)
+	* src/nautilus-window.h : make default size of navigation window bigger and different from that 
+	of spatial window. #127604 in b.g.o
+ 
+2003-11-26  Sebastien Bacher  <seb128@debian.org>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas.in: Fix 
+	other typos. (Closes: #115744).
+
+2003-11-26  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* libnautilus-private/apps_nautilus_preferences.schemas.in: Fix
+	typos. Closes bug #121589.
+
+2003-11-26  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* src/file-manager/fm-properties-window.c:
+	(create_permissions_page):
+	Remove unused variable (broke build).
+
+2003-11-26  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* src/file-manager/fm-properties-window.c:
+	(Add_permissions_checkbox): Add ATK relations between checkbox and 
+	label. Fixes bug #127810.
+
+=== nautilus 2.5.2 ===
+
+2003-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* NEWS: 
+	* configure.in:
+	2.5.2
+
+2003-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* libnautilus-private/nautilus-icon-container.c (nautilus_icon_container_accessible_initialize):
+	Don't crash on startup if a11y is disabled.
+
+2003-11-21  Padraig O'Briain  <padraig.obriain@sun.com>
+
+	* src/file-manager/fm-icon-container.c 
+	(fm_icon_container_instance_init): Add accessible name. 
+	Fixes bug #127485.
+
+2003-11-20  Dave Camp  <dave@ximian.com>
+
+	* src/nautilus-navigation-window.c (real_set_content_view_widget):
+	Forgot this bit of Srini's patch.
+
+2003-11-20  Dave Camp  <dave@ximian.com>
+
+	* src/nautilus-window-manage-views.c: (handle_view_failure): 
+	Disconnect the view.  Patch from Srinivasa 
+	Ragavan <sragavan@novell.com>.
+	
+2003-11-20  Dave Camp  <dave@ximian.com>
+
+	* src/file-manager/fm-list-view.c: (button_press_callback): Grab
+	focus if clicking on a selected row.  Patch from Sivaiah 
+	Nallagatla <snallagatla@novell.com>
+
 2003-11-19  James Willcox  <jwillcox@gnome.org>
 
 	* libnautilus-private/nautilus-icon-canvas-item.c:
diff --git a/Makefile.am b/Makefile.am
index 3ad326b2c..321f8665e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@ EXTRA_DIST=					\
 	intltool-extract.in			\
 	intltool-merge.in			\
 	intltool-update.in			\
+	intltool-modules/XML/Parser/Style/OrigTree.pm \
 	Makefile.shared				\
 	add-include-prefix			\
 	$(DESKTOP_IN_FILES)			\
diff --git a/NEWS b/NEWS
index 84be22cd4..c69540b73 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,26 @@
-This is nautilus 2.5.1.1 The file manager for the Gnome 2 desktop.
+This is nautilus 2.5.4, the file manager for the Gnome 2 desktop.
+
+Major changes since 2.5.3 are:
+* Use GtkIconTheme instead of GnomeIconTheme
+* Show visited folders differently
+* Better mouse/keynav in icon and list view
+* Save window geometry on window close
+* HIG message dialogs
+* File templates support
+
+Major changes since 2.5.2 are:
+* Accessibility fixes
+* Better initial size of navigation window
+* Close all parents closes all parents
+* Focus the next item after delete in list view 
 
 Major changes since 2.5.1.1 are:
+* Don't do unnecessary i/o on remote locations
+* handle broken symlinks that go unbroken
+* various bug fixes
+* some accessibility fixes
+
+Major changes since 2.5.1 are:
 
 * Fixed a NautilusFile leak
 * DISABLE_DEPRECATED fixes.
diff --git a/components/Makefile.am b/components/Makefile.am
index aa566a394..01670366f 100644
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -2,12 +2,10 @@ NULL=
 
 SUBDIRS = 					\
 	adapter                                 \
-	hardware 				\
 	history 				\
 	notes 					\
 	text 					\
 	throbber 				\
-	tree 					\
 	emblem					\
 	image_properties			\
 	$(NULL)
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index 67502ee05..ba17057f2 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -33,10 +33,9 @@
 #include "nautilus-adapter-load-strategy.h"
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-item-container.h>
-#include <eel/eel-generous-bin.h>
 #include <eel/eel-gtk-macros.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtkhbox.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
@@ -123,7 +122,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
 {
 	NautilusAdapter      *adapter;
 	BonoboControl        *control;
-	GtkWidget            *bin;
+	GtkWidget            *box;
 	BonoboObject         *zoomable;
 
 	/* FIXME bugzilla.gnome.org 44405: should be done with
@@ -133,9 +132,9 @@ nautilus_adapter_new (Bonobo_Unknown component)
 	adapter = NAUTILUS_ADAPTER (g_object_new (NAUTILUS_TYPE_ADAPTER, NULL));
 
 	/* Set up a few wrapper framework details */
-	bin = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL);
-	gtk_widget_show (bin);
-	control = bonobo_control_new (bin);
+	box = gtk_hbox_new (FALSE, 0);
+	gtk_widget_show (box);
+	control = bonobo_control_new (box);
 	adapter->details->nautilus_view = nautilus_view_new_from_bonobo_control (control);
 
 	g_object_weak_ref (G_OBJECT (adapter->details->nautilus_view),
@@ -180,7 +179,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
 				 adapter, G_CONNECT_SWAPPED);
 
 	/* complete the embedding */
-	gtk_container_add (GTK_CONTAINER (bin), 
+	gtk_container_add (GTK_CONTAINER (box), 
 			   nautilus_adapter_embed_strategy_get_widget (adapter->details->embed_strategy));
 			   
 	/* hook up view signals. */
diff --git a/components/emblem/nautilus-emblem-view.c b/components/emblem/nautilus-emblem-view.c
index a19219214..e572677a7 100644
--- a/components/emblem/nautilus-emblem-view.c
+++ b/components/emblem/nautilus-emblem-view.c
@@ -200,8 +200,9 @@ nautilus_emblem_view_delete_cb (GtkWidget *menu_item,
 	if (nautilus_emblem_remove_emblem (emblem_view->details->popup_emblem_keyword)) {
 		nautilus_emblem_view_refresh (emblem_view);
 	} else {
-		error = g_strdup_printf (_("Couldn't remove emblem with name '%s'.  This is probably because the emblem is a permanent one, and not one you added yourself."), emblem_view->details->popup_emblem_display_name);
-		eel_show_error_dialog (error, _("Couldn't remove emblem"),
+		error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_view->details->popup_emblem_display_name);
+		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one you added yourself."),
+				       _("Couldn't Remove Emblem"),
 				       NULL);
 		g_free (error);
 	}
@@ -235,8 +236,9 @@ rename_dialog_response_cb (GtkWidget *dialog, int response,
 	if (nautilus_emblem_rename_emblem (keyword, name)) {
 		nautilus_emblem_view_refresh (emblem_view);
 	} else {
-		error = g_strdup_printf (_("Couldn't rename emblem with name '%s'.  This is probably because the emblem is a permanent one, and not one that you added yourself."), name);
-		eel_show_error_dialog (error, _("Couldn't rename emblem"),
+		error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
+		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
+				       _("Couldn't Rename Emblem"),
 				       NULL);
 		g_free (error);
 	}
@@ -737,9 +739,9 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 		nautilus_icon_dnd_uri_list_free_strings (uris);
 
 		if (had_failure && emblems != NULL) {
-			eel_show_error_dialog (_("Some of the files could not be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
+			eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
 		} else if (had_failure && emblems == NULL) {
-			eel_show_error_dialog (_("None of the files could be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
+			eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
 
 		}
  
@@ -760,7 +762,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 		uri = g_strndup (data->data, data->length);
 
 		if (!eel_is_valid_uri (uri)) {
-			eel_show_error_dialog (_("The dragged text was not a valid file location."), _("Couldn't add emblem"), NULL);
+			eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), _("Couldn't Add Emblem"), NULL);
 			break;
 		}
 
@@ -785,7 +787,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 			} else {
 				error = g_strdup (_("The dragged file does not appear to be a valid image."));
 			}
-			eel_show_error_dialog (error, _("Couldn't add emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
 					       NULL);
 			g_free (error);
 			g_free (uri_utf8);
@@ -835,7 +837,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 			g_warning ("Tried to load '%s', but failed.\n",
 				   uri);
 			error = g_strdup_printf (_("The file '%s' does not appear to be a valid image."), uri);
-			eel_show_error_dialog (error, _("Couldn't add emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
 					       NULL);
 			g_free (error);
 		}
diff --git a/components/hardware/.cvsignore b/components/hardware/.cvsignore
deleted file mode 100644
index a62de2b07..000000000
--- a/components/hardware/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-nautilus-hardware-view
-Nautilus_View_hardware.server
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am
deleted file mode 100644
index 7700dd6d9..000000000
--- a/components/hardware/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-NULL=
-
-SUBDIRS=icons
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"Nautilus-Hardware\"		\
-	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
-	-I$(top_srcdir)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	$(COMPONENT_CFLAGS)				\
-	$(NULL)
-
-server_in_files = Nautilus_View_hardware.server.in.in
-
-serverdir = $(libdir)/bonobo/servers
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-@INTLTOOL_SERVER_RULE@
-
-if ENABLE_HARDWARE_VIEW
-libexec_PROGRAMS=nautilus-hardware-view
-server_DATA = $(server_in_files:.server.in.in=.server)
-endif
-
-nautilus_hardware_view_SOURCES =		        \
-	nautilus-hardware-view.c			\
-	nautilus-hardware-view.h			\
-	main.c
-
-nautilus_hardware_view_LDADD =				\
-	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
-	$(COMPONENT_LIBS) 				\
-	$(NULL)
-
-EXTRA_DIST = $(server_in_files) $(nautilus_hardware_view_SOURCES)
-
-if ENABLE_HARDWARE_VIEW
-CLEANFILES = $(server_DATA) $(server_DATA).in
-endif
diff --git a/components/hardware/Nautilus_View_hardware.server.in.in b/components/hardware/Nautilus_View_hardware.server.in.in
deleted file mode 100644
index db3ad89c3..000000000
--- a/components/hardware/Nautilus_View_hardware.server.in.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:Nautilus_Hardware_View_Factory"
-	type="exe" location="@LIBEXECDIR@/nautilus-hardware-view">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="description" type="string" _value="Factory for hardware view"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Nautilus_Hardware_View" type="factory" location="OAFIID:Nautilus_Hardware_View_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-		<item value="IDL:Nautilus/View:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Hardware view"/>
-	<oaf_attribute name="description" type="string" _value="hardware view"/>
-	<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-		<item value="hardware"/>
-	</oaf_attribute>
-	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Hardware"/>
-	<oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Hardware"/>
-	<oaf_attribute name="nautilus:viewer_label" type="string" _value="Hardware Viewer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/components/hardware/icons/.cvsignore b/components/hardware/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/hardware/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/hardware/icons/CD_drive.png b/components/hardware/icons/CD_drive.png
deleted file mode 100644
index 459f11256..000000000
--- a/components/hardware/icons/CD_drive.png
+++ /dev/null
diff --git a/components/hardware/icons/HD_drive.png b/components/hardware/icons/HD_drive.png
deleted file mode 100644
index 9184fa3f6..000000000
--- a/components/hardware/icons/HD_drive.png
+++ /dev/null
diff --git a/components/hardware/icons/Makefile.am b/components/hardware/icons/Makefile.am
deleted file mode 100644
index 6e48a759a..000000000
--- a/components/hardware/icons/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =			\
-	cpu.png			\
-	HD_drive.png		\
-	CD_drive.png		\
-	memory_chip.gif
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/hardware/icons/cpu.png b/components/hardware/icons/cpu.png
deleted file mode 100644
index aa0c63732..000000000
--- a/components/hardware/icons/cpu.png
+++ /dev/null
diff --git a/components/hardware/icons/memory_chip.gif b/components/hardware/icons/memory_chip.gif
deleted file mode 100644
index e422d0661..000000000
--- a/components/hardware/icons/memory_chip.gif
+++ /dev/null
diff --git a/components/hardware/main.c b/components/hardware/main.c
deleted file mode 100644
index 65c45cfd0..000000000
--- a/components/hardware/main.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Andy Hertzfeld
- */
-
-/* main.c - main function and object activation function for the hardware view component. */
-
-#define FACTORY_IID "OAFIID:Nautilus_Hardware_View_Factory" 
-#define VIEW_IID    "OAFIID:Nautilus_Hardware_View"
-
-#include <config.h>
-
-#include "nautilus-hardware-view.h"
-#include <libnautilus/nautilus-view-standard-main.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <eel/eel-debug.h>
-
-static BonoboObject *
-cb_create_hardware_view (const char *ignore0, void *ignore1)
-{
-	NautilusHardwareView *hardware_view =
-		g_object_new (NAUTILUS_TYPE_HARDWARE_VIEW, NULL);
-	return nautilus_hardware_view_get_nautilus_view (hardware_view);
-
-}
-int
-main (int argc, char *argv[])
-{
-	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		eel_make_warnings_and_criticals_stop_in_debugger ();
-	}
-
-	return nautilus_view_standard_main ("nautilus-hardware-view",
-					    VERSION,
-					    GETTEXT_PACKAGE,
-					    GNOMELOCALEDIR,
-					    argc,
-					    argv,
-					    FACTORY_IID,
-					    VIEW_IID,
-					    cb_create_hardware_view,
-					    nautilus_global_preferences_init,
-					    NULL);
-}
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
deleted file mode 100644
index cc821afde..000000000
--- a/components/hardware/nautilus-hardware-view.c
+++ /dev/null
@@ -1,781 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-/*
- *  Copyright (C) 2000 Eazel, Inc.
- *
- *  This library 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 library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this library; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Author: Andy Hertzfeld <andy@eazel.com>
- *          Shane Butler <shane_b@bigfoot.com>
- *
- */
-
-
-/* hardware view - presents various views of the hardware configuration */
-
-#include <config.h>
-#include "nautilus-hardware-view.h"
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gnome.h>
-#include <gtk/gtksignal.h>
-#include <eel/eel-background.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <libnautilus-private/nautilus-directory-background.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <eel/eel-string.h>
-#include <libnautilus/libnautilus.h>
-#include <limits.h>
-#include <locale.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-struct _NautilusHardwareViewDetails {
-        NautilusView *nautilus_view;
-	BonoboPropertyBag *property_bag;
-	        
-        GtkWidget *form;
-	
-	GtkLabel  *uptime_label;
-	int timer_task;
-	
-	int cpu_count;
-	int mem_size;
-};
-
-/* drag and drop properties */
-enum {
-	TARGET_COLOR
-};
-
-/* property bag properties */
-enum {
-	ICON_NAME,
-	COMPONENT_INFO
-};
-
-static GtkTargetEntry hardware_dnd_target_table[] = {
-	{ "application/x-color", 0, TARGET_COLOR },
-};
-
-static void nautilus_hardware_view_drag_data_received (GtkWidget                 *widget,
-                                                       GdkDragContext            *context,
-                                                       int                        x,
-                                                       int                        y,
-                                                       GtkSelectionData          *selection_data,
-                                                       guint                      info,
-                                                       guint                      time);
-static void nautilus_hardware_view_class_init   (NautilusHardwareViewClass *klass);
-static void nautilus_hardware_view_init         (NautilusHardwareView      *view);
-static void nautilus_hardware_view_finalize            (GObject                 *object);
-static void hardware_view_load_location_callback      (NautilusView              *view,
-                                                       const char                *location,
-                                                       NautilusHardwareView      *hardware_view);
-static char* make_summary_string		      (NautilusHardwareView	 *hardware_view);
-static int  update_uptime_text			      (gpointer			 callback_data);
-
-EEL_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, EEL_TYPE_BACKGROUND_BOX)
-
-static void
-nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = G_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
-
-	object_class->finalize = nautilus_hardware_view_finalize;
-	widget_class->drag_data_received  = nautilus_hardware_view_drag_data_received;
-}
-
-/* property bag property access routines */
-static void
-get_bonobo_properties (BonoboPropertyBag *bag,
-			BonoboArg *arg,
-			guint arg_id,
-			CORBA_Environment *ev,
-			gpointer callback_data)
-{
-	char *hardware_summary;
-	
-	switch (arg_id) {
-        	case ICON_NAME:
-                	BONOBO_ARG_SET_STRING (arg, "computer");					
-                	break;
-        	
-        	case COMPONENT_INFO:
-                	hardware_summary = make_summary_string ((NautilusHardwareView*) callback_data);
-                	BONOBO_ARG_SET_STRING (arg, hardware_summary);					
-                	g_free (hardware_summary);
-                	break;
-	
-        	default:
-                	g_warning ("Unhandled arg %d", arg_id);
-                	break;
-	}
-}
-
-/* there are no settable properties, so complain if someone tries to set one */
-static void
-set_bonobo_properties (BonoboPropertyBag *bag,
-			const BonoboArg *arg,
-			guint arg_id,
-			CORBA_Environment *ev,
-			gpointer callback_data)
-{
-                g_warning ("Bad Property set on hardware view: property ID %d", arg_id);
-}
-
-/* initialize ourselves by connecting to the load_location signal and allocating our subviews */
-static void
-nautilus_hardware_view_init (NautilusHardwareView *hardware_view)
-{
-  	EelBackground *background;
-
-	hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1);
-
-	hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (hardware_view));
-
-	g_signal_connect_object (hardware_view->details->nautilus_view, "load_location",
-                                 G_CALLBACK (hardware_view_load_location_callback), hardware_view, 0);
-
-  	background = eel_get_widget_background (GTK_WIDGET (hardware_view));
-
-	/* prepare ourselves to receive dropped objects */
-	gtk_drag_dest_set (GTK_WIDGET (hardware_view),
-			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   hardware_dnd_target_table, G_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
- 
- 	/* allocate a property bag to specify the name of the icon for this component */
-	hardware_view->details->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, hardware_view);
-	bonobo_property_bag_add (hardware_view->details->property_bag, "icon_name", ICON_NAME, BONOBO_ARG_STRING, NULL,
-				 _("name of icon for the hardware view"), 0);
-	bonobo_property_bag_add (hardware_view->details->property_bag, "summary_info", COMPONENT_INFO, BONOBO_ARG_STRING, NULL,
-				 _("summary of hardware info"), 0);
-	bonobo_control_set_properties (nautilus_view_get_bonobo_control (hardware_view->details->nautilus_view),
-	                               BONOBO_OBJREF (hardware_view->details->property_bag), NULL);
-
-	/* add the timer task to update the uptime */
-	hardware_view->details->timer_task = gtk_timeout_add (60000, update_uptime_text, hardware_view); 
-
-	gtk_widget_show_all (GTK_WIDGET (hardware_view));
-}
-
-static void
-nautilus_hardware_view_finalize (GObject *object)
-{
-	NautilusHardwareView *hardware_view;
-
-        hardware_view = NAUTILUS_HARDWARE_VIEW (object);
-
-        bonobo_object_unref (hardware_view->details->property_bag);
-	
-	if (hardware_view->details->timer_task != 0) {
-		gtk_timeout_remove (hardware_view->details->timer_task);
-	}
-
-	g_free (hardware_view->details);
-
-	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
-}
-
-/* Component embedding support */
-BonoboObject *
-nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *hardware_view)
-{
-	return BONOBO_OBJECT (hardware_view->details->nautilus_view);
-}
-
-static char * 
-read_proc_info (const char* proc_filename)
-{
-	FILE *thisFile;
-	char *result;
-	char buffer[256];
-	char* path_name;
-	GString* string_data = g_string_new("");
-	
-        path_name = g_strdup_printf ("/proc/%s", proc_filename);	
-	thisFile = fopen (path_name, "r");
-	g_free (path_name);
-	while (fgets (buffer, 255, thisFile) != NULL) {
-		g_string_append (string_data, buffer);		
-	}
-	fclose (thisFile);
-	
-	result = string_data->str;
-	g_string_free(string_data, FALSE);
-
-	return result;
-}
-
-/* utility routine to extract information from a string and add it to an XML node */
-
-static char*
-extract_info (char* data, const char *field_name, int nth)
-{
-	int index;
-	char **info_array;
-	char *field_data = NULL;
-	
-	/* parse the data into a string array */
-	info_array = g_strsplit (data, "\n", 32);
-	/* iterate through the data isolating the field */
-	for (index = 0; index < 32; index++) {
-		if (info_array[index] == NULL) {
-			break;
-                }
-		if (eel_str_has_prefix(info_array[index], field_name)) {
-			if (nth > 0) {
-                                nth--;
-			} else {
-				field_data = info_array[index] + strlen(field_name);
-				field_data = strchr(field_data, ':') + 1;
-				field_data =  g_strchug(field_data);
-				break;
-			}
-		}
-	}
-	
-	/* add the requested node if the field was found */
-	field_data = g_strdup (field_data);
-	g_strfreev (info_array);
-	return field_data;
-}
-
-/* get descriptive text about the CPU */
-
-static char *
-get_CPU_description (int nth)
-{
-	char *proc_data;
-        char *model, *speed, *cache_size; 
-        char *localized_speed;
-	char *result;
-	char *p;
- 	struct lconv *l;
-
-        proc_data = read_proc_info ("cpuinfo");
-	model = extract_info (proc_data, "model name", nth);
-	speed = extract_info (proc_data, "cpu MHz", nth);
-	cache_size = extract_info (proc_data, "cache size", nth);
-	g_free (proc_data);
-        
-  	/* Hack to localize the decimal_point */
-        p = speed == NULL ? NULL : strrchr (speed, '.');
-        if (p == NULL) {
-                localized_speed = g_strdup (speed);
-        } else {
-                *p = '\0';
-                l = localeconv ();
-                localized_speed = g_strconcat (speed, l->decimal_point,
-                                               p + 1, NULL);
-        }
-        
-        /* Remove the " KB" part so that it can be localized */
-        if (cache_size != NULL) {
-                p = strchr (cache_size, ' ');
-                if (p != NULL) {
-                        *p = '\0';
-                }   
-        }  	
-        
-        if (model == NULL || speed == NULL || cache_size == NULL) {
-                result = NULL;
-        } else {
-                result = g_strdup_printf (_("%s CPU\n"
-                                            "%s MHz\n"
-                                            "%s K cache size"),
-                                          model, localized_speed, cache_size);
-        }
-        
-        g_free (model);
-        g_free (speed);
-        g_free (localized_speed);
-        g_free (cache_size);
-
-	return result;	
-}
-
-/* get descriptive information about main memory */
-static char *
-get_RAM_description (void)
-{
-	char *temp_str, *result;
-	char *proc_data;
-        gulong ram_size;
-
-        proc_data = read_proc_info ("meminfo");
-
-	temp_str = extract_info (proc_data, "MemTotal", 0);
-        if (temp_str == NULL || strlen (temp_str) < 3) {
-                g_free (temp_str);
-                return NULL;
-        }
-
-        /* strip kbyte suffix */
-	temp_str[strlen(temp_str) - 3] = '\0';
-
-	ram_size = (strtoul (temp_str, NULL, 10) + 500) / 1000;
-	if (ram_size >= 1000) {
-		result = g_strdup_printf (_("%lu GB RAM"), ram_size / 1000);
-	} else {
-		result = g_strdup_printf (_("%lu MB RAM"), ram_size);
-	}
-
- 	g_free (temp_str);
-
-	g_free (proc_data);
-
-	return result;
-}
-
-static char *
-get_IDE_description (const char *device)
-{
-        char *temp_str, *num_str, *result;
-        GString *string_data = g_string_new("");
-        char *proc_file;
-        gulong capacity;
-
-        /* Read model information string */
-        proc_file = g_strdup_printf ("%s/model", device);
-        temp_str = read_proc_info (proc_file);
-        temp_str[strlen (temp_str) - 1] = '\0';
-        g_string_append (string_data, temp_str);
-        g_free (temp_str);
-        g_free (proc_file);
-        
-        /* Read media type */
-        proc_file = g_strdup_printf ("%s/media", device);
-        temp_str = read_proc_info (proc_file);
-        g_free (proc_file);
-        
-        /* If a hard disk, get the size */
-        if (strcmp (temp_str, "disk\n") == 0) {
-                g_free (temp_str);
-
-                proc_file = g_strdup_printf ("%s/capacity", device);
-                temp_str = read_proc_info (proc_file);
-                temp_str[strlen (temp_str) - 1] = '\0';
-
-                 /* NOTE: this should be 
-		  *  capacity = strtoul (...)
-		  *  num_str = gnome_vfs_format_file_size_for_display (512 * numsectors);   
-		  *               
-		  *  (512 bytes per sector)
-		  *
-		  *  but with large disks we overflow an unsigned long, which is the
-		  *  the type that gnome_vfs uses (Darin: Not true, gnome-vfs uses 64-bit integers).  
-		  *
-		  *  ALSO, in keeping with disk manufacturer convention, disk sizes
-		  *  are quoted in powers of 10 (i.e., MB is 10^6, GB is 10^9).
-		  *  (see http://www.maxtor.com/technology/Digi_vs_Deci.html
-		  *  So as to not confuse the user too much, we will follow the
-		  *  same convention.)
-		  *
-		  */
-   
-		capacity = (512 * (strtoul (temp_str, NULL, 10) / 1000)) / 1000;
-		if (capacity >= 1000) {
-			num_str = g_strdup_printf (_("%lu GB"), capacity / 1000);
-		} else {
-			num_str = g_strdup_printf (_("%lu MB"), capacity);
-		}
-             
-		g_string_append (string_data, "\n");
-                g_string_append (string_data, num_str);
-                g_free (temp_str);
-                g_free (proc_file);
-        } else {
-                g_free (temp_str);
-        }
-        
-        result = string_data->str;
-        g_string_free (string_data, FALSE);
-        
-        return result;
-}
-
-
-/* shared utility to allocate a title for a form */
-
-static void
-setup_form_title (NautilusHardwareView *view,
-                  const char *image_name,
-                  const char *title_text)
-{
-	GtkWidget *temp_widget;
-	char *file_name;	
-	GtkWidget *temp_container = gtk_hbox_new(FALSE, 0);
-
-	gtk_box_pack_start (GTK_BOX(view->details->form), temp_container, 0, 0, 4);	
-	gtk_widget_show(temp_container);
-	
-	if (image_name != NULL) {
- 		file_name = gnome_program_locate_file (
-                        NULL, GNOME_FILE_DOMAIN_PIXMAP, image_name, TRUE, NULL);
-		
-		if (file_name != NULL) {
-			temp_widget = gtk_image_new_from_file (file_name);
-			gtk_box_pack_start (GTK_BOX(temp_container), temp_widget, 0, 0, 8);		
-			gtk_widget_show (temp_widget);
-			g_free (file_name);
-		}
-	}
-	
- 	temp_widget = gtk_label_new (title_text);
-	eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_XX_LARGE);
-
-	gtk_box_pack_start (GTK_BOX (temp_container), temp_widget, 0, 0, 8);			 	
-	gtk_widget_show (temp_widget);
-}
-
-/* utility to add an element to the hardware view */
-static void
-add_element_to_table (GtkWidget *table, GtkWidget *element, int element_index)
-{
-	int column_pos, row_pos;
-	
-	column_pos = element_index % 3;
-	row_pos = element_index / 3;
-  	
-	gtk_table_attach (GTK_TABLE (table),element,
-			  column_pos, column_pos + 1, row_pos ,row_pos + 1, 
-			  GTK_FILL, GTK_FILL, 12, 12);
-}
-
-/* uptime the uptime label with the current uptime */
-static int
-update_uptime_text (gpointer callback_data)
-{
-	char *uptime_data, *uptime_text;
-	double uptime_seconds;
-	int uptime_days, uptime_hours, uptime_minutes;
-	
-	uptime_data = read_proc_info ("uptime");
-	uptime_seconds = atof (uptime_data);
-	
-	uptime_days = uptime_seconds / 86400;
-	uptime_hours = (uptime_seconds - (uptime_days * 86400)) / 3600;
-	uptime_minutes = (uptime_seconds - (uptime_days * 86400) - (uptime_hours * 3600)) / 60;
-	
-	uptime_text = g_strdup_printf (_("Uptime is %d days, %d hours, %d minutes"), uptime_days, uptime_hours, uptime_minutes);
-	gtk_label_set_text (NAUTILUS_HARDWARE_VIEW (callback_data)->details->uptime_label, uptime_text);
-	g_free (uptime_text);
-	
-	g_free (uptime_data);
-	return TRUE;
-}
-
-/* set up the widgetry for the overview page */
-static void
-setup_overview_form (NautilusHardwareView *view)
-{
-	char  *file_name, *temp_text;
-	GtkWidget *temp_widget, *pixmap_widget, *temp_box;
-	GtkWidget *table;
-	int element_index;
-	DIR *directory;
-        struct dirent* entry;
-        char *device, *proc_file, *ide_media;
-	
-	/* allocate a vbox as the container */	
-	view->details->form = gtk_vbox_new(FALSE,0);
-	gtk_container_add (GTK_CONTAINER (view), view->details->form);	
-	gtk_widget_show(view->details->form);
-
-	/* set up the title */	
-	setup_form_title (view, NULL, _("Hardware Overview"));
-
-	/* allocate a table to hold the elements */
-	table =  gtk_table_new (3, 3, FALSE);	
-	gtk_box_pack_start (GTK_BOX (view->details->form), table, 0, 0, 2);	
-	gtk_widget_show (GTK_WIDGET(table));
-   	element_index = 0;
-	
-   	view->details->cpu_count = 0;
-	while( (temp_text = get_CPU_description (view->details->cpu_count)) != NULL ) {
-		temp_box = gtk_vbox_new(FALSE, 4);
-		add_element_to_table (table, temp_box, element_index++);
-		gtk_widget_show (temp_box);
-
-		file_name = nautilus_pixmap_file ("cpu.png");
-                temp_widget = gtk_image_new_from_file (file_name);
-		gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
-		gtk_widget_show (temp_widget);
-		g_free (file_name);
-		
-		temp_widget = gtk_label_new (temp_text);
-		eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
-		gtk_label_set_justify (GTK_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
-		g_free(temp_text);
-		gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
-		gtk_widget_show (temp_widget);
-
-		view->details->cpu_count++;
-	}
-
-	/* set up the memory info */
-       	temp_box = gtk_vbox_new(FALSE, 4);
-	add_element_to_table (table, temp_box, element_index++);
-	gtk_widget_show (temp_box);
-
- 	file_name = nautilus_pixmap_file ("memory_chip.gif");
-  	temp_widget = gtk_image_new_from_file (file_name);
-	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
-  	gtk_widget_show(temp_widget);
-  	g_free (file_name);
-	
-	temp_text = get_RAM_description ();
-	temp_widget = gtk_label_new (temp_text);
-	eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
-	g_free (temp_text);
-	gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
- 	gtk_widget_show (temp_widget);
-	
-        /* Set up ide devices : by Shane Butler <shane_b@bigfoot.com> */
-        /* Open the ide devices directory */
-        if((directory = opendir("/proc/ide/")) != NULL) {
-                while((entry = readdir(directory)) != NULL) {
-                        /* Scan though each entry for actual device dirs */
-                        if(!strncmp(entry->d_name, "hd", 2)) {
-                                temp_box = gtk_vbox_new(FALSE, 4);
-				add_element_to_table (table, temp_box, element_index++);
-                                gtk_widget_show(temp_box);
-                                
-                                device = g_strdup_printf("ide/%s", entry->d_name);
-                                
-                                proc_file = g_strdup_printf("%s/media", device);
-                                ide_media = read_proc_info(proc_file);
-                                g_free(proc_file);
-                                
-                                /* Set the icon depending on the type of device */
-                                if (strcmp (ide_media, "disk\n") == 0) {
-                                        file_name = nautilus_pixmap_file ("HD_drive.png");
-                                } else if (strcmp (ide_media, "cdrom\n") == 0) {
-                                        file_name = nautilus_pixmap_file ("CD_drive.png");
-                                } else {
-                                        /* some other device ... still set an icon */
-                                        file_name = nautilus_pixmap_file ("HD_drive.png");
-                                }
-                                
-				pixmap_widget = gtk_image_new_from_file (file_name);
-				gtk_box_pack_start (GTK_BOX(temp_box), pixmap_widget, 0, 0, 0);
-				gtk_widget_show(pixmap_widget);
-				g_free(file_name);
-				g_free(ide_media);
-                                
-				temp_text = get_IDE_description (device);
-				temp_widget = gtk_label_new (temp_text);
-				eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
-				gtk_label_set_justify (GTK_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
-
-				g_free(temp_text);
-                                gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);
-                                gtk_widget_show(temp_widget);
-   
-                                g_free(device);
-                        }
-                }
-                closedir(directory);
-        }
-
-	/* allocate the uptime label */
-	view->details->uptime_label = GTK_LABEL (gtk_label_new (""));
-	eel_gtk_label_set_scale (view->details->uptime_label, PANGO_SCALE_LARGE);
-
-	gtk_box_pack_end (GTK_BOX (view->details->form), GTK_WIDGET (view->details->uptime_label), 0, 0, GNOME_PAD);
-	update_uptime_text (view);
-	gtk_widget_show(GTK_WIDGET (view->details->uptime_label));
-	
-}
-
-#ifdef ENABLE_SUBVIEWS
-
-/* set up the widgetry for the CPU page */
-
-static void
-setup_CPU_form (NautilusHardwareView *view)
-{
-	char *message;
-	GtkWidget *temp_widget;
-	
-	/* allocate a vbox as the container */	
-	view->details->form = gtk_vbox_new(FALSE,0);
-	gtk_container_add (GTK_CONTAINER (view), view->details->form);	
-	gtk_widget_show(view->details->form);
-
-	/* set up the title */	
-	setup_form_title (view, NULL, "CPU");
-	
-	message = _("This is a placeholder for the CPU page.");
-	temp_widget = gtk_label_new (message);
-	eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
- 	gtk_label_set_line_wrap (GTK_LABEL (temp_widget), TRUE);
-	
-	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
- 	gtk_widget_show (temp_widget);
-}
-
-/* set up the widgetry for the RAM page */
-
-static void
-setup_RAM_form (NautilusHardwareView *view)
-{
-	char *message;
-	GtkWidget *temp_widget;
-	
-	/* allocate a vbox as the container */	
-	view->details->form = gtk_vbox_new(FALSE,0);
-	gtk_container_add (GTK_CONTAINER (view), view->details->form);	
-	gtk_widget_show(view->details->form);
-
-	/* set up the title */	
-	setup_form_title (view, NULL, "RAM");
-	
-	message = _("This is a placeholder for the RAM page.");
-	temp_widget = gtk_label_new (message);
-	eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
- 	gtk_label_set_line_wrap (GTK_LABEL (temp_widget), TRUE);
-	
-	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
- 	gtk_widget_show (temp_widget);
-}
-
-/* set up the widgetry for the IDE page */
-
-static void
-setup_IDE_form (NautilusHardwareView *view)
-{
-        char *message;
-        GtkWidget *temp_widget;
-        
-        /* allocate a vbox as the container */  
-        view->details->form = gtk_vbox_new(FALSE,0);
-        gtk_container_add (GTK_CONTAINER (view), view->details->form);  
-        gtk_widget_show(view->details->form);
-        
-        /* set up the title */  
-        setup_form_title (view, NULL, "IDE");
-        
-        message = _("This is a placeholder for the IDE page.");
-        temp_widget = gtk_label_new (message);
-	eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE);
-        gtk_label_set_line_wrap (GTK_LABEL (temp_widget), TRUE);
-        
-        gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);            
-        gtk_widget_show (temp_widget);
-}
-
-
-/* utility for checking uri */
-static gboolean
-is_location (const char *document_str, const char *place_str)
-{
-	return document_str && strncmp(document_str + 1, place_str, strlen (place_str)) == 0;
-}
-
-#endif /* ENABLE_SUBVIEWS */
-
-/* load the uri by casing out on the path */
-
-void
-nautilus_hardware_view_load_uri (NautilusHardwareView *view, const char *uri)
-{
-#ifdef ENABLE_SUBVIEWS
-	const char *document_name;
-#endif
-	
-	/* dispose of any old form that was installed */
-	if (view->details->form != NULL) {
-		gtk_widget_destroy (view->details->form);
-		view->details->form = NULL;	
-	}
-		
-#ifndef ENABLE_SUBVIEWS
-        setup_overview_form (view);
-#else
-	/* extract the document part of the uri */
-	document_name = strchr (uri, ':');
-	
-	/* load the appropriate form, based on the uri and the registration state */
-	if (is_location (document_name, "overview")) {
-		setup_overview_form (view);
-	} else if (is_location (document_name, "CPU")) {
-		setup_CPU_form (view);
-	} else if (is_location (document_name, "RAM")) {
-		setup_RAM_form (view);
-        } else if (is_location (document_name, "IDE")) {
-                setup_IDE_form (view);
-	} else {
-		setup_overview_form (view); /* if we don't understand it, go to the overview */
-        }
-#endif
-}
-
-/* Create a string summarizing the most important hardware attributes */
-static char *
-make_summary_string (NautilusHardwareView *hardware_view)
-{
-	if (hardware_view->details->cpu_count == 1) {
-		return g_strdup ("1 CPU");
-	} else {
-		return g_strdup_printf ("%d CPUs", hardware_view->details->cpu_count);
-	}
-}
-
-static void
-hardware_view_load_location_callback (NautilusView *view, 
-                                      const char *location, 
-                                      NautilusHardwareView *hardware_view)
-{
-	nautilus_view_report_load_underway (hardware_view->details->nautilus_view);
-	nautilus_view_set_title (hardware_view->details->nautilus_view, _("Hardware"));	
-	nautilus_hardware_view_load_uri (hardware_view, location);
-	nautilus_view_report_load_complete (hardware_view->details->nautilus_view);
-}
-
-/* handle drag and drop */
-
-static void  
-nautilus_hardware_view_drag_data_received (GtkWidget *widget, GdkDragContext *context,
-					 int x, int y,
-					 GtkSelectionData *selection_data, guint info, guint time)
-{
-	g_return_if_fail (NAUTILUS_IS_HARDWARE_VIEW (widget));
-
-	switch (info) {
-        case TARGET_COLOR:
-                /* Let the background change based on the dropped color. */
-                eel_background_receive_dropped_color (eel_get_widget_background (widget),
-                                                      widget, 
-                                                      GDK_ACTION_COPY,
-                                                      x, y, selection_data);
-                break;
-                
-        default:
-                g_warning ("unknown drop type");
-                break;
-        }
-}
diff --git a/components/hardware/nautilus-hardware-view.h b/components/hardware/nautilus-hardware-view.h
deleted file mode 100644
index 57cf3a79e..000000000
--- a/components/hardware/nautilus-hardware-view.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Andy Hertzfeld
- */
-
-/* header file for the hardware view component */
-
-#ifndef NAUTILUS_HARDWARE_VIEW_H
-#define NAUTILUS_HARDWARE_VIEW_H
-
-#include <libnautilus/nautilus-view.h>
-#include <eel/eel-background-box.h>
-
-
-typedef struct _NautilusHardwareView      NautilusHardwareView;
-typedef struct _NautilusHardwareViewClass NautilusHardwareViewClass;
-
-#define NAUTILUS_TYPE_HARDWARE_VIEW		(nautilus_hardware_view_get_type ())
-#define NAUTILUS_HARDWARE_VIEW(obj)		(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_HARDWARE_VIEW, NautilusHardwareView))
-#define NAUTILUS_HARDWARE_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_HARDWARE_VIEW, NautilusHardwareViewClass))
-#define NAUTILUS_IS_HARDWARE_VIEW(obj)		(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_HARDWARE_VIEW))
-#define NAUTILUS_IS_HARDWARE_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_HARDWARE_VIEW))
-
-typedef struct _NautilusHardwareViewDetails NautilusHardwareViewDetails;
-
-struct _NautilusHardwareView {
-	EelBackgroundBox parent;
-	NautilusHardwareViewDetails *details;
-};
-
-struct _NautilusHardwareViewClass {
-	EelBackgroundBoxClass parent_class;
-};
-
-/* GObject support */
-GType	      nautilus_hardware_view_get_type          (void);
-
-/* Component embedding support */
-BonoboObject *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *view);
-
-/* URI handling */
-void          nautilus_hardware_view_load_uri          (NautilusHardwareView *view,
-							const char           *uri);
-
-#endif /* NAUTILUS_HARDWARE_VIEW_H */
diff --git a/components/image_properties/nautilus-image-properties-view.c b/components/image_properties/nautilus-image-properties-view.c
index a940e9f2a..fe7b3e624 100644
--- a/components/image_properties/nautilus-image-properties-view.c
+++ b/components/image_properties/nautilus-image-properties-view.c
@@ -197,7 +197,7 @@ append_exifdata_string (ExifData *exifdata, GString *string)
                 append_tag_value_pair (string, exifdata, EXIF_TAG_APERTURE_VALUE, _("Aperture Value"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_METERING_MODE, _("Metering Mode"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_FLASH,_("Flash Fired"));
-                append_tag_value_pair (string, exifdata, EXIF_TAG_FOCAL_LENGTH,_("Focal Lenght"));
+                append_tag_value_pair (string, exifdata, EXIF_TAG_FOCAL_LENGTH,_("Focal Length"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_SHUTTER_SPEED_VALUE, _("Shutter Speed"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_ISO_SPEED_RATINGS, _("ISO Speed Rating"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_SOFTWARE, _("Software"));
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
deleted file mode 100644
index e4c0f9ab6..000000000
--- a/components/music/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-NULL =
-
-if X86_OPTIMIZED
-optimized_source = dct64_i386.c decode_i386.c
-else
-optimized_source = dct64.c decode.c
-endif
-
-platform_source = decode.c dct64.c decode_i386.c dct64_i386.c
-
-INCLUDES =					\
-	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
-	-I$(top_srcdir)				\
-	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
-	$(DISABLE_DEPRECATED_CFLAGS)		\
-	$(MUSIC_COMPONENT_CFLAGS)		\
-	$(NULL)
-
-libexec_PROGRAMS=nautilus-music-view
-
-nautilus_music_view_SOURCES =			\
-	common.c				\
-	decode_2to1.c				\
-	decode_4to1.c				\
-	decode_ntom.c				\
-	dxhead.c				\
-	dxhead.h				\
-	esd-audio.c				\
-	esd-audio.h				\
-	esd-mixer.c				\
-	getbits.h				\
-	huffman.h				\
-	id3.c					\
-	id3.h					\
-	id3_frame.c				\
-	id3_frame_content.c			\
-	id3_frame_text.c			\
-	id3_frame_url.c				\
-	id3_header.h				\
-	id3_tag.c				\
-	l2tables.h				\
-	layer1.c				\
-	layer2.c				\
-	layer3.c				\
-	main.c					\
-	mp3head.c				\
-	mp3head.h				\
-	mpg123.c				\
-	mpg123.h				\
-	nautilus-music-view.c			\
-	nautilus-music-view.h			\
-	pixmaps.h				\
-	tabinit.c				\
-	$(optimized_source)
-
-nautilus_music_view_LDADD =			\
-	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
-	$(MUSIC_COMPONENT_LIBS)			\
-	$(NULL)
-
-server_in_files = Nautilus_View_music.server.in.in
-
-serverdir = $(libdir)/bonobo/servers
-server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-@INTLTOOL_SERVER_RULE@
-
-EXTRA_DIST=$(server_in_files) $(platform_source) \
-	configure.c				\
-	fileinfo.c				\
-	getbits.c				\
-	$(NULL)
-CLEANFILES = $(server_DATA) $(server_DATA).in
diff --git a/components/music/Nautilus_View_music.server.in.in b/components/music/Nautilus_View_music.server.in.in
deleted file mode 100644
index 9a5152cc0..000000000
--- a/components/music/Nautilus_View_music.server.in.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:Nautilus_Music_View_Factory"
-	type="exe" location="@LIBEXECDIR@/nautilus-music-view">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Music view factory"/>
-	<oaf_attribute name="description" type="string" _value="Factory for music view"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:Nautilus_Music_View" type="factory" location="OAFIID:Nautilus_Music_View_Factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-		<item value="IDL:Nautilus/View:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Music view"/>
-	<oaf_attribute name="description" type="string" _value="Music view"/>
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="x-directory/*"/>
-	</oaf_attribute>
-	<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-		<item value="file"/>
-	</oaf_attribute>
-	<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv">
-		<item value="audio/x-mpeg"/>
-		<item value="audio/x-mp3"/>
-	</oaf_attribute>
-	<oaf_attribute name="nautilus:view_as_name" type="string" _value="Music"/>
-	<oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Music"/>
-	<oaf_attribute name="nautilus:viewer_label" type="string" _value="Music Viewer"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/components/music/common.c b/components/music/common.c
deleted file mode 100644
index 46a6ee636..000000000
--- a/components/music/common.c
+++ /dev/null
@@ -1,662 +0,0 @@
-#include "config.h"
-
-#include <stdlib.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-/*  #ifdef HAVE_MMAP */
-#if 0
-#include <sys/mman.h>
-#ifndef MAP_FAILED
-#define MAP_FAILED ( (void *) -1 )
-#endif
-#endif
-
-#include "mpg123.h"
-#include "id3.h"
-#include "id3_header.h"
-
-#include <glib/gmem.h>
-
-/* max = 1728 */
-#define MAXFRAMESIZE 1792
-
-int tabsel_123[2][3][16] =
-{
-	{
-    {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,},
-       {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,},
-       {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,}},
-
-	{
-       {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256,},
-	    {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,},
-	    {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,}}
-};
-
-long mpg123_freqs[9] =
-{44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000};
-
-struct bitstream_info bsi;
-
-extern gint mpg123_bitrate, mpg123_frequency, mpg123_length;
-extern gchar *mpg123_title, *mpg123_filename;
-extern gboolean mpg123_stereo;
-
-static int fsizeold = 0, ssize;
-static unsigned char bsspace[2][MAXFRAMESIZE + 512];	/* MAXFRAMESIZE */
-static unsigned char *bsbuf = bsspace[1], *bsbufold;
-static int bsnum = 0;
-
-unsigned char *mpg123_pcm_sample;
-int mpg123_pcm_point = 0;
-
-static FILE *filept;
-
-static int get_fileinfo(void);
-
-static int fullread(FILE * fd, unsigned char *buf, int count)
-{
-	int ret, cnt = 0;
-
-	while (cnt < count)
-	{
-		ret = fread(buf + cnt, 1, count - cnt, fd);
-		if (ret < 0)
-			return ret;
-		if (ret == 0)
-			break;
-		cnt += ret;
-	}
-	return cnt;
-}
-
-#define HDRCMPMASK 0xfffffd00
-
-/*  #ifdef HAVE_MMAP */
-#if 0
-
-static unsigned char *mapbuf;
-static unsigned char *mappnt;
-static unsigned char *mapend;
-
-static int stream_init(void)
-{
-	long len;
-
-	len = get_fileinfo();
-	if (len < 0)
-		return -1;
-
-	mappnt = mapbuf = mmap(NULL, len, PROT_READ, MAP_SHARED, filept, 0);
-	if (!mapbuf || mapbuf == MAP_FAILED)
-		return -1;
-
-	mapend = mapbuf + len;
-
-	return 0;
-}
-
-static void stream_rewind(void)
-{
-	mappnt = mapbuf;
-}
-
-void mpg123_stream_close (void)
-{
-	if (filept) {
-		munmap(mapbuf, mapend - mapbuf);
-		close (filept);
-		filept = 0;
-	}
-}
-
-static int stream_head_read(unsigned long *newhead)
-{
-	unsigned long nh;
-
-	if (filept) {
-		if (mappnt + 4 > mapend)
-			return FALSE;
-
-		nh = (*mappnt++) << 24;
-		nh |= (*mappnt++) << 16;
-		nh |= (*mappnt++) << 8;
-		nh |= (*mappnt++);
-
-		*newhead = nh;
-
-	}
-	else
-	{
-		unsigned char hbuf[4];
-
-		if (fullread(filept, hbuf, 4) != 4)
-			return FALSE;
-
-		*newhead = ((unsigned long) hbuf[0] << 24) |
-			((unsigned long) hbuf[1] << 16) |
-			((unsigned long) hbuf[2] << 8) |
-			(unsigned long) hbuf[3];
-	}
-	return TRUE;
-
-}
-
-static int stream_head_shift(unsigned long *head)
-{
-
-	if (filept) {
-		if (mappnt + 1 > mapend)
-			return FALSE;
-		*head <<= 8;
-		*head |= *mappnt++;
-		*head &= 0xffffffff;
-	}
-	else
-	{
-		unsigned char hbuf;
-
-		if (fullread(filept, &hbuf, 1) != 1)
-			return 0;
-		*head <<= 8;
-		*head |= hbuf;
-		*head &= 0xffffffff;
-	}
-	return TRUE;
-}
-
-static int stream_mpg123_read_frame_body(unsigned char *buf,
-					 int size)
-{
-	if (filept) {
-#if 1
-		if (mappnt + size > mapend)
-			return FALSE;
-#else
-		long l;
-
-		if (size > (mapend - mappnt))
-		{
-			l = mapend - mappnt;
-			memcpy(buf, mappnt, l);
-			memset(buf + l, 0, size - l);
-		}
-		else
-#endif
-			memcpy(buf, mappnt, size);
-
-		mappnt += size;
-	}
-	else
-	{
-		long l;
-
-		if ((l = fullread(filept, buf, size)) != size)
-		{
-			if (l <= 0)
-				return 0;
-			memset(buf + l, 0, size - l);
-		}
-	}
-
-	return TRUE;
-}
-
-static int stream_back_bytes(int bytes)
-{
-	if ((mappnt - bytes) < mapbuf || (mappnt - bytes + 4) > mapend)
-		return -1;
-	mappnt -= bytes;
-	return 0;
-}
-
-void mpg123_stream_jump_to_frame(struct frame *fr, int frame)
-{
-	if (mapbuf + frame * (fr->framesize + 4) < mapend)
-	{
-		mpg123__init();
-		stream_rewind();
-		mpg123_read_frame(fr);
-		mappnt = mapbuf + frame * (fr->framesize + 4);
-
-		mpg123_read_frame(fr);
-	}
-}
-
-void mpg123_stream_jump_to_byte(struct frame *fr, int byte)
-{
-	if (mapbuf + byte < mapend)
-	{
-		mappnt = mapbuf + byte;
-		mpg123_read_frame(fr);
-	}
-}
-
-int mpg123_stream_check_for_xing_header(struct frame *fr, XHEADDATA * xhead)
-{
-	unsigned char *head_data;
-	int ret = 0;
-
-	stream_back_bytes(fr->framesize + 4);
-
-	if (mappnt + (fr->framesize + 4) < mapend)
-	{
-		ret = mpg123_get_xing_header(xhead, mappnt);
-		mappnt += fr->framesize + 4;
-	}
-	return ret;
-}
-
-#else
-
-static int stream_init(void)
-{
-	if (get_fileinfo() < 0)
-		return -1;
-	return 0;
-}
-
-void mpg123_stream_close(void)
-{
-	if (filept) {
-		fclose (filept);
-		filept = 0;
-	}
-}
-
-/**************************************** 
- * HACK,HACK,HACK: step back <num> frames 
- * can only work if the 'stream' isn't a real stream but a file
- */
-
-static int stream_head_read(unsigned long *newhead)
-{
-	unsigned char hbuf[4];
-
-	if (fullread(filept, hbuf, 4) != 4)
-		return FALSE;
-
-	*newhead = ((unsigned long) hbuf[0] << 24) |
-		((unsigned long) hbuf[1] << 16) |
-		((unsigned long) hbuf[2] << 8) |
-		(unsigned long) hbuf[3];
-
-	return TRUE;
-}
-
-static int stream_head_shift(unsigned long *head)
-{
-	unsigned char hbuf;
-
-	if (fullread(filept, &hbuf, 1) != 1)
-		return 0;
-	*head <<= 8;
-	*head |= hbuf;
-	*head &= 0xffffffff;
-	return 1;
-}
-
-static int stream_mpg123_read_frame_body(unsigned char *buf,
-					 int size)
-{
-	long l;
-
-	if ((l = fullread(filept, buf, size)) != size)
-	{
-		if (l <= 0)
-			return 0;
-		memset(buf + l, 0, size - l);
-	}
-	return 1;
-}
-
-void mpg123_stream_jump_to_frame(struct frame *fr, int frame)
-{
-	mpg123_read_frame_init();
-	fseek(filept, frame * (fr->framesize + 4), SEEK_SET);
-	mpg123_read_frame(fr);
-}
-
-void mpg123_stream_jump_to_byte(struct frame *fr, int byte)
-{
-	fseek(filept, byte, SEEK_SET);
-	mpg123_read_frame(fr);
-}
-
-int mpg123_stream_check_for_xing_header(struct frame *fr, XHEADDATA * xhead)
-{
-	unsigned char *head_data;
-	int ret;
-
-	fseek(filept, -(fr->framesize + 4), SEEK_CUR);
-	head_data = malloc(fr->framesize + 4);
-	fread(head_data, 1, fr->framesize + 4, filept);
-	ret = mpg123_get_xing_header(xhead, head_data);
-	free(head_data);
-	return ret;
-}
-
-#endif
-
-static int get_fileinfo(void)
-{
-	guchar buf[3];
-
-	if (filept == NULL)
-		return -1;
-	if (fseek(filept, 0, SEEK_END) < 0)
-		return -1;
-
-	mpg123_info->filesize = ftell(filept);
-	if (fseek(filept, -128, SEEK_END) < 0)
-		return -1;
-	if (fullread(filept, buf, 3) != 3)
-		return -1;
-	if (!strncmp(buf, "TAG", 3))
-		mpg123_info->filesize -=128;
-	if (fseek(filept, 0, SEEK_SET) < 0)
-		return -1;
-
-	if (mpg123_info->filesize <= 0)
-		return -1;
-
-	return mpg123_info->filesize;
-}
-
-void mpg123_read_frame_init(void)
-{
-	memset(bsspace[0],0,MAXFRAMESIZE + 512);
-	memset(bsspace[1],0,MAXFRAMESIZE + 512);
-	mpg123_info->output_audio = FALSE;
-}
-
-/*
- * Function read_id3v2_tag (head)
- *
- *    Read ID3v2 tag from stream.  Return TRUE upon success, or FALSE if
- *    an error occurred.
- *
- */
-static gboolean read_id3v2_tag(unsigned long head)
-{
-	struct
-	{
-		char id3[3];
-		struct id3_taghdr_t tag;
-	} id3header;
-	gchar *id3buf, *songname;
-	int hdrsize;
-	id3_t *id3d;
-	struct id3tag_t tag;
-	/*
-	 * Read ID3tag header.
-	 */
-	*(unsigned long *) &id3header = g_htonl(head);
-	if (fullread(filept, ((char *) &id3header) + sizeof (head),
-		     sizeof (id3header) - sizeof (head))
-	    != sizeof (id3header) - sizeof (head))
-		return FALSE;
-
-	hdrsize = ID3_GET_SIZE28(g_ntohl(id3header.tag.th_size));
-
-	/*
-	 * A invalid header could fool us into requesting insane
-	 * amounts of memory.  Make sure the header size is
-	 * reasonable.
-	 */
-	if ((mpg123_info->filesize && hdrsize > (int)mpg123_info->filesize) ||
-	    (!mpg123_info->filesize && hdrsize > 1000000))
-		return FALSE;
-
-	if (mpg123_cfg.disable_id3v2)
-	{
-		guint8 *tmp = g_malloc(hdrsize);
-		gboolean ret;
-		ret = (fullread(filept, tmp, hdrsize) == hdrsize);
-		g_free(tmp);
-		return ret;
-	}
-
-	id3buf = g_malloc(hdrsize + sizeof (id3header));
-	memcpy(id3buf, &id3header, sizeof (id3header));
-
-	/*
-	 * Read ID3tag body.
-	 */
-	if (fullread(filept, id3buf + sizeof (id3header),
-		     hdrsize) != hdrsize)
-	{
-		g_free(id3buf);
-		return FALSE;
-	}
-
-	/*
-	 * Get info from tag.
-	 */
-	id3d = id3_open_mem(id3buf, 0);
-	mpg123_get_id3v2(id3d, &tag);
-	if(!mpg123_info->first_frame)
-	{
-		songname = mpg123_title;
-		mpg123_title = mpg123_format_song_title(&tag, mpg123_filename);
-		//mpg123_ip.set_info(mpg123_title, mpg123_length,
-		//		   mpg123_bitrate * 1000,
-		//		   mpg123_frequency, mpg123_stereo);
-		if(songname)
-			g_free(songname);
-	}
-	else
-	{
-		
-		mpg123_title = mpg123_format_song_title(&tag, mpg123_filename);
-	}
-	id3_close(id3d);
-	g_free(id3buf);
-
-	return TRUE;
-}
-
-int mpg123_head_check(unsigned long head)
-{
-	if ((head & 0xffe00000) != 0xffe00000)
-		return FALSE;
-	if (!((head >> 17) & 3))
-		return FALSE;
-	if (((head >> 12) & 0xf) == 0xf)
-		return FALSE;
-	if (!((head >> 12) & 0xf))
-		return FALSE;
-	if (((head >> 10) & 0x3) == 0x3)
-		return FALSE;
-	if (((head >> 19) & 1) == 1 && ((head >> 17) & 3) == 3 && ((head >> 16) & 1) == 1)
-		return FALSE;
-	if ((head & 0xffff0000) == 0xfffe0000)
-		return FALSE;
-	
-	return TRUE;
-}
-
-/*****************************************************************
- * read next frame
- */
-int mpg123_read_frame(struct frame *fr)
-{
-	unsigned long newhead;
-
-	fsizeold = fr->framesize;	/* for Layer3 */
-
-	if (!stream_head_read(&newhead))
-		return FALSE;
-
-	if (!mpg123_head_check(newhead) || !mpg123_decode_header(fr, newhead))
-	{
-		int try = 0;
-
-		do
-		{
-			try++;
-			if ((newhead & 0xffffff00) == ('I' << 24) + ('D' << 16) + ('3' << 8))
-			{
-				read_id3v2_tag(newhead);
-				if (!stream_head_read(&newhead))
-					return FALSE;
-			}
-			else if (!stream_head_shift(&newhead))
-				return 0;
-			
-		}
-		while ((!mpg123_head_check(newhead) ||
-			!mpg123_decode_header(fr,newhead)) &&
-		       try < (256 * 1024));
-		if(try >= (256 * 1024))
-			return FALSE;
-		
-		mpg123_info->filesize -= try;
-	}
-	/* flip/init buffer for Layer 3 */
-	bsbufold = bsbuf;
-	bsbuf = bsspace[bsnum] + 512;
-	bsnum = (bsnum + 1) & 1;
-
-	if (!stream_mpg123_read_frame_body(bsbuf, fr->framesize))
-		return 0;
-
-	bsi.bitindex = 0;
-	bsi.wordpointer = (unsigned char *) bsbuf;
-
-
-	return 1;
-
-}
-
-/*
- * the code a header and write the information
- * into the frame structure
- */
-int mpg123_decode_header(struct frame *fr, unsigned long newhead)
-{
-	if (newhead & (1 << 20))
-	{
-		fr->lsf = (newhead & (1 << 19)) ? 0x0 : 0x1;
-		fr->mpeg25 = 0;
-	}
-	else
-	{
-		fr->lsf = 1;
-		fr->mpeg25 = 1;
-	}
-	fr->lay = 4 - ((newhead >> 17) & 3);
-	if (fr->mpeg25)
-	{
-		fr->sampling_frequency = 6 + ((newhead >> 10) & 0x3);
-	}
-	else
-		fr->sampling_frequency = ((newhead >> 10) & 0x3) + (fr->lsf * 3);
-	fr->error_protection = ((newhead >> 16) & 0x1) ^ 0x1;
-
-	if (fr->mpeg25)		/* allow Bitrate change for 2.5 ... */
-		fr->bitrate_index = ((newhead >> 12) & 0xf);
-
-	fr->bitrate_index = ((newhead >> 12) & 0xf);
-	fr->padding = ((newhead >> 9) & 0x1);
-	fr->extension = ((newhead >> 8) & 0x1);
-	fr->mode = ((newhead >> 6) & 0x3);
-	fr->mode_ext = ((newhead >> 4) & 0x3);
-	fr->copyright = ((newhead >> 3) & 0x1);
-	fr->original = ((newhead >> 2) & 0x1);
-	fr->emphasis = newhead & 0x3;
-
-	fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
-
-	ssize = 0;
-
-	if (!fr->bitrate_index)
-		return (0);
-
-	switch (fr->lay)
-	{
-		case 1:
-			fr->do_layer = mpg123_do_layer1;
-			mpg123_init_layer2();	/* inits also shared tables with layer1 */
-			fr->framesize = (long) tabsel_123[fr->lsf][0][fr->bitrate_index] * 12000;
-			fr->framesize /= mpg123_freqs[fr->sampling_frequency];
-			fr->framesize = ((fr->framesize + fr->padding) << 2) - 4;
-			break;
-		case 2:
-			fr->do_layer = mpg123_do_layer2;
-			mpg123_init_layer2();	/* inits also shared tables with layer1 */
-			fr->framesize = (long) tabsel_123[fr->lsf][1][fr->bitrate_index] * 144000;
-			fr->framesize /= mpg123_freqs[fr->sampling_frequency];
-			fr->framesize += fr->padding - 4;
-			break;
-		case 3:
-			fr->do_layer = mpg123_do_layer3;
-			if (fr->lsf)
-				ssize = (fr->stereo == 1) ? 9 : 17;
-			else
-				ssize = (fr->stereo == 1) ? 17 : 32;
-			if (fr->error_protection)
-				ssize += 2;
-			fr->framesize = (long) tabsel_123[fr->lsf][2][fr->bitrate_index] * 144000;
-			fr->framesize /= mpg123_freqs[fr->sampling_frequency] << (fr->lsf);
-			fr->framesize = fr->framesize + fr->padding - 4;
-			break;
-		default:
-			return (0);
-	}
-	if(fr->framesize > MAXFRAMESIZE)
-		return 0;
-	return 1;
-}
-
-void mpg123_open_stream(char *bs_filenam, int fd)
-{
-	if ((filept = fopen(bs_filenam, "rb")) != NULL) {
-		if (stream_init() == -1) {
-			mpg123_info->eof = 1;
-		}
-	} else {
-		mpg123_info->eof = 1;
-	}
-}
-
-void mpg123_set_pointer(long backstep)
-{
-	bsi.wordpointer = bsbuf + ssize - backstep;
-	if (backstep)
-		memcpy(bsi.wordpointer, bsbufold + fsizeold - backstep, backstep);
-	bsi.bitindex = 0;
-}
-
-double mpg123_compute_bpf(struct frame *fr)
-{
-	double bpf;
-
-	switch (fr->lay)
-	{
-		case 1:
-			bpf = tabsel_123[fr->lsf][0][fr->bitrate_index];
-			bpf *= 12000.0 * 4.0;
-			bpf /= mpg123_freqs[fr->sampling_frequency] << (fr->lsf);
-			break;
-		case 2:
-		case 3:
-			bpf = tabsel_123[fr->lsf][fr->lay - 1][fr->bitrate_index];
-			bpf *= 144000;
-			bpf /= mpg123_freqs[fr->sampling_frequency] << (fr->lsf);
-			break;
-		default:
-			bpf = 1.0;
-	}
-
-	return bpf;
-}
-
-int mpg123_calc_numframes(struct frame *fr)
-{
-	return (int) (mpg123_info->filesize / mpg123_compute_bpf(fr));
-}
diff --git a/components/music/configure.c b/components/music/configure.c
deleted file mode 100644
index 3569e3a59..000000000
--- a/components/music/configure.c
+++ /dev/null
@@ -1,736 +0,0 @@
-#include "mpg123.h"
-
-static GtkWidget *mpg123_configurewin = NULL;
-static GtkWidget *vbox, *notebook;
-static GtkWidget *decode_vbox, *decode_hbox1;
-static GtkWidget *decode_res_frame, *decode_res_vbox, *decode_res_16, *decode_res_8;
-static GtkWidget *decode_ch_frame, *decode_ch_vbox, *decode_ch_stereo,
-         *decode_ch_mono;
-static GtkWidget *decode_freq_frame, *decode_freq_vbox, *decode_freq_1to1,
-         *decode_freq_1to2, *decode_freq_1to4;
-static GtkWidget *option_frame, *option_vbox, *detect_by_content;
-#ifdef USE_3DNOW
-static GtkWidget *decoder_frame, *decoder_vbox, *auto_select,
-         *decoder_3dnow, *decoder_fpu;
-#endif
-
-/* unused
-   static GtkWidget *decode_freq_custom,*decode_freq_custom_hbox,*decode_freq_custom_spin,*decode_freq_custom_label;
-   static GtkObject *decode_freq_custom_adj;
- */
-static GtkObject *streaming_size_adj, *streaming_pre_adj;
-static GtkWidget *streaming_proxy_use, *streaming_proxy_host_entry;
-static GtkWidget *streaming_proxy_port_entry, *streaming_save_use, *streaming_save_entry;
-static GtkWidget *streaming_proxy_auth_use;
-static GtkWidget *streaming_proxy_auth_pass_entry, *streaming_proxy_auth_user_entry;
-static GtkWidget *streaming_proxy_auth_user_label, *streaming_proxy_auth_pass_label;
-static GtkWidget *streaming_cast_title, *streaming_udp_title;
-static GtkWidget *streaming_proxy_hbox, *streaming_proxy_auth_hbox, *streaming_save_dirbrowser;
-static GtkWidget *streaming_save_hbox, *title_id3_box, *title_id3_desc_box;
-static GtkWidget *title_id3_use, *title_id3_entry, *title_id3v2_disable;
-
-MPG123Config mpg123_cfg;
-
-static void mpg123_configurewin_ok(GtkWidget * widget, gpointer data)
-{
-	ConfigFile *cfg;
-	gchar *filename;
-
-	if (GTK_TOGGLE_BUTTON(decode_res_16)->active)
-		mpg123_cfg.resolution = 16;
-	else if (GTK_TOGGLE_BUTTON(decode_res_8)->active)
-		mpg123_cfg.resolution = 8;
-
-	if (GTK_TOGGLE_BUTTON(decode_ch_stereo)->active)
-		mpg123_cfg.channels = 2;
-	else if (GTK_TOGGLE_BUTTON(decode_ch_mono)->active)
-		mpg123_cfg.channels = 1;
-
-	if (GTK_TOGGLE_BUTTON(decode_freq_1to1)->active)
-		mpg123_cfg.downsample = 0;
-	else if (GTK_TOGGLE_BUTTON(decode_freq_1to2)->active)
-		mpg123_cfg.downsample = 1;
-	if (GTK_TOGGLE_BUTTON(decode_freq_1to4)->active)
-		mpg123_cfg.downsample = 2;
-	mpg123_cfg.detect_by_content = GTK_TOGGLE_BUTTON(detect_by_content)->active;
-/*
-   if(GTK_TOGGLE_BUTTON(decode_freq_custom)->active)
-   mpg123_cfg.downsample=3;
-   mpg123_cfg.downsample_custom=(gint)GTK_ADJUSTMENT(decode_freq_custom_adj)->value;
- */
-#ifdef USE_3DNOW
-	if (GTK_TOGGLE_BUTTON(auto_select)->active)
-                mpg123_cfg.use_3dnow = 0;
-        else if (GTK_TOGGLE_BUTTON(decoder_fpu)->active)
-                mpg123_cfg.use_3dnow = 2;
-        else mpg123_cfg.use_3dnow = 1;
-#endif
-	mpg123_cfg.http_buffer_size = (gint) GTK_ADJUSTMENT(streaming_size_adj)->value;
-	mpg123_cfg.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
-
-	mpg123_cfg.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
-	g_free(mpg123_cfg.proxy_host);
-	mpg123_cfg.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
-	mpg123_cfg.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
-
-	mpg123_cfg.proxy_use_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
-
-	if(mpg123_cfg.proxy_user)
-		g_free(mpg123_cfg.proxy_user);
-	mpg123_cfg.proxy_user = NULL;
-	if(strlen(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_user_entry))) > 0)
-		mpg123_cfg.proxy_user = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_user_entry)));
-
-	if(mpg123_cfg.proxy_pass)
-		g_free(mpg123_cfg.proxy_pass);
-	mpg123_cfg.proxy_pass = NULL;
-	if(strlen(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_pass_entry))) > 0)
-		mpg123_cfg.proxy_pass = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_pass_entry)));
-	
-	
-	mpg123_cfg.save_http_stream = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_save_use));
-	if (mpg123_cfg.save_http_path)
-		g_free(mpg123_cfg.save_http_path);
-	mpg123_cfg.save_http_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));
-
-	mpg123_cfg.cast_title_streaming = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_cast_title));
-	mpg123_cfg.use_udp_channel = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_udp_title));
-	
-	mpg123_cfg.use_id3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_id3_use));
-	mpg123_cfg.disable_id3v2 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_id3v2_disable));
-	g_free(mpg123_cfg.id3_format);
-	mpg123_cfg.id3_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_id3_entry)));
-
-	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
-	cfg = xmms_cfg_open_file(filename);
-	if (!cfg)
-		cfg = xmms_cfg_new();
-	xmms_cfg_write_int(cfg, "MPG123", "resolution", mpg123_cfg.resolution);
-	xmms_cfg_write_int(cfg, "MPG123", "channels", mpg123_cfg.channels);
-	xmms_cfg_write_int(cfg, "MPG123", "downsample", mpg123_cfg.downsample);
-/*      xmms_cfg_write_int(cfg,"MPG123","downsample_custom",mpg123_cfg.downsample_custom); */
-	xmms_cfg_write_int(cfg, "MPG123", "http_buffer_size", mpg123_cfg.http_buffer_size);
-	xmms_cfg_write_int(cfg, "MPG123", "http_prebuffer", mpg123_cfg.http_prebuffer);
-	xmms_cfg_write_boolean(cfg, "MPG123", "use_proxy", mpg123_cfg.use_proxy);
-	xmms_cfg_write_string(cfg, "MPG123", "proxy_host", mpg123_cfg.proxy_host);
-	xmms_cfg_write_int(cfg, "MPG123", "proxy_port", mpg123_cfg.proxy_port);
-	xmms_cfg_write_boolean(cfg, "MPG123", "proxy_use_auth", mpg123_cfg.proxy_use_auth);
-	if(mpg123_cfg.proxy_user)
-		xmms_cfg_write_string(cfg, "MPG123", "proxy_user", mpg123_cfg.proxy_user);
-	else
-		xmms_cfg_remove_key(cfg, "MPG123", "proxy_user");
-	if(mpg123_cfg.proxy_pass)
-		xmms_cfg_write_string(cfg, "MPG123", "proxy_pass", mpg123_cfg.proxy_pass);
-	else
-		xmms_cfg_remove_key(cfg, "MPG123", "proxy_pass");
-	xmms_cfg_write_boolean(cfg, "MPG123", "save_http_stream", mpg123_cfg.save_http_stream);
-	xmms_cfg_write_string(cfg, "MPG123", "save_http_path", mpg123_cfg.save_http_path);
-	xmms_cfg_write_boolean(cfg, "MPG123", "cast_title_streaming", mpg123_cfg.cast_title_streaming);
-	xmms_cfg_write_boolean(cfg, "MPG123", "use_udp_channel", mpg123_cfg.use_udp_channel);
-	xmms_cfg_write_boolean(cfg, "MPG123", "use_id3", mpg123_cfg.use_id3);
-	xmms_cfg_write_boolean(cfg, "MPG123", "disable_id3v2", mpg123_cfg.disable_id3v2);
-	xmms_cfg_write_string(cfg, "MPG123", "id3_format", mpg123_cfg.id3_format);
-	xmms_cfg_write_boolean(cfg, "MPG123", "detect_by_content", mpg123_cfg.detect_by_content);
-#ifdef USE_3DNOW
-	xmms_cfg_write_int(cfg, "MPG123", "use_3dnow", mpg123_cfg.use_3dnow);
-#endif
-	xmms_cfg_write_file(cfg, filename);
-	xmms_cfg_free(cfg);
-	g_free(filename);
-	gtk_widget_destroy(mpg123_configurewin);
-}
-
-#ifdef USE_3DNOW
-static void auto_select_cb(GtkWidget * w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_select)) == TRUE) {
-	  gtk_widget_set_sensitive(decoder_fpu, FALSE);
-	  gtk_widget_set_sensitive(decoder_3dnow, FALSE);
-	  if (support_3dnow() == TRUE) 
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_3dnow), TRUE);
-	  else
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_fpu), TRUE);
-	} else {
-	    gtk_widget_set_sensitive(decoder_3dnow, TRUE);
-	    gtk_widget_set_sensitive(decoder_fpu, TRUE);
-	}
-}
-
-static void use_3dnow_cb(GtkWidget * w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(decoder_3dnow)) == TRUE) {
-		mpg123_cfg.resolution = 16;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_res_16), TRUE);
-		gtk_widget_set_sensitive(decode_res_8, FALSE);
-
-		mpg123_cfg.channels = 2;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_ch_stereo), TRUE);
-		gtk_widget_set_sensitive(decode_ch_mono, FALSE);
-
-		mpg123_cfg.downsample = 0;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_1to1), TRUE);
-		gtk_widget_set_sensitive(decode_freq_1to2, FALSE);
-		gtk_widget_set_sensitive(decode_freq_1to4, FALSE);
-	}
-}
-
-static void use_fpu_cb(GtkWidget * w, gpointer data)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(decoder_fpu)) == TRUE) {
-		gtk_widget_set_sensitive(decode_res_8, TRUE);
-
-		gtk_widget_set_sensitive(decode_ch_mono, TRUE);
-
-		gtk_widget_set_sensitive(decode_freq_1to2, TRUE);
-		gtk_widget_set_sensitive(decode_freq_1to4, TRUE);
-	}
-}
-#endif
-
-static void proxy_use_cb(GtkWidget * w, gpointer data)
-{
-	gboolean use_proxy, use_proxy_auth;
-
-	use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
-	use_proxy_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
-		
-	gtk_widget_set_sensitive(streaming_proxy_hbox, use_proxy);
-	gtk_widget_set_sensitive(streaming_proxy_auth_use, use_proxy);
-	gtk_widget_set_sensitive(streaming_proxy_auth_hbox, use_proxy && use_proxy_auth);
-}
-
-static void proxy_auth_use_cb(GtkWidget *w, gpointer data)
-{
-	gboolean use_proxy, use_proxy_auth;
-
-	use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
-	use_proxy_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
-
-	gtk_widget_set_sensitive(streaming_proxy_auth_hbox, use_proxy && use_proxy_auth);
-}
-
-static void streaming_save_dirbrowser_cb(gchar * dir)
-{
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), dir);
-}
-
-static void streaming_save_browse_cb(GtkWidget * w, gpointer data)
-{
-	if (!streaming_save_dirbrowser)
-	{
-		streaming_save_dirbrowser = xmms_create_dir_browser(_("Select the directory where you want to store the MPEG streams:"),
-								    mpg123_cfg.save_http_path, GTK_SELECTION_SINGLE, streaming_save_dirbrowser_cb);
-		g_signal_connect(streaming_save_dirbrowser, "destroy", G_CALLBACK(gtk_widget_destroyed), &streaming_save_dirbrowser);
-		gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser), GTK_WINDOW(mpg123_configurewin));
-		gtk_widget_show(streaming_save_dirbrowser);
-	}
-}
-
-static void streaming_save_use_cb(GtkWidget * w, gpointer data)
-{
-	gboolean save_stream;
-
-	save_stream = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_save_use));
-
-	gtk_widget_set_sensitive(streaming_save_hbox, save_stream);
-}
-
-static void title_id3_use_cb(GtkWidget * w, gpointer data)
-{
-	gboolean use_id3;
-
-	use_id3 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_id3_use));
-
-	gtk_widget_set_sensitive(title_id3v2_disable, use_id3);
-	gtk_widget_set_sensitive(title_id3_box, use_id3);
-	gtk_widget_set_sensitive(title_id3_desc_box, use_id3);
-}
-
-static void configure_destroy(GtkWidget * w, gpointer data)
-{
-	if (streaming_save_dirbrowser)
-		gtk_widget_destroy(streaming_save_dirbrowser);
-}
-
-void mpg123_configure(void)
-{
-	GtkWidget *streaming_vbox;
-	GtkWidget *streaming_buf_frame, *streaming_buf_hbox;
-	GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
-	GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
-	GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
-	GtkWidget *streaming_proxy_port_label, 	*streaming_proxy_host_label;
-	GtkWidget *streaming_save_frame, *streaming_save_vbox;
-	GtkWidget *streaming_save_label, *streaming_save_browse;
-	GtkWidget *streaming_cast_frame, *streaming_cast_vbox;
-	GtkWidget *title_frame, *title_id3_vbox, *title_id3_label;
-	GtkWidget *title_id3_desc_label1, *title_id3_desc_label2;
-	GtkWidget *bbox, *ok, *cancel;
-
-	gchar *temp;
-
-	if (mpg123_configurewin != NULL)
-	{
-		gdk_window_raise(mpg123_configurewin->window);
-		return;
-	}
-	mpg123_configurewin = gtk_window_new(GTK_WINDOW_DIALOG);
-	g_signal_connect(mpg123_configurewin, "destroy", G_CALLBACK(gtk_widget_destroyed), &mpg123_configurewin);
-	g_signal_connect(mpg123_configurewin, "destroy", G_CALLBACK(configure_destroy), &mpg123_configurewin);
-	gtk_window_set_title(GTK_WINDOW(mpg123_configurewin), _("MPG123 Configuration"));
-	gtk_window_set_wmclass(GTK_WINDOW(mpg123_configurewin), "mpg123_configuration", "Nautilus");
-	gtk_window_set_policy(GTK_WINDOW(mpg123_configurewin), FALSE, FALSE, FALSE);
-	/*  gtk_window_set_position(GTK_WINDOW(mpg123_configurewin), GTK_WIN_POS_MOUSE); */
-	gtk_container_border_width(GTK_CONTAINER(mpg123_configurewin), 10);
-
-	vbox = gtk_vbox_new(FALSE, 10);
-	gtk_container_add(GTK_CONTAINER(mpg123_configurewin), vbox);
-
-	notebook = gtk_notebook_new();
-	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-
-	decode_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(decode_vbox), 5);
-
-	decode_hbox1 = gtk_hbox_new(TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(decode_vbox), decode_hbox1, FALSE, FALSE, 0);
-
-	decode_res_frame = gtk_frame_new(_("Resolution:"));
-	gtk_box_pack_start(GTK_BOX(decode_hbox1), decode_res_frame, TRUE, TRUE, 0);
-
-	decode_res_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(decode_res_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(decode_res_frame), decode_res_vbox);
-
-	decode_res_16 = gtk_radio_button_new_with_label(NULL, _("16 bit"));
-	if (mpg123_cfg.resolution == 16)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_res_16), TRUE);
-	gtk_box_pack_start(GTK_BOX(decode_res_vbox), decode_res_16, FALSE, FALSE, 0);
-	gtk_widget_show(decode_res_16);
-
-	decode_res_8 = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decode_res_16)), _("8 bit"));
-	if (mpg123_cfg.resolution == 8)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_res_8), TRUE);
-
-	gtk_box_pack_start(GTK_BOX(decode_res_vbox), decode_res_8, FALSE, FALSE, 0);
-	gtk_widget_show(decode_res_8);
-
-#ifdef USE_3DNOW
-	if (((support_3dnow() == TRUE) && (mpg123_cfg.use_3dnow !=2 )) ||
-		((support_3dnow() == FALSE) && (mpg123_cfg.use_3dnow == 1)))
-	{
-		mpg123_cfg.resolution = 16;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_res_16), TRUE);
-		gtk_widget_set_sensitive(decode_res_8, FALSE);
-	}
-#endif
-	gtk_widget_show(decode_res_vbox);
-	gtk_widget_show(decode_res_frame);
-
-	decode_ch_frame = gtk_frame_new(_("Channels:"));
-	gtk_box_pack_start(GTK_BOX(decode_hbox1), decode_ch_frame, TRUE, TRUE, 0);
-
-	decode_ch_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(decode_ch_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(decode_ch_frame), decode_ch_vbox);
-
-	decode_ch_stereo = gtk_radio_button_new_with_label(NULL, _("Stereo (if available)"));
-	if (mpg123_cfg.channels == 2)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_ch_stereo), TRUE);
-
-	gtk_box_pack_start(GTK_BOX(decode_ch_vbox), decode_ch_stereo, FALSE, FALSE, 0);
-	gtk_widget_show(decode_ch_stereo);
-
-	decode_ch_mono = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decode_ch_stereo)), _("Mono"));
-	if (mpg123_cfg.channels == 1)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_ch_mono), TRUE);
-
-	gtk_box_pack_start(GTK_BOX(decode_ch_vbox), decode_ch_mono, FALSE, FALSE, 0);
-	gtk_widget_show(decode_ch_mono);
-
-#ifdef USE_3DNOW
-	if (((support_3dnow() == TRUE) && (mpg123_cfg.use_3dnow !=2 )) ||
-		((support_3dnow() == FALSE) && (mpg123_cfg.use_3dnow == 1)))
-	{
-		mpg123_cfg.channels = 2;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_ch_stereo), TRUE);
-		gtk_widget_set_sensitive(decode_ch_mono, FALSE);
-	}
-#endif
-	gtk_widget_show(decode_ch_vbox);
-	gtk_widget_show(decode_ch_frame);
-	gtk_widget_show(decode_hbox1);
-
-	decode_freq_frame = gtk_frame_new(_("Down sample:"));
-	gtk_box_pack_start(GTK_BOX(decode_vbox), decode_freq_frame, FALSE, FALSE, 0);
-
-	decode_freq_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(decode_freq_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(decode_freq_frame), decode_freq_vbox);
-
-	decode_freq_1to1 = gtk_radio_button_new_with_label(NULL, _("1:1 (44 kHz)"));
-	if (mpg123_cfg.downsample == 0)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_1to1), TRUE);
-	gtk_box_pack_start(GTK_BOX(decode_freq_vbox), decode_freq_1to1, FALSE, FALSE, 0);
-	gtk_widget_show(decode_freq_1to1);
-
-	decode_freq_1to2 = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decode_freq_1to1)), _("1:2 (22 kHz)"));
-	if (mpg123_cfg.downsample == 1)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_1to2), TRUE);
-	gtk_box_pack_start(GTK_BOX(decode_freq_vbox), decode_freq_1to2, FALSE, FALSE, 0);
-	gtk_widget_show(decode_freq_1to2);
-
-	decode_freq_1to4 = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decode_freq_1to1)), _("1:4 (11 kHz)"));
-	if (mpg123_cfg.downsample == 2)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_1to4), TRUE);
-
-	gtk_box_pack_start(GTK_BOX(decode_freq_vbox), decode_freq_1to4, FALSE, FALSE, 0);
-	gtk_widget_show(decode_freq_1to4);
-#ifdef USE_3DNOW
-	if (((support_3dnow() == TRUE) && (mpg123_cfg.use_3dnow !=2 )) ||
-		((support_3dnow() == FALSE) && (mpg123_cfg.use_3dnow == 1)))
-	{
-		mpg123_cfg.downsample = 0;
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_1to1), TRUE);
-		gtk_widget_set_sensitive(decode_freq_1to2, FALSE);
-		gtk_widget_set_sensitive(decode_freq_1to4, FALSE);
-	}
-#endif
-	/*decode_freq_custom_hbox=gtk_hbox_new(FALSE,5);
-	   gtk_box_pack_start(GTK_BOX(decode_freq_vbox),decode_freq_custom_hbox,FALSE,FALSE,0);
-
-	   decode_freq_custom=gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decode_freq_1to1)),_("Custom"));
-	   if(mpg123_cfg.downsample==3)
-	   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decode_freq_custom),TRUE);
-	   gtk_box_pack_start(GTK_BOX(decode_freq_custom_hbox),decode_freq_custom,FALSE,FALSE,0);
-	   gtk_widget_show(decode_freq_custom);
-
-	   decode_freq_custom_adj=gtk_adjustment_new(mpg123_cfg.downsample_custom,8000,48000,25,25,25);
-	   decode_freq_custom_spin=gtk_spin_button_new(GTK_ADJUSTMENT(decode_freq_custom_adj),25,0);
-	   gtk_widget_set_usize(decode_freq_custom_spin,60,-1);
-	   gtk_box_pack_start(GTK_BOX(decode_freq_custom_hbox),decode_freq_custom_spin,FALSE,FALSE,0);
-	   gtk_widget_show(decode_freq_custom_spin);
-
-	   decode_freq_custom_label=gtk_label_new(_("Hz"));
-	   gtk_box_pack_start(GTK_BOX(decode_freq_custom_hbox),decode_freq_custom_label,FALSE,FALSE,0);
-	   gtk_widget_show(decode_freq_custom_label);
-
-	   gtk_widget_show(decode_freq_custom_hbox); */
-
-
-#ifdef USE_3DNOW
-	decoder_frame = gtk_frame_new(_("Decoder:"));
-	gtk_box_pack_start(GTK_BOX(decode_vbox), decoder_frame, FALSE, FALSE, 0);
-
-	decoder_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(decoder_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(decoder_frame), decoder_vbox);
-
-	auto_select = gtk_check_button_new_with_label(_("Enable Automatic detection"));
-	if (mpg123_cfg.use_3dnow == 0)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_select), TRUE);
-	gtk_box_pack_start(GTK_BOX(decoder_vbox), auto_select, FALSE, FALSE, 0);
-	g_signal_connect(auto_select, "clicked", G_CALLBACK(auto_select_cb), NULL);
-	gtk_widget_show(auto_select);
-
-	decoder_3dnow = gtk_radio_button_new_with_label(NULL, _("use 3DNow! optimized decoder"));
-	if (((support_3dnow() == TRUE) && mpg123_cfg.use_3dnow != 2) || (mpg123_cfg.use_3dnow == 1))
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_3dnow), TRUE);
-	gtk_box_pack_start(GTK_BOX(decoder_vbox), decoder_3dnow, FALSE, FALSE, 0);
-	g_signal_connect(decoder_3dnow, "clicked", G_CALLBACK(use_3dnow_cb), NULL);
-	gtk_widget_show(decoder_3dnow);
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_select)) == TRUE)
-	  gtk_widget_set_sensitive(decoder_3dnow, FALSE);
-
-	decoder_fpu = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(decoder_3dnow)), _("use FPU decoder"));
-	if (((support_3dnow() == FALSE) && mpg123_cfg.use_3dnow != 1) || (mpg123_cfg.use_3dnow == 2))
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_fpu), TRUE);
-	gtk_box_pack_start(GTK_BOX(decoder_vbox), decoder_fpu, FALSE, FALSE, 0);
-	g_signal_connect(decoder_fpu, "clicked", G_CALLBACK(use_fpu_cb), NULL);
-	gtk_widget_show(decoder_fpu);
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_select)) == TRUE)
-	  gtk_widget_set_sensitive(decoder_fpu, FALSE);
-
-	gtk_widget_show(decoder_vbox);
-	gtk_widget_show(decoder_frame);
-#endif
-
-	gtk_widget_show(decode_freq_vbox);
-	gtk_widget_show(decode_freq_frame);
-
-	option_frame = gtk_frame_new(_("Options"));
-	gtk_box_pack_start(GTK_BOX(decode_vbox), option_frame, FALSE, FALSE, 0);
-
-	option_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(option_frame), option_vbox);
-
-	detect_by_content = gtk_check_button_new_with_label(_("Detect files by content (instead of file extention)"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(detect_by_content), mpg123_cfg.detect_by_content);
-	gtk_box_pack_start(GTK_BOX(option_vbox), detect_by_content, FALSE, FALSE, 0);
-
-	gtk_widget_show(detect_by_content);
-	gtk_widget_show(option_vbox);
-	gtk_widget_show(option_frame);
-	
-	gtk_widget_show(decode_vbox);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), decode_vbox, gtk_label_new(_("Decoder")));
-
-	streaming_vbox = gtk_vbox_new(FALSE, 0);
-
-	streaming_buf_frame = gtk_frame_new(_("Buffering:"));
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_buf_frame, FALSE, FALSE, 0);
-
-	streaming_buf_hbox = gtk_hbox_new(TRUE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_hbox), 5);
-	gtk_container_add(GTK_CONTAINER(streaming_buf_frame), streaming_buf_hbox);
-
-	streaming_size_box = gtk_hbox_new(FALSE, 5);
-	/*gtk_table_attach_defaults(GTK_TABLE(streaming_buf_table),streaming_size_box,0,1,0,1); */
-	gtk_box_pack_start(GTK_BOX(streaming_buf_hbox), streaming_size_box, TRUE, TRUE, 0);
-	streaming_size_label = gtk_label_new(_("Buffer size (kb):"));
-	gtk_box_pack_start(GTK_BOX(streaming_size_box), streaming_size_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_size_label);
-	streaming_size_adj = gtk_adjustment_new(mpg123_cfg.http_buffer_size, 4, 4096, 4, 4, 4);
-	streaming_size_spin = gtk_spin_button_new(GTK_ADJUSTMENT(streaming_size_adj), 8, 0);
-	gtk_widget_set_usize(streaming_size_spin, 60, -1);
-	gtk_box_pack_start(GTK_BOX(streaming_size_box), streaming_size_spin, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_size_spin);
-	gtk_widget_show(streaming_size_box);
-
-	streaming_pre_box = gtk_hbox_new(FALSE, 5);
-	/*gtk_table_attach_defaults(GTK_TABLE(streaming_buf_table),streaming_pre_box,1,2,0,1); */
-	gtk_box_pack_start(GTK_BOX(streaming_buf_hbox), streaming_pre_box, TRUE, TRUE, 0);
-	streaming_pre_label = gtk_label_new(_("Pre-buffer (percent):"));
-	gtk_box_pack_start(GTK_BOX(streaming_pre_box), streaming_pre_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_pre_label);
-	streaming_pre_adj = gtk_adjustment_new(mpg123_cfg.http_prebuffer, 0, 90, 1, 1, 1);
-	streaming_pre_spin = gtk_spin_button_new(GTK_ADJUSTMENT(streaming_pre_adj), 1, 0);
-	gtk_widget_set_usize(streaming_pre_spin, 60, -1);
-	gtk_box_pack_start(GTK_BOX(streaming_pre_box), streaming_pre_spin, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_pre_spin);
-	gtk_widget_show(streaming_pre_box);
-
-	gtk_widget_show(streaming_buf_hbox);
-	gtk_widget_show(streaming_buf_frame);
-
- 	/*
- 	 * Proxy config.
- 	 */
-	streaming_proxy_frame = gtk_frame_new(_("Proxy:"));
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_proxy_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_proxy_frame, FALSE, FALSE, 0);
-
-	streaming_proxy_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_proxy_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(streaming_proxy_frame), streaming_proxy_vbox);
-
-	streaming_proxy_use = gtk_check_button_new_with_label(_("Use proxy"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_use), mpg123_cfg.use_proxy);
-	g_signal_connect(streaming_proxy_use, "clicked", G_CALLBACK(proxy_use_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_use, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_use);
-
-	streaming_proxy_hbox = gtk_hbox_new(FALSE, 5);
-	gtk_widget_set_sensitive(streaming_proxy_hbox, mpg123_cfg.use_proxy);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_hbox, FALSE, FALSE, 0);
-
-	streaming_proxy_host_label = gtk_label_new(_("Host:"));
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_host_label);
-
-	streaming_proxy_host_entry = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), mpg123_cfg.proxy_host);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
-	gtk_widget_show(streaming_proxy_host_entry);
-
-	streaming_proxy_port_label = gtk_label_new(_("Port:"));
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_port_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_port_label);
-
-	streaming_proxy_port_entry = gtk_entry_new();
-	gtk_widget_set_usize(streaming_proxy_port_entry, 50, -1);
-	temp = g_strdup_printf("%d", mpg123_cfg.proxy_port);
-	gtk_entry_set_text(GTK_ENTRY(streaming_proxy_port_entry), temp);
-	g_free(temp);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_port_entry, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_port_entry);
-
-	gtk_widget_show(streaming_proxy_hbox);
-	
-	streaming_proxy_auth_use = gtk_check_button_new_with_label(_("Use authentication"));
-	gtk_widget_set_sensitive(streaming_proxy_auth_use, mpg123_cfg.use_proxy);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use), mpg123_cfg.proxy_use_auth);
-	g_signal_connect(streaming_proxy_auth_use, "clicked", G_CALLBACK(proxy_auth_use_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_auth_use, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_auth_use);
-
-	streaming_proxy_auth_hbox = gtk_hbox_new(FALSE, 5);
-	gtk_widget_set_sensitive(streaming_proxy_auth_hbox, mpg123_cfg.use_proxy && mpg123_cfg.proxy_use_auth);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_auth_hbox, FALSE, FALSE, 0);
-	
-	streaming_proxy_auth_user_label = gtk_label_new(_("Username:"));
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_user_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_auth_user_label);
-
-	streaming_proxy_auth_user_entry = gtk_entry_new();
-	if(mpg123_cfg.proxy_user)
-		gtk_entry_set_text(GTK_ENTRY(streaming_proxy_auth_user_entry), mpg123_cfg.proxy_user);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_user_entry, TRUE, TRUE, 0);
-	gtk_widget_show(streaming_proxy_auth_user_entry);
-
-	streaming_proxy_auth_pass_label = gtk_label_new(_("Password:"));
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_pass_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_proxy_auth_pass_label);
-
-	streaming_proxy_auth_pass_entry = gtk_entry_new();
-	if(mpg123_cfg.proxy_pass)
-		gtk_entry_set_text(GTK_ENTRY(streaming_proxy_auth_pass_entry), mpg123_cfg.proxy_pass);
-	gtk_entry_set_visibility(GTK_ENTRY(streaming_proxy_auth_pass_entry), FALSE);
-	gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_pass_entry, TRUE, TRUE, 0);
-	gtk_widget_show(streaming_proxy_auth_pass_entry);
-
-	gtk_widget_show(streaming_proxy_auth_hbox);
-	gtk_widget_show(streaming_proxy_vbox);
-	gtk_widget_show(streaming_proxy_frame);
-
-
-	/*
-	 * Save to disk config.
-	 */
-	streaming_save_frame = gtk_frame_new(_("Save stream to disk:"));
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_save_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_save_frame, FALSE, FALSE, 0);
-
-	streaming_save_vbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_save_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(streaming_save_frame), streaming_save_vbox);
-
-	streaming_save_use = gtk_check_button_new_with_label(_("Save stream to disk"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_save_use), mpg123_cfg.save_http_stream);
-	g_signal_connect(streaming_save_use, "clicked", G_CALLBACK(streaming_save_use_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_save_vbox), streaming_save_use, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_save_use);
-
-	streaming_save_hbox = gtk_hbox_new(FALSE, 5);
-	gtk_widget_set_sensitive(streaming_save_hbox, mpg123_cfg.save_http_stream);
-	gtk_box_pack_start(GTK_BOX(streaming_save_vbox), streaming_save_hbox, FALSE, FALSE, 0);
-
-	streaming_save_label = gtk_label_new(_("Path:"));
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_save_label);
-
-	streaming_save_entry = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), mpg123_cfg.save_http_path);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
-	gtk_widget_show(streaming_save_entry);
-
-	streaming_save_browse = gtk_button_new_with_label(_("Browse"));
-	g_signal_connect(streaming_save_browse, "clicked", G_CALLBACK(streaming_save_browse_cb), NULL);
-	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_browse, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_save_browse);
-
-	gtk_widget_show(streaming_save_hbox);
-	gtk_widget_show(streaming_save_vbox);
-	gtk_widget_show(streaming_save_frame);
-
-	streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
-	gtk_container_set_border_width(GTK_CONTAINER(streaming_cast_frame), 5);
-	gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_cast_frame, FALSE, FALSE, 0);
-
-	streaming_cast_vbox = gtk_vbox_new(5, FALSE);
-	gtk_container_add(GTK_CONTAINER(streaming_cast_frame), streaming_cast_vbox);
-	
-	streaming_cast_title = gtk_check_button_new_with_label(_("Enable SHOUT/Icecast title streaming"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_cast_title), mpg123_cfg.cast_title_streaming);
-	gtk_box_pack_start(GTK_BOX(streaming_cast_vbox), streaming_cast_title, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_cast_title);
-
-	streaming_udp_title = gtk_check_button_new_with_label(_("Enable Icecast Metadata UDP Channel"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_udp_title), mpg123_cfg.use_udp_channel);
-	gtk_box_pack_start(GTK_BOX(streaming_cast_vbox), streaming_udp_title, FALSE, FALSE, 0);
-	gtk_widget_show(streaming_udp_title);
-
-	gtk_widget_show(streaming_cast_vbox);
-	gtk_widget_show(streaming_cast_frame);
-
-	gtk_widget_show(streaming_vbox);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), streaming_vbox, gtk_label_new(_("Streaming")));
-
-	title_frame = gtk_frame_new(_("ID3 Tags:"));
-	gtk_container_border_width(GTK_CONTAINER(title_frame), 5);
-
-	title_id3_vbox = gtk_vbox_new(FALSE, 10);
-	gtk_container_border_width(GTK_CONTAINER(title_id3_vbox), 5);
-	gtk_container_add(GTK_CONTAINER(title_frame), title_id3_vbox);
-
-	title_id3_use = gtk_check_button_new_with_label(_("Use ID3 tags"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(title_id3_use), mpg123_cfg.use_id3);
-	g_signal_connect(title_id3_use, "clicked", title_id3_use_cb, NULL);
-	gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_id3_use, FALSE, FALSE, 0);
-	gtk_widget_show(title_id3_use);
-
-	title_id3v2_disable = gtk_check_button_new_with_label(_("Disable ID3V2 tags"));
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(title_id3v2_disable),
-				     mpg123_cfg.disable_id3v2);
-	gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_id3v2_disable, FALSE, FALSE, 0);
-	gtk_widget_show(title_id3v2_disable);
-
-	title_id3_box = gtk_hbox_new(FALSE, 5);
-	gtk_widget_set_sensitive(title_id3_box, mpg123_cfg.use_id3);
-	gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_id3_box, FALSE, FALSE, 0);
-
-	title_id3_label = gtk_label_new(_("ID3 format:"));
-	gtk_box_pack_start(GTK_BOX(title_id3_box), title_id3_label, FALSE, FALSE, 0);
-	gtk_widget_show(title_id3_label);
-
-	title_id3_entry = gtk_entry_new();
-	gtk_entry_set_text(GTK_ENTRY(title_id3_entry), mpg123_cfg.id3_format);
-	gtk_box_pack_start(GTK_BOX(title_id3_box), title_id3_entry, TRUE, TRUE, 0);
-	gtk_widget_show(title_id3_entry);
-	gtk_widget_show(title_id3_box);
-
-	title_id3_desc_box = gtk_hbox_new(TRUE, 5);
-	gtk_widget_set_sensitive(title_id3_desc_box, mpg123_cfg.use_id3);
-	gtk_box_pack_start(GTK_BOX(title_id3_vbox), title_id3_desc_box, FALSE, FALSE, 0);
-
-	title_id3_desc_label1 = gtk_label_new(_("%1 = Artist\n%3 = Album\n%5 = Comment\n%7 = File name\n%9 = File extension"));
-	gtk_misc_set_alignment(GTK_MISC(title_id3_desc_label1), 0, 0);
-	gtk_label_set_justify(GTK_LABEL(title_id3_desc_label1), GTK_JUSTIFY_LEFT);
-	gtk_box_pack_start(GTK_BOX(title_id3_desc_box), title_id3_desc_label1, TRUE, TRUE, 0);
-	gtk_widget_show(title_id3_desc_label1);
-
-	title_id3_desc_label2 = gtk_label_new(_("%2 = Title\n%4 = Year\n%6 = Genre\n%8 = Path"));
-	gtk_label_set_justify(GTK_LABEL(title_id3_desc_label2), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment(GTK_MISC(title_id3_desc_label2), 0, 0);
-	gtk_box_pack_start(GTK_BOX(title_id3_desc_box), title_id3_desc_label2, TRUE, TRUE, 0);
-	gtk_widget_show(title_id3_desc_label2);
-	gtk_widget_show(title_id3_desc_box);
-	gtk_widget_show(title_id3_vbox);
-	gtk_widget_show(title_frame);
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), title_frame, gtk_label_new(_("Title")));
-
-	gtk_widget_show(notebook);
-
-	bbox = gtk_hbutton_box_new();
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
-	ok = gtk_button_new_from_stock (GTK_STOCK_OK);
-	g_signal_connect(ok, "clicked", G_CALLBACK(mpg123_configurewin_ok), NULL);
-	GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
-	gtk_widget_show(ok);
-	gtk_widget_grab_default(ok);
-
-	cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-	g_signal_connect_object(cancel, "clicked", G_CALLBACK(gtk_widget_destroy), mpg123_configurewin, 0);
-	GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
-	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
-	gtk_widget_show(cancel);
-
-	gtk_widget_show(bbox);
-	gtk_widget_show(vbox);
-	gtk_widget_show(mpg123_configurewin);
-}
diff --git a/components/music/dct64.c b/components/music/dct64.c
deleted file mode 100644
index dad147619..000000000
--- a/components/music/dct64.c
+++ /dev/null
@@ -1,167 +0,0 @@
-
-/*
- * Discrete Cosine Tansform (DCT) for subband synthesis
- *
- * -funroll-loops (for gcc) will remove the loops for better performance
- * using loops in the source-code enhances readabillity
- */
-
-/*
- * TODO: write an optimized version for the down-sampling modes
- *       (in these modes the bands 16-31 (2:1) or 8-31 (4:1) are zero 
- */
-
-#include "mpg123.h"
-
-void mpg123_dct64(real * out0, real * out1, real * samples)
-{
-	real bufs[64];
-
-	{
-		register int i, j;
-		register real *b1, *b2, *bs, *costab;
-
-		b1 = samples;
-		bs = bufs;
-		costab = mpg123_pnts[0] + 16;
-		b2 = b1 + 32;
-
-		for (i = 15; i >= 0; i--)
-			*bs++ = (*b1++ + *--b2);
-		for (i = 15; i >= 0; i--)
-			*bs++ = (*--b2 - *b1++) * *--costab;
-
-		b1 = bufs;
-		costab = mpg123_pnts[1] + 8;
-		b2 = b1 + 16;
-
-		{
-			for (i = 7; i >= 0; i--)
-				*bs++ = (*b1++ + *--b2);
-			for (i = 7; i >= 0; i--)
-				*bs++ = (*--b2 - *b1++) * *--costab;
-			b2 += 32;
-			costab += 8;
-			for (i = 7; i >= 0; i--)
-				*bs++ = (*b1++ + *--b2);
-			for (i = 7; i >= 0; i--)
-				*bs++ = (*b1++ - *--b2) * *--costab;
-			b2 += 32;
-		}
-
-		bs = bufs;
-		costab = mpg123_pnts[2];
-		b2 = b1 + 8;
-
-		for (j = 2; j; j--)
-		{
-			for (i = 3; i >= 0; i--)
-				*bs++ = (*b1++ + *--b2);
-			for (i = 3; i >= 0; i--)
-				*bs++ = (*--b2 - *b1++) * costab[i];
-			b2 += 16;
-			for (i = 3; i >= 0; i--)
-				*bs++ = (*b1++ + *--b2);
-			for (i = 3; i >= 0; i--)
-				*bs++ = (*b1++ - *--b2) * costab[i];
-			b2 += 16;
-		}
-
-		b1 = bufs;
-		costab = mpg123_pnts[3];
-		b2 = b1 + 4;
-
-		for (j = 4; j; j--)
-		{
-			*bs++ = (*b1++ + *--b2);
-			*bs++ = (*b1++ + *--b2);
-			*bs++ = (*--b2 - *b1++) * costab[1];
-			*bs++ = (*--b2 - *b1++) * costab[0];
-			b2 += 8;
-			*bs++ = (*b1++ + *--b2);
-			*bs++ = (*b1++ + *--b2);
-			*bs++ = (*b1++ - *--b2) * costab[1];
-			*bs++ = (*b1++ - *--b2) * costab[0];
-			b2 += 8;
-		}
-		bs = bufs;
-		costab = mpg123_pnts[4];
-
-		for (j = 8; j; j--)
-		{
-			real v0, v1;
-
-			v0 = *b1++;
-			v1 = *b1++;
-			*bs++ = (v0 + v1);
-			*bs++ = (v0 - v1) * (*costab);
-			v0 = *b1++;
-			v1 = *b1++;
-			*bs++ = (v0 + v1);
-			*bs++ = (v1 - v0) * (*costab);
-		}
-
-	}
-
-	{
-		register real *b1;
-		register int i;
-
-		for (b1 = bufs, i = 8; i; i--, b1 += 4)
-			b1[2] += b1[3];
-
-		for (b1 = bufs, i = 4; i; i--, b1 += 8)
-		{
-			b1[4] += b1[6];
-			b1[6] += b1[5];
-			b1[5] += b1[7];
-		}
-
-		for (b1 = bufs, i = 2; i; i--, b1 += 16)
-		{
-			b1[8] += b1[12];
-			b1[12] += b1[10];
-			b1[10] += b1[14];
-			b1[14] += b1[9];
-			b1[9] += b1[13];
-			b1[13] += b1[11];
-			b1[11] += b1[15];
-		}
-	}
-
-	out0[0x10 * 16] = bufs[0];
-	out0[0x10 * 15] = bufs[16 + 0] + bufs[16 + 8];
-	out0[0x10 * 14] = bufs[8];
-	out0[0x10 * 13] = bufs[16 + 8] + bufs[16 + 4];
-	out0[0x10 * 12] = bufs[4];
-	out0[0x10 * 11] = bufs[16 + 4] + bufs[16 + 12];
-	out0[0x10 * 10] = bufs[12];
-	out0[0x10 * 9] = bufs[16 + 12] + bufs[16 + 2];
-	out0[0x10 * 8] = bufs[2];
-	out0[0x10 * 7] = bufs[16 + 2] + bufs[16 + 10];
-	out0[0x10 * 6] = bufs[10];
-	out0[0x10 * 5] = bufs[16 + 10] + bufs[16 + 6];
-	out0[0x10 * 4] = bufs[6];
-	out0[0x10 * 3] = bufs[16 + 6] + bufs[16 + 14];
-	out0[0x10 * 2] = bufs[14];
-	out0[0x10 * 1] = bufs[16 + 14] + bufs[16 + 1];
-	out0[0x10 * 0] = bufs[1];
-
-	out1[0x10 * 0] = bufs[1];
-	out1[0x10 * 1] = bufs[16 + 1] + bufs[16 + 9];
-	out1[0x10 * 2] = bufs[9];
-	out1[0x10 * 3] = bufs[16 + 9] + bufs[16 + 5];
-	out1[0x10 * 4] = bufs[5];
-	out1[0x10 * 5] = bufs[16 + 5] + bufs[16 + 13];
-	out1[0x10 * 6] = bufs[13];
-	out1[0x10 * 7] = bufs[16 + 13] + bufs[16 + 3];
-	out1[0x10 * 8] = bufs[3];
-	out1[0x10 * 9] = bufs[16 + 3] + bufs[16 + 11];
-	out1[0x10 * 10] = bufs[11];
-	out1[0x10 * 11] = bufs[16 + 11] + bufs[16 + 7];
-	out1[0x10 * 12] = bufs[7];
-	out1[0x10 * 13] = bufs[16 + 7] + bufs[16 + 15];
-	out1[0x10 * 14] = bufs[15];
-	out1[0x10 * 15] = bufs[16 + 15];
-
-}
diff --git a/components/music/dct64_i386.c b/components/music/dct64_i386.c
deleted file mode 100644
index f0f6c8930..000000000
--- a/components/music/dct64_i386.c
+++ /dev/null
@@ -1,315 +0,0 @@
-
-/*
- * Discrete Cosine Tansform (DCT) for subband synthesis
- * optimized for machines with no auto-increment. 
- * The performance is highly compiler dependend. Maybe
- * the mpg123_dct64.c version for 'normal' processor may be faster
- * even for Intel processors.
- */
-
-#include "mpg123.h"
-
-static void 
-mpg123_dct64_1(real * out0, real * out1, real * b1, real * b2, real * samples)
-{
-
-	{
-		register real *costab = mpg123_pnts[0];
-
-		b1[0x00] = samples[0x00] + samples[0x1F];
-		b1[0x1F] = (samples[0x00] - samples[0x1F]) * costab[0x0];
-
-		b1[0x01] = samples[0x01] + samples[0x1E];
-		b1[0x1E] = (samples[0x01] - samples[0x1E]) * costab[0x1];
-
-		b1[0x02] = samples[0x02] + samples[0x1D];
-		b1[0x1D] = (samples[0x02] - samples[0x1D]) * costab[0x2];
-
-		b1[0x03] = samples[0x03] + samples[0x1C];
-		b1[0x1C] = (samples[0x03] - samples[0x1C]) * costab[0x3];
-
-		b1[0x04] = samples[0x04] + samples[0x1B];
-		b1[0x1B] = (samples[0x04] - samples[0x1B]) * costab[0x4];
-
-		b1[0x05] = samples[0x05] + samples[0x1A];
-		b1[0x1A] = (samples[0x05] - samples[0x1A]) * costab[0x5];
-
-		b1[0x06] = samples[0x06] + samples[0x19];
-		b1[0x19] = (samples[0x06] - samples[0x19]) * costab[0x6];
-
-		b1[0x07] = samples[0x07] + samples[0x18];
-		b1[0x18] = (samples[0x07] - samples[0x18]) * costab[0x7];
-
-		b1[0x08] = samples[0x08] + samples[0x17];
-		b1[0x17] = (samples[0x08] - samples[0x17]) * costab[0x8];
-
-		b1[0x09] = samples[0x09] + samples[0x16];
-		b1[0x16] = (samples[0x09] - samples[0x16]) * costab[0x9];
-
-		b1[0x0A] = samples[0x0A] + samples[0x15];
-		b1[0x15] = (samples[0x0A] - samples[0x15]) * costab[0xA];
-
-		b1[0x0B] = samples[0x0B] + samples[0x14];
-		b1[0x14] = (samples[0x0B] - samples[0x14]) * costab[0xB];
-
-		b1[0x0C] = samples[0x0C] + samples[0x13];
-		b1[0x13] = (samples[0x0C] - samples[0x13]) * costab[0xC];
-
-		b1[0x0D] = samples[0x0D] + samples[0x12];
-		b1[0x12] = (samples[0x0D] - samples[0x12]) * costab[0xD];
-
-		b1[0x0E] = samples[0x0E] + samples[0x11];
-		b1[0x11] = (samples[0x0E] - samples[0x11]) * costab[0xE];
-
-		b1[0x0F] = samples[0x0F] + samples[0x10];
-		b1[0x10] = (samples[0x0F] - samples[0x10]) * costab[0xF];
-	}
-
-	{
-		register real *costab = mpg123_pnts[1];
-
-		b2[0x00] = b1[0x00] + b1[0x0F];
-		b2[0x0F] = (b1[0x00] - b1[0x0F]) * costab[0];
-		b2[0x01] = b1[0x01] + b1[0x0E];
-		b2[0x0E] = (b1[0x01] - b1[0x0E]) * costab[1];
-		b2[0x02] = b1[0x02] + b1[0x0D];
-		b2[0x0D] = (b1[0x02] - b1[0x0D]) * costab[2];
-		b2[0x03] = b1[0x03] + b1[0x0C];
-		b2[0x0C] = (b1[0x03] - b1[0x0C]) * costab[3];
-		b2[0x04] = b1[0x04] + b1[0x0B];
-		b2[0x0B] = (b1[0x04] - b1[0x0B]) * costab[4];
-		b2[0x05] = b1[0x05] + b1[0x0A];
-		b2[0x0A] = (b1[0x05] - b1[0x0A]) * costab[5];
-		b2[0x06] = b1[0x06] + b1[0x09];
-		b2[0x09] = (b1[0x06] - b1[0x09]) * costab[6];
-		b2[0x07] = b1[0x07] + b1[0x08];
-		b2[0x08] = (b1[0x07] - b1[0x08]) * costab[7];
-
-		b2[0x10] = b1[0x10] + b1[0x1F];
-		b2[0x1F] = (b1[0x1F] - b1[0x10]) * costab[0];
-		b2[0x11] = b1[0x11] + b1[0x1E];
-		b2[0x1E] = (b1[0x1E] - b1[0x11]) * costab[1];
-		b2[0x12] = b1[0x12] + b1[0x1D];
-		b2[0x1D] = (b1[0x1D] - b1[0x12]) * costab[2];
-		b2[0x13] = b1[0x13] + b1[0x1C];
-		b2[0x1C] = (b1[0x1C] - b1[0x13]) * costab[3];
-		b2[0x14] = b1[0x14] + b1[0x1B];
-		b2[0x1B] = (b1[0x1B] - b1[0x14]) * costab[4];
-		b2[0x15] = b1[0x15] + b1[0x1A];
-		b2[0x1A] = (b1[0x1A] - b1[0x15]) * costab[5];
-		b2[0x16] = b1[0x16] + b1[0x19];
-		b2[0x19] = (b1[0x19] - b1[0x16]) * costab[6];
-		b2[0x17] = b1[0x17] + b1[0x18];
-		b2[0x18] = (b1[0x18] - b1[0x17]) * costab[7];
-	}
-
-	{
-		register real *costab = mpg123_pnts[2];
-
-		b1[0x00] = b2[0x00] + b2[0x07];
-		b1[0x07] = (b2[0x00] - b2[0x07]) * costab[0];
-		b1[0x01] = b2[0x01] + b2[0x06];
-		b1[0x06] = (b2[0x01] - b2[0x06]) * costab[1];
-		b1[0x02] = b2[0x02] + b2[0x05];
-		b1[0x05] = (b2[0x02] - b2[0x05]) * costab[2];
-		b1[0x03] = b2[0x03] + b2[0x04];
-		b1[0x04] = (b2[0x03] - b2[0x04]) * costab[3];
-
-		b1[0x08] = b2[0x08] + b2[0x0F];
-		b1[0x0F] = (b2[0x0F] - b2[0x08]) * costab[0];
-		b1[0x09] = b2[0x09] + b2[0x0E];
-		b1[0x0E] = (b2[0x0E] - b2[0x09]) * costab[1];
-		b1[0x0A] = b2[0x0A] + b2[0x0D];
-		b1[0x0D] = (b2[0x0D] - b2[0x0A]) * costab[2];
-		b1[0x0B] = b2[0x0B] + b2[0x0C];
-		b1[0x0C] = (b2[0x0C] - b2[0x0B]) * costab[3];
-
-		b1[0x10] = b2[0x10] + b2[0x17];
-		b1[0x17] = (b2[0x10] - b2[0x17]) * costab[0];
-		b1[0x11] = b2[0x11] + b2[0x16];
-		b1[0x16] = (b2[0x11] - b2[0x16]) * costab[1];
-		b1[0x12] = b2[0x12] + b2[0x15];
-		b1[0x15] = (b2[0x12] - b2[0x15]) * costab[2];
-		b1[0x13] = b2[0x13] + b2[0x14];
-		b1[0x14] = (b2[0x13] - b2[0x14]) * costab[3];
-
-		b1[0x18] = b2[0x18] + b2[0x1F];
-		b1[0x1F] = (b2[0x1F] - b2[0x18]) * costab[0];
-		b1[0x19] = b2[0x19] + b2[0x1E];
-		b1[0x1E] = (b2[0x1E] - b2[0x19]) * costab[1];
-		b1[0x1A] = b2[0x1A] + b2[0x1D];
-		b1[0x1D] = (b2[0x1D] - b2[0x1A]) * costab[2];
-		b1[0x1B] = b2[0x1B] + b2[0x1C];
-		b1[0x1C] = (b2[0x1C] - b2[0x1B]) * costab[3];
-	}
-
-	{
-		register real const cos0 = mpg123_pnts[3][0];
-		register real const cos1 = mpg123_pnts[3][1];
-
-		b2[0x00] = b1[0x00] + b1[0x03];
-		b2[0x03] = (b1[0x00] - b1[0x03]) * cos0;
-		b2[0x01] = b1[0x01] + b1[0x02];
-		b2[0x02] = (b1[0x01] - b1[0x02]) * cos1;
-
-		b2[0x04] = b1[0x04] + b1[0x07];
-		b2[0x07] = (b1[0x07] - b1[0x04]) * cos0;
-		b2[0x05] = b1[0x05] + b1[0x06];
-		b2[0x06] = (b1[0x06] - b1[0x05]) * cos1;
-
-		b2[0x08] = b1[0x08] + b1[0x0B];
-		b2[0x0B] = (b1[0x08] - b1[0x0B]) * cos0;
-		b2[0x09] = b1[0x09] + b1[0x0A];
-		b2[0x0A] = (b1[0x09] - b1[0x0A]) * cos1;
-
-		b2[0x0C] = b1[0x0C] + b1[0x0F];
-		b2[0x0F] = (b1[0x0F] - b1[0x0C]) * cos0;
-		b2[0x0D] = b1[0x0D] + b1[0x0E];
-		b2[0x0E] = (b1[0x0E] - b1[0x0D]) * cos1;
-
-		b2[0x10] = b1[0x10] + b1[0x13];
-		b2[0x13] = (b1[0x10] - b1[0x13]) * cos0;
-		b2[0x11] = b1[0x11] + b1[0x12];
-		b2[0x12] = (b1[0x11] - b1[0x12]) * cos1;
-
-		b2[0x14] = b1[0x14] + b1[0x17];
-		b2[0x17] = (b1[0x17] - b1[0x14]) * cos0;
-		b2[0x15] = b1[0x15] + b1[0x16];
-		b2[0x16] = (b1[0x16] - b1[0x15]) * cos1;
-
-		b2[0x18] = b1[0x18] + b1[0x1B];
-		b2[0x1B] = (b1[0x18] - b1[0x1B]) * cos0;
-		b2[0x19] = b1[0x19] + b1[0x1A];
-		b2[0x1A] = (b1[0x19] - b1[0x1A]) * cos1;
-
-		b2[0x1C] = b1[0x1C] + b1[0x1F];
-		b2[0x1F] = (b1[0x1F] - b1[0x1C]) * cos0;
-		b2[0x1D] = b1[0x1D] + b1[0x1E];
-		b2[0x1E] = (b1[0x1E] - b1[0x1D]) * cos1;
-	}
-
-	{
-		register real const cos0 = mpg123_pnts[4][0];
-
-		b1[0x00] = b2[0x00] + b2[0x01];
-		b1[0x01] = (b2[0x00] - b2[0x01]) * cos0;
-		b1[0x02] = b2[0x02] + b2[0x03];
-		b1[0x03] = (b2[0x03] - b2[0x02]) * cos0;
-		b1[0x02] += b1[0x03];
-
-		b1[0x04] = b2[0x04] + b2[0x05];
-		b1[0x05] = (b2[0x04] - b2[0x05]) * cos0;
-		b1[0x06] = b2[0x06] + b2[0x07];
-		b1[0x07] = (b2[0x07] - b2[0x06]) * cos0;
-		b1[0x06] += b1[0x07];
-		b1[0x04] += b1[0x06];
-		b1[0x06] += b1[0x05];
-		b1[0x05] += b1[0x07];
-
-		b1[0x08] = b2[0x08] + b2[0x09];
-		b1[0x09] = (b2[0x08] - b2[0x09]) * cos0;
-		b1[0x0A] = b2[0x0A] + b2[0x0B];
-		b1[0x0B] = (b2[0x0B] - b2[0x0A]) * cos0;
-		b1[0x0A] += b1[0x0B];
-
-		b1[0x0C] = b2[0x0C] + b2[0x0D];
-		b1[0x0D] = (b2[0x0C] - b2[0x0D]) * cos0;
-		b1[0x0E] = b2[0x0E] + b2[0x0F];
-		b1[0x0F] = (b2[0x0F] - b2[0x0E]) * cos0;
-		b1[0x0E] += b1[0x0F];
-		b1[0x0C] += b1[0x0E];
-		b1[0x0E] += b1[0x0D];
-		b1[0x0D] += b1[0x0F];
-
-		b1[0x10] = b2[0x10] + b2[0x11];
-		b1[0x11] = (b2[0x10] - b2[0x11]) * cos0;
-		b1[0x12] = b2[0x12] + b2[0x13];
-		b1[0x13] = (b2[0x13] - b2[0x12]) * cos0;
-		b1[0x12] += b1[0x13];
-
-		b1[0x14] = b2[0x14] + b2[0x15];
-		b1[0x15] = (b2[0x14] - b2[0x15]) * cos0;
-		b1[0x16] = b2[0x16] + b2[0x17];
-		b1[0x17] = (b2[0x17] - b2[0x16]) * cos0;
-		b1[0x16] += b1[0x17];
-		b1[0x14] += b1[0x16];
-		b1[0x16] += b1[0x15];
-		b1[0x15] += b1[0x17];
-
-		b1[0x18] = b2[0x18] + b2[0x19];
-		b1[0x19] = (b2[0x18] - b2[0x19]) * cos0;
-		b1[0x1A] = b2[0x1A] + b2[0x1B];
-		b1[0x1B] = (b2[0x1B] - b2[0x1A]) * cos0;
-		b1[0x1A] += b1[0x1B];
-
-		b1[0x1C] = b2[0x1C] + b2[0x1D];
-		b1[0x1D] = (b2[0x1C] - b2[0x1D]) * cos0;
-		b1[0x1E] = b2[0x1E] + b2[0x1F];
-		b1[0x1F] = (b2[0x1F] - b2[0x1E]) * cos0;
-		b1[0x1E] += b1[0x1F];
-		b1[0x1C] += b1[0x1E];
-		b1[0x1E] += b1[0x1D];
-		b1[0x1D] += b1[0x1F];
-	}
-
-	out0[0x10 * 16] = b1[0x00];
-	out0[0x10 * 12] = b1[0x04];
-	out0[0x10 * 8] = b1[0x02];
-	out0[0x10 * 4] = b1[0x06];
-	out0[0x10 * 0] = b1[0x01];
-	out1[0x10 * 0] = b1[0x01];
-	out1[0x10 * 4] = b1[0x05];
-	out1[0x10 * 8] = b1[0x03];
-	out1[0x10 * 12] = b1[0x07];
-
-	b1[0x08] += b1[0x0C];
-	out0[0x10 * 14] = b1[0x08];
-	b1[0x0C] += b1[0x0a];
-	out0[0x10 * 10] = b1[0x0C];
-	b1[0x0A] += b1[0x0E];
-	out0[0x10 * 6] = b1[0x0A];
-	b1[0x0E] += b1[0x09];
-	out0[0x10 * 2] = b1[0x0E];
-	b1[0x09] += b1[0x0D];
-	out1[0x10 * 2] = b1[0x09];
-	b1[0x0D] += b1[0x0B];
-	out1[0x10 * 6] = b1[0x0D];
-	b1[0x0B] += b1[0x0F];
-	out1[0x10 * 10] = b1[0x0B];
-	out1[0x10 * 14] = b1[0x0F];
-
-	b1[0x18] += b1[0x1C];
-	out0[0x10 * 15] = b1[0x10] + b1[0x18];
-	out0[0x10 * 13] = b1[0x18] + b1[0x14];
-	b1[0x1C] += b1[0x1a];
-	out0[0x10 * 11] = b1[0x14] + b1[0x1C];
-	out0[0x10 * 9] = b1[0x1C] + b1[0x12];
-	b1[0x1A] += b1[0x1E];
-	out0[0x10 * 7] = b1[0x12] + b1[0x1A];
-	out0[0x10 * 5] = b1[0x1A] + b1[0x16];
-	b1[0x1E] += b1[0x19];
-	out0[0x10 * 3] = b1[0x16] + b1[0x1E];
-	out0[0x10 * 1] = b1[0x1E] + b1[0x11];
-	b1[0x19] += b1[0x1D];
-	out1[0x10 * 1] = b1[0x11] + b1[0x19];
-	out1[0x10 * 3] = b1[0x19] + b1[0x15];
-	b1[0x1D] += b1[0x1B];
-	out1[0x10 * 5] = b1[0x15] + b1[0x1D];
-	out1[0x10 * 7] = b1[0x1D] + b1[0x13];
-	b1[0x1B] += b1[0x1F];
-	out1[0x10 * 9] = b1[0x13] + b1[0x1B];
-	out1[0x10 * 11] = b1[0x1B] + b1[0x17];
-	out1[0x10 * 13] = b1[0x17] + b1[0x1F];
-	out1[0x10 * 15] = b1[0x1F];
-}
-
-/*
- * the call via mpg123_dct64 is a trick to force GCC to use
- * (new) registers for the b1,b2 pointer to the bufs[xx] field
- */
-void mpg123_dct64 (real * a, real * b, real * c)
-{
-	real bufs[0x40];
-
-	mpg123_dct64_1(a, b, bufs, bufs + 0x20, c);
-}
diff --git a/components/music/decode.c b/components/music/decode.c
deleted file mode 100644
index 9c766620a..000000000
--- a/components/music/decode.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* 
- * Mpeg Layer-1,2,3 audio decoder 
- * ------------------------------
- * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
- * See also 'README'
- *
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "mpg123.h"
-
-#define WRITE_SAMPLE(samples,sum,clip) \
-  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = sum; }
-
-int mpg123_synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt)
-{
-  short samples_tmp[64];
-  short *tmp1 = samples_tmp + channel;
-  int i,ret;
-  int pnt1=0;
-
-  ret = mpg123_synth_1to1(bandPtr,channel,(unsigned char *) samples_tmp,&pnt1);
-  samples += channel + *pnt;
-
-  for(i=0;i<32;i++) {
-    *samples = mpg123_conv16to8[*tmp1>>AUSHIFT];
-    samples += 2;
-    tmp1 += 2;
-  }
-  *pnt += 64;
-
-  return ret;
-}
-
-int mpg123_synth_1to1_8bit_mono(real *bandPtr,unsigned char *samples,int *pnt)
-{
-  short samples_tmp[64];
-  short *tmp1 = samples_tmp;
-  int i,ret;
-  int pnt1 = 0;
-
-  ret = mpg123_synth_1to1(bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
-  samples += *pnt;
-
-  for(i=0;i<32;i++) {
-    *samples++ = mpg123_conv16to8[*tmp1>>AUSHIFT];
-    tmp1 += 2;
-  }
-  *pnt += 32;
-  
-  return ret;
-}
-
-int mpg123_synth_1to1_8bit_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt)
-{
-  short samples_tmp[64];
-  short *tmp1 = samples_tmp;
-  int i,ret;
-  int pnt1 = 0;
-
-  ret = mpg123_synth_1to1(bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
-  samples += *pnt;
-
-  for(i=0;i<32;i++) {
-    *samples++ = mpg123_conv16to8[*tmp1>>AUSHIFT];
-    *samples++ = mpg123_conv16to8[*tmp1>>AUSHIFT];
-    tmp1 += 2;
-  }
-  *pnt += 64;
-
-  return ret;
-}
-
-int mpg123_synth_1to1_mono(real *bandPtr,unsigned char *samples,int *pnt)
-{
-  short samples_tmp[64];
-  short *tmp1 = samples_tmp;
-  int i,ret;
-  int pnt1 = 0;
-
-  ret = mpg123_synth_1to1(bandPtr,0,(unsigned char *) samples_tmp,&pnt1);
-  samples += *pnt;
-
-  for(i=0;i<32;i++) {
-    *( (short *)samples) = *tmp1;
-    samples += 2;
-    tmp1 += 2;
-  }
-  *pnt += 64;
-
-  return ret;
-}
-
-
-int mpg123_synth_1to1_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt)
-{
-  int i,ret;
-
-  ret = mpg123_synth_1to1(bandPtr,0,samples,pnt);
-  samples = samples + *pnt - 128;
-
-  for(i=0;i<32;i++) {
-    ((short *)samples)[1] = ((short *)samples)[0];
-    samples+=4;
-  }
-
-  return ret;
-}
-
-
-int mpg123_synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
-{
-  static real buffs[2][2][0x110];
-  static const int step = 2;
-  static int bo = 1;
-  short *samples = (short *) (out+*pnt);
-
-  real *b0,(*buf)[0x110];
-  int clip = 0; 
-  int bo1;
-
-  /*if(equalfile)
-	do_equalizer(bandPtr,channel);*/
-
-  if(!channel) {
-    bo--;
-    bo &= 0xf;
-    buf = buffs[0];
-  }
-  else {
-    samples++;
-    buf = buffs[1];
-  }
-
-  if(bo & 0x1) {
-    b0 = buf[0];
-    bo1 = bo;
-    mpg123_dct64(buf[1]+((bo+1)&0xf),buf[0]+bo,bandPtr);
-  }
-  else {
-    b0 = buf[1];
-    bo1 = bo+1;
-    mpg123_dct64(buf[0]+bo,buf[1]+bo+1,bandPtr);
-  }
-
-
-  {
-    register int j;
-    real *window = mpg123_decwin + 16 - bo1;
- 
-    for (j=16;j;j--,window+=0x10,samples+=step)
-    {
-      real sum;
-      sum  = *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-      sum += *window++ * *b0++;
-      sum -= *window++ * *b0++;
-
-      WRITE_SAMPLE(samples,sum,clip);
-    }
-
-    {
-      real sum;
-      sum  = window[0x0] * b0[0x0];
-      sum += window[0x2] * b0[0x2];
-      sum += window[0x4] * b0[0x4];
-      sum += window[0x6] * b0[0x6];
-      sum += window[0x8] * b0[0x8];
-      sum += window[0xA] * b0[0xA];
-      sum += window[0xC] * b0[0xC];
-      sum += window[0xE] * b0[0xE];
-      WRITE_SAMPLE(samples,sum,clip);
-      b0-=0x10,window-=0x20,samples+=step;
-    }
-    window += bo1<<1;
-
-    for (j=15;j;j--,b0-=0x20,window-=0x10,samples+=step)
-    {
-      real sum;
-      sum = -*(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-      sum -= *(--window) * *b0++;
-
-      WRITE_SAMPLE(samples,sum,clip);
-    }
-  }
-
-  *pnt += 128;
-
-  return clip;
-}
-
-
diff --git a/components/music/decode_2to1.c b/components/music/decode_2to1.c
deleted file mode 100644
index 28448d49e..000000000
--- a/components/music/decode_2to1.c
+++ /dev/null
@@ -1,247 +0,0 @@
-
-/*
- * Mpeg Layer-1,2,3 audio decoder
- * ------------------------------
- * copyright (c) 1995 by Michael Hipp, All rights reserved. See also 'README'
- * version for slower machines .. decodes only every second sample
- * sounds like 24000,22050 or 16000 kHz .. (depending on original sample freq.)
- *
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "mpg123.h"
-
-#define WRITE_SAMPLE(samples,sum,clip) \
-  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = sum; }
-
-int mpg123_synth_2to1_8bit(real * bandPtr, int channel, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[32];
-	short *tmp1 = samples_tmp + channel;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_2to1(bandPtr, channel, (unsigned char *) samples_tmp, &pnt1);
-	samples += channel + *pnt;
-
-	for (i = 0; i < 16; i++)
-	{
-		*samples = (*tmp1 >> 8) ^ 128;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 32;
-
-	return ret;
-}
-
-int mpg123_synth_2to1_8bit_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[32];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_2to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 16; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 16;
-
-	return ret;
-}
-
-int mpg123_synth_2to1_8bit_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[32];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_2to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 16; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 32;
-
-	return ret;
-}
-
-int mpg123_synth_2to1_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[32];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_2to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 16; i++)
-	{
-		*((short *) samples) = *tmp1;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 32;
-
-	return ret;
-}
-
-int mpg123_synth_2to1_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	int i, ret;
-
-	ret = mpg123_synth_2to1(bandPtr, 0, samples, pnt);
-	samples = samples + *pnt - 64;
-
-	for (i = 0; i < 16; i++)
-	{
-		((short *) samples)[1] = ((short *) samples)[0];
-		samples += 4;
-	}
-
-	return ret;
-}
-
-int mpg123_synth_2to1(real * bandPtr, int channel, unsigned char *out, int *pnt)
-{
-	static real buffs[2][2][0x110];
-	static const int step = 2;
-	static int bo = 1;
-	short *samples = (short *) (out + *pnt);
-
-	real *b0, (*buf)[0x110];
-	int clip = 0;
-	int bo1;
-
-/*  if(param.equalizer)
-   do_equalizer(bandPtr,channel); */
-
-	if (!channel)
-	{
-		bo--;
-		bo &= 0xf;
-		buf = buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = buffs[1];
-	}
-
-	if (bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = bo;
-		mpg123_dct64(buf[1] + ((bo + 1) & 0xf), buf[0] + bo, bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = bo + 1;
-		mpg123_dct64(buf[0] + bo, buf[1] + bo + 1, bandPtr);
-	}
-
-	{
-		register int j;
-		real *window = mpg123_decwin + 16 - bo1;
-
-		for (j = 8; j; j--, b0 += 0x10, window += 0x30)
-		{
-			real sum;
-
-			sum = *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-		}
-
-		{
-			real sum;
-
-			sum = window[0x0] * b0[0x0];
-			sum += window[0x2] * b0[0x2];
-			sum += window[0x4] * b0[0x4];
-			sum += window[0x6] * b0[0x6];
-			sum += window[0x8] * b0[0x8];
-			sum += window[0xA] * b0[0xA];
-			sum += window[0xC] * b0[0xC];
-			sum += window[0xE] * b0[0xE];
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-			b0 -= 0x20, window -= 0x40;
-		}
-		window += bo1 << 1;
-
-		for (j = 7; j; j--, b0 -= 0x30, window -= 0x30)
-		{
-			real sum;
-
-			sum = -*(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-		}
-	}
-
-	*pnt += 64;
-
-	return clip;
-}
diff --git a/components/music/decode_4to1.c b/components/music/decode_4to1.c
deleted file mode 100644
index 85ed16c90..000000000
--- a/components/music/decode_4to1.c
+++ /dev/null
@@ -1,260 +0,0 @@
-
-/*
- * Mpeg Layer-1,2,3 audio decoder
- * ------------------------------
- * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
- * See also 'README'
- * version for slower machines .. decodes only every fourth sample
- * dunno why it sounds THIS annoying (maybe we should adapt the window?)
- * absolutely not optimized for this operation
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "mpg123.h"
-
-#define WRITE_SAMPLE(samples,sum,clip) \
-  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = sum; }
-
-int mpg123_synth_4to1_8bit(real * bandPtr, int channel, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[16];
-	short *tmp1 = samples_tmp + channel;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_4to1(bandPtr, channel, (unsigned char *) samples_tmp, &pnt1);
-	samples += channel + *pnt;
-
-	for (i = 0; i < 8; i++)
-	{
-		*samples = (*tmp1 >> 8) ^ 128;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 16;
-
-	return ret;
-}
-
-int mpg123_synth_4to1_8bit_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[16];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_4to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 8; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 8;
-
-	return ret;
-}
-
-int mpg123_synth_4to1_8bit_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[16];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_4to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 8; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 16;
-
-	return ret;
-}
-
-int mpg123_synth_4to1_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[16];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_4to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 8; i++)
-	{
-		*((short *) samples) = *tmp1;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 16;
-
-	return ret;
-}
-
-int mpg123_synth_4to1_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	int i, ret;
-
-	ret = mpg123_synth_4to1(bandPtr, 0, samples, pnt);
-	samples = samples + *pnt - 32;
-
-	for (i = 0; i < 8; i++)
-	{
-		((short *) samples)[1] = ((short *) samples)[0];
-		samples += 4;
-	}
-
-	return ret;
-}
-
-int mpg123_synth_4to1(real * bandPtr, int channel, unsigned char *out, int *pnt)
-{
-	static real buffs[2][2][0x110];
-	static const int step = 2;
-	static int bo = 1;
-	short *samples = (short *) (out + *pnt);
-
-	real *b0, (*buf)[0x110];
-	int clip = 0;
-	int bo1;
-
-/*  if(param.equalizer)
-   do_equalizer(bandPtr,channel); */
-
-	if (!channel)
-	{
-		bo--;
-		bo &= 0xf;
-		buf = buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = buffs[1];
-	}
-
-	if (bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = bo;
-		mpg123_dct64(buf[1] + ((bo + 1) & 0xf), buf[0] + bo, bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = bo + 1;
-		mpg123_dct64(buf[0] + bo, buf[1] + bo + 1, bandPtr);
-	}
-
-	{
-		register int j;
-		real *window = mpg123_decwin + 16 - bo1;
-
-		for (j = 4; j; j--, b0 += 0x30, window += 0x70)
-		{
-			real sum;
-
-			sum = *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-		}
-
-		{
-			real sum;
-
-			sum = window[0x0] * b0[0x0];
-			sum += window[0x2] * b0[0x2];
-			sum += window[0x4] * b0[0x4];
-			sum += window[0x6] * b0[0x6];
-			sum += window[0x8] * b0[0x8];
-			sum += window[0xA] * b0[0xA];
-			sum += window[0xC] * b0[0xC];
-			sum += window[0xE] * b0[0xE];
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-			b0 -= 0x40, window -= 0x80;
-		}
-		window += bo1 << 1;
-
-		for (j = 3; j; j--, b0 -= 0x50, window -= 0x70)
-		{
-			real sum;
-
-			sum = -*(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#if 0
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-			WRITE_SAMPLE(samples, sum, clip);
-			samples += step;
-#endif
-		}
-	}
-
-	*pnt += 32;
-
-	return clip;
-}
diff --git a/components/music/decode_i386.c b/components/music/decode_i386.c
deleted file mode 100644
index 172f9dc65..000000000
--- a/components/music/decode_i386.c
+++ /dev/null
@@ -1,257 +0,0 @@
-
-/* 
- * Mpeg Layer-1,2,3 audio decoder 
- * ------------------------------
- * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
- * See also 'README'
- *
- * slighlty optimized for machines without autoincrement/decrement.
- * The performance is highly compiler dependend. Maybe
- * the decode.c version for 'normal' processor may be faster
- * even for Intel processors.
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "mpg123.h"
-
-#if 0
- /* old WRITE_SAMPLE */
-#define WRITE_SAMPLE(samples,sum,clip) \
-  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = sum; }
-#else
- /* new WRITE_SAMPLE */
-#define WRITE_SAMPLE(samples,sum,clip) { \
-  double dtemp; int v; /* sizeof(int) == 4 */ \
-  dtemp = ((((65536.0 * 65536.0 * 16)+(65536.0 * 0.5))* 65536.0)) + (sum);  \
-  v = ((*(int *)&dtemp) - 0x80000000); \
-  if( v > 32767) { *(samples) = 0x7fff; (clip)++; } \
-  else if( v < -32768) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = v; }  \
-}
-#endif
-
-int mpg123_synth_1to1_8bit(real * bandPtr, int channel, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[64];
-	short *tmp1 = samples_tmp + channel;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_1to1(bandPtr, channel, (unsigned char *) samples_tmp, &pnt1);
-	samples += channel + *pnt;
-
-	for (i = 0; i < 32; i++)
-	{
-		*samples = (*tmp1 >> 8) ^ 128;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 64;
-
-	return ret;
-}
-
-int mpg123_synth_1to1_8bit_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_1to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 32; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 32;
-
-	return ret;
-}
-
-int mpg123_synth_1to1_8bit_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_1to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 32; i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += 64;
-
-	return ret;
-}
-
-int mpg123_synth_1to1_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_1to1(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < 32; i++)
-	{
-		*((short *) samples) = *tmp1;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += 64;
-
-	return ret;
-}
-
-int mpg123_synth_1to1_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	int i, ret;
-
-	ret = mpg123_synth_1to1(bandPtr, 0, samples, pnt);
-	samples = samples + *pnt - 128;
-
-	for (i = 0; i < 32; i++)
-	{
-		((short *) samples)[1] = ((short *) samples)[0];
-		samples += 4;
-	}
-
-	return ret;
-}
-
-int mpg123_synth_1to1(real * bandPtr, int channel, unsigned char *out, int *pnt)
-{
-#if 1
-	static real buffs[2][2][0x110];
-	static const int step = 2;
-	static int bo = 1;
-	short *samples = (short *) (out + *pnt);
-
-	real *b0, (*buf)[0x110];
-	int clip = 0;
-	int bo1;
-
-#endif
-
-#if 1
-	if (!channel)
-	{
-		bo--;
-		bo &= 0xf;
-		buf = buffs[0];
-	}
-	else
-	{
-		samples++;
-		buf = buffs[1];
-	}
-
-	if (bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = bo;
-		mpg123_dct64(buf[1] + ((bo + 1) & 0xf), buf[0] + bo, bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = bo + 1;
-		mpg123_dct64(buf[0] + bo, buf[1] + bo + 1, bandPtr);
-	}
-
-	{
-		register int j;
-		real *window = mpg123_decwin + 16 - bo1;
-
-		for (j = 16; j; j--, b0 += 0x10, window += 0x20, samples += step)
-		{
-			real sum;
-
-			sum = window[0x0] * b0[0x0];
-			sum -= window[0x1] * b0[0x1];
-			sum += window[0x2] * b0[0x2];
-			sum -= window[0x3] * b0[0x3];
-			sum += window[0x4] * b0[0x4];
-			sum -= window[0x5] * b0[0x5];
-			sum += window[0x6] * b0[0x6];
-			sum -= window[0x7] * b0[0x7];
-			sum += window[0x8] * b0[0x8];
-			sum -= window[0x9] * b0[0x9];
-			sum += window[0xA] * b0[0xA];
-			sum -= window[0xB] * b0[0xB];
-			sum += window[0xC] * b0[0xC];
-			sum -= window[0xD] * b0[0xD];
-			sum += window[0xE] * b0[0xE];
-			sum -= window[0xF] * b0[0xF];
-
-			WRITE_SAMPLE(samples, sum, clip);
-		}
-
-		{
-			real sum;
-
-			sum = window[0x0] * b0[0x0];
-			sum += window[0x2] * b0[0x2];
-			sum += window[0x4] * b0[0x4];
-			sum += window[0x6] * b0[0x6];
-			sum += window[0x8] * b0[0x8];
-			sum += window[0xA] * b0[0xA];
-			sum += window[0xC] * b0[0xC];
-			sum += window[0xE] * b0[0xE];
-			WRITE_SAMPLE(samples, sum, clip);
-			b0 -= 0x10, window -= 0x20, samples += step;
-		}
-		window += bo1 << 1;
-
-		for (j = 15; j; j--, b0 -= 0x10, window -= 0x20, samples += step)
-		{
-			real sum;
-
-			sum = -window[-0x1] * b0[0x0];
-			sum -= window[-0x2] * b0[0x1];
-			sum -= window[-0x3] * b0[0x2];
-			sum -= window[-0x4] * b0[0x3];
-			sum -= window[-0x5] * b0[0x4];
-			sum -= window[-0x6] * b0[0x5];
-			sum -= window[-0x7] * b0[0x6];
-			sum -= window[-0x8] * b0[0x7];
-			sum -= window[-0x9] * b0[0x8];
-			sum -= window[-0xA] * b0[0x9];
-			sum -= window[-0xB] * b0[0xA];
-			sum -= window[-0xC] * b0[0xB];
-			sum -= window[-0xD] * b0[0xC];
-			sum -= window[-0xE] * b0[0xD];
-			sum -= window[-0xF] * b0[0xE];
-			sum -= window[-0x0] * b0[0xF];
-
-			WRITE_SAMPLE(samples, sum, clip);
-		}
-	}
-	*pnt += 128;
-
-	return clip;
-#else
-	{
-		int ret;
-
-		ret = mpg123_synth_1to1_pent(bandPtr, channel, out + *pnt);
-		*pnt += 128;
-		return ret;
-	}
-#endif
-}
diff --git a/components/music/decode_ntom.c b/components/music/decode_ntom.c
deleted file mode 100644
index 2a4e4177b..000000000
--- a/components/music/decode_ntom.c
+++ /dev/null
@@ -1,301 +0,0 @@
-
-/* 
- * Mpeg Layer-1,2,3 audio decoder 
- * ------------------------------
- * copyright (c) 1995,1996,1997 by Michael Hipp, All rights reserved.
- * See also 'README'
- *
- * N->M down/up sampling. Not optimized for speed.
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "mpg123.h"
-
-#define WRITE_SAMPLE(samples,sum,clip) \
-  if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
-  else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
-  else { *(samples) = sum; }
-
-#define NTOM_MUL (32768)
-static unsigned long ntom_val[2] =
-{NTOM_MUL >> 1, NTOM_MUL >> 1};
-static unsigned long ntom_step = NTOM_MUL;
-
-void mpg123_synth_ntom_set_step(long m, long n)
-{
-/*      if(param.verbose > 1)
-   fprintf(stderr,"Init rate converter: %ld->%ld\n",m,n); */
-
-	if (n >= 96000 || m >= 96000 || m == 0 || n == 0)
-	{
-/*              fprintf(stderr,"NtoM converter: illegal rates\n");
-   exit(1); */
-	}
-
-	n *= NTOM_MUL;
-	ntom_step = n / m;
-
-	if (ntom_step > 8 * NTOM_MUL)
-	{
-/*              fprintf(stderr,"max. 1:8 conversion allowed!\n");
-   exit(1); */
-	}
-
-	ntom_val[0] = ntom_val[1] = NTOM_MUL >> 1;
-}
-
-int mpg123_synth_ntom_8bit(real * bandPtr, int channel, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[8 * 64];
-	short *tmp1 = samples_tmp + channel;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_ntom(bandPtr, channel, (unsigned char *) samples_tmp, &pnt1);
-	samples += channel + *pnt;
-
-	for (i = 0; i < (pnt1 >> 2); i++)
-	{
-		*samples = (*tmp1 >> 8) ^ 128;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += pnt1 >> 1;
-
-	return ret;
-}
-
-int mpg123_synth_ntom_8bit_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[8 * 64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_ntom(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < (pnt1 >> 21); i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += pnt1 >> 2;
-
-	return ret;
-}
-
-int mpg123_synth_ntom_8bit_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[8 * 64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_ntom(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < (pnt1 >> 2); i++)
-	{
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		*samples++ = (*tmp1 >> 8) ^ 128;
-		tmp1 += 2;
-	}
-	*pnt += pnt1 >> 1;
-
-	return ret;
-}
-
-int mpg123_synth_ntom_mono(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	short samples_tmp[8 * 64];
-	short *tmp1 = samples_tmp;
-	int i, ret;
-	int pnt1 = 0;
-
-	ret = mpg123_synth_ntom(bandPtr, 0, (unsigned char *) samples_tmp, &pnt1);
-	samples += *pnt;
-
-	for (i = 0; i < (pnt1 >> 2); i++)
-	{
-		*((short *) samples) = *tmp1;
-		samples += 2;
-		tmp1 += 2;
-	}
-	*pnt += pnt1 >> 1;
-
-	return ret;
-}
-
-int mpg123_synth_ntom_mono2stereo(real * bandPtr, unsigned char *samples, int *pnt)
-{
-	int i, ret;
-	int pnt1 = *pnt;
-
-	ret = mpg123_synth_ntom(bandPtr, 0, samples, pnt);
-	samples += pnt1;
-
-	for (i = 0; i < ((*pnt - pnt1) >> 2); i++)
-	{
-		((short *) samples)[1] = ((short *) samples)[0];
-		samples += 4;
-	}
-
-	return ret;
-}
-
-int mpg123_synth_ntom(real * bandPtr, int channel, unsigned char *out, int *pnt)
-{
-	static real buffs[2][2][0x110];
-	static const int step = 2;
-	static int bo = 1;
-	short *samples = (short *) (out + *pnt);
-
-	real *b0, (*buf)[0x110];
-	int clip = 0;
-	int bo1;
-	int ntom;
-
-/*  if(param.equalizer)
-   do_equalizer(bandPtr,channel); */
-
-	if (!channel)
-	{
-		bo--;
-		bo &= 0xf;
-		buf = buffs[0];
-		ntom = ntom_val[1] = ntom_val[0];
-	}
-	else
-	{
-		samples++;
-		out += 2;	/* to compute the right *pnt value */
-		buf = buffs[1];
-		ntom = ntom_val[1];
-	}
-
-	if (bo & 0x1)
-	{
-		b0 = buf[0];
-		bo1 = bo;
-		mpg123_dct64(buf[1] + ((bo + 1) & 0xf), buf[0] + bo, bandPtr);
-	}
-	else
-	{
-		b0 = buf[1];
-		bo1 = bo + 1;
-		mpg123_dct64(buf[0] + bo, buf[1] + bo + 1, bandPtr);
-	}
-
-	{
-		register int j;
-		real *window = mpg123_decwin + 16 - bo1;
-
-		for (j = 16; j; j--, window += 0x10)
-		{
-			real sum;
-
-			ntom += ntom_step;
-			if (ntom < NTOM_MUL)
-			{
-				window += 16;
-				b0 += 16;
-				continue;
-			}
-
-			sum = *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-			sum += *window++ * *b0++;
-			sum -= *window++ * *b0++;
-
-			while (ntom >= NTOM_MUL)
-			{
-				WRITE_SAMPLE(samples, sum, clip);
-				samples += step;
-				ntom -= NTOM_MUL;
-			}
-		}
-
-		ntom += ntom_step;
-		if (ntom >= NTOM_MUL)
-		{
-			real sum;
-
-			sum = window[0x0] * b0[0x0];
-			sum += window[0x2] * b0[0x2];
-			sum += window[0x4] * b0[0x4];
-			sum += window[0x6] * b0[0x6];
-			sum += window[0x8] * b0[0x8];
-			sum += window[0xA] * b0[0xA];
-			sum += window[0xC] * b0[0xC];
-			sum += window[0xE] * b0[0xE];
-
-			while (ntom >= NTOM_MUL)
-			{
-				WRITE_SAMPLE(samples, sum, clip);
-				samples += step;
-				ntom -= NTOM_MUL;
-			}
-		}
-
-		b0 -= 0x10, window -= 0x20;
-		window += bo1 << 1;
-
-		for (j = 15; j; j--, b0 -= 0x20, window -= 0x10)
-		{
-			real sum;
-
-			ntom += ntom_step;
-			if (ntom < NTOM_MUL)
-			{
-				window -= 16;
-				b0 += 16;
-				continue;
-			}
-
-			sum = -*(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-			sum -= *(--window) * *b0++;
-
-			while (ntom >= NTOM_MUL)
-			{
-				WRITE_SAMPLE(samples, sum, clip);
-				samples += step;
-				ntom -= NTOM_MUL;
-			}
-		}
-	}
-
-	ntom_val[channel] = ntom;
-	*pnt = ((unsigned char *) samples - out);
-
-	return clip;
-}
diff --git a/components/music/dxhead.c b/components/music/dxhead.c
deleted file mode 100644
index e6e9269bf..000000000
--- a/components/music/dxhead.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*---- DXhead.c --------------------------------------------

-

-

-decoder MPEG Layer III

-

-handle Xing header

-

-mod 12/7/98 add vbr scale

-

-Copyright 1998 Xing Technology Corp.

------------------------------------------------------------*/  

-#include <stdlib.h>

-#include <stdio.h>

-#include <float.h>

-#include <math.h>

-#include "dxhead.h"

-

-/* 4   Xing

- * 4   flags

- * 4   frames

- * 4   bytes

- * 100 toc

- */ 

-

-/*-------------------------------------------------------------*/ 

-static int ExtractI4(unsigned char *buf) 

-{
-	

-		int x;
-	

-/* big endian extract */ 

-		

-		x = buf[0];
-	

-		x <<= 8;
-	

-		x |= buf[1];
-	

-		x <<= 8;
-	

-		x |= buf[2];
-	

-		x <<= 8;
-	

-		x |= buf[3];
-	

-		

-		return x;
-	

-}
-

-/*-------------------------------------------------------------*/ 

-int mpg123_get_xing_header(XHEADDATA * X, unsigned char *buf) 

-{
-	

-		int i, head_flags;
-	

-		int h_id, h_mode, h_sr_index;
-	

-		static int sr_table[4] =
-	{44100, 48000, 32000, 99999};
-	

-		

-/* get Xing header data */ 

-		

-		

-		X->flags = 0;	/* clear to null incase fail */
-	

-		

-		

-/* get selected MPEG header data */ 

-		h_id = (buf[1] >> 3) & 1;
-	

-		h_sr_index = (buf[2] >> 2) & 3;
-	

-		h_mode = (buf[3] >> 6) & 3;
-	

-		

-		

-/* determine offset of header */ 

-		if (h_id)
-	{			/* mpeg1 */
-		

-			if (h_mode != 3)
-			buf += (32 + 4);
-		

-			else
-			buf += (17 + 4);
-		

-	}
-	

-		else
-	{			/* mpeg2 */
-		

-			if (h_mode != 3)
-			buf += (17 + 4);
-		

-			else
-			buf += (9 + 4);
-		

-	}
-	

-		

-		if (buf[0] != 'X')
-		return 0;	/* fail */
-	

-		if (buf[1] != 'i')
-		return 0;	/* header not found */
-	

-		if (buf[2] != 'n')
-		return 0;
-	

-		if (buf[3] != 'g')
-		return 0;
-	

-		buf += 4;
-	

-		

-		X->h_id = h_id;
-	

-		X->samprate = sr_table[h_sr_index];
-	

-		if (h_id == 0)
-		X->samprate >>= 1;
-	

-		

-		head_flags = X->flags = ExtractI4(buf);
-	buf += 4;		/* get flags */
-	

-		

-		if (head_flags & FRAMES_FLAG)
-	{
-		X->frames = ExtractI4(buf);
-		buf += 4;
-	}
-	

-		if (head_flags & BYTES_FLAG)
-	{
-		X->bytes = ExtractI4(buf);
-		buf += 4;
-	}
-	

-		

-		if (head_flags & TOC_FLAG)
-	{
-		

-			if (X->toc != NULL)
-		{
-			

-				for (i = 0; i < 100; i++)
-				X->toc[i] = buf[i];
-			

-		}
-		

-			buf += 100;
-		

-	}
-	

-		

-		X->vbr_scale = -1;
-	

-		if (head_flags & VBR_SCALE_FLAG)
-	{
-		X->vbr_scale = ExtractI4(buf);
-		buf += 4;
-	}
-	

-		

-/*if( X->toc != NULL ) {

- *for(i=0;i<100;i++) {

- *    if( (i%10) == 0 ) printf("\n");

- *    printf(" %3d", (int)(X->toc[i]));

- *}

- *}

- */ 

-		

-		return 1;	/* success */
-	

-}
-

-/*-------------------------------------------------------------*/ 

-int mpg123_seek_point(unsigned char TOC[100], int file_bytes, float percent) 

-{
-	

-/* interpolate in TOC to get file seek point in bytes */ 

-		int a, seekpoint;
-	

-		float fa, fb, fx;
-	

-		

-		

-		if (percent < 0.0f)
-		percent = 0.0f;
-	

-		if (percent > 100.0f)
-		percent = 100.0f;
-	

-		

-		a = (int) percent;
-	

-		if (a > 99)
-		a = 99;
-	

-		fa = TOC[a];
-	

-		if (a < 99)
-	{
-		

-			fb = TOC[a + 1];
-		

-	}
-	

-		else
-	{
-		

-			fb = 256.0f;
-		

-	}
-	

-		

-		

-		fx = fa + (fb - fa) * (percent - a);
-	

-		

-		seekpoint = (int) ((1.0f / 256.0f) * fx * file_bytes);
-	

-		

-		

-		return seekpoint;
-	

-}
-

-/*-------------------------------------------------------------*/ 

diff --git a/components/music/dxhead.h b/components/music/dxhead.h
deleted file mode 100644
index 0c88566ff..000000000
--- a/components/music/dxhead.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---- DXhead.h --------------------------------------------

-

-

-decoder MPEG Layer III

-

-handle Xing header

-

-

-Copyright 1998 Xing Technology Corp.

------------------------------------------------------------*/  

-/* A Xing header may be present in the ancillary

- * data field of the first frame of an mp3 bitstream

- * The Xing header (optionally) contains

- *      frames      total number of audio frames in the bitstream

- *      bytes       total number of bytes in the bitstream

- *      toc         table of contents

- 

- * toc (table of contents) gives seek points

- * for random access

- * the ith entry determines the seek point for

- * i-percent duration

- * seek point in bytes = (toc[i]/256.0) * total_bitstream_bytes

- * e.g. half duration seek point = (toc[50]/256.0) * total_bitstream_bytes

- */ 

-

-#define FRAMES_FLAG     0x0001

-#define BYTES_FLAG      0x0002

-#define TOC_FLAG        0x0004

-#define VBR_SCALE_FLAG  0x0008

-

-#define FRAMES_AND_BYTES (FRAMES_FLAG | BYTES_FLAG)

-

-/* structure to receive extracted header

- * toc may be NULL

- */ 

-typedef struct
-{
-	

-	int h_id;		/* from MPEG header, 0=MPEG2, 1=MPEG1 */
-	   

-	int samprate;		/* determined from MPEG header */
-	   

-	int flags;		/* from Xing header data */
-	   

-	int frames;		/* total bit stream frames from Xing header data */
-	   

-	int bytes;		/* total bit stream bytes from Xing header data */
-	   

-	int vbr_scale;		/* encoded vbr scale from Xing header data */
-	   

-	unsigned char *toc;	/* pointer to unsigned char toc_buffer[100] */
-	    

-	/* may be NULL if toc not desired */ 

-}
-XHEADDATA;
-

-

-

-int mpg123_get_xing_header(XHEADDATA * X, unsigned char *buf);
-

-/* return 0=fail, 1=success

- * X   structure to receive header data (output)

- * buf bitstream input 

- */ 

-

-int mpg123_seek_point(unsigned char TOC[100], int file_bytes, float percent);
-

-/* return seekpoint in bytes (may be at eof if percent=100.0)

- * TOC = table of contents from Xing header

- * file_bytes = number of bytes in mp3 file

- * percent = play time percentage of total playtime. May be

- * fractional (e.g. 87.245)

- */ 

-

-

-

diff --git a/components/music/esd-audio.c b/components/music/esd-audio.c
deleted file mode 100644
index 7ab6e6fc4..000000000
--- a/components/music/esd-audio.c
+++ /dev/null
@@ -1,444 +0,0 @@
-
-#include <config.h>
-#include "esd-audio.h"
-
-#include <glib/gmem.h>
-#include <glib/gstrfuncs.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static gint fd = 0;
-static gpointer buffer;
-static gboolean going = FALSE, prebuffer, paused = FALSE, remove_prebuffer = FALSE;
-static gint buffer_size, prebuffer_size, blk_size = 4096;
-static gint rd_index = 0, wr_index = 0;
-static gint output_time_offset = 0;
-static guint64 written = 0, output_bytes = 0;
-static gint bps, ebps;
-static gint flush;
-static gint channels, frequency, latency;
-static AFormat format;
-static esd_format_t esd_format;
-static gint input_bps, input_format, input_frequency, input_channels;
-static gchar *hostname;
-static pthread_t buffer_thread;
-static void *(*esd_translate)(void *, gint);
-
-
-ESDConfig esd_cfg;
-esd_info_t *all_info;
-esd_player_info_t *player_info;
-
-static void 
-esdout_init (void)
-{
-	memset (&esd_cfg, 0, sizeof (ESDConfig));
-	esd_cfg.port = ESD_DEFAULT_PORT;
-	esd_cfg.buffer_size = 3000;
-	esd_cfg.prebuffer = 25;
-}
-
-static gint 
-get_latency(void)
-{
-	int fd, amount = 0;
-
-#ifndef HAVE_ESD_GET_LATENCY
-	esd_server_info_t *info;
-#endif
-
-	fd = esd_open_sound (hostname);
-	if (fd == -1) {
-		return 0;
-	}
-
-#ifdef HAVE_ESD_GET_LATENCY
-	amount = esd_get_latency(fd);
-#else
-	info = esd_get_server_info(fd);
-	if (info) {
-		if (info->format & ESD_STEREO) {
-			if (info->format & ESD_BITS16)
-				amount = (44100 * (ESD_BUF_SIZE + 64)) / info->rate;
-			else
-				amount = (44100 * (ESD_BUF_SIZE + 128)) / info->rate;
-		} else {
-			if (info->format & ESD_BITS16)
-				amount = (2 * 44100 * (ESD_BUF_SIZE + 128)) / info->rate;
-			else
-				amount = (2 * 44100 * (ESD_BUF_SIZE + 256)) / info->rate;
-		}
-		free(info);
-	}
-	amount += ESD_BUF_SIZE * 2;
-#endif
-	esd_close (fd);
-	return amount;
-}
-
-static void *
-esd_stou8(void *data, gint length)
-{
-	int len = length;
-	unsigned char *dat = (unsigned char *)data;
-	while (len-- > 0)
-		*dat++ ^= 0x80;
-	return data;
-}
-
-static void *esd_utos16sw(void *data, gint length)
-{
-	int len = length;
-	short *dat = data;
-	while ( len > 0 ) {
-		*dat = GUINT16_SWAP_LE_BE( *dat ) ^ 0x8000;
-		dat++;
-		len-=2;
-	}
-	return data;
-}
-
-static void *esd_utos16(void *data, gint length)
-{
-	int len = length;
-	short *dat = data;
-	while ( len > 0 ) {
-		*dat ^= 0x8000;
-		dat++;
-		len-=2;
-	}
-	return data;
-}
-
-static void *esd_16sw(void *data, gint length)
-{
-	int len = length;
-	short *dat = data;
-	while ( len > 0 ) {
-		*dat = GUINT16_SWAP_LE_BE( *dat );
-		dat++;
-		len-=2;
-	}
-	return data;
-}
-
-static void 
-esdout_setup_format (AFormat fmt, gint rate, gint nch)
-{
-	gboolean swap_sign = FALSE;
-	gboolean swap_16 = FALSE;
-
-	format = fmt;
-	frequency = rate;
-	channels = nch;
-	switch (fmt)
-	{
-		case FMT_S8:
-			swap_sign = TRUE;
-		case FMT_U8:
-			esd_format = ESD_BITS8;
-			break;
-		case FMT_U16_LE:
-		case FMT_U16_BE:
-		case FMT_U16_NE:
-			swap_sign = TRUE;
-		case FMT_S16_LE:
-		case FMT_S16_BE:
-		case FMT_S16_NE:
-			esd_format = ESD_BITS16;
-			break;
-	}
-
-#ifdef WORDS_BIGENDIAN
-	if (fmt == FMT_U16_LE || fmt == FMT_S16_LE)
-#else
-	if (fmt == FMT_U16_BE || fmt == FMT_S16_BE)
-#endif
-		swap_16 = TRUE;
-
-	esd_translate = (void*(*)())NULL;
-	if (esd_format == ESD_BITS8) {
-		if (swap_sign == TRUE)
-			esd_translate = esd_stou8;
-	} else {
-		if (swap_sign == TRUE) {
-			if (swap_16 == TRUE)
-				esd_translate = esd_utos16sw;
-			else
-				esd_translate = esd_utos16;
-		} else {
-			if (swap_16 == TRUE)
-				esd_translate = esd_16sw;
-		}
-	}
-
-	bps = rate * nch;
-	if (esd_format == ESD_BITS16)
-		bps *= 2;
-	if(nch == 1)
-		esd_format |= ESD_MONO;
-	else
-		esd_format |= ESD_STEREO;
-	esd_format |= ESD_STREAM | ESD_PLAY;
-	
-	latency = ((get_latency() * frequency) / 44100) * channels;
-	if (format != FMT_U8 && format != FMT_S8)
-		latency *= 2;
-}
-	
-
-gint 
-esdout_get_written_time (void)
-{
-	if (!going)
-		return 0;
-	return (gint) ((written * 1000) / input_bps);
-}
-
-gint 
-esdout_get_output_time (void)
-{
-	guint64 bytes;
-
-	if (!fd || !going) {
-		return 0;
-	}
-
-	bytes = output_bytes;
-	if (!paused) {
-		bytes -= (bytes < (guint64)latency ? bytes : (guint64)latency);
-	}
-	
-	return output_time_offset + (gint) ((bytes * 1000) / ebps);
-}
-
-/* Returns the number of bytes in our buffer still to be sent to esd. */
-gint 
-esdout_used (void)
-{
-	if (wr_index >= rd_index) {
-		return wr_index - rd_index;
-	}
-	return buffer_size - (rd_index - wr_index);
-}
-
-/* Returns TRUE if we can play a track, i.e. we can connect to esd. */
-int
-esdout_can_play (void)
-{
-	int fd;
-	
-	fd = esd_open_sound (hostname);
-	if (fd == -1) {
-		return FALSE;
-	}
-	esd_close (fd);
-	
-	return TRUE;
-}
-
-/* Returns TRUE if we are playing a track, i.e. the thread is still streaming
-   data to esd. */
-int
-esdout_playing (void)
-{
-	/* If our thread is not streaming data to esd, return FALSE. */
-	if (!going)
-		return FALSE;
-
-	/* If we've run out of data to send, we assume the track is done. */
-	if (esdout_used () == 0)
-		return FALSE;
-
-	return TRUE;
-}
-
-gint 
-esdout_free (void)
-{
-	if (remove_prebuffer && prebuffer) {
-		prebuffer = FALSE;
-		remove_prebuffer = FALSE;
-	}
-	
-	if (prebuffer) {
-		remove_prebuffer = TRUE;
-	}
-
-	if (rd_index > wr_index) {
-		return (rd_index - wr_index) - 1;
-	}
-	
-	return (buffer_size - (wr_index - rd_index)) - 1;
-}
-
-static void 
-esdout_write_audio (gpointer data, gint length)
-{
-	AFormat new_format;
-	gint new_frequency,new_channels;
-	
-	new_format = input_format;
-	new_frequency = input_frequency;
-	new_channels = input_channels;
-		
-	if (new_format != format || new_frequency != frequency || new_channels != channels) {
-		output_time_offset += (gint) ((output_bytes * 1000) / ebps);
-		output_bytes = 0;
-		esdout_setup_format(new_format, new_frequency, new_channels);
-		frequency = new_frequency;
-		channels = new_channels;
-		close(fd);
-		esdout_set_audio_params();
-	}
-	
-        if (esd_translate) {
-                output_bytes += write(fd,esd_translate(data,length),length);
-	} else {
-		output_bytes += write(fd,data,length);
-	}
-}
-
-
-void 
-esdout_write (gpointer ptr, gint length)
-{
-	gint cnt, off = 0;
-
-	remove_prebuffer = FALSE;
-
-	written += length;
-	while (length > 0) {
-		cnt = MIN(length, buffer_size - wr_index);
-		memcpy((gchar *)buffer + wr_index, (gchar *)ptr + off, cnt);
-		wr_index = (wr_index + cnt) % buffer_size;
-		length -= cnt;
-		off += cnt;
-
-	}
-}
-
-void 
-esdout_close (void)
-{
-	if (!going) {
-		return;
-	}
-	
-	wr_index = 0;
-	rd_index = 0;
-	going = 0;
-	g_free (hostname);
-	hostname = NULL;
-	pthread_join (buffer_thread, NULL);
-}
-
-void 
-esdout_flush (gint time)
-{
-	flush = time;
-	while (flush != -1) {
-		usleep(10000);
-	}
-}
-
-void 
-esdout_pause (gboolean p)
-{
-	paused = p;
-}
-
-static void *
-esdout_loop (void *arg)
-{
-	gint length, cnt;
-	
-	while (going) {
-		if (esdout_used () > prebuffer_size) {
-			prebuffer = FALSE;
-		}
-		
-		if (esdout_used () > 0 && !paused && !prebuffer) {
-			length = MIN (blk_size, esdout_used ());
-			while (length > 0) {
-				cnt = MIN(length,buffer_size-rd_index);
-				esdout_write_audio ((gchar *)buffer + rd_index, cnt);
-				rd_index=(rd_index+cnt)%buffer_size;
-				length-=cnt;				
-			}
-		} else {
-			usleep (10000);
-		}
-
-		if (flush != -1) {
-			output_time_offset = flush;
-			written = (guint64)(flush / 10) * (guint64)(input_bps / 100);
-			rd_index = wr_index = output_bytes = 0;
-			flush = -1;
-			prebuffer = TRUE;
-		}
-	}
-
-	close (fd);
-	g_free (buffer);
-	pthread_exit (NULL);
-	return NULL;  /* make gcc happy */
-}
-
-void 
-esdout_set_audio_params(void)
-{
-	/* frequency = GUINT16_SWAP_LE_BE( frequency ); */
-	fd = esd_play_stream (esd_format, frequency, hostname, "nautilus-music-view");
-	ebps = frequency * channels;
-	if (format == FMT_U16_BE || format == FMT_U16_LE || format == FMT_S16_BE || format == FMT_S16_LE || format == FMT_S16_NE || format == FMT_U16_NE)
-		ebps *= 2;
-}
-
-gint
-esdout_open (AFormat fmt, gint rate, gint nch)
-{	
-	esdout_init ();
-	
-	esdout_setup_format (fmt,rate,nch);
-	
-	input_format = format;
-	input_channels = channels;
-	input_frequency = frequency;
-	input_bps = bps;
-
-	buffer_size = (esd_cfg.buffer_size * input_bps) / 1000;
-	if (buffer_size < 8192)
-		buffer_size = 8192;
-	prebuffer_size = (buffer_size * esd_cfg.prebuffer) / 100;
-	if (buffer_size - prebuffer_size < 4096)
-		prebuffer_size = buffer_size - 4096;
-
-	buffer = g_malloc0(buffer_size);
-	
-	flush = -1;
-	prebuffer = 1;
-	wr_index = rd_index = output_time_offset = written = output_bytes = 0;
-	paused = FALSE;
-	remove_prebuffer = FALSE;
-
-	if (hostname)
-		g_free (hostname);
-	if (esd_cfg.use_remote)
-		hostname = g_strdup_printf("%s:%d", esd_cfg.server, esd_cfg.port);
-	else
-		hostname = NULL;
-	
-	esdout_set_audio_params ();
-	if (fd == -1) {
-		g_free(buffer);
-		return 0;
-	}
-	going = 1;
-
-	pthread_create (&buffer_thread, NULL, esdout_loop, NULL);
-	
-	return 1;
-}
diff --git a/components/music/esd-audio.h b/components/music/esd-audio.h
deleted file mode 100644
index 15aabe777..000000000
--- a/components/music/esd-audio.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef ESD_AUDIO_H
-#define ESD_AUDIO_H
-
-#include <esd.h>
-#include <glib/gtypes.h>
-
-typedef struct {
-	gboolean use_remote;
-	char *server;
-	int port;
-	int buffer_size;
-	int prebuffer;
-}
-ESDConfig;
-
-extern ESDConfig esd_cfg;
-
-typedef enum {
-	FMT_U8, 
-	FMT_S8, 
-	FMT_U16_LE, 
-	FMT_U16_BE, 
-	FMT_U16_NE, 
-	FMT_S16_LE, 
-	FMT_S16_BE, 
-	FMT_S16_NE
-}
-AFormat;
-
-int 	esdout_open (AFormat fmt, int rate, int nch);
-void 	esdout_set_audio_params (void);
-int 	esdout_get_written_time (void);
-int 	esdout_used (void);
-int	esdout_can_play (void);
-int 	esdout_playing (void);
-int 	esdout_free (void);
-void 	esdout_write (gpointer ptr, int length);
-void 	esdout_close (void);
-void 	esdout_flush (int time);
-void 	esdout_pause (gboolean p);
-int 	esdout_get_output_time (void);
-
-/* esd-mixer.c */
-void esdout_get_volume(int *l, int *r);
-void esdout_set_volume(int l, int r);
-
-#endif
-
-
-
diff --git a/components/music/esd-mixer.c b/components/music/esd-mixer.c
deleted file mode 100644
index a137eaa7a..000000000
--- a/components/music/esd-mixer.c
+++ /dev/null
@@ -1,78 +0,0 @@
-
-#include "config.h"
-#include "esd-audio.h"
-
-#include <sys/ioctl.h>
-#if defined(HAVE_SYS_SOUNDCARD_H)
-#include <sys/soundcard.h>
-#elif defined(HAVE_MACHINE_SOUNDCARD_H)
-#include <machine/soundcard.h>
-#endif
-
-void 
-esdout_get_volume(int *l, int *r)
-{
-#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
-	int fd, v, cmd, devs;
-
-	if (esd_cfg.use_remote)
-	{
-		*l = 100;
-		*r = 100;
-		return;
-	}
-
-	fd = open(DEV_MIXER, O_RDONLY);
-	if (fd != -1)
-	{
-		ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs);
-		if (devs & SOUND_MASK_PCM)
-			cmd = SOUND_MIXER_READ_PCM;
-		else if (devs & SOUND_MASK_VOLUME)
-			cmd = SOUND_MIXER_READ_VOLUME;
-		else
-		{
-			close(fd);
-			return;
-		}
-		ioctl(fd, cmd, &v);
-		*r = (v & 0xFF00) >> 8;
-		*l = (v & 0x00FF);
-		close(fd);
-	}
-#else
-	*l = 100;
-	*r = 100;
-#endif
-}
-
-void 
-esdout_set_volume(int l, int r)
-{
-#if defined(HAVE_SYS_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
-
-	int fd, v, cmd, devs;
-
-	if (esd_cfg.use_remote)
-		return;
-
-	fd = open(DEV_MIXER, O_RDONLY);
-
-	if (fd != -1)
-	{
-		ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs);
-		if (devs & SOUND_MASK_PCM)
-			cmd = SOUND_MIXER_WRITE_PCM;
-		else if (devs & SOUND_MASK_VOLUME)
-			cmd = SOUND_MIXER_WRITE_VOLUME;
-		else
-		{
-			close(fd);
-			return;
-		}
-		v = (r << 8) | l;
-		ioctl(fd, cmd, &v);
-		close(fd);
-	}
-#endif
-}
diff --git a/components/music/fileinfo.c b/components/music/fileinfo.c
deleted file mode 100644
index d153f5e35..000000000
--- a/components/music/fileinfo.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/*  XMMS - Cross-platform multimedia player
- *  Copyright (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
- *  Copyright (C) 1999,2000  Håvard Kvålen
- *
- *  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.
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include "mpg123.h"
-
-static GtkWidget *window = NULL;
-static GtkWidget *filename_entry, *id3_frame;
-static GtkWidget *title_entry, *artist_entry, *album_entry, *year_entry, *comment_entry;
-static GtkWidget *genre_combo;
-static GtkWidget *mpeg_level, *mpeg_bitrate, *mpeg_samplerate, *mpeg_flags;
-static GtkWidget *mpeg_fileinfo;
-
-static GList *genre_list = NULL;
-static gchar *current_filename = NULL;
-
-extern gchar *mpg123_filename;
-extern gint mpg123_bitrate, mpg123_frequency, mpg123_layer, mpg123_lsf, mpg123_mode;
-extern gboolean mpg123_stereo, mpg123_mpeg25;
-
-#define MAX_STR_LEN 100
-
-static void set_entry_tag(GtkEntry * entry, gchar * tag, gint length)
-{
-	gint stripped_len;
-	gchar *text;
-
-	stripped_len = mpg123_strip_spaces(tag, length);
-	text = g_strdup_printf("%-*.*s", stripped_len, stripped_len, tag);
-	gtk_entry_set_text(entry, text);
-	g_free(text);
-}
-
-static void get_entry_tag(GtkEntry * entry, gchar * tag, gint length)
-{
-	gchar *text;
-
-	text = gtk_entry_get_text(entry);
-	memset(tag, ' ', length);
-	memcpy(tag, text, strlen(text) > length ? length : strlen(text));
-}
-
-static gint find_genre_id(gchar * text)
-{
-	gint i;
-
-	for (i = 0; i < GENRE_MAX; i++)
-	{
-		if (strcmp (mpg123_id3_genres[i], text) == 0)
-			return i;
-	}
-	if (text[0] == '\0')
-		return 0xff;
-	return 0;
-}
-
-static gint genre_comp_func(gconstpointer a, gconstpointer b)
-{
-	return eel_strcoll(a, b);
-}
-
-static void save_cb(GtkWidget * w, gpointer data)
-{
-	gint fd;
-	struct id3v1tag_t tag;
-
-	if (!g_ascii_strncasecmp(current_filename, "http://", 7))
-		return;
-
-	if ((fd = open(current_filename, O_RDWR)) != -1)
-	{
-		lseek(fd, -128, SEEK_END);
-		read(fd, &tag, sizeof (struct id3v1tag_t));
-
-		if (!strncmp(tag.tag, "TAG", 3))
-			lseek(fd, -128, SEEK_END);
-		else
-			lseek(fd, 0, SEEK_END);
-		tag.tag[0] = 'T';
-		tag.tag[1] = 'A';
-		tag.tag[2] = 'G';
-		get_entry_tag(GTK_ENTRY(title_entry), tag.title, 30);
-		get_entry_tag(GTK_ENTRY(artist_entry), tag.artist, 30);
-		get_entry_tag(GTK_ENTRY(album_entry), tag.album, 30);
-		get_entry_tag(GTK_ENTRY(year_entry), tag.year, 4);
-		get_entry_tag(GTK_ENTRY(comment_entry), tag.comment, 30);
-		tag.genre = find_genre_id(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry)));
-		if (write(fd, &tag, sizeof (struct id3v1tag_t)) != sizeof (struct id3v1tag_t))
-			xmms_show_message(_("File Info"), _("Couldn't write tag!"),
-					  _("Ok"), FALSE, NULL, NULL);
-
-		close(fd);
-	}
-	else
-		xmms_show_message(_("File Info"), _("Couldn't write tag!"), _("Ok"),
-				  FALSE, NULL, NULL);
-	gtk_widget_destroy(window);
-}
-
-static void label_set_text(GtkWidget * label, char *str, ...)
-{
-	va_list args;
-	gchar tempstr[MAX_STR_LEN];
-
-	va_start(args, str);
-	g_vsnprintf(tempstr, MAX_STR_LEN, str, args);
-	va_end(args);
-
-	gtk_label_set_text(GTK_LABEL(label), tempstr);
-}
-
-static void remove_id3_cb(GtkWidget * w, gpointer data)
-{
-	gint fd, len;
-	struct id3v1tag_t tag;
-
-	if (!g_ascii_strncasecmp(current_filename, "http://", 7))
-		return;
-
-	if ((fd = open(current_filename, O_RDWR)) != -1)
-	{
-		len = lseek(fd, -128, SEEK_END);
-		read(fd, &tag, sizeof (struct id3v1tag_t));
-
-		if (!strncmp(tag.tag, "TAG", 3))
-		{
-			if (ftruncate(fd, len))
-				xmms_show_message(_("File Info"),
-						  _("Couldn't remove tag!"), _("Ok"),
-						  FALSE, NULL, NULL);
-		}
-		else
-			xmms_show_message(_("File Info"), _("No tag to remove!"), _("Ok"),
-					  FALSE, NULL, NULL);
-		close(fd);
-	}
-	else
-		xmms_show_message(_("File Info"), _("Couldn't remove tag!"),
-				  _("Ok"), FALSE, NULL, NULL);
-	gtk_widget_destroy(window);
-}
-
-static void set_mpeg_level_label(gboolean mpeg25, gint lsf, gint layer)
-{
-	if (mpeg25)
-		label_set_text(mpeg_level, "MPEG 2.5, layer %d", layer);
-	else
-		label_set_text(mpeg_level, "MPEG %d, layer %d", lsf + 1, layer);
-}
-
-static gchar* channel_mode_name(int mode)
-{
-	static const gchar *channel_mode[] =
-		{N_("Stereo"), N_("Joint stereo"),
-		 N_("Dual channel"), N_("Single channel")};
-	if (mode < 0 || mode > 3)
-		return "";
-	return gettext(channel_mode[mode]);
-}
-
-static void file_info_http(char *filename)
-{
-	gtk_widget_set_sensitive(id3_frame, FALSE);
-	if (mpg123_filename && strcmp(filename, mpg123_filename) == 0 &&
-	    mpg123_bitrate != 0)
-	{
-		set_mpeg_level_label(mpg123_mpeg25, mpg123_lsf, mpg123_layer);
-		label_set_text(mpeg_bitrate, _("Bitrate: %d kb/s"), mpg123_bitrate);
-		label_set_text(mpeg_samplerate, _("Samplerate: %ld Hz"), mpg123_frequency);
-		label_set_text(mpeg_flags, "%s", channel_mode_name(mpg123_mode));
-	}
-}
-
-void mpg123_file_info_box(char *filename)
-{
-	gint i;
-	struct id3v1tag_t tag;
-	FILE *fh;
-	gchar *tmp, *title;
-	const gchar *emphasis[] = {N_("None"), N_("50/15 ms"),
-				   "", N_("CCIT J.17")};
-	const gchar *bool_label[] = {N_("No"), N_("Yes")};
-
-	{
-		int i;
-
-		for (i=0; i < 4; i++)
-			if (*emphasis[i])
-				emphasis[i] = _(emphasis[i]);
-		for (i=0; i < 2; i++)
-			bool_label[i] = _(bool_label[i]);
-	}
-	if (!window)
-	{
-		GtkWidget *vbox, *hbox, *left_vbox, *table;
-		GtkWidget *mpeg_frame, *mpeg_box;
-		GtkWidget *label, *filename_hbox;
-		GtkWidget *bbox, *save, *remove_id3, *cancel;
-		
-		window = gtk_window_new(GTK_WINDOW_DIALOG);
-		gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-		g_signal_connect(window, "destroy", G_CALLBACK(gtk_widget_destroyed), &window);
-		gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-
-		vbox = gtk_vbox_new(FALSE, 10);
-		gtk_container_add(GTK_CONTAINER(window), vbox);
-
-		filename_hbox = gtk_hbox_new(FALSE, 5);
-		gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
-
-		label = gtk_label_new(_("Filename:"));
-		gtk_box_pack_start(GTK_BOX(filename_hbox), label, FALSE, TRUE, 0);
-		filename_entry = gtk_entry_new();
-		gtk_editable_set_editable(GTK_EDITABLE(filename_entry), FALSE);
-		gtk_box_pack_start(GTK_BOX(filename_hbox), filename_entry, TRUE, TRUE, 0);
-		
-		hbox = gtk_hbox_new(FALSE, 10);
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
-		
-		left_vbox = gtk_vbox_new(FALSE, 10);
-		gtk_box_pack_start(GTK_BOX(hbox), left_vbox, FALSE, FALSE, 0);
-
-		id3_frame = gtk_frame_new(_("ID3 Tag:"));
-		gtk_box_pack_start(GTK_BOX(left_vbox), id3_frame, FALSE, FALSE, 0);
-
-		table = gtk_table_new(4, 5, FALSE);
-		gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-		gtk_container_add(GTK_CONTAINER(id3_frame), table);
-
-		label = gtk_label_new(_("Title:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 5);
-
-		title_entry = gtk_entry_new_with_max_length(30);
-		gtk_table_attach(GTK_TABLE(table), title_entry, 1, 4, 0, 1, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		label = gtk_label_new(_("Artist:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
-
-		artist_entry = gtk_entry_new_with_max_length(30);
-		gtk_table_attach(GTK_TABLE(table), artist_entry, 1, 4, 1, 2, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		label = gtk_label_new(_("Album:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 5, 5);
-
-		album_entry = gtk_entry_new_with_max_length(30);
-		gtk_table_attach(GTK_TABLE(table), album_entry, 1, 4, 2, 3, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		label = gtk_label_new(_("Comment:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 5, 5);
-
-		comment_entry = gtk_entry_new_with_max_length(30);
-		gtk_table_attach(GTK_TABLE(table), comment_entry, 1, 4, 3, 4, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		label = gtk_label_new(_("Year:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 5, 5);
-
-		year_entry = gtk_entry_new_with_max_length(4);
-		gtk_widget_set_usize(year_entry, 40, -1);
-		gtk_table_attach(GTK_TABLE(table), year_entry, 1, 2, 4, 5, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		label = gtk_label_new(_("Genre:"));
-		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 4, 5, GTK_FILL, GTK_FILL, 5, 5);
-
-		genre_combo = gtk_combo_new();
-		gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), FALSE);
-		if (!genre_list)
-		{
-			for (i = 0; i < GENRE_MAX; i++)
-				genre_list = g_list_prepend(genre_list, (gchar *) mpg123_id3_genres[i]);
-			genre_list = g_list_prepend(genre_list, "");
-			genre_list = g_list_sort(genre_list, genre_comp_func);
-		}
-		gtk_combo_set_popdown_strings(GTK_COMBO(genre_combo), genre_list);
-
-		gtk_table_attach(GTK_TABLE(table), genre_combo, 3, 4, 4, 5, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
-
-		bbox = gtk_hbutton_box_new();
-		gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-		gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-		gtk_box_pack_start(GTK_BOX(left_vbox), bbox, FALSE, FALSE, 0);
-
-		save = gtk_button_new_with_label(_("Save"));
-		g_signal_connect(save, "clicked", G_CALLBACK(save_cb), NULL);
-		GTK_WIDGET_SET_FLAGS(save, GTK_CAN_DEFAULT);
-		gtk_box_pack_start(GTK_BOX(bbox), save, TRUE, TRUE, 0);
-		gtk_widget_grab_default(save);
-
-		remove_id3 = gtk_button_new_with_label(_("Remove ID3"));
-		g_signal_connect(remove_id3, "clicked", G_CALLBACK(remove_id3_cb), NULL);
-		GTK_WIDGET_SET_FLAGS(remove_id3, GTK_CAN_DEFAULT);
-		gtk_box_pack_start(GTK_BOX(bbox), remove_id3, TRUE, TRUE, 0);
-
-		cancel = gtk_button_new_with_label(_("Cancel"));
-		g_signal_connect_object(cancel, "clicked", G_CALLBACK(gtk_widget_destroy), window, G_CONNECT_SWAPPED);
-		GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
-		gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
-
-		mpeg_frame = gtk_frame_new(_("MPEG Info:"));
-		gtk_box_pack_start(GTK_BOX(hbox), mpeg_frame, FALSE, FALSE, 0);
-
-		mpeg_box = gtk_vbox_new(FALSE, 5);
-		gtk_container_add(GTK_CONTAINER(mpeg_frame), mpeg_box);
-		gtk_container_set_border_width(GTK_CONTAINER(mpeg_box), 10);
-		gtk_box_set_spacing(GTK_BOX(mpeg_box), 0);
-
-		mpeg_level = gtk_label_new("");
-		gtk_widget_set_usize(mpeg_level, 120, -2);
-		gtk_misc_set_alignment(GTK_MISC(mpeg_level), 0, 0);
-		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_level, FALSE, FALSE, 0);
-
-		mpeg_bitrate = gtk_label_new("");
-		gtk_misc_set_alignment(GTK_MISC(mpeg_bitrate), 0, 0);
-		gtk_label_set_justify(GTK_LABEL(mpeg_bitrate), GTK_JUSTIFY_LEFT);
-		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_bitrate, FALSE, FALSE, 0);
-
-		mpeg_samplerate = gtk_label_new("");
-		gtk_misc_set_alignment(GTK_MISC(mpeg_samplerate), 0, 0);
-		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_samplerate, FALSE, FALSE, 0);
-
-		mpeg_flags = gtk_label_new("");
-		gtk_misc_set_alignment(GTK_MISC(mpeg_flags), 0, 0);
-		gtk_label_set_justify(GTK_LABEL(mpeg_flags), GTK_JUSTIFY_LEFT);
-		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_flags, FALSE, FALSE, 0);
-
-		mpeg_fileinfo = gtk_label_new("");
-		gtk_misc_set_alignment(GTK_MISC(mpeg_fileinfo), 0, 0);
-		gtk_label_set_justify(GTK_LABEL(mpeg_fileinfo), GTK_JUSTIFY_LEFT);
-		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_fileinfo, FALSE, FALSE, 0);
-
-		gtk_widget_show_all(window);
-	}
-
-	if (current_filename)
-		g_free(current_filename);
-	current_filename = g_strdup(filename);
-
-	title = g_strdup_printf(_("File Info - %s"), g_basename(filename));
-	gtk_window_set_title(GTK_WINDOW(window), title);
-	gtk_window_set_wmclass(GTK_WINDOW(window), "mpg123_file_info", "Nautilus");
-	g_free(title);
-
-	gtk_entry_set_text(GTK_ENTRY(filename_entry), filename);
-	gtk_editable_set_position(GTK_EDITABLE(filename_entry), -1);
-
-	title = g_strdup(g_basename(filename));
-	if ((tmp = strrchr(title, '.')) != NULL)
-		*tmp = '\0';
-	gtk_entry_set_text(GTK_ENTRY(title_entry), title);
-	g_free(title);
-
-	gtk_entry_set_text(GTK_ENTRY(artist_entry), "");
-	gtk_entry_set_text(GTK_ENTRY(album_entry), "");
-	gtk_entry_set_text(GTK_ENTRY(year_entry), "");
-	gtk_entry_set_text(GTK_ENTRY(comment_entry), "");
-	gtk_list_select_item(GTK_LIST(GTK_COMBO(genre_combo)->list), g_list_index(genre_list, ""));
-	gtk_label_set_text(GTK_LABEL(mpeg_level), "MPEG ?, layer ?");
-	gtk_label_set_text(GTK_LABEL(mpeg_bitrate), "");
-	gtk_label_set_text(GTK_LABEL(mpeg_samplerate), "");
-	gtk_label_set_text(GTK_LABEL(mpeg_flags), "");
-	gtk_label_set_text(GTK_LABEL(mpeg_fileinfo), "");
-
-	if (!g_ascii_strncasecmp(filename, "http://", 7))
-	{
-		file_info_http(filename);
-		return;
-	}
-
-	gtk_widget_set_sensitive(id3_frame, TRUE);
-
-	if ((fh = fopen(current_filename, "rb")) != NULL)
-	{
-		guint32 head;
-		unsigned char tmp[4];
-		struct frame frm;
-		gboolean id3_found = FALSE;
-
-		fseek(fh, -sizeof (tag), SEEK_END);
-		if (fread(&tag, 1, sizeof (tag), fh) == sizeof (tag))
-		{
-			if (!strncmp(tag.tag, "TAG", 3))
-			{
-				id3_found = TRUE;
-				set_entry_tag(GTK_ENTRY(title_entry),
-					      tag.title, 30);
-				set_entry_tag(GTK_ENTRY(artist_entry),
-					      tag.artist, 30);
-				set_entry_tag(GTK_ENTRY(album_entry),
-					      tag.album, 30);
-				set_entry_tag(GTK_ENTRY(year_entry),
-					      tag.year, 4);
-				set_entry_tag(GTK_ENTRY(comment_entry),
-					      tag.comment, 30);
-				gtk_list_select_item(GTK_LIST(GTK_COMBO(genre_combo)->list), g_list_index(genre_list, (gchar *) mpg123_id3_genres[tag.genre]));
-			}
-		}
-		rewind(fh);
-		if (fread(tmp, 1, 4, fh) != 4)
-		{
-			fclose(fh);
-			return;
-		}
-		head = ((guint32) tmp[0] << 24) | ((guint32) tmp[1] << 16) | ((guint32) tmp[2] << 8) | (guint32) tmp[3];
-		while (!mpg123_head_check(head))
-		{
-			head <<= 8;
-			if (fread(tmp, 1, 1, fh) != 1)
-			{
-				fclose(fh);
-				return;
-			}
-			head |= tmp[0];
-		}
-		if (mpg123_decode_header(&frm, head))
-		{
-			guchar *buf;
-			gdouble tpf;
-			gint pos;
-			XHEADDATA xing_header;
-			guint32 num_frames;
-
-			buf = g_malloc(frm.framesize + 4);
-			fseek(fh, -4, SEEK_CUR);
-			fread(buf, 1, frm.framesize + 4, fh);
-			xing_header.toc = NULL;
-			tpf = mpg123_compute_tpf(&frm);
-			set_mpeg_level_label(frm.mpeg25, frm.lsf, frm.lay);
-			pos = ftell(fh);
-			fseek(fh, 0, SEEK_END);
-			if (mpg123_get_xing_header(&xing_header, buf))
-			{
-				num_frames = xing_header.frames;
-				label_set_text(mpeg_bitrate, _("Bitrate: Variable,\navg. bitrate: %d kb/s"), (gint) ((xing_header.bytes * 8) / (tpf * xing_header.frames * 1000)));
-			}
-			else
-			{
-				num_frames = ((ftell(fh) - pos - (id3_found ? 128 : 0)) / mpg123_compute_bpf(&frm)) + 1;
-				label_set_text(mpeg_bitrate, _("Bitrate: %d kb/s"), tabsel_123[frm.lsf][frm.lay - 1][frm.bitrate_index]);
-			}
-			label_set_text(mpeg_samplerate, _("Samplerate: %ld Hz"), mpg123_freqs[frm.sampling_frequency]);
-			label_set_text(mpeg_flags, _("%s\nError protection: %s\nCopyright: %s\nOriginal: %s\nEmphasis: %s"), channel_mode_name(frm.mode), bool_label[frm.error_protection], bool_label[frm.copyright], bool_label[frm.original], emphasis[frm.emphasis]);
-			label_set_text(mpeg_fileinfo, _("%d frames\nFilesize: %lu B"), num_frames, ftell(fh));
-			g_free(buf);
-		}
-		fclose(fh);
-	}
-}
diff --git a/components/music/getbits.c b/components/music/getbits.c
deleted file mode 100644
index a071b5e80..000000000
--- a/components/music/getbits.c
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "mpg123.h"
-
-#if 0
-static void check_buffer_range(int size)
-{
-	int pos = (bsi.wordpointer-bsbuf) + (size >> 3);
-
-	if( pos >= fsizeold) {
-		fprintf(stderr, "Pointer out of range (%d,%d)!\n", pos, fsizeold);
-	}
-}
-#endif
-
-void mpg123_backbits(int number_of_bits)
-{
-	bsi.bitindex    -= number_of_bits;
-	bsi.wordpointer += (bsi.bitindex>>3);
-	bsi.bitindex    &= 0x7;
-}
-
-int mpg123_getbitoffset(void) 
-{
-	return (-bsi.bitindex)&0x7;
-}
-
-int mpg123_getbyte(void)
-{
-#ifdef DEBUG_GETBITS
-	if(bsi.bitindex) 
-		fprintf(stderr,"getbyte called unsynched!\n");
-#endif
-	return *bsi.wordpointer++;
-}
-
-unsigned int mpg123_getbits(int number_of_bits)
-{
-	unsigned long rval;
-
-#ifdef DEBUG_GETBITS
-	fprintf(stderr, "g%d", number_of_bits);
-#endif
-
-	if(!number_of_bits)
-		return 0;
-
-#if 0
-	check_buffer_range(number_of_bits + bsi.bitindex);
-#endif
-
-	{
-		rval = bsi.wordpointer[0];
-		rval <<= 8;
-		rval |= bsi.wordpointer[1];
-		rval <<= 8;
-		rval |= bsi.wordpointer[2];
-
-		rval <<= bsi.bitindex;
-		rval &= 0xffffff;
-		
-		bsi.bitindex += number_of_bits;
-
-		rval >>= (24-number_of_bits);
-
-		bsi.wordpointer += (bsi.bitindex >> 3);
-		bsi.bitindex &= 7;
-	}
-
-#ifdef DEBUG_GETBITS
-	fprintf(stderr,":%x ",rval);
-#endif
-
-	return rval;
-}
-
-unsigned int mpg123_getbits_fast(int number_of_bits)
-{
-	unsigned int rval;
-#ifdef DEBUG_GETBITS
-	fprintf(stderr,"g%d",number_of_bits);
-#endif
-
-#if 0
-	check_buffer_range(number_of_bits+bsi.bitindex);
-#endif
-
-	rval =  (unsigned char) (bsi.wordpointer[0] << bsi.bitindex);
-	rval |= ((unsigned int) bsi.wordpointer[1] << bsi.bitindex) >> 8;
-	rval <<= number_of_bits;
-	rval >>= 8;
-
-	bsi.bitindex += number_of_bits;
-
-	bsi.wordpointer += (bsi.bitindex >> 3);
-	bsi.bitindex &= 7;
-
-#ifdef DEBUG_GETBITS
-	fprintf(stderr,":%x ",rval);
-#endif
-	return rval;
-}
-
-unsigned int mpg123_get1bit(void)
-{
-	unsigned char rval;
-
-#ifdef DEBUG_GETBITS
-	fprintf(stderr,"g%d",1);
-#endif
-
-#if 0
-	check_buffer_range(1+bsi.bitindex);
-#endif
-
-	rval = *bsi.wordpointer << bsi.bitindex;
-
-	bsi.bitindex++;
-	bsi.wordpointer += (bsi.bitindex >> 3);
-	bsi.bitindex &= 7;
-
-#ifdef DEBUG_GETBITS
-	fprintf(stderr,":%d ",rval >> 7);
-#endif
-
-	return rval>>7;
-}
-
diff --git a/components/music/getbits.h b/components/music/getbits.h
deleted file mode 100644
index 1e5cf6519..000000000
--- a/components/music/getbits.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-/*
- * This does the same as getbits.c but with defines to
- * force inlining
- */
-
-#define mpg123_backbits(nob)			\
-do {						\
-	bsi.bitindex    -= nob;			\
-	bsi.wordpointer += (bsi.bitindex >> 3);	\
-	bsi.bitindex    &= 0x7;			\
-} while (0)
-
-#define mpg123_getbitoffset() ((-bsi.bitindex) & 0x7)
-#define mpg123_getbyte()      (*bsi.wordpointer++)
-
-#define mpg123_getbits(nob)			\
-	(rval = bsi.wordpointer[0],		\
-	rval <<= 8,				\
-	rval |= bsi.wordpointer[1],		\
-	rval <<= 8,				\
-	rval |= bsi.wordpointer[2],		\
-	rval <<= bsi.bitindex,			\
-	rval &= 0xffffff,			\
-	bsi.bitindex += (nob),			\
-	rval >>= (24-(nob)),			\
-	bsi.wordpointer += (bsi.bitindex>>3),	\
-	bsi.bitindex &= 7,			\
-	rval)
-
-#define mpg123_getbits_fast(nob)						\
-	(rval = (unsigned char) (bsi.wordpointer[0] << bsi.bitindex),		\
-	rval |= ((unsigned long) bsi.wordpointer[1] << bsi.bitindex) >> 8,	\
-	rval <<= (nob),								\
-	rval >>= 8,								\
-	bsi.bitindex += (nob),							\
-	bsi.wordpointer += (bsi.bitindex >> 3),					\
-	bsi.bitindex &= 7,							\
-	rval)
-
-#define mpg123_get1bit()				\
-	(rval_uc = *bsi.wordpointer << bsi.bitindex,	\
-	bsi.bitindex++,					\
-	bsi.wordpointer += (bsi.bitindex>>3),		\
-	bsi.bitindex &= 7,				\
-	rval_uc >> 7)
diff --git a/components/music/huffman.h b/components/music/huffman.h
deleted file mode 100644
index 83a230b1c..000000000
--- a/components/music/huffman.h
+++ /dev/null
@@ -1,329 +0,0 @@
-
-/*
- * huffman tables ... recalcualted to work with my optimzed
- * decoder scheme (MH)
- * 
- * probably we could save a few bytes of memory, because the 
- * smaller tables are often the part of a bigger table
- */
-
-struct newhuff
-{
-	unsigned int linbits;
-	short *table;
-};
-
-static short tab0[] =
-{
-	0
-};
-
-static short tab1[] =
-{
-	-5, -3, -1, 17, 1, 16, 0
-};
-
-static short tab2[] =
-{
-	-15, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 17, -1, 1,
-	16, 0
-};
-
-static short tab3[] =
-{
-	-13, -11, -9, -5, -3, -1, 34, 2, 18, -1, 33, 32, 16, 17, -1,
-	1, 0
-};
-
-static short tab5[] =
-{
-	-29, -25, -23, -15, -7, -5, -3, -1, 51, 35, 50, 49, -3, -1, 19,
-	3, -1, 48, 34, -3, -1, 18, 33, -1, 2, 32, 17, -1, 1, 16,
-	0
-};
-
-static short tab6[] =
-{
-	-25, -19, -13, -9, -5, -3, -1, 51, 3, 35, -1, 50, 48, -1, 19,
-	49, -3, -1, 34, 2, 18, -3, -1, 33, 32, 1, -1, 17, -1, 16,
-	0
-};
-
-static short tab7[] =
-{
-	-69, -65, -57, -39, -29, -17, -11, -7, -3, -1, 85, 69, -1, 84, 83,
-	-1, 53, 68, -3, -1, 37, 82, 21, -5, -1, 81, -1, 5, 52, -1,
-	80, -1, 67, 51, -5, -3, -1, 36, 66, 20, -1, 65, 64, -11, -7,
-	-3, -1, 4, 35, -1, 50, 3, -1, 19, 49, -3, -1, 48, 34, 18,
-	-5, -1, 33, -1, 2, 32, 17, -1, 1, 16, 0
-};
-
-static short tab8[] =
-{
-	-65, -63, -59, -45, -31, -19, -13, -7, -5, -3, -1, 85, 84, 69, 83,
-	-3, -1, 53, 68, 37, -3, -1, 82, 5, 21, -5, -1, 81, -1, 52,
-	67, -3, -1, 80, 51, 36, -5, -3, -1, 66, 20, 65, -3, -1, 4,
-	64, -1, 35, 50, -9, -7, -3, -1, 19, 49, -1, 3, 48, 34, -1,
-	2, 32, -1, 18, 33, 17, -3, -1, 1, 16, 0
-};
-
-static short tab9[] =
-{
-	-63, -53, -41, -29, -19, -11, -5, -3, -1, 85, 69, 53, -1, 83, -1,
-	84, 5, -3, -1, 68, 37, -1, 82, 21, -3, -1, 81, 52, -1, 67,
-	-1, 80, 4, -7, -3, -1, 36, 66, -1, 51, 64, -1, 20, 65, -5,
-	-3, -1, 35, 50, 19, -1, 49, -1, 3, 48, -5, -3, -1, 34, 2,
-	18, -1, 33, 32, -3, -1, 17, 1, -1, 16, 0
-};
-
-static short tab10[] =
-{
-   -125, -121, -111, -83, -55, -35, -21, -13, -7, -3, -1, 119, 103, -1, 118,
-	87, -3, -1, 117, 102, 71, -3, -1, 116, 86, -1, 101, 55, -9, -3,
-	-1, 115, 70, -3, -1, 85, 84, 99, -1, 39, 114, -11, -5, -3, -1,
-	100, 7, 112, -1, 98, -1, 69, 53, -5, -1, 6, -1, 83, 68, 23,
-	-17, -5, -1, 113, -1, 54, 38, -5, -3, -1, 37, 82, 21, -1, 81,
-	-1, 52, 67, -3, -1, 22, 97, -1, 96, -1, 5, 80, -19, -11, -7,
-	-3, -1, 36, 66, -1, 51, 4, -1, 20, 65, -3, -1, 64, 35, -1,
-	50, 3, -3, -1, 19, 49, -1, 48, 34, -7, -3, -1, 18, 33, -1,
-	2, 32, 17, -1, 1, 16, 0
-};
-
-static short tab11[] =
-{
-    -121, -113, -89, -59, -43, -27, -17, -7, -3, -1, 119, 103, -1, 118, 117,
-	-3, -1, 102, 71, -1, 116, -1, 87, 85, -5, -3, -1, 86, 101, 55,
-	-1, 115, 70, -9, -7, -3, -1, 69, 84, -1, 53, 83, 39, -1, 114,
-	-1, 100, 7, -5, -1, 113, -1, 23, 112, -3, -1, 54, 99, -1, 96,
-	-1, 68, 37, -13, -7, -5, -3, -1, 82, 5, 21, 98, -3, -1, 38,
-	6, 22, -5, -1, 97, -1, 81, 52, -5, -1, 80, -1, 67, 51, -1,
-	36, 66, -15, -11, -7, -3, -1, 20, 65, -1, 4, 64, -1, 35, 50,
-	-1, 19, 49, -5, -3, -1, 3, 48, 34, 33, -5, -1, 18, -1, 2,
-	32, 17, -3, -1, 1, 16, 0
-};
-
-static short tab12[] =
-{
-	-115, -99, -73, -45, -27, -17, -9, -5, -3, -1, 119, 103, 118, -1, 87,
-	117, -3, -1, 102, 71, -1, 116, 101, -3, -1, 86, 55, -3, -1, 115,
-	85, 39, -7, -3, -1, 114, 70, -1, 100, 23, -5, -1, 113, -1, 7,
-	112, -1, 54, 99, -13, -9, -3, -1, 69, 84, -1, 68, -1, 6, 5,
-	-1, 38, 98, -5, -1, 97, -1, 22, 96, -3, -1, 53, 83, -1, 37,
-	82, -17, -7, -3, -1, 21, 81, -1, 52, 67, -5, -3, -1, 80, 4,
-	36, -1, 66, 20, -3, -1, 51, 65, -1, 35, 50, -11, -7, -5, -3,
-	-1, 64, 3, 48, 19, -1, 49, 34, -1, 18, 33, -7, -5, -3, -1,
-	2, 32, 0, 17, -1, 1, 16
-};
-
-static short tab13[] =
-{
-	-509, -503, -475, -405, -333, -265, -205, -153, -115, -83, -53, -35, -21, -13, -9,
-	-7, -5, -3, -1, 254, 252, 253, 237, 255, -1, 239, 223, -3, -1, 238,
-	207, -1, 222, 191, -9, -3, -1, 251, 206, -1, 220, -1, 175, 233, -1,
-	236, 221, -9, -5, -3, -1, 250, 205, 190, -1, 235, 159, -3, -1, 249,
-	234, -1, 189, 219, -17, -9, -3, -1, 143, 248, -1, 204, -1, 174, 158,
-	-5, -1, 142, -1, 127, 126, 247, -5, -1, 218, -1, 173, 188, -3, -1,
-	203, 246, 111, -15, -7, -3, -1, 232, 95, -1, 157, 217, -3, -1, 245,
-	231, -1, 172, 187, -9, -3, -1, 79, 244, -3, -1, 202, 230, 243, -1,
-	63, -1, 141, 216, -21, -9, -3, -1, 47, 242, -3, -1, 110, 156, 15,
-	-5, -3, -1, 201, 94, 171, -3, -1, 125, 215, 78, -11, -5, -3, -1,
-	200, 214, 62, -1, 185, -1, 155, 170, -1, 31, 241, -23, -13, -5, -1,
-	240, -1, 186, 229, -3, -1, 228, 140, -1, 109, 227, -5, -1, 226, -1,
-	46, 14, -1, 30, 225, -15, -7, -3, -1, 224, 93, -1, 213, 124, -3,
-	-1, 199, 77, -1, 139, 184, -7, -3, -1, 212, 154, -1, 169, 108, -1,
-	198, 61, -37, -21, -9, -5, -3, -1, 211, 123, 45, -1, 210, 29, -5,
-	-1, 183, -1, 92, 197, -3, -1, 153, 122, 195, -7, -5, -3, -1, 167,
-	151, 75, 209, -3, -1, 13, 208, -1, 138, 168, -11, -7, -3, -1, 76,
-	196, -1, 107, 182, -1, 60, 44, -3, -1, 194, 91, -3, -1, 181, 137,
-	28, -43, -23, -11, -5, -1, 193, -1, 152, 12, -1, 192, -1, 180, 106,
-	-5, -3, -1, 166, 121, 59, -1, 179, -1, 136, 90, -11, -5, -1, 43,
-	-1, 165, 105, -1, 164, -1, 120, 135, -5, -1, 148, -1, 119, 118, 178,
-	-11, -3, -1, 27, 177, -3, -1, 11, 176, -1, 150, 74, -7, -3, -1,
-	58, 163, -1, 89, 149, -1, 42, 162, -47, -23, -9, -3, -1, 26, 161,
-	-3, -1, 10, 104, 160, -5, -3, -1, 134, 73, 147, -3, -1, 57, 88,
-	-1, 133, 103, -9, -3, -1, 41, 146, -3, -1, 87, 117, 56, -5, -1,
-	131, -1, 102, 71, -3, -1, 116, 86, -1, 101, 115, -11, -3, -1, 25,
-	145, -3, -1, 9, 144, -1, 72, 132, -7, -5, -1, 114, -1, 70, 100,
-	40, -1, 130, 24, -41, -27, -11, -5, -3, -1, 55, 39, 23, -1, 113,
-	-1, 85, 7, -7, -3, -1, 112, 54, -1, 99, 69, -3, -1, 84, 38,
-	-1, 98, 53, -5, -1, 129, -1, 8, 128, -3, -1, 22, 97, -1, 6,
-	96, -13, -9, -5, -3, -1, 83, 68, 37, -1, 82, 5, -1, 21, 81,
-	-7, -3, -1, 52, 67, -1, 80, 36, -3, -1, 66, 51, 20, -19, -11,
-	-5, -1, 65, -1, 4, 64, -3, -1, 35, 50, 19, -3, -1, 49, 3,
-	-1, 48, 34, -3, -1, 18, 33, -1, 2, 32, -3, -1, 17, 1, 16,
-	0
-};
-
-static short tab15[] =
-{
--495, -445, -355, -263, -183, -115, -77, -43, -27, -13, -7, -3, -1, 255, 239,
-	-1, 254, 223, -1, 238, -1, 253, 207, -7, -3, -1, 252, 222, -1, 237,
-	191, -1, 251, -1, 206, 236, -7, -3, -1, 221, 175, -1, 250, 190, -3,
-	-1, 235, 205, -1, 220, 159, -15, -7, -3, -1, 249, 234, -1, 189, 219,
-	-3, -1, 143, 248, -1, 204, 158, -7, -3, -1, 233, 127, -1, 247, 173,
-	-3, -1, 218, 188, -1, 111, -1, 174, 15, -19, -11, -3, -1, 203, 246,
-	-3, -1, 142, 232, -1, 95, 157, -3, -1, 245, 126, -1, 231, 172, -9,
-	-3, -1, 202, 187, -3, -1, 217, 141, 79, -3, -1, 244, 63, -1, 243,
-	216, -33, -17, -9, -3, -1, 230, 47, -1, 242, -1, 110, 240, -3, -1,
-	31, 241, -1, 156, 201, -7, -3, -1, 94, 171, -1, 186, 229, -3, -1,
-	125, 215, -1, 78, 228, -15, -7, -3, -1, 140, 200, -1, 62, 109, -3,
-	-1, 214, 227, -1, 155, 185, -7, -3, -1, 46, 170, -1, 226, 30, -5,
-	-1, 225, -1, 14, 224, -1, 93, 213, -45, -25, -13, -7, -3, -1, 124,
-	199, -1, 77, 139, -1, 212, -1, 184, 154, -7, -3, -1, 169, 108, -1,
-	198, 61, -1, 211, 210, -9, -5, -3, -1, 45, 13, 29, -1, 123, 183,
-	-5, -1, 209, -1, 92, 208, -1, 197, 138, -17, -7, -3, -1, 168, 76,
-	-1, 196, 107, -5, -1, 182, -1, 153, 12, -1, 60, 195, -9, -3, -1,
-	122, 167, -1, 166, -1, 192, 11, -1, 194, -1, 44, 91, -55, -29, -15,
-	-7, -3, -1, 181, 28, -1, 137, 152, -3, -1, 193, 75, -1, 180, 106,
-	-5, -3, -1, 59, 121, 179, -3, -1, 151, 136, -1, 43, 90, -11, -5,
-	-1, 178, -1, 165, 27, -1, 177, -1, 176, 105, -7, -3, -1, 150, 74,
-	-1, 164, 120, -3, -1, 135, 58, 163, -17, -7, -3, -1, 89, 149, -1,
-	42, 162, -3, -1, 26, 161, -3, -1, 10, 160, 104, -7, -3, -1, 134,
-	73, -1, 148, 57, -5, -1, 147, -1, 119, 9, -1, 88, 133, -53, -29,
-	-13, -7, -3, -1, 41, 103, -1, 118, 146, -1, 145, -1, 25, 144, -7,
-	-3, -1, 72, 132, -1, 87, 117, -3, -1, 56, 131, -1, 102, 71, -7,
-	-3, -1, 40, 130, -1, 24, 129, -7, -3, -1, 116, 8, -1, 128, 86,
-	-3, -1, 101, 55, -1, 115, 70, -17, -7, -3, -1, 39, 114, -1, 100,
-	23, -3, -1, 85, 113, -3, -1, 7, 112, 54, -7, -3, -1, 99, 69,
-	-1, 84, 38, -3, -1, 98, 22, -3, -1, 6, 96, 53, -33, -19, -9,
-	-5, -1, 97, -1, 83, 68, -1, 37, 82, -3, -1, 21, 81, -3, -1,
-	5, 80, 52, -7, -3, -1, 67, 36, -1, 66, 51, -1, 65, -1, 20,
-	4, -9, -3, -1, 35, 50, -3, -1, 64, 3, 19, -3, -1, 49, 48,
-	34, -9, -7, -3, -1, 18, 33, -1, 2, 32, 17, -3, -1, 1, 16,
-	0
-};
-
-static short tab16[] =
-{
- -509, -503, -461, -323, -103, -37, -27, -15, -7, -3, -1, 239, 254, -1, 223,
-	253, -3, -1, 207, 252, -1, 191, 251, -5, -1, 175, -1, 250, 159, -3,
-	-1, 249, 248, 143, -7, -3, -1, 127, 247, -1, 111, 246, 255, -9, -5,
-	-3, -1, 95, 245, 79, -1, 244, 243, -53, -1, 240, -1, 63, -29, -19,
-	-13, -7, -5, -1, 206, -1, 236, 221, 222, -1, 233, -1, 234, 217, -1,
-	238, -1, 237, 235, -3, -1, 190, 205, -3, -1, 220, 219, 174, -11, -5,
-	-1, 204, -1, 173, 218, -3, -1, 126, 172, 202, -5, -3, -1, 201, 125,
-	94, 189, 242, -93, -5, -3, -1, 47, 15, 31, -1, 241, -49, -25, -13,
-	-5, -1, 158, -1, 188, 203, -3, -1, 142, 232, -1, 157, 231, -7, -3,
-	-1, 187, 141, -1, 216, 110, -1, 230, 156, -13, -7, -3, -1, 171, 186,
-	-1, 229, 215, -1, 78, -1, 228, 140, -3, -1, 200, 62, -1, 109, -1,
-	214, 155, -19, -11, -5, -3, -1, 185, 170, 225, -1, 212, -1, 184, 169,
-	-5, -1, 123, -1, 183, 208, 227, -7, -3, -1, 14, 224, -1, 93, 213,
-	-3, -1, 124, 199, -1, 77, 139, -75, -45, -27, -13, -7, -3, -1, 154,
-	108, -1, 198, 61, -3, -1, 92, 197, 13, -7, -3, -1, 138, 168, -1,
-	153, 76, -3, -1, 182, 122, 60, -11, -5, -3, -1, 91, 137, 28, -1,
-	192, -1, 152, 121, -1, 226, -1, 46, 30, -15, -7, -3, -1, 211, 45,
-	-1, 210, 209, -5, -1, 59, -1, 151, 136, 29, -7, -3, -1, 196, 107,
-	-1, 195, 167, -1, 44, -1, 194, 181, -23, -13, -7, -3, -1, 193, 12,
-	-1, 75, 180, -3, -1, 106, 166, 179, -5, -3, -1, 90, 165, 43, -1,
-	178, 27, -13, -5, -1, 177, -1, 11, 176, -3, -1, 105, 150, -1, 74,
-	164, -5, -3, -1, 120, 135, 163, -3, -1, 58, 89, 42, -97, -57, -33,
-	-19, -11, -5, -3, -1, 149, 104, 161, -3, -1, 134, 119, 148, -5, -3,
-	-1, 73, 87, 103, 162, -5, -1, 26, -1, 10, 160, -3, -1, 57, 147,
-	-1, 88, 133, -9, -3, -1, 41, 146, -3, -1, 118, 9, 25, -5, -1,
-	145, -1, 144, 72, -3, -1, 132, 117, -1, 56, 131, -21, -11, -5, -3,
-	-1, 102, 40, 130, -3, -1, 71, 116, 24, -3, -1, 129, 128, -3, -1,
-	8, 86, 55, -9, -5, -1, 115, -1, 101, 70, -1, 39, 114, -5, -3,
-	-1, 100, 85, 7, 23, -23, -13, -5, -1, 113, -1, 112, 54, -3, -1,
-	99, 69, -1, 84, 38, -3, -1, 98, 22, -1, 97, -1, 6, 96, -9,
-	-5, -1, 83, -1, 53, 68, -1, 37, 82, -1, 81, -1, 21, 5, -33,
-	-23, -13, -7, -3, -1, 52, 67, -1, 80, 36, -3, -1, 66, 51, 20,
-	-5, -1, 65, -1, 4, 64, -1, 35, 50, -3, -1, 19, 49, -3, -1,
-	3, 48, 34, -3, -1, 18, 33, -1, 2, 32, -3, -1, 17, 1, 16,
-	0
-};
-
-static short tab24[] =
-{
-      -451, -117, -43, -25, -15, -7, -3, -1, 239, 254, -1, 223, 253, -3, -1,
-	207, 252, -1, 191, 251, -5, -1, 250, -1, 175, 159, -1, 249, 248, -9,
-	-5, -3, -1, 143, 127, 247, -1, 111, 246, -3, -1, 95, 245, -1, 79,
-	244, -71, -7, -3, -1, 63, 243, -1, 47, 242, -5, -1, 241, -1, 31,
-	240, -25, -9, -1, 15, -3, -1, 238, 222, -1, 237, 206, -7, -3, -1,
-	236, 221, -1, 190, 235, -3, -1, 205, 220, -1, 174, 234, -15, -7, -3,
-	-1, 189, 219, -1, 204, 158, -3, -1, 233, 173, -1, 218, 188, -7, -3,
-      -1, 203, 142, -1, 232, 157, -3, -1, 217, 126, -1, 231, 172, 255, -235,
-	-143, -77, -45, -25, -15, -7, -3, -1, 202, 187, -1, 141, 216, -5, -3,
-	-1, 14, 224, 13, 230, -5, -3, -1, 110, 156, 201, -1, 94, 186, -9,
-	-5, -1, 229, -1, 171, 125, -1, 215, 228, -3, -1, 140, 200, -3, -1,
-	78, 46, 62, -15, -7, -3, -1, 109, 214, -1, 227, 155, -3, -1, 185,
-	170, -1, 226, 30, -7, -3, -1, 225, 93, -1, 213, 124, -3, -1, 199,
-	77, -1, 139, 184, -31, -15, -7, -3, -1, 212, 154, -1, 169, 108, -3,
-	-1, 198, 61, -1, 211, 45, -7, -3, -1, 210, 29, -1, 123, 183, -3,
-	-1, 209, 92, -1, 197, 138, -17, -7, -3, -1, 168, 153, -1, 76, 196,
-	-3, -1, 107, 182, -3, -1, 208, 12, 60, -7, -3, -1, 195, 122, -1,
-	167, 44, -3, -1, 194, 91, -1, 181, 28, -57, -35, -19, -7, -3, -1,
-	137, 152, -1, 193, 75, -5, -3, -1, 192, 11, 59, -3, -1, 176, 10,
-	26, -5, -1, 180, -1, 106, 166, -3, -1, 121, 151, -3, -1, 160, 9,
-	144, -9, -3, -1, 179, 136, -3, -1, 43, 90, 178, -7, -3, -1, 165,
-	27, -1, 177, 105, -1, 150, 164, -17, -9, -5, -3, -1, 74, 120, 135,
-	-1, 58, 163, -3, -1, 89, 149, -1, 42, 162, -7, -3, -1, 161, 104,
-	-1, 134, 119, -3, -1, 73, 148, -1, 57, 147, -63, -31, -15, -7, -3,
-	-1, 88, 133, -1, 41, 103, -3, -1, 118, 146, -1, 25, 145, -7, -3,
-	-1, 72, 132, -1, 87, 117, -3, -1, 56, 131, -1, 102, 40, -17, -7,
-	-3, -1, 130, 24, -1, 71, 116, -5, -1, 129, -1, 8, 128, -1, 86,
-	101, -7, -5, -1, 23, -1, 7, 112, 115, -3, -1, 55, 39, 114, -15,
-	-7, -3, -1, 70, 100, -1, 85, 113, -3, -1, 54, 99, -1, 69, 84,
-	-7, -3, -1, 38, 98, -1, 22, 97, -5, -3, -1, 6, 96, 53, -1,
-	83, 68, -51, -37, -23, -15, -9, -3, -1, 37, 82, -1, 21, -1, 5,
-	80, -1, 81, -1, 52, 67, -3, -1, 36, 66, -1, 51, 20, -9, -5,
-	-1, 65, -1, 4, 64, -1, 35, 50, -1, 19, 49, -7, -5, -3, -1,
-	3, 48, 34, 18, -1, 33, -1, 2, 32, -3, -1, 17, 1, -1, 16,
-	0
-};
-
-static short tab_c0[] =
-{
-	-29, -21, -13, -7, -3, -1, 11, 15, -1, 13, 14, -3, -1, 7, 5,
-	9, -3, -1, 6, 3, -1, 10, 12, -3, -1, 2, 1, -1, 4, 8,
-	0
-};
-
-static short tab_c1[] =
-{
-	-15, -7, -3, -1, 15, 14, -1, 13, 12, -3, -1, 11, 10, -1, 9,
-	8, -7, -3, -1, 7, 6, -1, 5, 4, -3, -1, 3, 2, -1, 1,
-	0
-};
-
-static struct newhuff ht[] =
-{
-	{ /* 0 */ 0, tab0},
-	{ /* 2 */ 0, tab1},
-	{ /* 3 */ 0, tab2},
-	{ /* 3 */ 0, tab3},
-	{ /* 0 */ 0, tab0},
-	{ /* 4 */ 0, tab5},
-	{ /* 4 */ 0, tab6},
-	{ /* 6 */ 0, tab7},
-	{ /* 6 */ 0, tab8},
-	{ /* 6 */ 0, tab9},
-	{ /* 8 */ 0, tab10},
-	{ /* 8 */ 0, tab11},
-	{ /* 8 */ 0, tab12},
-	{ /* 16 */ 0, tab13},
-	{ /* 0  */ 0, tab0},
-	{ /* 16 */ 0, tab15},
-
-	{ /* 16 */ 1, tab16},
-	{ /* 16 */ 2, tab16},
-	{ /* 16 */ 3, tab16},
-	{ /* 16 */ 4, tab16},
-	{ /* 16 */ 6, tab16},
-	{ /* 16 */ 8, tab16},
-	{ /* 16 */ 10, tab16},
-	{ /* 16 */ 13, tab16},
-	{ /* 16 */ 4, tab24},
-	{ /* 16 */ 5, tab24},
-	{ /* 16 */ 6, tab24},
-	{ /* 16 */ 7, tab24},
-	{ /* 16 */ 8, tab24},
-	{ /* 16 */ 9, tab24},
-	{ /* 16 */ 11, tab24},
-	{ /* 16 */ 13, tab24}
-};
-
-static struct newhuff htc[] =
-{
-	{ /* 1 , 1 , */ 0, tab_c0},
-	{ /* 1 , 1 , */ 0, tab_c1}
-};
diff --git a/components/music/id3.c b/components/music/id3.c
deleted file mode 100644
index 727808fee..000000000
--- a/components/music/id3.c
+++ /dev/null
@@ -1,630 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3.c
- * Description:   Code for accessing ID3 tags.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Fri Feb  5 23:55:13 1999
- *                
- * $Id$
- * 
- * 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.
- * 
- ********************************************************************/
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <glib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "id3.h"
-#include "id3_header.h"
-
-
-
-/*
-**
-** Functions for accessing the ID3 tag using a memory pointer.
-**
-*/
-
-/*
- * Function id3_seek_mem (id3, offset)
- *
- *    Seek `offset' bytes forward in the indicated ID3-tag.  Return 0
- *    upon success, or -1 if an error occured.
- *
- */
-static int id3_seek_mem(id3_t *id3, int offset)
-{
-    id3->s.me.id3_ptr = (char *) id3->s.me.id3_ptr + offset;
-    id3->id3_pos += offset;
-
-    if ( id3->id3_pos > id3->id3_tagsize ) {
-	id3->id3_pos = id3->id3_tagsize;
-	id3_error( id3, "seeking beyond tag boundary" );
-	return -1;
-    }
-
-    return 0;
-}
-
-
-/*
- * Function id3_read_mem (id3, buf, size)
- *
- *    Read `size' bytes from indicated ID3-tag.  If `buf' is non-NULL,
- *    read into that buffer.  Return a pointer to the data which was
- *    read, or NULL upon error.
- *
- */
-static void *id3_read_mem(id3_t *id3, void *buf, int size)
-{
-    void *ret = id3->s.me.id3_ptr;
-
-    /*
-     * Check boundary.
-     */
-    if ( id3->id3_pos + size > id3->id3_tagsize ) {
-	size = id3->id3_tagsize - id3->id3_pos;
-    }
-
-    /*
-     * If buffer is non-NULL, we have to copy the data.
-     */
-    if ( buf != NULL )
-	memcpy( buf, id3->s.me.id3_ptr, size );
-
-    /*
-     * Update memory pointer.
-     */
-    id3->s.me.id3_ptr = (char *) id3->s.me.id3_ptr + size;
-    id3->id3_pos += size;
-
-    return ret;
-}
-
-
-/*
-**
-** Functions for accessing the ID3 tag using a file descriptor.
-**
-*/
-
-/*
- * Function id3_seek_fd (id3, offset)
- *
- *    Seek `offset' bytes forward in the indicated ID3-tag.  Return 0
- *    upon success, or -1 if an error occured.
- *
- */
-static int id3_seek_fd(id3_t *id3, int offset)
-{
-    if ( lseek( id3->s.fd.id3_fd, offset, SEEK_CUR ) == -1 ) {
-	id3_error( id3, "seeking beyond tag boundary" );
-	return -1;
-    }
-    id3->id3_pos += offset;
-
-    return 0;
-}
-
-
-/*
- * Function id3_read_fd (id3, buf, size)
- *
- *    Read `size' bytes from indicated ID3-tag.  If `buf' is non-NULL,
- *    read into that buffer.  Return a pointer to the data which was
- *    read, or NULL upon error.
- *
- */
-static void *id3_read_fd(id3_t *id3, void *buf, int size)
-{
-    int rsize = size > ID3_FD_BUFSIZE ? ID3_FD_BUFSIZE : size;
-    int done = 0;
-
-    /*
-     * Check boundary.
-     */
-    if ( id3->id3_pos + size > id3->id3_tagsize ) {
-	size = id3->id3_tagsize - id3->id3_pos;
-    }
-
-    /*
-     * If buffer is NULL, we use the default buffer.
-     */
-    if ( buf == NULL )
-	buf = id3->s.fd.id3_buf;
-
-    /*
-     * Read until we have slurped as much data as we wanted.
-     */
-    while ( done < rsize ) {
-	char *buffer = (char *)buf + done;
-	int ret;
-
-	/*
-	 * Try reading from file.
-	 */
-	ret = read( id3->s.fd.id3_fd, buffer, rsize );
-	if ( ret == -1 ) {
-	    id3_error( id3, "read(2) failed" );
-	    return NULL;
-	}
-
-	/*
-	 * Check if we've reached end-of-file.
-	 */
-	if ( ret == 0 )
-	    return buf;
-
-	id3->id3_pos += ret;
-	done += ret;
-    }
-
-    return buf;
-}
-
-
-/*
-**
-** Functions for accessing the ID3 tag using a file pointer.
-**
-*/
-
-/*
- * Function id3_seek_fp (id3, offset)
- *
- *    Seek `offset' bytes forward in the indicated ID3-tag.  Return 0
- *    upon success, or -1 if an error occured.
- *
- */
-static int id3_seek_fp(id3_t *id3, int offset)
-{
-    if ( offset > 0 ) {
-	/*
-	 * If offset is positive, we use fread() instead of fseek().  This
-	 * is more robust with respect to streams.
-	 */
-	char buf[64];
-	int r, remain = offset;
-
-	while ( remain > 0 ) {
-	    r = fread( buf, 1, 64, id3->s.fp.id3_fp );
-	    if ( r == -1 ) {
-		id3_error(  id3, "fread() failed" );
-		return -1;
-	    }
-	    remain -= r;
-	}
-    } else {
-	/*
-	 * If offset is negative, we ahve to use fseek().  Let us hope
-	 * that it works.
-	 */
-	if ( fseek( id3->s.fp.id3_fp, offset, SEEK_CUR ) == -1 ) {
-	    id3_error( id3, "seeking beyond tag boundary" );
-	    return -1;
-	}
-    }
-    id3->id3_pos += offset;
-
-    return 0;
-}
-
-
-/*
- * Function id3_read_fp (id3, buf, size)
- *
- *    Read `size' bytes from indicated ID3-tag.  If `buf' is non-NULL,
- *    read into that buffer.  Return a pointer to the data which was
- *    read, or NULL upon error.
- *
- */
-static void *id3_read_fp(id3_t *id3, void *buf, int size)
-{
-    int rsize = size > ID3_FD_BUFSIZE ? ID3_FD_BUFSIZE : size;
-    int done = 0;
-
-    /*
-     * Check boundary.
-     */
-    if ( id3->id3_pos + size > id3->id3_tagsize ) {
-	size = id3->id3_tagsize - id3->id3_pos;
-    }
-
-    /*
-     * If buffer is NULL, we use the default buffer.
-     */
-    if ( buf == NULL )
-	buf = id3->s.fp.id3_buf;
-
-    /*
-     * Read until we have slurped as much data as we wanted.
-     */
-    while ( done < rsize ) {
-	char *buffer = (char *)buf + done;
-	int ret;
-
-	/*
-	 * Try reading from file.
-	 */
-	ret = fread( buffer, 1, rsize, id3->s.fp.id3_fp );
-	if ( ret == -1 ) {
-	    id3_error( id3, "fread() failed" );
-	    return NULL;
-	}
-
-	/*
-	 * Check if we've reached end-of-file.
-	 */
-	if ( ret == 0 )
-	    return buf;
-
-	id3->id3_pos += ret;
-	done += ret;
-    }
-
-    return buf;
-}
-
-
-
-
-/*
- * Function id3_open_mem (ptr, flags)
- *
- *    Open an ID3 tag using a memory pointer.  Return a pointer to a
- *    structure describing the ID3 tag, or NULL if an error occured.
- *
- */
-id3_t *id3_open_mem(void *ptr, int flags)
-{
-    id3_t *id3;
-
-    /*
-     * Allocate ID3 structure.
-     */
-    id3 = malloc( sizeof(id3_t) );
-    if ( id3 == NULL )
-	return NULL;
-    bzero( id3, sizeof(id3_t) );
-
-    /*
-     * Initialize access pointers.
-     */
-    id3->id3_seek = id3_seek_mem;
-    id3->id3_read = id3_read_mem;
-
-    id3->id3_oflags = flags;
-    id3->id3_type = ID3_TYPE_MEM;
-    id3->id3_pos = 0;
-    id3->s.me.id3_ptr = ptr;
-
-    /*
-     * Try reading ID3 tag.
-     */
-    if ( id3_read_tag( id3 ) == -1 ) {
-	if ( ~flags & ID3_OPENF_CREATE )
-	    goto Return_NULL;
-	id3_init_tag ( id3 );
-    }
-
-    return id3;
-
- Return_NULL:
-    free( id3 );
-    return NULL;
-}
-
-
-/*
- * Function id3_open_fd (fd, flags)
- *
- *    Open an ID3 tag using a file descriptor.  Return a pointer to a
- *    structure describing the ID3 tag, or NULL if an error occured.
- *
- */
-id3_t *id3_open_fd(int fd, int flags)
-{
-    id3_t *id3;
-
-    /*
-     * Allocate ID3 structure.
-     */
-    id3 = malloc( sizeof(id3_t) );
-    if ( id3 == NULL )
-	return NULL;
-    bzero( id3, sizeof(id3_t) );
-
-    /*
-     * Initialize access pointers.
-     */
-    id3->id3_seek = id3_seek_fd;
-    id3->id3_read = id3_read_fd;
-
-    id3->id3_oflags = flags;
-    id3->id3_type = ID3_TYPE_FD;
-    id3->id3_pos = 0;
-    id3->s.fd.id3_fd = fd;
-
-    /*
-     * Allocate buffer to hold read data.
-     */
-    id3->s.fd.id3_buf = malloc( ID3_FD_BUFSIZE );
-    if ( id3->s.fd.id3_buf == NULL ) {
-	id3_error( id3, "malloc - no memory" );
-	goto Error_nobuf;
-    }
-
-    /*
-     * Try reading ID3 tag.
-     */
-    if ( id3_read_tag( id3 ) == -1 ) {
-	if ( ~flags & ID3_OPENF_CREATE ) 
-	    goto Return_NULL;
-	id3_init_tag ( id3 );
-    }
-
-    return id3;
-
-    /*
-     * Cleanup code.
-     */
- Return_NULL:
-    free( id3->s.fd.id3_buf );
- Error_nobuf:
-    free( id3 );
-    return NULL;
-}
-
-
-/*
- * Function id3_open_fp (fp, flags)
- *
- *    Open an ID3 tag using a file pointer.  Return a pointer to a
- *    structure describing the ID3 tag, or NULL if an error occured.
- *
- */
-id3_t *id3_open_fp(FILE *fp, int flags)
-{
-    id3_t *id3;
-
-    /*
-     * Allocate ID3 structure.
-     */
-    id3 = malloc( sizeof(id3_t) );
-    if ( id3 == NULL )
-	return NULL;
-    bzero( id3, sizeof(id3_t) );
-
-    /*
-     * Initialize access pointers.
-     */
-    id3->id3_seek = id3_seek_fp;
-    id3->id3_read = id3_read_fp;
-
-    id3->id3_oflags = flags;
-    id3->id3_type = ID3_TYPE_FP;
-    id3->id3_pos = 0;
-    id3->s.fp.id3_fp = fp;
-
-    /*
-     * Allocate buffer to hold read data.
-     */
-    id3->s.fp.id3_buf = malloc( ID3_FD_BUFSIZE );
-    if ( id3->s.fp.id3_buf == NULL ) {
-	id3_error( id3, "malloc - no memory" );
-	goto Error_nobuf;
-    }
-
-    /*
-     * Try reading ID3 tag.
-     */
-    if ( id3_read_tag( id3 ) == -1 ) {
-	if ( ~flags & ID3_OPENF_CREATE ) 
-	    goto Return_NULL;
-	id3_init_tag ( id3 );
-    }
-    
-
-    return id3;
-
-    /*
-     * Cleanup code.
-     */
- Return_NULL:
-    free( id3->s.fp.id3_buf );
- Error_nobuf:
-    free( id3 );
-    return NULL;
-}
-
-
-/*
- * Function id3_close (id3)
- *
- *    Free all resources assoicated with the ID3 tag.
- *
- */
-int id3_close(id3_t *id3)
-{
-    int ret = 0;
-    
-    switch( id3->id3_type ) {
-    case ID3_TYPE_MEM:
-	break;
-    case ID3_TYPE_FD:
-	free( id3->s.fd.id3_buf );
-	break;
-    case ID3_TYPE_FP:
-	free( id3->s.fp.id3_buf );
-	break;
-    case ID3_TYPE_NONE:
-	id3_error( id3, "unknown ID3 type" );
-	ret = -1;
-    }
-    free( id3 );
-
-    return ret;
-}
-
-
-/*
- * Function id3_tell (id3)
- *
- *    Return the current position in ID3 tag.  This will always be
- *    directly after the tag.
- *
- */
-int id3_tell(id3_t *id3)
-{
-    if ( id3->id3_newtag ) {
-	return 0;
-    } else {
-	return id3->id3_tagsize + 3 + sizeof(id3_taghdr_t);
-    }
-}
-
-
-/*
- * Function id3_alter_file (id3)
- *
- *    When altering a file, some ID3 tags should be discarded.  As the ID3
- *    library has no means of knowing when a file has been altered
- *    outside of the library, this function must be called manually
- *    whenever the file is altered.
- *
- */
-int id3_alter_file(id3_t *id3)
-{
-    /*
-     * List of frame classes that should be discarded whenever the
-     * file is altered.
-     */
-    static guint32 discard_list[] = {
-	ID3_ETCO, ID3_EQUA, ID3_MLLT, ID3_POSS, ID3_SYLT,
-	ID3_SYTC, ID3_RVAD, ID3_TENC, ID3_TLEN, ID3_TSIZ,
-	0
-    };
-    id3_frame_t *fr;
-    guint32 id, i = 0;
-
-    /*
-     * Go through list of frame types that should be discarded.
-     */
-    while ( (id = discard_list[i++]) != 0 ) {
-	/*
-	 * Discard all frames of that type.
-	 */
-	while ( (fr = id3_get_frame(id3, id, 1)) ) {
-	    id3_delete_frame( fr );
-	}
-    }
-    
-    return 0;
-}
-
-
-/*
- * Function safe_write (fd, buf, size)
- *
- *    Like write(2), except that the whole buffer will be written.
- *
- */
-static int safe_write(int fd, void *buf, int size)
-{
-    int remaining = size;
-    char *ptr = buf;
-    int r;
-
-    while ( remaining > 0 ) {
-	if ( (r = write( fd, ptr, remaining )) == -1 )
-	    return -1;
-	remaining -= r;
-	ptr += r;
-    }
-
-    return 0;
-}
-
-
-/*
- * Function id3_write_tag (id3, fd)
- *
- *    Wrtite the ID3 tag to the indicated file descriptor.  Return 0
- *    upon success, or -1 if an error occured.
- *
- */
-int id3_write_tag(id3_t *id3, int fd)
-{
-    id3_frame_t *fr;
-    id3_taghdr_t taghdr;
-    int size = 0;
-
-    /*
-     * Calculate size of ID3 tag.
-     */
-    for ( fr = id3->id3_frame; fr != NULL; fr = fr->fr_next ) {
-	size += fr->fr_size + sizeof(id3_framehdr_t);
-    }
-
-    /*
-     * Write tag header.
-     */
-    taghdr.th_version = id3->id3_version;
-    taghdr.th_revision = id3->id3_revision;
-    taghdr.th_flags = id3->id3_flags;
-    taghdr.th_size = g_htonl( ID3_SET_SIZE28(size) );
-
-    if ( safe_write(fd, "ID3", 3) == -1 )
-	return -1;
-    if ( safe_write(fd, &taghdr, sizeof(taghdr)) == -1 )
-	return -1;
-
-    /*
-     * TODO: Write extended header.
-     */
-#if 0
-    if ( id3->id3_flags & ID3_THFLAG_EXT ) {
-	id3_exthdr_t exthdr;
-    }
-#endif
-	    
-    for ( fr = id3->id3_frame; fr != NULL; fr = fr->fr_next ) {
-	id3_framehdr_t fhdr;
-
-	/*
-	 * TODO: Support compressed headers, encoded
-	 * headers, and grouping info.
-	 */
-	fhdr.fh_id = fr->fr_desc ? g_htonl(fr->fr_desc->fd_id) : 0;
-	fhdr.fh_size = g_htonl( fr->fr_size );
-	fhdr.fh_flags = g_ntohl( fr->fr_flags );
-
-	if ( safe_write(fd, &fhdr, sizeof(fhdr)) == -1 )
-	    return -1;
-
-	if ( safe_write(fd, fr->fr_data, fr->fr_size) == -1 )
-	    return -1;
-    }
-    return 0;
-}
diff --git a/components/music/id3.h b/components/music/id3.h
deleted file mode 100644
index 5705b30b2..000000000
--- a/components/music/id3.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1998, 1999,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3.h
- * Description:   Include file for accessing the ID3 library.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Thu Nov  5 15:55:10 1998
- *                
- * $Id$
- * 
- * 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 ID3_H
-#define ID3_H
-
-#include <glib/gtypes.h>
-
-/*
- * Option flags to id3_open_*().
- */
-#define ID3_OPENF_NONE		0x0000
-#define ID3_OPENF_NOCHK		0x0001
-#define ID3_OPENF_CREATE	0x0002
-
-
-/*
- * The size of the read buffer used by file operations.
- */
-#define ID3_FD_BUFSIZE	8192
-
-
-typedef struct id3_t		id3_t;
-typedef struct id3_frame_t	id3_frame_t;
-typedef struct id3_framedesc_t	id3_framedesc_t;
-
-
-/*
- * Structure describing the ID3 tag.
- */
-struct id3_t {
-    int		id3_type;		/* Memory or file desriptor */
-    int		id3_oflags;		/* Flags from open call */
-    int		id3_flags;		/* Flags from tag header */
-    int		id3_altered;		/* Set when tag has been altered */
-    int		id3_newtag;		/* Set if this is a new tag */
-
-    int		id3_version;		/* Major ID3 version number */
-    int		id3_revision;		/* ID3 revision number */
-
-    int		id3_tagsize;		/* Total size of ID3 tag */
-    int		id3_pos;		/* Current position within tag */
-    
-    char	*id3_error_msg;		/* Last error message */
-
-    char	id3_buffer[256];	/* Used for various strings */
-
-    union {
-	/*
-	 * Memory specific fields.
-	 */
-	struct {
-	    void	*id3_ptr;
-	} me;
-
-	/*
-	 * File desc. specific fields.
-	 */
-	struct {
-	    int		id3_fd;
-	    void	*id3_buf;
-	} fd;
-
-	/*
-	 * File ptr. specific fields.
-	 */
-	struct {
-	    FILE	*id3_fp;
-	    void	*id3_buf;
-	} fp;
-    } s;
-
-    /*
-     * Functions for doing operations within ID3 tag.
-     */
-    int (*id3_seek)(id3_t *, int);
-    void *(*id3_read)(id3_t *, void *, int);
-
-    /*
-     * Linked list of ID3 frames.
-     */
-    int		id3_numframes;
-    id3_frame_t	*id3_frame;
-    id3_frame_t	*id3_tail;
-};
-
-#define ID3_TYPE_NONE	0
-#define ID3_TYPE_MEM	1
-#define ID3_TYPE_FD	2
-#define ID3_TYPE_FP	3
-
-
-/*
- * Structure describing an ID3 frame.
- */
-struct id3_frame_t {
-    id3_t		*fr_owner;
-    id3_framedesc_t	*fr_desc;
-    int			fr_flags;
-    unsigned char	fr_encryption;
-    unsigned char	fr_grouping;
-    unsigned char	fr_altered;
-
-    void		*fr_data;	/* The uncompressed frame */
-    int			fr_size;	/* Size of uncompressed frame */
-
-    void		*fr_data_z;	/* The compressed frame */
-    int			fr_size_z;	/* Size of compressed frame */
- 
-    id3_frame_t		*fr_next;
-};
-
-
-/*
- * Structure describing an ID3 frame type.
- */
-struct id3_framedesc_t {
-    guint32	fd_id;
-    char	fd_idstr[4];
-    char	*fd_description;
-};
-
-
-/*
- * Text encodings.
- */
-#define ID3_ENCODING_ISO_8859_1	0x00
-#define ID3_ENCODING_UNICODE	0x01
-
-
-
-/*
- * ID3 frame id numbers.
- */
-#define ID3_FRAME_ID(a,b,c,d)   ((a << 24) | (b << 16) | (c << 8) | d)
-
-#define ID3_AENC	ID3_FRAME_ID('A','E','N','C')
-#define ID3_APIC	ID3_FRAME_ID('A','P','I','C')
-#define ID3_COMM	ID3_FRAME_ID('C','O','M','M')
-#define ID3_COMR	ID3_FRAME_ID('C','O','M','R')
-#define ID3_ENCR	ID3_FRAME_ID('E','N','C','R')
-#define ID3_EQUA	ID3_FRAME_ID('E','Q','U','A')
-#define ID3_ETCO	ID3_FRAME_ID('E','T','C','O')
-#define ID3_GEOB	ID3_FRAME_ID('G','E','O','B')
-#define ID3_GRID	ID3_FRAME_ID('G','R','I','D')
-#define ID3_IPLS	ID3_FRAME_ID('I','P','L','S')
-#define ID3_LINK	ID3_FRAME_ID('L','I','N','K')
-#define ID3_MCDI	ID3_FRAME_ID('M','C','D','I')
-#define ID3_MLLT	ID3_FRAME_ID('M','L','L','T')
-#define ID3_OWNE	ID3_FRAME_ID('O','W','N','E')
-#define ID3_PRIV	ID3_FRAME_ID('P','R','I','V')
-#define ID3_PCNT	ID3_FRAME_ID('P','C','N','T')
-#define ID3_POPM	ID3_FRAME_ID('P','O','P','M')
-#define ID3_POSS	ID3_FRAME_ID('P','O','S','S')
-#define ID3_RBUF	ID3_FRAME_ID('R','B','U','F')
-#define ID3_RVAD	ID3_FRAME_ID('R','V','A','D')
-#define ID3_RVRB	ID3_FRAME_ID('R','V','R','B')
-#define ID3_SYLT	ID3_FRAME_ID('S','Y','L','T')
-#define ID3_SYTC	ID3_FRAME_ID('S','Y','T','C')
-#define ID3_TALB	ID3_FRAME_ID('T','A','L','B')
-#define ID3_TBPM	ID3_FRAME_ID('T','B','P','M')
-#define ID3_TCOM	ID3_FRAME_ID('T','C','O','M')
-#define ID3_TCON	ID3_FRAME_ID('T','C','O','N')
-#define ID3_TCOP	ID3_FRAME_ID('T','C','O','P')
-#define ID3_TDAT	ID3_FRAME_ID('T','D','A','T')
-#define ID3_TDLY	ID3_FRAME_ID('T','D','L','Y')
-#define ID3_TENC	ID3_FRAME_ID('T','E','N','C')
-#define ID3_TEXT	ID3_FRAME_ID('T','E','X','T')
-#define ID3_TFLT	ID3_FRAME_ID('T','F','L','T')
-#define ID3_TIME	ID3_FRAME_ID('T','I','M','E')
-#define ID3_TIT1	ID3_FRAME_ID('T','I','T','1')
-#define ID3_TIT2	ID3_FRAME_ID('T','I','T','2')
-#define ID3_TIT3	ID3_FRAME_ID('T','I','T','3')
-#define ID3_TKEY	ID3_FRAME_ID('T','K','E','Y')
-#define ID3_TLAN	ID3_FRAME_ID('T','L','A','N')
-#define ID3_TLEN	ID3_FRAME_ID('T','L','E','N')
-#define ID3_TMED	ID3_FRAME_ID('T','M','E','D')
-#define ID3_TOAL	ID3_FRAME_ID('T','O','A','L')
-#define ID3_TOFN	ID3_FRAME_ID('T','O','F','N')
-#define ID3_TOLY	ID3_FRAME_ID('T','O','L','Y')
-#define ID3_TOPE	ID3_FRAME_ID('T','O','P','E')
-#define ID3_TORY	ID3_FRAME_ID('T','O','R','Y')
-#define ID3_TOWN	ID3_FRAME_ID('T','O','W','N')
-#define ID3_TPE1	ID3_FRAME_ID('T','P','E','1')
-#define ID3_TPE2	ID3_FRAME_ID('T','P','E','2')
-#define ID3_TPE3	ID3_FRAME_ID('T','P','E','3')
-#define ID3_TPE4	ID3_FRAME_ID('T','P','E','4')
-#define ID3_TPOS	ID3_FRAME_ID('T','P','O','S')
-#define ID3_TPUB	ID3_FRAME_ID('T','P','U','B')
-#define ID3_TRCK	ID3_FRAME_ID('T','R','C','K')
-#define ID3_TRDA	ID3_FRAME_ID('T','R','D','A')
-#define ID3_TRSN	ID3_FRAME_ID('T','R','S','N')
-#define ID3_TRSO	ID3_FRAME_ID('T','R','S','O')
-#define ID3_TSIZ	ID3_FRAME_ID('T','S','I','Z')
-#define ID3_TSRC	ID3_FRAME_ID('T','S','R','C')
-#define ID3_TSSE	ID3_FRAME_ID('T','S','S','E')
-#define ID3_TYER	ID3_FRAME_ID('T','Y','E','R')
-#define ID3_TXXX	ID3_FRAME_ID('T','X','X','X')
-#define ID3_UFID	ID3_FRAME_ID('U','F','I','D')
-#define ID3_USER	ID3_FRAME_ID('U','S','E','R')
-#define ID3_USLT	ID3_FRAME_ID('U','S','L','T')
-#define ID3_WCOM	ID3_FRAME_ID('W','C','O','M')
-#define ID3_WCOP	ID3_FRAME_ID('W','C','O','P')
-#define ID3_WOAF	ID3_FRAME_ID('W','O','A','F')
-#define ID3_WOAR	ID3_FRAME_ID('W','O','A','R')
-#define ID3_WOAS	ID3_FRAME_ID('W','O','A','S')
-#define ID3_WORS	ID3_FRAME_ID('W','O','R','S')
-#define ID3_WPAY	ID3_FRAME_ID('W','P','A','Y')
-#define ID3_WPUB	ID3_FRAME_ID('W','P','U','B')
-#define ID3_WXXX	ID3_FRAME_ID('W','X','X','X')
-
-
-
-/*
- * Prototypes.
- */
-
-/* From id3.c */
-id3_t *id3_open_mem(void *, int);
-id3_t *id3_open_fd(int, int);
-id3_t *id3_open_fp(FILE *, int);
-int id3_set_output(id3_t *, char *);
-int id3_close(id3_t *);
-int id3_tell(id3_t *);
-int id3_alter_file(id3_t *);
-int id3_write_tag(id3_t *, int);
-
-/* From id3_frame.c */
-int id3_read_frame(id3_t *id3);
-id3_frame_t *id3_get_frame(id3_t *, guint32, int);
-int id3_delete_frame(id3_frame_t *frame);
-id3_frame_t *id3_add_frame(id3_t *, guint32);
-int id3_decompress_frame(id3_frame_t *);
-
-/* From id3_frame_text.c */
-gint8 id3_get_encoding(id3_frame_t *);
-int id3_set_encoding(id3_frame_t *, gint8);
-char *id3_get_text(id3_frame_t *);
-char *id3_get_text_desc(id3_frame_t *);
-int id3_get_text_number(id3_frame_t *);
-int id3_set_text(id3_frame_t *, char *);
-int id3_set_text_number(id3_frame_t *, int);
-
-/* From id3_frame_content.c */
-char *id3_get_content(id3_frame_t *);
-
-/* From id3_frame_url.c */
-char *id3_get_url(id3_frame_t *);
-char *id3_get_url_desc(id3_frame_t *);
-
-/* From id3_tag.c */
-void id3_init_tag(id3_t *id3);
-int id3_read_tag(id3_t *id3);
-
-#endif /* ID3_H */
diff --git a/components/music/id3_frame.c b/components/music/id3_frame.c
deleted file mode 100644
index 4fa77e0cd..000000000
--- a/components/music/id3_frame.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999-2000,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_frame.c
- * Description:   Code for handling ID3 frames.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Fri Feb  5 23:47:08 1999
- * 
- * $Id$
- * 
- * 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.
- *                
- ********************************************************************/
-#if HAVE_LIBZ
-#include <zlib.h>
-#endif
-#include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "id3.h"
-#include "id3_header.h"
-
-/*
- * Description of all valid ID3v2 frames.
- */
-static id3_framedesc_t Framedesc[] = {
-    { ID3_AENC, "AENC", "Audio encryption" },
-    { ID3_APIC, "APIC", "Attached picture" },
-
-    { ID3_COMM, "COMM", "Comments" },
-    { ID3_COMR, "COMR", "Commercial frame" },
-
-    { ID3_ENCR, "ENCR", "Encryption method registration" },
-    { ID3_EQUA, "EQUA", "Equalization" },
-    { ID3_ETCO, "ETCO", "Event timing codes" },
-
-    { ID3_GEOB, "GEOB", "General encapsulated object" },
-    { ID3_GRID, "GRID", "Group identification registration" },
-
-    { ID3_IPLS, "IPLS", "Involved people list" },
-
-    { ID3_LINK, "LINK", "Linked information" },
-
-    { ID3_MCDI, "MCDI", "Music CD identifier" },
-    { ID3_MLLT, "MLLT", "MPEG location lookup table" },
-
-    { ID3_OWNE, "OWNE", "Ownership frame" },
-
-    { ID3_PRIV, "PRIV", "Private frame" },
-    { ID3_PCNT, "PCNT", "Play counter" },
-    { ID3_POPM, "POPM", "Popularimeter" },
-    { ID3_POSS, "POSS", "Position synchronisation frame" },
-
-    { ID3_RBUF, "RBUF", "Recommended buffer size" },
-    { ID3_RVAD, "RVAD", "Relative volume adjustment" },
-    { ID3_RVRB, "RVRB", "Reverb" },
-
-    { ID3_SYLT, "SYLT", "Synchronized lyric/text" },
-    { ID3_SYTC, "SYTC", "Synchronized tempo codes" },
-
-    { ID3_TALB, "TALB", "Album/Movie/Show title" },
-    { ID3_TBPM, "TBPM", "BPM (beats per minute)" },
-    { ID3_TCOM, "TCOM", "Composer" },
-    { ID3_TCON, "TCON", "Content type" },
-    { ID3_TCOP, "TCOP", "Copyright message" },
-    { ID3_TDAT, "TDAT", "Date" },
-    { ID3_TDLY, "TDLY", "Playlist delay" },
-    { ID3_TENC, "TENC", "Encoded by" },
-    { ID3_TEXT, "TEXT", "Lyricist/Text writer" },
-    { ID3_TFLT, "TFLT", "File type" },
-    { ID3_TIME, "TIME", "Time" },
-    { ID3_TIT1, "TIT1", "Content group description" },
-    { ID3_TIT2, "TIT2", "Title/songname/content description" },
-    { ID3_TIT3, "TIT3", "Subtitle/Description refinement" },
-    { ID3_TKEY, "TKEY", "Initial key" },
-    { ID3_TLAN, "TLAN", "Language(s)" },
-    { ID3_TLEN, "TLEN", "Length" },
-    { ID3_TMED, "TMED", "Media type" },
-    { ID3_TOAL, "TOAL", "Original album/movie/show title" },
-    { ID3_TOFN, "TOFN", "Original filename" },
-    { ID3_TOLY, "TOLY", "Original lyricist(s)/text writer(s)" },
-    { ID3_TOPE, "TOPE", "Original artist(s)/performer(s)" },
-    { ID3_TORY, "TORY", "Original release year" },
-    { ID3_TOWN, "TOWN", "File owner/licensee" },
-    { ID3_TPE1, "TPE1", "Lead performer(s)/Soloist(s)" },
-    { ID3_TPE2, "TPE2", "Band/orchestra/accompaniment" },
-    { ID3_TPE3, "TPE3", "Conductor/performer refinement" },
-    { ID3_TPE4, "TPE4", "Interpreted, remixed, or otherwise modified by" },
-    { ID3_TPOS, "TPOS", "Part of a set" },
-    { ID3_TPUB, "TPUB", "Publisher" },
-    { ID3_TRCK, "TRCK", "Track number/Position in set" },
-    { ID3_TRDA, "TRDA", "Recording dates" },
-    { ID3_TRSN, "TRSN", "Internet radio station name" },
-    { ID3_TRSO, "TRSO", "Internet radio station owner" },
-    { ID3_TSIZ, "TSIZ", "Size" },
-    { ID3_TSRC, "TSRC", "ISRC (international standard recording code)" },
-    { ID3_TSSE, "TSSE", "Software/Hardware and settings used for encoding" },
-    { ID3_TYER, "TYER", "Year" },
-    { ID3_TXXX, "TXXX", "User defined text information frame" },
-
-    { ID3_UFID, "UFID", "Unique file identifier" },
-    { ID3_USER, "USER", "Terms of use" },
-    { ID3_USLT, "USLT", "Unsychronized lyric/text transcription" },
-
-    { ID3_WCOM, "WCOM", "Commercial information" },
-    { ID3_WCOP, "WCOP", "Copyright/Legal information" },
-    { ID3_WOAF, "WOAF", "Official audio file webpage" },
-    { ID3_WOAR, "WOAR", "Official artist/performer webpage" },
-    { ID3_WOAS, "WOAS", "Official audio source webpage" },
-    { ID3_WORS, "WORS", "Official internet radio station homepage" },
-    { ID3_WPAY, "WPAY", "Payment" },
-    { ID3_WPUB, "WPUB", "Publishers official webpage" },
-    { ID3_WXXX, "WXXX", "User defined URL link frame" },
-};
-
-
-/*
- * Function id3_read_frame (id3)
- *
- *    Read next frame from the indicated ID3 tag.  Return 0 upon
- *    success, or -1 if an error occured.
- *
- */
-int id3_read_frame(id3_t *id3)
-{
-    id3_framehdr_t *framehdr;
-    id3_frame_t *frame;
-    guint32 id;
-    void *p;
-    int i;
-
-    /*
-     * Read frame header.
-     */
-    framehdr = id3->id3_read( id3, NULL, sizeof(*framehdr) );
-    if ( framehdr == NULL )
-	return -1;
-
-    /*
-     * If we encounter an invalid frame id, we assume that there is
-     * some padding in the header.  We just skip the rest of the ID3
-     * tag.
-     */
-    i = *((guint8 *) &framehdr->fh_id);
-    if ( !((i >= '0' && i <= '9') || (i >= 'A' && i <= 'Z')) ) {
-	id3->id3_seek( id3, id3->id3_tagsize - id3->id3_pos );
-	return 0;
-    }
-    id = g_ntohl( framehdr->fh_id );
-
-    /*
-     * Allocate frame.
-     */
-    frame = malloc( sizeof(*frame) );
-    if ( frame == NULL )
-	return -1;
-
-    frame->fr_owner = id3;
-    frame->fr_size = g_ntohl(framehdr->fh_size);
-    frame->fr_flags = g_ntohs(framehdr->fh_flags);
-    frame->fr_encryption = 0;
-    frame->fr_grouping = 0;
-    frame->fr_desc = NULL;
-    frame->fr_altered = 0;
-    frame->fr_data = NULL;
-
-    /*
-     * Determine the type of the frame.
-     */
-    for ( i = 0;
-	  i < (int)(sizeof(Framedesc) / sizeof(id3_framedesc_t));
-	  i++ ) {
-
-	if ( Framedesc[i].fd_id == id ) {
-	    /*
-	     * Insert frame into linked list.
-	     */
-	    frame->fr_next = NULL;
-	    if ( id3->id3_frame ) {
-		id3->id3_tail->fr_next = frame;
-	    } else {
-		id3->id3_frame = frame;
-	    }
-	    id3->id3_tail = frame;
-	    id3->id3_numframes++;
-
-	    /*
-	     * Initialize frame.
-	     */
-	    frame->fr_desc = Framedesc + i;
-
-	    /*
-	     * When allocating memory to hold a text frame, we
-	     * allocate 2 extra byte.  This simplifies retrieval of
-	     * text strings.
-	     */
-	    frame->fr_data = malloc( frame->fr_size +
-				     (frame->fr_desc->fd_idstr[0] == 'T' ||
-				      frame->fr_desc->fd_idstr[0] == 'W' ?
-				      2 : 0) );
-	    if ( frame->fr_data == NULL ) {
-		free( frame );
-		return -1;
-	    }
-	    p = id3->id3_read(id3, frame->fr_data, frame->fr_size );
-	    if ( p == NULL ) {
-		free( frame->fr_data );
-		free( frame );
-		return -1;
-	    }
-
-	    /*
-	     * Null-terminate text frames.
-	     */
-	    if ( frame->fr_desc->fd_idstr[0] == 'T' ||
-		 frame->fr_desc->fd_idstr[0] == 'W' ) {
-		((char *) frame->fr_data)[frame->fr_size]   = 0;
-		((char *) frame->fr_data)[frame->fr_size+1] = 0;
-	    }
-
-	    break;
-	}
-    }
-
-    /*
-     * Check if frame had a valid id.
-     */
-    if ( frame->fr_desc == NULL ) {
-	/*
-	 * No. Ignore the frame.
-	 */
-	return 0;
-    }
-
-
-    if ( frame->fr_flags & ID3_FHFLAG_COMPRESS ) {
-	/*
-	 * Frame is compressed using zlib.  Fetch the size of the
-	 * decompressed data.
-	 */
-	frame->fr_size_z = frame->fr_size;
-	frame->fr_size   = g_ntohl( *((guint32 *) frame->fr_data) );
-	frame->fr_data_z = GINT_TO_POINTER ((GPOINTER_TO_INT (frame->fr_data) + 4));
-	frame->fr_data   = NULL;
-    } else {
-	/*
-	 * Frame is not compressed.
-	 */
-	frame->fr_size_z = 0;
-	frame->fr_data_z = NULL;
-    }
-
-    /*
-     * If frame is encrypted, we have one extra byte in the header.
-     */
-    if ( frame->fr_flags & ID3_FHFLAG_ENCRYPT ) {
-	if ( frame->fr_data_z )
-	    frame->fr_data_z = (char *) frame->fr_data_z + 1;
-	else
-	    frame->fr_data = (char *) frame->fr_data + 1;
-    }
-
-    /*
-     * If frame has grouping identity, we have one extra byte in the
-     * header.
-     */
-    if ( frame->fr_flags & ID3_FHFLAG_GROUP ) {
-	if ( frame->fr_data_z )
-	    frame->fr_data_z = (char *) frame->fr_data + 1;
-	else
-	    frame->fr_data = (char *) frame->fr_data + 1;
-    }
-
-    return 0;
-}
-
-
-/*
- * Function id3_get_frame (id3, type, num)
- *
- *    Search in the list of frames for the ID3-tag, and return a frame
- *    of the indicated type.  If tag contains several frames of the
- *    indicated type, the third argument tells which of the frames to
- *    return.
- *
- */
-id3_frame_t *id3_get_frame(id3_t *id3, guint32 type, int num)
-{
-    id3_frame_t	*fr = id3->id3_frame;
-
-    while ( fr != NULL ) {
-	if (fr->fr_desc && fr->fr_desc->fd_id ==  type )
-	{
-	    if ( --num <= 0 )
-		break;
-        }
-	fr = fr->fr_next;
-    } 
-    return fr;
-}
-
-
-/*
- * Function id3_decompress_frame (frame)
- *
- *    Uncompress the indicated frame.  Return 0 upon success, or -1 if
- *    an error occured.
- *
- */
-int id3_decompress_frame(id3_frame_t *frame)
-{
-#ifdef HAVE_LIBZ
-    z_stream z;
-    int r;
-
-    /*
-     * Allocate memory to hold uncompressed frame.
-     */
-    frame->fr_data = malloc( frame->fr_size + 
-			     (frame->fr_desc->fd_idstr[0] == 'T' ||
-			      frame->fr_desc->fd_idstr[0] == 'W' ? 2 : 0) );
-    if ( frame->fr_data == NULL ) {
-	id3_error( frame->fr_owner, "malloc - no memory" );
-	return -1;
-    }
-
-    /*
-     * Initialize zlib.
-     */
-    z.next_in   = (Bytef *) frame->fr_data_z;
-    z.avail_in  = frame->fr_size_z;
-    z.zalloc    = NULL;
-    z.zfree     = NULL;
-    z.opaque    = NULL;
-
-    r = inflateInit( &z );
-    switch ( r ) {
-    case Z_OK:
-	break;
-    case Z_MEM_ERROR:
-	id3_error( frame->fr_owner, "zlib - no memory" );
-	goto Error_init;
-    case Z_VERSION_ERROR:
-	id3_error( frame->fr_owner, "zlib - invalid version" );
-	goto Error_init;
-    default:
-	id3_error( frame->fr_owner, "zlib - unknown error" );
-	goto Error_init;
-    }
-
-    /*
-     * Decompress frame.
-     */
-    z.next_out   = (Bytef *) frame->fr_data;
-    z.avail_out  = frame->fr_size;
-    r = inflate( &z, Z_SYNC_FLUSH );
-    switch ( r ) {
-    case Z_STREAM_END:
-	break;
-    case Z_OK:
-	if ( z.avail_in == 0 )
-	    /*
-	     * This should not be possible with a correct stream.
-	     * We will be nice however, and try to go on.
-	     */
-	    break;
-	id3_error( frame->fr_owner, "zlib - buffer exhausted" );
-	goto Error_inflate;
-    default:
-	id3_error( frame->fr_owner, "zlib - unknown error" );
-	goto Error_inflate;
-    }
-
-    r = inflateEnd( &z );
-    if ( r != Z_OK )
-	id3_error( frame->fr_owner, "zlib - inflateEnd error" );
-
-    /*
-     * Null-terminate text frames.
-     */
-    if ( frame->fr_desc->fd_idstr[0] == 'T' ||
-	 frame->fr_desc->fd_idstr[0] == 'W' ) {
-	((char *) frame->fr_data)[frame->fr_size]   = 0;
-	((char *) frame->fr_data)[frame->fr_size+1] = 0;
-    }
-
-    return 0;
-
-    /*
-     * Cleanup code.
-     */
- Error_inflate:
-    r = inflateEnd( &z );
- Error_init:
-    free( frame->fr_data );
-    frame->fr_data = NULL;
-#endif
-    return -1;
-}
-
-
-/*
- * Function id3_delete_frame (frame)
- *
- *    Remove frame from ID3 tag and release memory ocupied by it.
- *
- */
-int id3_delete_frame(id3_frame_t *frame)
-{
-    id3_frame_t *fr = frame->fr_owner->id3_frame;
-    id3_frame_t *prev = NULL;
-    int ret;
-
-    /*
-     * Search for frame in list.
-     */
-    while ( fr != frame && fr != NULL ) {
-	prev = fr;
-	fr = fr->fr_next;
-    }
-
-    if ( fr == NULL ) {
-	/*
-	 * Frame does not exist in frame list.
-	 */
-	ret = -1;
-
-    } else {
-	/*
-	 * Remove frame from frame list.
-	 */
-	if ( prev == NULL ) {
-	    frame->fr_owner->id3_frame = frame->fr_next;
-	} else {
-	    prev->fr_next = frame->fr_next;
-	}
-	if ( frame->fr_owner->id3_tail == frame )
-	    frame->fr_owner->id3_tail = prev;
-	
-	frame->fr_owner->id3_numframes--;
-	frame->fr_owner->id3_altered = 1;
-	ret = 0;
-    }
-
-    /*
-     * Release memory occupied by frame.
-     */
-    if ( frame->fr_data )
-	 free( frame->fr_data );
-    if ( frame->fr_data_z )
-	 free( frame->fr_data_z );
-    free( frame );
-
-    return ret;
-}
-
-
-/*
- * Function id3_add_frame (id3, type)
- *
- *    Add a new frame to the ID3 tag.  Return a pointer to the new
- *    frame, or NULL if an error occured.
- *
- */
-id3_frame_t *id3_add_frame(id3_t *id3, guint32 type)
-{
-    id3_frame_t *frame;
-    int i;
-
-    /*
-     * Allocate frame.
-     */
-    frame = malloc( sizeof(*frame) );
-    if ( frame == NULL )
-	return NULL;
-
-    /*
-     * Initialize frame
-     */
-    frame->fr_owner		= id3;
-    frame->fr_desc		= NULL;
-    frame->fr_flags		= 0;
-    frame->fr_encryption	= 0;
-    frame->fr_grouping		= 0;
-    frame->fr_altered		= 0;
-    frame->fr_data = frame->fr_data_z = NULL;
-    frame->fr_size = frame->fr_size_z = 0;
-
-    /*
-     * Try finding the correct frame descriptor.
-     */
-    for ( i = 0;
-	  i < (int)(sizeof(Framedesc) / sizeof(id3_framedesc_t));
-	  i++ ) {
-	if ( Framedesc[i].fd_id == type ) {
-	    frame->fr_desc = &Framedesc[i];
-	    break;
-	}
-    }
-
-    /*
-     * Insert frame into linked list.
-     */
-    frame->fr_next = NULL;
-    if ( id3->id3_frame ) {
-	id3->id3_tail->fr_next = frame;
-    } else {
-	id3->id3_frame = frame;
-    }
-    id3->id3_tail = frame;
-    id3->id3_numframes++;
-    id3->id3_altered = 1;
-
-    return frame;
-}
-
-
diff --git a/components/music/id3_frame_content.c b/components/music/id3_frame_content.c
deleted file mode 100644
index aaa6b4456..000000000
--- a/components/music/id3_frame_content.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_frame_content.c
- * Description:   Code for handling ID3 content frames.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Mon Feb  8 17:13:46 1999
- *                
- * $Id$
- * 
- * 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.
- * 
- ********************************************************************/
- 
-#include <stdio.h>
-#include "mpg123.h"
-
-#include "id3.h"
-
-
-/*
- * Function id3_get_content (frame)
- *
- *    Expand content type string of frame and return it.  Return NULL
- *    upon error.
- *
- */
-char *id3_get_content(id3_frame_t *frame)
-{
-    char *text, *ptr;
-    char *buffer = frame->fr_owner->id3_buffer;
-    int spc = sizeof( frame->fr_owner->id3_buffer ) - 1;
-
-    /* Type check */
-    if ( frame->fr_desc->fd_id != ID3_TCON )
-	return NULL;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return NULL;
-    
-    text = (char *) frame->fr_data + 1;
-
-    /*
-     * If content is just plain text, return it.
-     */
-    if ( text[0] != '(' )
-	return text;
-
-    /*
-     * Expand ID3v1 genre numbers.
-     */
-    ptr = buffer;
-    while ( text[0] == '(' && text[1] != '(' && spc > 0 ) {
-	char *genre;
-	int num = 0;
-
-	if ( text[1] == 'R' && text[2] == 'X' ) {
-	    text += 4;
-	    genre = ptr != buffer ? " (Remix)" : "(Remix)";
-
-	} else if ( text[1] == 'C' && text[2] == 'R' ) {
-	    text += 4;
-	    genre = ptr != buffer ? " (Cover)" : "(Cover)";
-
-	} else {
-	    /* Get ID3v1 genre number */
-	    text++;
-	    while ( *text != ')' ) {
-		num *= 10;
-		num += *text++ - '0';
-	    }
-	    text++;
-
-	    /* Boundary check */
-	    if ( num >= (int)(sizeof(mpg123_id3_genres) / sizeof(char *)) )
-		continue;
-
-	    genre = (char *)mpg123_id3_genres[num];
-
-	    if ( ptr != buffer && spc-- > 0 )
-		*ptr++ = '/';
-	}
-	
-	/* Expand string into buffer */
-	while ( *genre != '\0' && spc > 0 ) {
-	    *ptr++ = *genre++;
-	    spc--;
-	}
-    }
-
-    /*
-     * Add plaintext refinement.
-     */
-    if ( *text == '(' )
-	text++;
-    if ( *text != '\0' && ptr != buffer && spc-- > 0 )
-	*ptr++ = ' ';
-    while ( *text != '\0' && spc > 0 ) {
-	*ptr++ = *text++;
-	spc--;
-    }
-    *ptr = '\0';
-
-
-    /*
-     * Return the expanded content string.
-     */
-    return buffer;
-}
diff --git a/components/music/id3_frame_text.c b/components/music/id3_frame_text.c
deleted file mode 100644
index 566c4ae9b..000000000
--- a/components/music/id3_frame_text.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_frame_text.c
- * Description:   Code for handling ID3 text frames.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Fri Feb  5 23:50:33 1999
- *                
- * $Id$
- * 
- * 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.
- *                
- ********************************************************************/
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "id3.h"
-#include "id3_header.h"
-
-
-/*
- * Function id3_get_encoding (frame)
- *
- *    Return text encoding for frame, or -1 if frame does not have any
- *    text encoding.
- *
- */
-gint8 id3_get_encoding(id3_frame_t *frame)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' &&
-	 frame->fr_desc->fd_id != ID3_WXXX &&
-	 frame->fr_desc->fd_id != ID3_IPLS &&
-	 frame->fr_desc->fd_id != ID3_USLT &&
-	 frame->fr_desc->fd_id != ID3_SYLT &&
-	 frame->fr_desc->fd_id != ID3_COMM &&
-	 frame->fr_desc->fd_id != ID3_APIC &&
-	 frame->fr_desc->fd_id != ID3_GEOB &&
-	 frame->fr_desc->fd_id != ID3_USER &&
-	 frame->fr_desc->fd_id != ID3_OWNE &&
-	 frame->fr_desc->fd_id != ID3_COMR )
-	return -1;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return -1;
-
-    return *(gint8 *) frame->fr_data;
-}
-
-
-/*
- * Function id3_set_encoding (frame, encoding)
- *
- *    Set text encoding for frame.  Return 0 upon success, or -1 if an
- *    error occured. 
- *
- */
-int id3_set_encoding(id3_frame_t *frame, gint8 encoding)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' &&
-	 frame->fr_desc->fd_id != ID3_WXXX &&
-	 frame->fr_desc->fd_id != ID3_IPLS &&
-	 frame->fr_desc->fd_id != ID3_USLT &&
-	 frame->fr_desc->fd_id != ID3_SYLT &&
-	 frame->fr_desc->fd_id != ID3_COMM &&
-	 frame->fr_desc->fd_id != ID3_APIC &&
-	 frame->fr_desc->fd_id != ID3_GEOB &&
-	 frame->fr_desc->fd_id != ID3_USER &&
-	 frame->fr_desc->fd_id != ID3_OWNE &&
-	 frame->fr_desc->fd_id != ID3_COMR )
-	return -1;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return -1;
-
-    /* Changing the encoding of frames is not supported yet */
-    if ( *(gint8 *) frame->fr_data != encoding )
-	return -1;
-
-    /* Set encoding */
-    *(gint8 *) frame->fr_data = encoding;
-    return 0;
-}
-
-
-/*
- * Function id3_get_text (frame)
- *
- *    Return string contents of frame.
- *
- */
-char *id3_get_text(id3_frame_t *frame)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' )
-	return NULL;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return NULL;
-
-    if ( frame->fr_desc->fd_id == ID3_TXXX ) {
-	/*
-	 * This is a user defined text frame.  Skip the description.
-	 */
-	switch ( *(guint8 *) frame->fr_data ) {
-	case ID3_ENCODING_ISO_8859_1:
-	{
-	    char *text = (char *) frame->fr_data + 1;
-
-	    while ( *text != 0 )
-		text++;
-
-	    return ++text;
-	}
-	case ID3_ENCODING_UNICODE:
-	{
-	    gint16 *text16 = GINT_TO_POINTER ((GPOINTER_TO_INT (frame->fr_data) + 1));
-
-	    while ( *text16 != 0 )
-		text16++;
-
-	    return (char *) ++text16;
-	}
-	default:
-	    return NULL;
-	}
-    }
-
-    return (char *) frame->fr_data + 1;
-}
-
-
-/*
- * Function id3_get_text_desc (frame)
- *
- *    Get description part of a text frame.
- *
- */
-char *id3_get_text_desc(id3_frame_t *frame)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' )
-	return NULL;
-
-    /* If predefined text frame, return description. */
-    if ( frame->fr_desc->fd_id != ID3_TXXX )
-	return frame->fr_desc->fd_description;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return NULL;
-
-    return (char *) frame->fr_data + 1;
-}
-
-
-/*
- * Function id3_get_text_number (frame)
- *
- *    Return string contents of frame translated to a positive
- *    integer, or -1 if an error occured.
- *
- */
-int id3_get_text_number(id3_frame_t *frame)
-{
-    int number = 0;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return -1;
-
-    /*
-     * Generate integer according to encoding.
-     */
-    switch ( *(guint8 *) frame->fr_data ) {
-    case ID3_ENCODING_ISO_8859_1:
-    {
-	char *text = ((char *) frame->fr_data) + 1;
-
-	while ( *text >= '0' && *text <= '9' ) {
-	    number *= 10;
-	    number += *text - '0';
-	    text++;
-	}
-
-	return number;
-    }
-    case ID3_ENCODING_UNICODE:
-    {
-	gint16 *text = ((gint16 *) frame->fr_data) + 1;
-
-	while ( *text >= '0' && *text <= '9' ) {
-	    number *= 10;
-	    number += *text - '0';
-	    text++;
-	}
-
-	return number;
-    }
-
-    default:
-	return -1;
-    }
-}
-
-
-/*
- * Function id3_set_text (frame, text)
- *
- *    Set text for the indicated frame (only ISO-8859-1 is currently
- *    supported).  Return 0 upon success, or -1 if an error occured.
- *
- */
-int id3_set_text(id3_frame_t *frame, char *text)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' )
-	return -1;
-
-    /*
-     * Release memory occupied by previous data.
-     */
-    if ( frame->fr_data )
-	free( frame->fr_data );
-    if ( frame->fr_data_z )
-	free( frame->fr_data_z );
-    frame->fr_data_z = NULL;
-    frame->fr_size_z = 0;
-
-    /*
-     * Allocate memory for new data.
-     */
-    frame->fr_size = strlen(text) + 1;
-    frame->fr_data = malloc( frame->fr_size + 1 );
-    if ( frame->fr_data == NULL )
-	return -1;
-
-    /*
-     * Copy contents.
-     */
-    *(gint8 *) frame->fr_data = ID3_ENCODING_ISO_8859_1;
-    memcpy( (char *) frame->fr_data + 1, text, frame->fr_size );
-
-    frame->fr_altered = 1;
-    frame->fr_owner->id3_altered = 1;
-
-    return 0;
-}
-
-
-/*
- * Function id3_set_text_number (frame, number)
- *
- *    Set number for the indicated frame (only ISO-8859-1 is currently
- *    supported).  Return 0 upon success, or -1 if an error occured.
- *
- */
-int id3_set_text_number(id3_frame_t *frame, int number)
-{
-    char buf[64];
-    int pos;
-    char *text;
-
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'T' )
-	return -1;
-
-    /*
-     * Release memory occupied by previous data.
-     */
-    if ( frame->fr_data )
-	free( frame->fr_data );
-    if ( frame->fr_data_z )
-	free( frame->fr_data_z );
-    frame->fr_data_z = NULL;
-    frame->fr_size_z = 0;
-
-    /*
-     * Create a string with a reversed number.
-     */
-    pos = 0;
-    while ( number > 0 && pos < 64 ) {
-	buf[pos++] = (number % 10) + '0';
-	number /= 10;
-    }
-    if ( pos == 64 )
-	return -1;
-    if ( pos == 0 )
-	buf[pos++] = '0';
-
-    /*
-     * Allocate memory for new data.
-     */
-    frame->fr_size = pos + 1;
-    frame->fr_data = malloc( frame->fr_size + 1 );
-    if ( frame->fr_data == NULL )
-	return -1;
-
-    /*
-     * Insert contents.
-     */
-    *(gint8 *) frame->fr_data = ID3_ENCODING_ISO_8859_1;
-    text = (char *) frame->fr_data + 1;
-    while ( --pos >= 0 ) 
-	*text++ = buf[pos];
-    *text = '\0';
-
-    frame->fr_altered = 1;
-    frame->fr_owner->id3_altered = 1;
-
-    return 0;
-}
diff --git a/components/music/id3_frame_url.c b/components/music/id3_frame_url.c
deleted file mode 100644
index 7b598af3d..000000000
--- a/components/music/id3_frame_url.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999,
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_frame_url.c
- * Description:   Code for handling ID3 URL frames.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Tue Feb  9 21:10:45 1999
- *                
- * $Id$
- * 
- * 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.
- *                
- ********************************************************************/
-#include <stdio.h>
-
-#include "id3.h"
-#include "id3_header.h"
-
-
-/*
- * Function id3_get_url (frame)
- *
- *    Return URL of frame.
- *
- */
-char *id3_get_url(id3_frame_t *frame)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'W' )
-	return NULL;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return NULL;
-
-    if ( frame->fr_desc->fd_id == ID3_WXXX ) {
-	/*
-	 * This is a user defined link frame.  Skip the description.
-	 */
-	switch ( *(guint8 *) frame->fr_data ) {
-	case ID3_ENCODING_ISO_8859_1:
-	{
-	    char *text = (char *) frame->fr_data + 1;
-
-	    while ( *text != 0 )
-		text++;
-
-	    return ++text;
-	}
-	case ID3_ENCODING_UNICODE:
-	{
-	    gint16 *text16 = GINT_TO_POINTER ((GPOINTER_TO_INT (frame->fr_data) + 1));
-
-	    while ( *text16 != 0 )
-		text16++;
-
-	    return (char *) ++text16;
-	}
-	default:
-	    return NULL;
-	}
-    }
-
-    return (char *) frame->fr_data;
-}
-
-
-/*
- * Function id3_get_url_desc (frame)
- *
- *    Get description of a URL.
- *
- */
-char *id3_get_url_desc(id3_frame_t *frame)
-{
-    /* Type check */
-    if ( frame->fr_desc->fd_idstr[0] != 'W' )
-	return NULL;
-
-    /* If predefined link frame, return description. */
-    if ( frame->fr_desc->fd_id != ID3_WXXX )
-	return frame->fr_desc->fd_description;
-
-    /* Check if frame is compressed */
-    if ( frame->fr_data_z && !frame->fr_data )
-	if ( id3_decompress_frame( frame ) == -1 )
-	    return NULL;
-
-    return (char *) frame->fr_data + 1;
-}
diff --git a/components/music/id3_header.h b/components/music/id3_header.h
deleted file mode 100644
index 3827bd418..000000000
--- a/components/music/id3_header.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1998, 1999,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_header.h
- * Description:   Definitions for various ID3 headers.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Thu Nov  5 15:55:10 1998
- *                
- * $Id$
- * 
- * 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 ID3_HEADER_H
-#define ID3_HEADER_H
-
-#ifndef __GNUC__
-#define __attribute__(A)
-#endif
-
-/*
- * Layout for the ID3 tag header.
- */
-typedef struct id3_taghdr_t id3_taghdr_t;
-struct id3_taghdr_t {
-    guint8	th_version;
-    guint8	th_revision;
-    guint8	th_flags;
-    guint32	th_size;
-} __attribute__ ((packed));
-
-#define ID3_THFLAG_USYNC	0x80000000
-#define ID3_THFLAG_EXT		0x40000000
-#define ID3_THFLAG_EXP		0x20000000
-
-#define ID3_SET_SIZE28(size)		\
-    ( ((size << 3) & 0x7f000000) |	\
-      ((size << 2) & 0x007f0000) |	\
-      ((size << 1) & 0x00007f00) |	\
-      ((size     ) & 0x0000007f) )
-
-#define ID3_GET_SIZE28(size)		\
-    ( ((size & 0x7f000000) >> 3) |	\
-      ((size & 0x007f0000) >> 2) |	\
-      ((size & 0x00007f00) >> 1) |	\
-      ((size & 0x0000007f)     ) )
-
-
-
-/*
- * Layout for the extended header.
- */
-typedef struct id3_exthdr_t id3_exthdr_t;
-struct id3_exthdr_t {
-    guint32	eh_size;
-    guint16	eh_flags;
-    guint32	eh_padsize;
-} __attribute__ ((packed));
-
-#define ID3_EHFLAG_CRC		0x80000000
-
-
-
-/*
- * Layout for the frame header.
- */
-typedef struct id3_framehdr_t id3_framehdr_t;
-struct id3_framehdr_t {
-    guint32	fh_id;
-    guint32	fh_size;
-    guint16	fh_flags;
-} __attribute__ ((packed));
-
-#define ID3_FHFLAG_TAGALT	0x8000
-#define ID3_FHFLAG_FILEALT	0x4000
-#define ID3_FHFLAG_RO		0x2000
-#define ID3_FHFLAG_COMPRESS	0x0080
-#define ID3_FHFLAG_ENCRYPT	0x0040
-#define ID3_FHFLAG_GROUP	0x0020
-
-
-typedef enum {
-    ID3_UNI_LATIN	= 0x007f,
-    ID3_UNI_LATIN_1	= 0x00ff,
-
-    ID3_UNI_SUPPORTED	= 0x00ff,
-    ID3_UNI_UNSUPPORTED	= 0xffff,
-} id3_unicode_blocks;
-
-
-#ifdef DEBUG_ID3
-#define id3_error(id3, error)		\
-  (void) ( id3->id3_error_msg = error,	\
-           printf( "Error %s, line %d: %s\n", __FILE__, __LINE__, error ) )
-
-
-#else
-#define id3_error(id3, error)		\
-  (void) ( id3->id3_error_msg = error )
-
-#endif
-
-
-#endif /* ID3_HEADER_H */
diff --git a/components/music/id3_tag.c b/components/music/id3_tag.c
deleted file mode 100644
index 196873a38..000000000
--- a/components/music/id3_tag.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*********************************************************************
- * 
- *    Copyright (C) 1999-2000,  Espen Skoglund
- *    Department of Computer Science, University of Tromsø
- * 
- * Filename:      id3_tag.c
- * Description:   Code for handling ID3 tags.
- * Author:        Espen Skoglund <espensk@stud.cs.uit.no>
- * Created at:    Tue Feb  9 21:13:19 1999
- *                
- * $Id$
- * 
- * 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.
- *                
- ********************************************************************/
-#include <glib.h>
-#include <stdio.h>
-
-#include "id3.h"
-#include "id3_header.h"
-
-
-/*
- * Function id3_init_tag (id3)
- *
- *    Initialize an empty ID3 tag.
- *
- */
-void id3_init_tag(id3_t *id3)
-{
-    /*
-     * Initialize header.
-     */
-    id3->id3_version = 3;
-    id3->id3_revision = 0;
-    id3->id3_flags = ID3_THFLAG_USYNC | ID3_THFLAG_EXP;
-    id3->id3_tagsize = 0;
-
-    id3->id3_altered = 1;
-    id3->id3_newtag = 1;
-    id3->id3_pos = 0;
-
-    /*
-     * Initialize frames.
-     */
-    id3->id3_numframes = 0;
-    id3->id3_frame = id3->id3_tail = NULL;
-}
-
-
-/*
- * Function id3_read_tag (id3)
- *
- *    Read the ID3 tag from the input stream.  The start of the tag
- *    must be positioned in the next tag in the stream.  Return 0 upon
- *    success, or -1 if an error occured.
- *
- */
-int id3_read_tag(id3_t *id3)
-{
-    id3_taghdr_t *taghdr;
-    id3_exthdr_t *exthdr;
-    char *id;
-
-    /*
-     * We know that the tag will be at least this big.
-     */
-    id3->id3_tagsize = sizeof(*taghdr) + 3;
-
-    if ( !(id3->id3_oflags & ID3_OPENF_NOCHK) ) {
-	/*
-	 * Check if we have a valid ID3 tag.
-	 */
-	id = id3->id3_read( id3, NULL, 3 );
-	if ( id == NULL )
-	    return -1;
-
-	if ( id[0] != 'I' || id[1] != 'D' || id[2] != '3' ) {
-	    /*
-	     * ID3 tag was not detected.
-	     */
-	    id3->id3_seek( id3, -3 );
-	    return -1;
-	}
-    }
-
-    /*
-     * Read ID3 tag-header.
-     */
-    taghdr = id3->id3_read( id3, NULL, sizeof(*taghdr) );
-    if ( taghdr == NULL )
-	return -1;
-
-    id3->id3_version = taghdr->th_version;
-    id3->id3_revision = taghdr->th_revision;
-    id3->id3_flags = taghdr->th_flags;
-    id3->id3_tagsize = ID3_GET_SIZE28( g_ntohl(taghdr->th_size) );
-    id3->id3_newtag = 0;
-    id3->id3_pos = 0;
-
-    /*
-     * Parse extended header.
-     */
-    if ( taghdr->th_flags & ID3_THFLAG_EXT ) {
-	exthdr = id3->id3_read( id3, NULL, sizeof(*exthdr) );
-	if ( exthdr == NULL )
-	    return -1;
-    }
-
-    /*
-     * Parse frames.
-     */
-    while ( id3->id3_pos < id3->id3_tagsize ) {
-	if ( id3_read_frame( id3 ) == -1 )
-	    return -1;
-    }
-
-    return 0;
-}
diff --git a/components/music/l2tables.h b/components/music/l2tables.h
deleted file mode 100644
index 51eb22f35..000000000
--- a/components/music/l2tables.h
+++ /dev/null
@@ -1,997 +0,0 @@
-/*
- * Layer 2 Alloc tables .. 
- * most other tables are calculated on program start (which is (of course)
- * not ISO-conform) .. 
- * Layer-3 huffman table is in huffman.h
- */
-
-struct al_table alloc_0[] =
-{
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767}};
-
-struct al_table alloc_1[] =
-{
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{3, -3},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{16, -32767}};
-
-struct al_table alloc_2[] =
-{
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63}};
-
-struct al_table alloc_3[] =
-{
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{15, -16383},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63}};
-
-struct al_table alloc_4[] =
-{
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{4, 0},
-	{5, 3},
-	{7, 5},
-	{3, -3},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{8, -127},
-	{9, -255},
-	{10, -511},
-	{11, -1023},
-	{12, -2047},
-	{13, -4095},
-	{14, -8191},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{3, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{4, -7},
-	{5, -15},
-	{6, -31},
-	{7, -63},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9},
-	{2, 0},
-	{5, 3},
-	{7, 5},
-	{10, 9}};
diff --git a/components/music/layer1.c b/components/music/layer1.c
deleted file mode 100644
index 32915644c..000000000
--- a/components/music/layer1.c
+++ /dev/null
@@ -1,191 +0,0 @@
-
-/* 
- * Mpeg Layer-1 audio decoder 
- * --------------------------
- * copyright (c) 1995 by Michael Hipp, All rights reserved. See also 'README'
- * near unoptimzed ...
- *
- * may have a few bugs after last optimization ... 
- *
- */
-
-#include "esd-audio.h"
-#include "mpg123.h"
-#include "getbits.h"
-
-/* Used by the getbits macros */
-static unsigned long rval;
-
-static void 
-I_step_one(unsigned int balloc[], unsigned int scale_index[2][SBLIMIT], struct frame *fr)
-{
-	unsigned int *ba = balloc;
-	unsigned int *sca = (unsigned int *) scale_index;
-
-	if (fr->stereo)
-	{
-		int i;
-		int jsbound = fr->jsbound;
-
-		for (i = 0; i < jsbound; i++)
-		{
-			*ba++ = mpg123_getbits(4);
-			*ba++ = mpg123_getbits(4);
-		}
-		for (i = jsbound; i < SBLIMIT; i++)
-			*ba++ = mpg123_getbits(4);
-
-		ba = balloc;
-
-		for (i = 0; i < jsbound; i++)
-		{
-			if ((*ba++))
-				*sca++ = mpg123_getbits(6);
-			if ((*ba++))
-				*sca++ = mpg123_getbits(6);
-		}
-		for (i = jsbound; i < SBLIMIT; i++)
-			if ((*ba++))
-			{
-				*sca++ = mpg123_getbits(6);
-				*sca++ = mpg123_getbits(6);
-			}
-	}
-	else
-	{
-		int i;
-
-		for (i = 0; i < SBLIMIT; i++)
-			*ba++ = mpg123_getbits(4);
-		ba = balloc;
-		for (i = 0; i < SBLIMIT; i++)
-			if ((*ba++))
-				*sca++ = mpg123_getbits(6);
-	}
-}
-
-static void 
-I_step_two(real fraction[2][SBLIMIT], unsigned int balloc[2 * SBLIMIT],
-		unsigned int scale_index[2][SBLIMIT], struct frame *fr)
-{
-	int i, n;
-	int smpb[2 * SBLIMIT];	/* values: 0-65535 */
-	int *sample;
-	register unsigned int *ba;
-	register unsigned int *sca = (unsigned int *) scale_index;
-
-	if (fr->stereo)
-	{
-		int jsbound = fr->jsbound;
-		register real *f0 = fraction[0];
-		register real *f1 = fraction[1];
-
-		ba = balloc;
-		for (sample = smpb, i = 0; i < jsbound; i++)
-		{
-			if ((n = *ba++))
-				*sample++ = mpg123_getbits(n + 1);
-			if ((n = *ba++))
-				*sample++ = mpg123_getbits(n + 1);
-		}
-		for (i = jsbound; i < SBLIMIT; i++)
-			if ((n = *ba++))
-				*sample++ = mpg123_getbits(n + 1);
-
-		ba = balloc;
-		for (sample = smpb, i = 0; i < jsbound; i++)
-		{
-			if ((n = *ba++))
-				*f0++ = (real) (((-1) << n) + (*sample++) + 1) * mpg123_muls[n + 1][*sca++];
-			else
-				*f0++ = 0.0;
-			if ((n = *ba++))
-				*f1++ = (real) (((-1) << n) + (*sample++) + 1) * mpg123_muls[n + 1][*sca++];
-			else
-				*f1++ = 0.0;
-		}
-		for (i = jsbound; i < SBLIMIT; i++)
-		{
-			if ((n = *ba++))
-			{
-				real samp = (((-1) << n) + (*sample++) + 1);
-
-				*f0++ = samp * mpg123_muls[n + 1][*sca++];
-				*f1++ = samp * mpg123_muls[n + 1][*sca++];
-			}
-			else
-				*f0++ = *f1++ = 0.0;
-		}
-		for (i = fr->down_sample_sblimit; i < 32; i++)
-			fraction[0][i] = fraction[1][i] = 0.0;
-	}
-	else
-	{
-		register real *f0 = fraction[0];
-
-		ba = balloc;
-		for (sample = smpb, i = 0; i < SBLIMIT; i++)
-			if ((n = *ba++))
-				*sample++ = mpg123_getbits(n + 1);
-		ba = balloc;
-		for (sample = smpb, i = 0; i < SBLIMIT; i++)
-		{
-			if ((n = *ba++))
-				*f0++ = (real) (((-1) << n) + (*sample++) + 1) * mpg123_muls[n + 1][*sca++];
-			else
-				*f0++ = 0.0;
-		}
-		for (i = fr->down_sample_sblimit; i < 32; i++)
-			fraction[0][i] = 0.0;
-	}
-}
-
-int mpg123_do_layer1(struct frame *fr)
-{
-	int i, stereo = fr->stereo;
-	unsigned int balloc[2 * SBLIMIT];
-	unsigned int scale_index[2][SBLIMIT];
-	real fraction[2][SBLIMIT];
-	int single = fr->single;
-
-	fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext << 2) + 4 : 32;
-
-	if (stereo == 1 || single == 3)
-		single = 0;
-
-	I_step_one (balloc, scale_index, fr);
-
-	for (i = 0; i < SCALE_BLOCK; i++)
-	{
-		I_step_two (fraction, balloc, scale_index, fr);
-
-		if (single >= 0)
-		{
-			(fr->synth_mono) ((real *) fraction[single], mpg123_pcm_sample, &mpg123_pcm_point);
-		}
-		else
-		{
-			int p1 = mpg123_pcm_point;
-
-			(fr->synth) ((real *) fraction[0], 0, mpg123_pcm_sample, &p1);
-			(fr->synth) ((real *) fraction[1], 1, mpg123_pcm_sample, &mpg123_pcm_point);
-		}
-
-		if (mpg123_info->output_audio)
-		{
-
-			//mpg123_ip.add_vis_pcm(mpg123_ip.output->written_time(), mpg123_cfg.resolution == 16 ? FMT_S16_NE : FMT_U8,
-			//		      mpg123_cfg.channels == 2 ? fr->stereo : 1, mpg123_pcm_point, mpg123_pcm_sample);
-			while (esdout_free () < mpg123_pcm_point && mpg123_info->going && mpg123_info->jump_to_time == -1) {
-				usleep(10000);
-			}
-
-			if (mpg123_info->going && mpg123_info->jump_to_time == -1) {
-				esdout_write (mpg123_pcm_sample, mpg123_pcm_point);
-			}
-		}
-		mpg123_pcm_point = 0;
-	}
-
-	return 1;
-}
diff --git a/components/music/layer2.c b/components/music/layer2.c
deleted file mode 100644
index af234b7af..000000000
--- a/components/music/layer2.c
+++ /dev/null
@@ -1,340 +0,0 @@
-
-/* 
- * Mpeg Layer-2 audio decoder 
- * --------------------------
- * copyright (c) 1995 by Michael Hipp, All rights reserved. See also 'README'
- *
- */
-
-#include "esd-audio.h"
-#include "mpg123.h"
-#include "l2tables.h"
-#include "getbits.h"
-
-static int grp_3tab[32 * 3] =
-{0,};				/* used: 27 */
-static int grp_5tab[128 * 3] =
-{0,};				/* used: 125 */
-static int grp_9tab[1024 * 3] =
-{0,};				/* used: 729 */
-
-real mpg123_muls[27][64];	/* also used by layer 1 */
-
-/* Used by the getbits macros */
-static unsigned long rval;
-
-void mpg123_init_layer2(void)
-{
-	static double mulmul[27] =
-	{
-		0.0, -2.0 / 3.0, 2.0 / 3.0,
-		2.0 / 7.0, 2.0 / 15.0, 2.0 / 31.0, 2.0 / 63.0, 2.0 / 127.0, 2.0 / 255.0,
-	2.0 / 511.0, 2.0 / 1023.0, 2.0 / 2047.0, 2.0 / 4095.0, 2.0 / 8191.0,
-		2.0 / 16383.0, 2.0 / 32767.0, 2.0 / 65535.0,
-		-4.0 / 5.0, -2.0 / 5.0, 2.0 / 5.0, 4.0 / 5.0,
-	-8.0 / 9.0, -4.0 / 9.0, -2.0 / 9.0, 2.0 / 9.0, 4.0 / 9.0, 8.0 / 9.0};
-	static int base[3][9] =
-	{
-		{1, 0, 2,},
-		{17, 18, 0, 19, 20,},
-		{21, 1, 22, 23, 0, 24, 25, 2, 26}};
-	int i, j, k, l, len;
-	real *table;
-	static int tablen[3] =
-	{3, 5, 9};
-	static int *itable, *tables[3] =
-	{grp_3tab, grp_5tab, grp_9tab};
-
-	for (i = 0; i < 3; i++)
-	{
-		itable = tables[i];
-		len = tablen[i];
-		for (j = 0; j < len; j++)
-			for (k = 0; k < len; k++)
-				for (l = 0; l < len; l++)
-				{
-					*itable++ = base[i][l];
-					*itable++ = base[i][k];
-					*itable++ = base[i][j];
-				}
-	}
-
-	for (k = 0; k < 27; k++)
-	{
-		double m = mulmul[k];
-
-		table = mpg123_muls[k];
-		for (j = 3, i = 0; i < 63; i++, j--)
-			*table++ = m * pow(2.0, (double) j / 3.0);
-		*table++ = 0.0;
-	}
-}
-
-static void 
-II_step_one(unsigned int *bit_alloc, int *scale, struct frame *fr)
-{
-	int stereo = fr->stereo - 1;
-	int sblimit = fr->II_sblimit;
-	int jsbound = fr->jsbound;
-	int sblimit2 = fr->II_sblimit << stereo;
-	struct al_table *alloc1 = fr->alloc;
-	int i;
-	static unsigned int scfsi_buf[64];
-	unsigned int *scfsi, *bita;
-	int sc, step;
-
-	bita = bit_alloc;
-	if (stereo)
-	{
-		for (i = jsbound; i > 0; i--, alloc1 += (1 << step))
-		{
-			*bita++ = (char) mpg123_getbits(step = alloc1->bits);
-			*bita++ = (char) mpg123_getbits(step);
-		}
-		for (i = sblimit - jsbound; i > 0; i--, alloc1 += (1 << step))
-		{
-			bita[0] = (char) mpg123_getbits(step = alloc1->bits);
-			bita[1] = bita[0];
-			bita += 2;
-		}
-		bita = bit_alloc;
-		scfsi = scfsi_buf;
-		for (i = sblimit2; i; i--)
-			if (*bita++)
-				*scfsi++ = (char) mpg123_getbits_fast(2);
-	}
-	else
-		/* mono */
-	{
-		for (i = sblimit; i; i--, alloc1 += (1 << step))
-			*bita++ = (char) mpg123_getbits(step = alloc1->bits);
-		bita = bit_alloc;
-		scfsi = scfsi_buf;
-		for (i = sblimit; i; i--)
-			if (*bita++)
-				*scfsi++ = (char) mpg123_getbits_fast(2);
-	}
-
-	bita = bit_alloc;
-	scfsi = scfsi_buf;
-	for (i = sblimit2; i; i--)
-		if (*bita++)
-			switch (*scfsi++)
-			{
-				case 0:
-					*scale++ = mpg123_getbits_fast(6);
-					*scale++ = mpg123_getbits_fast(6);
-					*scale++ = mpg123_getbits_fast(6);
-					break;
-				case 1:
-					*scale++ = sc = mpg123_getbits_fast(6);
-					*scale++ = sc;
-					*scale++ = mpg123_getbits_fast(6);
-					break;
-				case 2:
-					*scale++ = sc = mpg123_getbits_fast(6);
-					*scale++ = sc;
-					*scale++ = sc;
-					break;
-				default:	/* case 3 */
-					*scale++ = mpg123_getbits_fast(6);
-					*scale++ = sc = mpg123_getbits_fast(6);
-					*scale++ = sc;
-					break;
-			}
-
-}
-
-static void 
-II_step_two(unsigned int *bit_alloc, real fraction[2][4][SBLIMIT], int *scale, struct frame *fr, int x1)
-{
-	int i, j, k, ba;
-	int stereo = fr->stereo;
-	int sblimit = fr->II_sblimit;
-	int jsbound = fr->jsbound;
-	struct al_table *alloc2, *alloc1 = fr->alloc;
-	unsigned int *bita = bit_alloc;
-	int d1, step;
-
-	for (i = 0; i < jsbound; i++, alloc1 += (1 << step))
-	{
-		step = alloc1->bits;
-		for (j = 0; j < stereo; j++)
-		{
-			if ((ba = *bita++))
-			{
-				k = (alloc2 = alloc1 + ba)->bits;
-				if ((d1 = alloc2->d) < 0)
-				{
-					real cm = mpg123_muls[k][scale[x1]];
-
-					fraction[j][0][i] = ((real) ((int) mpg123_getbits(k) + d1)) * cm;
-					fraction[j][1][i] = ((real) ((int) mpg123_getbits(k) + d1)) * cm;
-					fraction[j][2][i] = ((real) ((int) mpg123_getbits(k) + d1)) * cm;
-				}
-				else
-				{
-					static int *table[] =
-					{0, 0, 0, grp_3tab, 0, grp_5tab, 0, 0, 0, grp_9tab};
-					unsigned int idx, *tab, m = scale[x1];
-
-					idx = (unsigned int) mpg123_getbits(k);
-					tab = (unsigned int *) (table[d1] + idx + idx + idx);
-					fraction[j][0][i] = mpg123_muls[*tab++][m];
-					fraction[j][1][i] = mpg123_muls[*tab++][m];
-					fraction[j][2][i] = mpg123_muls[*tab][m];
-				}
-				scale += 3;
-			}
-			else
-				fraction[j][0][i] = fraction[j][1][i] = fraction[j][2][i] = 0.0;
-		}
-	}
-
-	for (i = jsbound; i < sblimit; i++, alloc1 += (1 << step))
-	{
-		step = alloc1->bits;
-		bita++;		/* channel 1 and channel 2 bitalloc are the same */
-		if ((ba = *bita++))
-		{
-			k = (alloc2 = alloc1 + ba)->bits;
-			if ((d1 = alloc2->d) < 0)
-			{
-				real cm;
-
-				cm = mpg123_muls[k][scale[x1 + 3]];
-				fraction[1][0][i] = (fraction[0][0][i] = (real) ((int) mpg123_getbits(k) + d1)) * cm;
-				fraction[1][1][i] = (fraction[0][1][i] = (real) ((int) mpg123_getbits(k) + d1)) * cm;
-				fraction[1][2][i] = (fraction[0][2][i] = (real) ((int) mpg123_getbits(k) + d1)) * cm;
-				cm = mpg123_muls[k][scale[x1]];
-				fraction[0][0][i] *= cm;
-				fraction[0][1][i] *= cm;
-				fraction[0][2][i] *= cm;
-			}
-			else
-			{
-				static int *table[] =
-				{0, 0, 0, grp_3tab, 0, grp_5tab, 0, 0, 0, grp_9tab};
-				unsigned int idx, *tab, m1, m2;
-
-				m1 = scale[x1];
-				m2 = scale[x1 + 3];
-				idx = (unsigned int) mpg123_getbits(k);
-				tab = (unsigned int *) (table[d1] + idx + idx + idx);
-				fraction[0][0][i] = mpg123_muls[*tab][m1];
-				fraction[1][0][i] = mpg123_muls[*tab++][m2];
-				fraction[0][1][i] = mpg123_muls[*tab][m1];
-				fraction[1][1][i] = mpg123_muls[*tab++][m2];
-				fraction[0][2][i] = mpg123_muls[*tab][m1];
-				fraction[1][2][i] = mpg123_muls[*tab][m2];
-			}
-			scale += 6;
-		}
-		else
-		{
-			fraction[0][0][i] = fraction[0][1][i] = fraction[0][2][i] =
-				fraction[1][0][i] = fraction[1][1][i] = fraction[1][2][i] = 0.0;
-		}
-/* 
-   should we use individual scalefac for channel 2 or
-   is the current way the right one , where we just copy channel 1 to
-   channel 2 ?? 
-   The current 'strange' thing is, that we throw away the scalefac
-   values for the second channel ...!!
-   -> changed .. now we use the scalefac values of channel one !! 
- */
-	}
-
-	if (sblimit > (fr->down_sample_sblimit))
-		sblimit = fr->down_sample_sblimit;
-
-	for (i = sblimit; i < SBLIMIT; i++)
-		for (j = 0; j < stereo; j++)
-			fraction[j][0][i] = fraction[j][1][i] = fraction[j][2][i] = 0.0;
-
-}
-
-static void II_select_table(struct frame *fr)
-{
-	static int translate[3][2][16] = {
-		{{0, 2, 2, 2, 2, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 0},
-		 {0, 2, 2, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0}},
-		{{0, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-		 {0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
-		{{0, 3, 3, 3, 3, 3, 3, 0, 0, 0, 1, 1, 1, 1, 1, 0},
-		 {0, 3, 3, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0}}
-	};
-
-	int table, sblim;
-	static struct al_table *tables[5] =
-		{alloc_0, alloc_1, alloc_2, alloc_3, alloc_4};
-	static int sblims[5] = { 27, 30, 8, 12, 30 };
-
-	if (fr->lsf)
-		table = 4;
-	else
-		table =	translate[fr->sampling_frequency][2 - fr->stereo][fr->bitrate_index];
-	sblim = sblims[table];
-
-	fr->alloc = tables[table];
-	fr->II_sblimit = sblim;
-}
-
-
-int 
-mpg123_do_layer2(struct frame *fr)
-{
-	int i, j;
-	int stereo = fr->stereo;
-	real fraction[2][4][SBLIMIT];	/* pick_table clears unused subbands */
-	unsigned int bit_alloc[64];
-	int scale[192];
-	int single = fr->single;
-
-	II_select_table(fr);
-	fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
-		(fr->mode_ext << 2) + 4 : fr->II_sblimit;
-
-	if (stereo == 1 || single == 3)
-		single = 0;
-
-	II_step_one(bit_alloc, scale, fr);
-
-	for (i = 0; i < SCALE_BLOCK; i++)
-	{
-		II_step_two(bit_alloc, fraction, scale, fr, i >> 2);
-		for (j = 0; j < 3; j++)
-		{
-			if (single >= 0)
-			{
-				(fr->synth_mono) (fraction[single][j], mpg123_pcm_sample, &mpg123_pcm_point);
-			}
-			else
-			{
-				int p1 = mpg123_pcm_point;
-
-				(fr->synth) (fraction[0][j], 0, mpg123_pcm_sample, &p1);
-				(fr->synth) (fraction[1][j], 1, mpg123_pcm_sample, &mpg123_pcm_point);
-			}
-
-			/*    if(mpg123_pcm_point >= audiobufsize)
-			   audio_flush(outmode,ai); */
-		}
-	}
-	
-	if (mpg123_info->output_audio) {
-
-		//mpg123_ip.add_vis_pcm(mpg123_ip.output->written_time(), mpg123_cfg.resolution == 16 ? FMT_S16_NE : FMT_U8,
-		//		      mpg123_cfg.channels == 2 ? fr->stereo : 1, mpg123_pcm_point, mpg123_pcm_sample);
-		while (esdout_free () < mpg123_pcm_point && mpg123_info->going && mpg123_info->jump_to_time == -1) {
-			usleep(10000);
-		}
-		
-		if (mpg123_info->going && mpg123_info->jump_to_time == -1) {
-			esdout_write (mpg123_pcm_sample, mpg123_pcm_point);
-		}
-	}
-	mpg123_pcm_point = 0;
-
-	return 1;
-}
diff --git a/components/music/layer3.c b/components/music/layer3.c
deleted file mode 100644
index c6bf7c6c1..000000000
--- a/components/music/layer3.c
+++ /dev/null
@@ -1,2104 +0,0 @@
-
-/* 
- * Mpeg Layer-3 audio decoder 
- * --------------------------
- * copyright (c) 1995-1999 by Michael Hipp.
- * All rights reserved. See also 'README'
- *
- * Optimize-TODO: put short bands into the band-field without the stride of 3 reals
- * Length-optimze: unify long and short band code where it is possible
- */
-
-#include <stdlib.h>
-#include "esd-audio.h"
-#include "mpg123.h"
-#include "huffman.h"
-
-#include "getbits.h"
-
-static real ispow[8207];
-static real aa_ca[8], aa_cs[8];
-static real COS1[12][6];
-static real win[4][36];
-static real win1[4][36];
-static real gainpow2[256 + 118 + 4];
-real COS9[9];
-static real COS6_1, COS6_2;
-real tfcos36[9];
-static real tfcos12[3];
-#define NEW_DCT9
-#ifdef NEW_DCT9
-static real cos9[3], cos18[3];
-#endif
-
-struct bandInfoStruct
-{
-	int longIdx[23];
-	int longDiff[22];
-	int shortIdx[14];
-	int shortDiff[13];
-};
-
-int longLimit[9][23];
-int shortLimit[9][14];
-
-/* Used by the getbits macros */
-static unsigned long rval;
-static unsigned char rval_uc;
-
-struct bandInfoStruct bandInfo[9] =
-{
-
-/* MPEG 1.0 */
-	{
-		{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 52, 62, 74, 90, 110, 134, 162, 196, 238, 288, 342, 418, 576},
-		{4, 4, 4, 4, 4, 4, 6, 6, 8, 8, 10, 12, 16, 20, 24, 28, 34, 42, 50, 54, 76, 158},
-		{0, 4 * 3, 8 * 3, 12 * 3, 16 * 3, 22 * 3, 30 * 3, 40 * 3, 52 * 3, 66 * 3, 84 * 3, 106 * 3, 136 * 3, 192 * 3},
-		{4, 4, 4, 4, 6, 8, 10, 12, 14, 18, 22, 30, 56}},
-
-	{
-		{0, 4, 8, 12, 16, 20, 24, 30, 36, 42, 50, 60, 72, 88, 106, 128, 156, 190, 230, 276, 330, 384, 576},
-		{4, 4, 4, 4, 4, 4, 6, 6, 6, 8, 10, 12, 16, 18, 22, 28, 34, 40, 46, 54, 54, 192},
-		{0, 4 * 3, 8 * 3, 12 * 3, 16 * 3, 22 * 3, 28 * 3, 38 * 3, 50 * 3, 64 * 3, 80 * 3, 100 * 3, 126 * 3, 192 * 3},
-		{4, 4, 4, 4, 6, 6, 10, 12, 14, 16, 20, 26, 66}},
-
-	{
-		{0, 4, 8, 12, 16, 20, 24, 30, 36, 44, 54, 66, 82, 102, 126, 156, 194, 240, 296, 364, 448, 550, 576},
-		{4, 4, 4, 4, 4, 4, 6, 6, 8, 10, 12, 16, 20, 24, 30, 38, 46, 56, 68, 84, 102, 26},
-		{0, 4 * 3, 8 * 3, 12 * 3, 16 * 3, 22 * 3, 30 * 3, 42 * 3, 58 * 3, 78 * 3, 104 * 3, 138 * 3, 180 * 3, 192 * 3},
-		{4, 4, 4, 4, 6, 8, 12, 16, 20, 26, 34, 42, 12}},
-
-/* MPEG 2.0 */
-	{
-		{0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576},
-		{6, 6, 6, 6, 6, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 38, 46, 52, 60, 68, 58, 54},
-		{0, 4 * 3, 8 * 3, 12 * 3, 18 * 3, 24 * 3, 32 * 3, 42 * 3, 56 * 3, 74 * 3, 100 * 3, 132 * 3, 174 * 3, 192 * 3},
-		{4, 4, 4, 6, 6, 8, 10, 14, 18, 26, 32, 42, 18}},
-
-	{
-		{0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, 114, 136, 162, 194, 232, 278, 330, 394, 464, 540, 576},
-		{6, 6, 6, 6, 6, 6, 8, 10, 12, 14, 16, 18, 22, 26, 32, 38, 46, 52, 64, 70, 76, 36},
-		{0, 4 * 3, 8 * 3, 12 * 3, 18 * 3, 26 * 3, 36 * 3, 48 * 3, 62 * 3, 80 * 3, 104 * 3, 136 * 3, 180 * 3, 192 * 3},
-		{4, 4, 4, 6, 8, 10, 12, 14, 18, 24, 32, 44, 12}},
-
-	{
-		{0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576},
-		{6, 6, 6, 6, 6, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 38, 46, 52, 60, 68, 58, 54},
-		{0, 4 * 3, 8 * 3, 12 * 3, 18 * 3, 26 * 3, 36 * 3, 48 * 3, 62 * 3, 80 * 3, 104 * 3, 134 * 3, 174 * 3, 192 * 3},
-		{4, 4, 4, 6, 8, 10, 12, 14, 18, 24, 30, 40, 18}},
-/* MPEG 2.5 */
-	{
-		{0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576},
-		{6, 6, 6, 6, 6, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 38, 46, 52, 60, 68, 58, 54},
-		{0, 12, 24, 36, 54, 78, 108, 144, 186, 240, 312, 402, 522, 576},
-		{4, 4, 4, 6, 8, 10, 12, 14, 18, 24, 30, 40, 18}},
-	{
-		{0, 6, 12, 18, 24, 30, 36, 44, 54, 66, 80, 96, 116, 140, 168, 200, 238, 284, 336, 396, 464, 522, 576},
-		{6, 6, 6, 6, 6, 6, 8, 10, 12, 14, 16, 20, 24, 28, 32, 38, 46, 52, 60, 68, 58, 54},
-		{0, 12, 24, 36, 54, 78, 108, 144, 186, 240, 312, 402, 522, 576},
-		{4, 4, 4, 6, 8, 10, 12, 14, 18, 24, 30, 40, 18}},
-	{
-		{0, 12, 24, 36, 48, 60, 72, 88, 108, 132, 160, 192, 232, 280, 336, 400, 476, 566, 568, 570, 572, 574, 576},
-		{12, 12, 12, 12, 12, 12, 16, 20, 24, 28, 32, 40, 48, 56, 64, 76, 90, 2, 2, 2, 2, 2},
-		{0, 24, 48, 72, 108, 156, 216, 288, 372, 480, 486, 492, 498, 576},
-		{8, 8, 8, 12, 16, 20, 24, 28, 36, 2, 2, 2, 26}},
-};
-
-static int mapbuf0[9][152];
-static int mapbuf1[9][156];
-static int mapbuf2[9][44];
-static int *map[9][3];
-static int *mapend[9][3];
-
-static unsigned int n_slen2[512];	/* MPEG 2.0 slen for 'normal' mode */
-static unsigned int i_slen2[256];	/* MPEG 2.0 slen for intensity stereo */
-
-static real tan1_1[16], tan2_1[16], tan1_2[16], tan2_2[16];
-static real pow1_1[2][16], pow2_1[2][16], pow1_2[2][16], pow2_2[2][16];
-
-/* 
- * init tables for layer-3 
- */
-void mpg123_init_layer3(int down_sample_sblimit)
-{
-	int i, j, k, l;
-
-	for (i = -256; i < 118 + 4; i++)
-		gainpow2[i + 256] = pow((double) 2.0, -0.25 * (double) (i + 210));
-
-	for (i = 0; i < 8207; i++)
-		ispow[i] = pow((double) i, (double) 4.0 / 3.0);
-
-	for (i = 0; i < 8; i++)
-	{
-		static double Ci[8] =
-		{-0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037};
-		double sq = sqrt(1.0 + Ci[i] * Ci[i]);
-
-		aa_cs[i] = 1.0 / sq;
-		aa_ca[i] = Ci[i] / sq;
-	}
-
-	for (i = 0; i < 18; i++)
-	{
-		win[0][i] = win[1][i] = 0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 0) + 1)) / cos(M_PI * (double) (2 * (i + 0) + 19) / 72.0);
-		win[0][i + 18] = win[3][i + 18] = 0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 18) + 1)) / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0);
-	}
-	for (i = 0; i < 6; i++)
-	{
-		win[1][i + 18] = 0.5 / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0);
-		win[3][i + 12] = 0.5 / cos(M_PI * (double) (2 * (i + 12) + 19) / 72.0);
-		win[1][i + 24] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 13)) / cos(M_PI * (double) (2 * (i + 24) + 19) / 72.0);
-		win[1][i + 30] = win[3][i] = 0.0;
-		win[3][i + 6] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * (i + 6) + 19) / 72.0);
-	}
-
-	for (i = 0; i < 9; i++)
-		COS9[i] = cos(M_PI / 18.0 * (double) i);
-
-	for (i = 0; i < 9; i++)
-		tfcos36[i] = 0.5 / cos(M_PI * (double) (i * 2 + 1) / 36.0);
-	for (i = 0; i < 3; i++)
-		tfcos12[i] = 0.5 / cos(M_PI * (double) (i * 2 + 1) / 12.0);
-
-	COS6_1 = cos(M_PI / 6.0 * (double) 1);
-	COS6_2 = cos(M_PI / 6.0 * (double) 2);
-
-#ifdef NEW_DCT9
-	cos9[0] = cos(1.0 * M_PI / 9.0);
-	cos9[1] = cos(5.0 * M_PI / 9.0);
-	cos9[2] = cos(7.0 * M_PI / 9.0);
-	cos18[0] = cos(1.0 * M_PI / 18.0);
-	cos18[1] = cos(11.0 * M_PI / 18.0);
-	cos18[2] = cos(13.0 * M_PI / 18.0);
-#endif
-
-	for (i = 0; i < 12; i++)
-	{
-		win[2][i] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * i + 7) / 24.0);
-		for (j = 0; j < 6; j++)
-			COS1[i][j] = cos(M_PI / 24.0 * (double) ((2 * i + 7) * (2 * j + 1)));
-	}
-
-	for (j = 0; j < 4; j++)
-	{
-		static int len[4] = { 36, 36, 12, 36 };
-
-		for (i = 0; i < len[j]; i += 2)
-			win1[j][i] = +win[j][i];
-		for (i = 1; i < len[j]; i += 2)
-			win1[j][i] = -win[j][i];
-	}
-
-	for (i = 0; i < 16; i++)
-	{
-		double t = tan((double) i * M_PI / 12.0);
-
-		tan1_1[i] = t / (1.0 + t);
-		tan2_1[i] = 1.0 / (1.0 + t);
-		tan1_2[i] = M_SQRT2 * t / (1.0 + t);
-		tan2_2[i] = M_SQRT2 / (1.0 + t);
-
-		for (j = 0; j < 2; j++)
-		{
-			double base = pow(2.0, -0.25 * (j + 1.0));
-			double p1 = 1.0, p2 = 1.0;
-
-			if (i > 0)
-			{
-				if (i & 1)
-					p1 = pow(base, (i + 1.0) * 0.5);
-				else
-					p2 = pow(base, i * 0.5);
-			}
-			pow1_1[j][i] = p1;
-			pow2_1[j][i] = p2;
-			pow1_2[j][i] = M_SQRT2 * p1;
-			pow2_2[j][i] = M_SQRT2 * p2;
-		}
-	}
-
-	for (j = 0; j < 9; j++)
-	{
-		struct bandInfoStruct *bi = &bandInfo[j];
-		int *mp;
-		int cb, lwin;
-		int *bdf;
-
-		mp = map[j][0] = mapbuf0[j];
-		bdf = bi->longDiff;
-		for (i = 0, cb = 0; cb < 8; cb++, i += *bdf++)
-		{
-			*mp++ = (*bdf) >> 1;
-			*mp++ = i;
-			*mp++ = 3;
-			*mp++ = cb;
-		}
-		bdf = bi->shortDiff + 3;
-		for (cb = 3; cb < 13; cb++)
-		{
-			int l = (*bdf++) >> 1;
-
-			for (lwin = 0; lwin < 3; lwin++)
-			{
-				*mp++ = l;
-				*mp++ = i + lwin;
-				*mp++ = lwin;
-				*mp++ = cb;
-			}
-			i += 6 * l;
-		}
-		mapend[j][0] = mp;
-
-		mp = map[j][1] = mapbuf1[j];
-		bdf = bi->shortDiff + 0;
-		for (i = 0, cb = 0; cb < 13; cb++)
-		{
-			int l = (*bdf++) >> 1;
-
-			for (lwin = 0; lwin < 3; lwin++)
-			{
-				*mp++ = l;
-				*mp++ = i + lwin;
-				*mp++ = lwin;
-				*mp++ = cb;
-			}
-			i += 6 * l;
-		}
-		mapend[j][1] = mp;
-
-		mp = map[j][2] = mapbuf2[j];
-		bdf = bi->longDiff;
-		for (cb = 0; cb < 22; cb++)
-		{
-			*mp++ = (*bdf++) >> 1;
-			*mp++ = cb;
-		}
-		mapend[j][2] = mp;
-
-	}
-
-	for (j = 0; j < 9; j++)
-	{
-		for (i = 0; i < 23; i++)
-		{
-			longLimit[j][i] = (bandInfo[j].longIdx[i] - 1 + 8) / 18 + 1;
-			if (longLimit[j][i] > (down_sample_sblimit))
-				longLimit[j][i] = down_sample_sblimit;
-		}
-		for (i = 0; i < 14; i++)
-		{
-			shortLimit[j][i] = (bandInfo[j].shortIdx[i] - 1) / 18 + 1;
-			if (shortLimit[j][i] > (down_sample_sblimit))
-				shortLimit[j][i] = down_sample_sblimit;
-		}
-	}
-
-	for (i = 0; i < 5; i++)
-	{
-		for (j = 0; j < 6; j++)
-		{
-			for (k = 0; k < 6; k++)
-			{
-				int n = k + j * 6 + i * 36;
-
-				i_slen2[n] = i | (j << 3) | (k << 6) | (3 << 12);
-			}
-		}
-	}
-	for (i = 0; i < 4; i++)
-	{
-		for (j = 0; j < 4; j++)
-		{
-			for (k = 0; k < 4; k++)
-			{
-				int n = k + j * 4 + i * 16;
-
-				i_slen2[n + 180] = i | (j << 3) | (k << 6) | (4 << 12);
-			}
-		}
-	}
-	for (i = 0; i < 4; i++)
-	{
-		for (j = 0; j < 3; j++)
-		{
-			int n = j + i * 3;
-
-			i_slen2[n + 244] = i | (j << 3) | (5 << 12);
-			n_slen2[n + 500] = i | (j << 3) | (2 << 12) | (1 << 15);
-		}
-	}
-
-	for (i = 0; i < 5; i++)
-	{
-		for (j = 0; j < 5; j++)
-		{
-			for (k = 0; k < 4; k++)
-			{
-				for (l = 0; l < 4; l++)
-				{
-					int n = l + k * 4 + j * 16 + i * 80;
-
-					n_slen2[n] = i | (j << 3) | (k << 6) | (l << 9) | (0 << 12);
-				}
-			}
-		}
-	}
-	for (i = 0; i < 5; i++)
-	{
-		for (j = 0; j < 5; j++)
-		{
-			for (k = 0; k < 4; k++)
-			{
-				int n = k + j * 4 + i * 20;
-
-				n_slen2[n + 400] = i | (j << 3) | (k << 6) | (1 << 12);
-			}
-		}
-	}
-}
-
-/*
- * read additional side information (for MPEG 1 and MPEG 2)
- */
-static int III_get_side_info(struct III_sideinfo *si, int stereo,
-			      int ms_stereo, long sfreq, int single, int lsf)
-{
-	int ch, gr;
-	int powdiff = (single == 3) ? 4 : 0;
-
-	static const int tabs[2][5] = { {2, 9, 5, 3, 4}, {1, 8, 1, 2, 9} };
-	const int *tab = tabs[lsf];
-
-	si->main_data_begin = mpg123_getbits(tab[1]);
-	if (stereo == 1)
-		si->private_bits = mpg123_getbits_fast(tab[2]);
-	else
-		si->private_bits = mpg123_getbits_fast(tab[3]);
-
-	if (!lsf)
-	{
-		for (ch = 0; ch < stereo; ch++)
-		{
-			si->ch[ch].gr[0].scfsi = -1;
-			si->ch[ch].gr[1].scfsi = mpg123_getbits_fast(4);
-		}
-	}
-
-	for (gr = 0; gr < tab[0]; gr++)
-	{
-		for (ch = 0; ch < stereo; ch++)
-		{
-			register struct gr_info_s *gr_info = &(si->ch[ch].gr[gr]);
-
-			gr_info->part2_3_length = mpg123_getbits(12);
-			gr_info->big_values = mpg123_getbits(9);
-			if (gr_info->big_values > 288)
-			{
-				/*  fprintf(stderr, "big_values too large!\n"); */
-				/*  gr_info->big_values = 288; */
-				return 0;
-			}
-			gr_info->pow2gain = gainpow2 + 256 - mpg123_getbits_fast(8) + powdiff;
-			if (ms_stereo)
-				gr_info->pow2gain += 2;
-			gr_info->scalefac_compress = mpg123_getbits(tab[4]);
-
-			if (mpg123_get1bit())
-			{	/* window switch flag  */
-				int i;
-
-				gr_info->block_type = mpg123_getbits_fast(2);
-				gr_info->mixed_block_flag = mpg123_get1bit();
-				gr_info->table_select[0] = mpg123_getbits_fast(5);
-				gr_info->table_select[1] = mpg123_getbits_fast(5);
-				/*
-				 * table_select[2] not needed, because there is no region2,
-				 * but to satisfy some verifications tools we set it either.
-				 */
-				gr_info->table_select[2] = 0;
-				for (i = 0; i < 3; i++)
-					gr_info->full_gain[i] = gr_info->pow2gain + (mpg123_getbits_fast(3) << 3);
-
-				if (gr_info->block_type == 0)
-				{
-					/*  fprintf(stderr,	"Blocktype == 0 and window-switching == 1 not allowed.\n"); */
-					/*  exit(1); */
-					return 0;
-				}
-
-				/* region_count/start parameters are implicit in this case. */
-				if (!lsf || gr_info->block_type == 2)
-					gr_info->region1start = 36 >> 1;
-				else
-				{
-					/* check this again for 2.5 and sfreq=8 */
-					if (sfreq == 8)
-						gr_info->region1start =	108 >> 1;
-					else
-						gr_info->region1start =	54 >> 1;
-				}
-				gr_info->region2start = 576 >> 1;
-			}
-			else
-			{
-				int i, r0c, r1c;
-
-				for (i = 0; i < 3; i++)
-					gr_info->table_select[i] = mpg123_getbits_fast(5);
-				r0c = mpg123_getbits_fast(4);
-				r1c = mpg123_getbits_fast(3);
-				gr_info->region1start = bandInfo[sfreq].longIdx[r0c + 1] >> 1;
-				if (r0c + r1c + 2 > 22)
-					gr_info->region2start = 576 >> 1;
-				else
-					gr_info->region2start = bandInfo[sfreq].longIdx[r0c + 1 + r1c + 1] >> 1;
-				gr_info->block_type = 0;
-				gr_info->mixed_block_flag = 0;
-			}
-			if (!lsf)
-				gr_info->preflag = mpg123_get1bit();
-			gr_info->scalefac_scale = mpg123_get1bit();
-			gr_info->count1table_select = mpg123_get1bit();
-		}
-	}
-	return 1;
-}
-
-
-/*
- * read scalefactors
- */
-static int III_get_scale_factors_1(int *scf, struct gr_info_s *gr_info)
-{
-	static const unsigned char slen[2][16] = {
-		{0, 0, 0, 0, 3, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4},
-		{0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}
-	};
-	int numbits;
-	int num0 = slen[0][gr_info->scalefac_compress];
-	int num1 = slen[1][gr_info->scalefac_compress];
-
-	if (gr_info->block_type == 2)
-	{
-		int i = 18;
-
-		numbits = (num0 + num1) * 18;
-
-		if (gr_info->mixed_block_flag)
-		{
-			for (i = 8; i; i--)
-				*scf++ = mpg123_getbits_fast(num0);
-			i = 9;
-			numbits -= num0;	/* num0 * 17 + num1 * 18 */
-		}
-
-		for (; i; i--)
-			*scf++ = mpg123_getbits_fast(num0);
-		for (i = 18; i; i--)
-			*scf++ = mpg123_getbits_fast(num1);
-		*scf++ = 0;
-		*scf++ = 0;
-		*scf++ = 0;	/* short[13][0..2] = 0 */
-	}
-	else
-	{
-		int i;
-		int scfsi = gr_info->scfsi;
-
-		if (scfsi < 0)
-		{		/* scfsi < 0 => granule == 0 */
-			for (i = 11; i; i--)
-				*scf++ = mpg123_getbits_fast(num0);
-			for (i = 10; i; i--)
-				*scf++ = mpg123_getbits_fast(num1);
-			numbits = (num0 + num1) * 10 + num0;
-			*scf++ = 0;
-		}
-		else
-		{
-			numbits = 0;
-			if (!(scfsi & 0x8))
-			{
-				for (i = 0; i < 6; i++)
-					*scf++ = mpg123_getbits_fast(num0);
-				numbits += num0 * 6;
-			}
-			else
-			{
-				scf += 6;
-			}
-
-			if (!(scfsi & 0x4))
-			{
-				for (i = 0; i < 5; i++)
-					*scf++ = mpg123_getbits_fast(num0);
-				numbits += num0 * 5;
-			}
-			else
-			{
-				scf += 5;
-			}
-
-			if (!(scfsi & 0x2))
-			{
-				for (i = 0; i < 5; i++)
-					*scf++ = mpg123_getbits_fast(num1);
-				numbits += num1 * 5;
-			}
-			else
-			{
-				scf += 5;
-			}
-
-			if (!(scfsi & 0x1))
-			{
-				for (i = 0; i < 5; i++)
-					*scf++ = mpg123_getbits_fast(num1);
-				numbits += num1 * 5;
-			}
-			else
-			{
-				scf += 5;
-			}
-			*scf++ = 0;	/* no l[21] in original sources */
-		}
-	}
-	return numbits;
-}
-
-static int III_get_scale_factors_2(int *scf, struct gr_info_s *gr_info, int i_stereo)
-{
-	unsigned char *pnt;
-	int i, j, n = 0, numbits = 0;
-	unsigned int slen;
-
-	static unsigned char stab[3][6][4] =
-	{
-		{{6, 5, 5, 5}, {6, 5, 7, 3}, {11, 10, 0, 0},
-		 {7, 7, 7, 0}, {6, 6, 6, 3}, {8, 8, 5, 0}},
-		{{9, 9, 9, 9}, {9, 9, 12, 6}, {18, 18, 0, 0},
-		 {12, 12, 12, 0}, {12, 9, 9, 6}, {15, 12, 9, 0}},
-		{{6, 9, 9, 9}, {6, 9, 12, 6}, {15, 18, 0, 0},
-		 {6, 15, 12, 0}, {6, 12, 9, 6}, {6, 18, 9, 0}}
-	};
-
-	if (i_stereo)		/* i_stereo AND second channel -> mpg123_do_layer3() checks this */
-		slen = i_slen2[gr_info->scalefac_compress >> 1];
-	else
-		slen = n_slen2[gr_info->scalefac_compress];
-
-	gr_info->preflag = (slen >> 15) & 0x1;
-
-	n = 0;
-	if (gr_info->block_type == 2)
-	{
-		n++;
-		if (gr_info->mixed_block_flag)
-			n++;
-	}
-
-	pnt = stab[n][(slen >> 12) & 0x7];
-
-	for (i = 0; i < 4; i++)
-	{
-		int num = slen & 0x7;
-
-		slen >>= 3;
-		if (num)
-		{
-			for (j = 0; j < (int) (pnt[i]); j++)
-				*scf++ = mpg123_getbits_fast(num);
-			numbits += pnt[i] * num;
-		}
-		else
-		{
-			for (j = 0; j < (int) (pnt[i]); j++)
-				*scf++ = 0;
-		}
-	}
-
-	n = (n << 1) + 1;
-	for (i = 0; i < n; i++)
-		*scf++ = 0;
-
-	return numbits;
-}
-
-static int pretab1[22] =
-{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 3, 3, 3, 2, 0};
-static int pretab2[22] =
-{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-/*
- * Dequantize samples (includes huffman decoding)
- */
-/* 24 is enough because tab13 has max. a 19 bit huffvector */
-#define BITSHIFT ((sizeof (long) - 1) * 8)
-
-#define REFRESH_MASK()							\
-while(num < (int)BITSHIFT) {							\
-	mask |= ((unsigned long)mpg123_getbyte()) << (BITSHIFT - num);	\
-	num += 8;							\
-	part2remain -= 8;						\
-}
-
-static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT], int *scf,
-			struct gr_info_s *gr_info, int sfreq, int part2bits)
-{
-	int shift = 1 + gr_info->scalefac_scale;
-	real *xrpnt = (real *) xr;
-	int l[3], l3;
-	int part2remain = gr_info->part2_3_length - part2bits;
-	int *me;
-
-	int num = mpg123_getbitoffset();
-	long mask;
-	/* we must split this, because for num==0 the shift is undefined if you do it in one step */
-	mask = ((unsigned long) mpg123_getbits(num)) << BITSHIFT;
-	mask <<= 8 - num;
-	part2remain -= num;
-
-	{
-		int bv = gr_info->big_values;
-		int region1 = gr_info->region1start;
-		int region2 = gr_info->region2start;
-
-		l3 = ((576 >> 1) - bv) >> 1;
-/*
- * we may lose the 'odd' bit here !! 
- * check this later again 
- */
-		if (bv <= region1)
-		{
-			l[0] = bv;
-			l[1] = 0;
-			l[2] = 0;
-		}
-		else
-		{
-			l[0] = region1;
-			if (bv <= region2)
-			{
-				l[1] = bv - l[0];
-				l[2] = 0;
-			}
-			else
-			{
-				l[1] = region2 - l[0];
-				l[2] = bv - region2;
-			}
-		}
-	}
-
-	if (gr_info->block_type == 2)
-	{
-		/*
-		 * decoding with short or mixed mode BandIndex table 
-		 */
-		int i, max[4];
-		int step = 0, lwin = 3, cb = 0;
-		register real v = 0.0;
-		register int *m, mc;
-
-		if (gr_info->mixed_block_flag)
-		{
-			max[3] = -1;
-			max[0] = max[1] = max[2] = 2;
-			m = map[sfreq][0];
-			me = mapend[sfreq][0];
-		}
-		else
-		{
-			max[0] = max[1] = max[2] = max[3] = -1;
-			/* max[3] not really needed in this case */
-			m = map[sfreq][1];
-			me = mapend[sfreq][1];
-		}
-
-		mc = 0;
-		for (i = 0; i < 2; i++)
-		{
-			int lp = l[i];
-			struct newhuff *h = ht + gr_info->table_select[i];
-
-			for (; lp; lp--, mc--)
-			{
-				register int x, y;
-				if ((!mc))
-				{
-					mc = *m++;
-					xrpnt = ((real *) xr) + (*m++);
-					lwin = *m++;
-					cb = *m++;
-					if (lwin == 3)
-					{
-						v = gr_info->pow2gain[(*scf++) << shift];
-						step = 1;
-					}
-					else
-					{
-						v = gr_info->full_gain[lwin][(*scf++) << shift];
-						step = 3;
-					}
-				}
-				{
-					register short *val = h->table;
-
-					REFRESH_MASK ();
-					while ((y = *val++) < 0)
-					{
-						if (mask < 0)
-							val -= y;
-						num--;
-						mask <<= 1;
-					}
-					x = y >> 4;
-					y &= 0xf;
-				}
-				if (x == 15 && h->linbits)
-				{
-					max[lwin] = cb;
-					REFRESH_MASK();
-					x += ((unsigned long) mask) >> (BITSHIFT + 8 - h->linbits);
-					num -= h->linbits + 1;
-					mask <<= h->linbits;
-					if (mask < 0)
-						*xrpnt = -ispow[x] * v;
-					else
-						*xrpnt = ispow[x] * v;
-					mask <<= 1;
-				}
-				else if (x)
-				{
-					max[lwin] = cb;
-					if (mask < 0)
-						*xrpnt = -ispow[x] * v;
-					else
-						*xrpnt = ispow[x] * v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt = 0.0;
-				xrpnt += step;
-				if (y == 15 && h->linbits)
-				{
-					max[lwin] = cb;
-					REFRESH_MASK();
-					y += ((unsigned long) mask) >> (BITSHIFT + 8 - h->linbits);
-					num -= h->linbits + 1;
-					mask <<= h->linbits;
-					if (mask < 0)
-						*xrpnt = -ispow[y] * v;
-					else
-						*xrpnt = ispow[y] * v;
-					mask <<= 1;
-				}
-				else if (y)
-				{
-					max[lwin] = cb;
-					if (mask < 0)
-						*xrpnt = -ispow[y] * v;
-					else
-						*xrpnt = ispow[y] * v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt = 0.0;
-				xrpnt += step;
-			}
-		}
-
-		for (; l3 && (part2remain + num > 0); l3--)
-		{
-			struct newhuff *h = htc + gr_info->count1table_select;
-			register short *val = h->table, a;
-
-			REFRESH_MASK();
-			while ((a = *val++) < 0)
-			{
-				if (mask < 0)
-					val -= a;
-				num--;
-				mask <<= 1;
-			}
-			if (part2remain + num <= 0)
-			{
-				num -= part2remain + num;
-				break;
-			}
-
-			for (i = 0; i < 4; i++)
-			{
-				if (!(i & 1))
-				{
-					if (!mc)
-					{
-						mc = *m++;
-						xrpnt =	((real *) xr) + (*m++);
-						lwin = *m++;
-						cb = *m++;
-						if (lwin == 3)
-						{
-							v = gr_info->pow2gain[(*scf++) << shift];
-							step = 1;
-						}
-						else
-						{
-							v = gr_info->full_gain[lwin][(*scf++) << shift];
-							step = 3;
-						}
-					}
-					mc--;
-				}
-				if ((a & (0x8 >> i)))
-				{
-					max[lwin] = cb;
-					if (part2remain + num <= 0)
-					{
-						break;
-					}
-					if (mask < 0)
-						*xrpnt = -v;
-					else
-						*xrpnt = v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt = 0.0;
-				xrpnt += step;
-			}
-		}
-
-		if (lwin < 3)
-		{		/* short band? */
-			while (1)
-			{
-				for (; mc > 0; mc--)
-				{
-					*xrpnt = 0.0;
-					xrpnt += 3;	/* short band -> step=3 */
-					*xrpnt = 0.0;
-					xrpnt += 3;
-				}
-				if (m >= me)
-					break;
-				mc = *m++;
-				xrpnt = ((real *) xr) + *m++;
-				if (*m++ == 0)
-					break;	/* optimize: field will be set to zero at the end of the function */
-				m++;	/* cb */
-			}
-		}
-
-		gr_info->maxband[0] = max[0] + 1;
-		gr_info->maxband[1] = max[1] + 1;
-		gr_info->maxband[2] = max[2] + 1;
-		gr_info->maxbandl = max[3] + 1;
-
-		{
-			int rmax = max[0] > max[1] ? max[0] : max[1];
-
-			rmax = (rmax > max[2] ? rmax : max[2]) + 1;
-			gr_info->maxb = rmax ? shortLimit[sfreq][rmax] : longLimit[sfreq][max[3] + 1];
-		}
-
-	}
-	else
-	{
-		/*
-		 * decoding with 'long' BandIndex table (block_type != 2)
-		 */
-		int *pretab = gr_info->preflag ? pretab1 : pretab2;
-		int i, max = -1;
-		int cb = 0;
-		int *m = map[sfreq][2];
-		register real v = 0.0;
-		int mc = 0;
-
-		/*
-		 * long hash table values
-		 */
-		for (i = 0; i < 3; i++)
-		{
-			int lp = l[i];
-			struct newhuff *h = ht + gr_info->table_select[i];
-
-			for (; lp; lp--, mc--)
-			{
-				int x, y;
-
-				if (!mc)
-				{
-					mc = *m++;
-					cb = *m++;
-					if (cb == 21)
-						v = 0.0;
-					else
-						v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
-
-				}
-				{
-					register short *val = h->table;
-					REFRESH_MASK();
-					while ((y = *val++) < 0)
-					{
-						if (mask < 0)
-							val -= y;
-						num--;
-						mask <<= 1;
-					}
-					x = y >> 4;
-					y &= 0xf;
-				}
-
-				if (x == 15 && h->linbits)
-				{
-					max = cb;
-					REFRESH_MASK();
-					x += ((unsigned long) mask) >> (BITSHIFT + 8 - h->linbits);
-					num -= h->linbits + 1;
-					mask <<= h->linbits;
-					if (mask < 0)
-						*xrpnt++ = -ispow[x] * v;
-					else
-						*xrpnt++ = ispow[x] * v;
-					mask <<= 1;
-				}
-				else if (x)
-				{
-					max = cb;
-					if (mask < 0)
-						*xrpnt++ = -ispow[x] * v;
-					else
-						*xrpnt++ = ispow[x] * v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt++ = 0.0;
-
-				if (y == 15 && h->linbits)
-				{
-					max = cb;
-					REFRESH_MASK();
-					y += ((unsigned long) mask) >> (BITSHIFT + 8 - h->linbits);
-					num -= h->linbits + 1;
-					mask <<= h->linbits;
-					if (mask < 0)
-						*xrpnt++ = -ispow[y] * v;
-					else
-						*xrpnt++ = ispow[y] * v;
-					mask <<= 1;
-				}
-				else if (y)
-				{
-					max = cb;
-					if (mask < 0)
-						*xrpnt++ = -ispow[y] * v;
-					else
-						*xrpnt++ = ispow[y] * v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt++ = 0.0;
-			}
-		}
-
-		/*
-		 * short (count1table) values
-		 */
-		for (; l3 && (part2remain + num > 0); l3--)
-		{
-			struct newhuff *h = htc + gr_info->count1table_select;
-			register short *val = h->table, a;
-
-			REFRESH_MASK();
-			while ((a = *val++) < 0)
-			{
-				if (mask < 0)
-					val -= a;
-				num--;
-				mask <<= 1;
-			}
-			if (part2remain + num <= 0)
-			{
-				num -= part2remain + num;
-				break;
-			}
-
-			for (i = 0; i < 4; i++)
-			{
-				if (!(i & 1))
-				{
-					if (!mc)
-					{
-						mc = *m++;
-						cb = *m++;
-						if (cb == 21)
-							v = 0.0;
-						else
-							v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift];
-					}
-					mc--;
-				}
-				if ((a & (0x8 >> i)))
-				{
-					max = cb;
-					if (part2remain + num <= 0)
-					{
-						break;
-					}
-					if (mask < 0)
-						*xrpnt++ = -v;
-					else
-						*xrpnt++ = v;
-					num--;
-					mask <<= 1;
-				}
-				else
-					*xrpnt++ = 0.0;
-			}
-		}
-
-		gr_info->maxbandl = max + 1;
-		gr_info->maxb = longLimit[sfreq][gr_info->maxbandl];
-	}
-
-	part2remain += num;
-	mpg123_backbits(num);
-	num = 0;
-
-	while (xrpnt < &xr[SBLIMIT][0])
-		*xrpnt++ = 0.0;
-
-	while (part2remain > 16)
-	{
-		mpg123_getbits(16);	/* Dismiss stuffing Bits */
-		part2remain -= 16;
-	}
-	if (part2remain > 0)
-		mpg123_getbits(part2remain);
-	else if (part2remain < 0)
-	{
-/*  		fprintf(stderr, "mpg123: Can't rewind stream by %d bits!\n", */
-/*  			-part2remain); */
-		return 1;	/* -> error */
-	}
-	return 0;
-}
-
-/* 
- * III_stereo: calculate real channel values for Joint-I-Stereo-mode
- */
-static void III_i_stereo(real xr_buf[2][SBLIMIT][SSLIMIT], int *scalefac, struct gr_info_s *gr_info, int sfreq, int ms_stereo, int lsf)
-{
-	real(*xr)[SBLIMIT * SSLIMIT] = (real(*)[SBLIMIT * SSLIMIT]) xr_buf;
-	struct bandInfoStruct *bi = &bandInfo[sfreq];
-
-	const real *tab1, *tab2;
-
-#if 1
-	int tab;
-	static const real *tabs[3][2][2] = {
-		{{tan1_1, tan2_1}, {tan1_2, tan2_2}},
-		{{pow1_1[0], pow2_1[0]}, {pow1_2[0], pow2_2[0]}},
-		{{pow1_1[1], pow2_1[1]}, {pow1_2[1], pow2_2[1]}}
-	};
-
-	tab = lsf + (gr_info->scalefac_compress & lsf);
-	tab1 = tabs[tab][ms_stereo][0];
-	tab2 = tabs[tab][ms_stereo][1];
-#else
-	if (lsf)
-	{
-		int p = gr_info->scalefac_compress & 0x1;
-
-		if (ms_stereo)
-		{
-			tab1 = pow1_2[p];
-			tab2 = pow2_2[p];
-		}
-		else
-		{
-			tab1 = pow1_1[p];
-			tab2 = pow2_1[p];
-		}
-	}
-	else
-	{
-		if (ms_stereo)
-		{
-			tab1 = tan1_2;
-			tab2 = tan2_2;
-		}
-		else
-		{
-			tab1 = tan1_1;
-			tab2 = tan2_1;
-		}
-	}
-#endif
-
-	if (gr_info->block_type == 2)
-	{
-		int lwin, do_l = 0;
-
-		if (gr_info->mixed_block_flag)
-			do_l = 1;
-
-		for (lwin = 0; lwin < 3; lwin++)
-		{	/* process each window */
-			/* get first band with zero values */
-			int is_p, sb, idx, sfb = gr_info->maxband[lwin];	/* sfb is minimal 3 for mixed mode */
-
-			if (sfb > 3)
-				do_l = 0;
-
-			for (; sfb < 12; sfb++)
-			{
-				is_p = scalefac[sfb * 3 + lwin - gr_info->mixed_block_flag];	/* scale: 0-15 */
-				if (is_p != 7)
-				{
-					real t1, t2;
-
-					sb = bi->shortDiff[sfb];
-					idx = bi->shortIdx[sfb] + lwin;
-					t1 = tab1[is_p];
-					t2 = tab2[is_p];
-					for (; sb > 0; sb--, idx += 3)
-					{
-						real v = xr[0][idx];
-
-						xr[0][idx] = v * t1;
-						xr[1][idx] = v * t2;
-					}
-				}
-			}
-
-#if 1
-/* in the original: copy 10 to 11 , here: copy 11 to 12 
-   maybe still wrong??? (copy 12 to 13?) */
-			is_p = scalefac[11 * 3 + lwin - gr_info->mixed_block_flag];	/* scale: 0-15 */
-			sb = bi->shortDiff[12];
-			idx = bi->shortIdx[12] + lwin;
-#else
-			is_p = scalefac[10 * 3 + lwin - gr_info->mixed_block_flag];	/* scale: 0-15 */
-			sb = bi->shortDiff[11];
-			idx = bi->shortIdx[11] + lwin;
-#endif
-			if (is_p != 7)
-			{
-				real t1, t2;
-				t1 = tab1[is_p];
-				t2 = tab2[is_p];
-				for (; sb > 0; sb--, idx += 3)
-				{
-					real v = xr[0][idx];
-					xr[0][idx] = v * t1;
-					xr[1][idx] = v * t2;
-				}
-			}
-		}		/* end for(lwin; .. ; . ) */
-
-/* also check l-part, if ALL bands in the three windows are 'empty'
- * and mode = mixed_mode 
- */
-		if (do_l)
-		{
-			int sfb = gr_info->maxbandl;
-			int idx = bi->longIdx[sfb];
-
-			for (; sfb < 8; sfb++)
-			{
-				int sb = bi->longDiff[sfb];
-				int is_p = scalefac[sfb];	/* scale: 0-15 */
-
-				if (is_p != 7)
-				{
-					real t1, t2;
-
-					t1 = tab1[is_p];
-					t2 = tab2[is_p];
-					for (; sb > 0; sb--, idx++)
-					{
-						real v = xr[0][idx];
-
-						xr[0][idx] = v * t1;
-						xr[1][idx] = v * t2;
-					}
-				}
-				else
-					idx += sb;
-			}
-		}
-	}
-	else
-	{			/* ((gr_info->block_type != 2)) */
-		int sfb = gr_info->maxbandl;
-		int is_p, idx = bi->longIdx[sfb];
-
-/* hmm ... maybe the maxbandl stuff for i-stereo is buggy? */
-		if (sfb <= 21)
- 		{
-			for (; sfb < 21; sfb++)
-			{
-				int sb = bi->longDiff[sfb];
-
-				is_p = scalefac[sfb];	/* scale: 0-15 */
-				if (is_p != 7)
-				{
-					real t1, t2;
-					t1 = tab1[is_p];
-					t2 = tab2[is_p];
-					for (; sb > 0; sb--, idx++)
-					{
-						real v = xr[0][idx];
-						xr[0][idx] = v * t1;
-						xr[1][idx] = v * t2;
-					}
-				}
-				else
-					idx += sb;
-			}
-		}
-
-		is_p = scalefac[20];
-		if (is_p != 7)
-		{		/* copy l-band 20 to l-band 21 */
-			int sb;
-			real t1 = tab1[is_p], t2 = tab2[is_p];
-
-			for (sb = bi->longDiff[21]; sb > 0; sb--, idx++)
-			{
-				real v = xr[0][idx];
-
-				xr[0][idx] = v * t1;
-				xr[1][idx] = v * t2;
-			}
-		}
-	}			/* ... */
-}
-
-static void III_antialias(real xr[SBLIMIT][SSLIMIT], struct gr_info_s *gr_info)
-{
-	int sblim;
-
-	if (gr_info->block_type == 2)
-	{
-		if (!gr_info->mixed_block_flag)
-			return;
-		sblim = 1;
-	}
-	else
-	{
-		sblim = gr_info->maxb - 1;
-	}
-
-	/* 31 alias-reduction operations between each pair of sub-bands */
-	/* with 8 butterflies between each pair                         */
-
-	{
-		int sb;
-		real *xr1 = (real *) xr[1];
-
-		if (sblim < 1 || sblim > SBLIMIT)
-			return;
-		
-		for (sb = sblim; sb; sb--, xr1 += 10)
-		{
-			int ss;
-			real *cs = aa_cs, *ca = aa_ca;
-			real *xr2 = xr1;
-
-			for (ss = 7; ss >= 0; ss--)
-			{	/* upper and lower butterfly inputs */
-				register real bu = *--xr2, bd = *xr1;
-
-				*xr2 = (bu * (*cs)) - (bd * (*ca));
-				*xr1++ = (bd * (*cs++)) + (bu * (*ca++));
-			}
-		}
-	}
-}
-
-/* 
- This is an optimized DCT from Jeff Tsay's maplay 1.2+ package.
- Saved one multiplication by doing the 'twiddle factor' stuff
- together with the window mul. (MH)
-
- This uses Byeong Gi Lee's Fast Cosine Transform algorithm, but the
- 9 point IDCT needs to be reduced further. Unfortunately, I don't
- know how to do that, because 9 is not an even number. - Jeff.
-
- ****************************************************************
-
- 9 Point Inverse Discrete Cosine Transform
-
- This piece of code is Copyright 1997 Mikko Tommila and is freely usable
- by anybody. The algorithm itself is of course in the public domain.
-
- Again derived heuristically from the 9-point WFTA.
-
- The algorithm is optimized (?) for speed, not for small rounding errors or
- good readability.
-
- 36 additions, 11 multiplications
-
- Again this is very likely sub-optimal.
-
- The code is optimized to use a minimum number of temporary variables,
- so it should compile quite well even on 8-register Intel x86 processors.
- This makes the code quite obfuscated and very difficult to understand.
-
- References:
- [1] S. Winograd: "On Computing the Discrete Fourier Transform",
-     Mathematics of Computation, Volume 32, Number 141, January 1978,
-     Pages 175-199
-*/
-
-/*------------------------------------------------------------------*/
-/*                                                                  */
-/*    Function: Calculation of the inverse MDCT                     */
-/*                                                                  */
-/*------------------------------------------------------------------*/
-
-#ifdef USE_3DNOW
-void dct36(real *inbuf,real *o1,real *o2,real *wintab,real *tsbuf)
-#else
-static void dct36(real * inbuf, real * o1, real * o2, real * wintab, real * tsbuf)
-#endif
-{
-#ifdef NEW_DCT9
-	real tmp[18];
-#endif
-
-	{
-		register real *in = inbuf;
-
-		in[17] += in[16];
-		in[16] += in[15];
-		in[15] += in[14];
-		in[14] += in[13];
-		in[13] += in[12];
-		in[12] += in[11];
-		in[11] += in[10];
-		in[10] += in[9];
-		in[9] += in[8];
-		in[8] += in[7];
-		in[7] += in[6];
-		in[6] += in[5];
-		in[5] += in[4];
-		in[4] += in[3];
-		in[3] += in[2];
-		in[2] += in[1];
-		in[1] += in[0];
-
-		in[17] += in[15];
-		in[15] += in[13];
-		in[13] += in[11];
-		in[11] += in[9];
-		in[9] += in[7];
-		in[7] += in[5];
-		in[5] += in[3];
-		in[3] += in[1];
-
-
-#ifdef NEW_DCT9
-#if 1
-		{
-			real t3;
-			{
-				real t0, t1, t2;
-
-				t0 = COS6_2 * (in[8] + in[16] - in[4]);
-				t1 = COS6_2 * in[12];
-
-				t3 = in[0];
-				t2 = t3 - t1 - t1;
-				tmp[1] = tmp[7] = t2 - t0;
-				tmp[4] = t2 + t0 + t0;
-				t3 += t1;
-
-				t2 = COS6_1 * (in[10] + in[14] - in[2]);
-				tmp[1] -= t2;
-				tmp[7] += t2;
-			}
-			{
-				real t0, t1, t2;
-
-				t0 = cos9[0] * (in[4] + in[8]);
-				t1 = cos9[1] * (in[8] - in[16]);
-				t2 = cos9[2] * (in[4] + in[16]);
-
-				tmp[2] = tmp[6] = t3 - t0 - t2;
-				tmp[0] = tmp[8] = t3 + t0 + t1;
-				tmp[3] = tmp[5] = t3 - t1 + t2;
-			}
-		}
-		{
-			real t1, t2, t3;
-
-			t1 = cos18[0] * (in[2] + in[10]);
-			t2 = cos18[1] * (in[10] - in[14]);
-			t3 = COS6_1 * in[6];
-
-			{
-				real t0 = t1 + t2 + t3;
-				tmp[0] += t0;
-				tmp[8] -= t0;
-			}
-
-			t2 -= t3;
-			t1 -= t3;
-
-			t3 = cos18[2] * (in[2] + in[14]);
-
-			t1 += t3;
-			tmp[3] += t1;
-			tmp[5] -= t1;
-
-			t2 -= t3;
-			tmp[2] += t2;
-			tmp[6] -= t2;
-		}
-
-#else
-		{
-			real t0, t1, t2, t3, t4, t5, t6, t7;
-
-			t1 = COS6_2 * in[12];
-			t2 = COS6_2 * (in[8] + in[16] - in[4]);
-
-			t3 = in[0] + t1;
-			t4 = in[0] - t1 - t1;
-			t5 = t4 - t2;
-			tmp[4] = t4 + t2 + t2;
-
-			t0 = cos9[0] * (in[4] + in[8]);
-			t1 = cos9[1] * (in[8] - in[16]);
-
-			t2 = cos9[2] * (in[4] + in[16]);
-
-			t6 = t3 - t0 - t2;
-			t0 += t3 + t1;
-			t3 += t2 - t1;
-
-			t2 = cos18[0] * (in[2] + in[10]);
-			t4 = cos18[1] * (in[10] - in[14]);
-			t7 = COS6_1 * in[6];
-
-			t1 = t2 + t4 + t7;
-			tmp[0] = t0 + t1;
-			tmp[8] = t0 - t1;
-			t1 = cos18[2] * (in[2] + in[14]);
-			t2 += t1 - t7;
-
-			tmp[3] = t3 + t2;
-			t0 = COS6_1 * (in[10] + in[14] - in[2]);
-			tmp[5] = t3 - t2;
-
-			t4 -= t1 + t7;
-
-			tmp[1] = t5 - t0;
-			tmp[7] = t5 + t0;
-			tmp[2] = t6 + t4;
-			tmp[6] = t6 - t4;
-		}
-#endif
-
-		{
-			real t0, t1, t2, t3, t4, t5, t6, t7;
-
-			t1 = COS6_2 * in[13];
-			t2 = COS6_2 * (in[9] + in[17] - in[5]);
-
-			t3 = in[1] + t1;
-			t4 = in[1] - t1 - t1;
-			t5 = t4 - t2;
-
-			t0 = cos9[0] * (in[5] + in[9]);
-			t1 = cos9[1] * (in[9] - in[17]);
-
-			tmp[13] = (t4 + t2 + t2) * tfcos36[17 - 13];
-			t2 = cos9[2] * (in[5] + in[17]);
-
-			t6 = t3 - t0 - t2;
-			t0 += t3 + t1;
-			t3 += t2 - t1;
-
-			t2 = cos18[0] * (in[3] + in[11]);
-			t4 = cos18[1] * (in[11] - in[15]);
-			t7 = COS6_1 * in[7];
-
-			t1 = t2 + t4 + t7;
-			tmp[17] = (t0 + t1) * tfcos36[17 - 17];
-			tmp[9] = (t0 - t1) * tfcos36[17 - 9];
-			t1 = cos18[2] * (in[3] + in[15]);
-			t2 += t1 - t7;
-
-			tmp[14] = (t3 + t2) * tfcos36[17 - 14];
-			t0 = COS6_1 * (in[11] + in[15] - in[3]);
-			tmp[12] = (t3 - t2) * tfcos36[17 - 12];
-
-			t4 -= t1 + t7;
-
-			tmp[16] = (t5 - t0) * tfcos36[17 - 16];
-			tmp[10] = (t5 + t0) * tfcos36[17 - 10];
-			tmp[15] = (t6 + t4) * tfcos36[17 - 15];
-			tmp[11] = (t6 - t4) * tfcos36[17 - 11];
-		}
-
-#define MACRO(v)						\
-do {								\
-	real tmpval;						\
-								\
-	tmpval = tmp[(v)] + tmp[17-(v)];			\
-	out2[9+(v)] = tmpval * w[27+(v)];			\
-	out2[8-(v)] = tmpval * w[26-(v)];			\
-	tmpval = tmp[(v)] - tmp[17-(v)];			\
-	ts[SBLIMIT*(8-(v))] = out1[8-(v)] + tmpval * w[8-(v)];	\
-	ts[SBLIMIT*(9+(v))] = out1[9+(v)] + tmpval * w[9+(v)];	\
-} while (0)
-
-		{
-			register real *out2 = o2;
-			register real *w = wintab;
-			register real *out1 = o1;
-			register real *ts = tsbuf;
-
-			MACRO(0);
-			MACRO(1);
-			MACRO(2);
-			MACRO(3);
-			MACRO(4);
-			MACRO(5);
-			MACRO(6);
-			MACRO(7);
-			MACRO(8);
-		}
-
-#else
-
-		{
-
-#define MACRO0(v)						\
-do {								\
-	real tmp;						\
-	out2[9+(v)] = (tmp = sum0 + sum1) * w[27+(v)];		\
-	out2[8-(v)] = tmp * w[26-(v)];				\
-	sum0 -= sum1;						\
-	ts[SBLIMIT*(8-(v))] = out1[8-(v)] + sum0 * w[8-(v)];	\
-	ts[SBLIMIT*(9+(v))] = out1[9+(v)] + sum0 * w[9+(v)];	\
-} while (0)
-
-#define MACRO1(v)				\
-do {						\
-	real sum0,sum1;				\
-	sum0 = tmp1a + tmp2a;			\
-	sum1 = (tmp1b + tmp2b) * tfcos36[(v)];	\
-	MACRO0(v);				\
-} while (0)
-
-#define MACRO2(v)				\
-do {						\
-	real sum0, sum1;			\
-	sum0 = tmp2a - tmp1a;			\
-	sum1 = (tmp2b - tmp1b) * tfcos36[(v)];	\
-	MACRO0(v);				\
-} while (0)
-
-			register const real *c = COS9;
-			register real *out2 = o2;
-			register real *w = wintab;
-			register real *out1 = o1;
-			register real *ts = tsbuf;
-
-			real ta33, ta66, tb33, tb66;
-
-			ta33 = in[2 * 3 + 0] * c[3];
-			ta66 = in[2 * 6 + 0] * c[6] + in[2 * 0 + 0];
-			tb33 = in[2 * 3 + 1] * c[3];
-			tb66 = in[2 * 6 + 1] * c[6] + in[2 * 0 + 1];
-
-			{
-				real tmp1a, tmp2a, tmp1b, tmp2b;
-				tmp1a =	in[2 * 1 + 0] * c[1] + ta33 + in[2 * 5 + 0] * c[5] + in[2 * 7 + 0] * c[7];
-				tmp1b =	in[2 * 1 + 1] * c[1] + tb33 + in[2 * 5 + 1] * c[5] + in[2 * 7 + 1] * c[7];
-				tmp2a =	in[2 * 2 + 0] * c[2] + in[2 * 4 + 0] * c[4] + ta66 + in[2 * 8 + 0] * c[8];
-				tmp2b =	in[2 * 2 + 1] * c[2] + in[2 * 4 + 1] * c[4] + tb66 + in[2 * 8 + 1] * c[8];
-
-				MACRO1(0);
-				MACRO2(8);
-			}
-
-			{
-				real tmp1a, tmp2a, tmp1b, tmp2b;
-				tmp1a =	(in[2 * 1 + 0] - in[2 * 5 + 0] - in[2 * 7 + 0]) * c[3];
-				tmp1b =	(in[2 * 1 + 1] - in[2 * 5 + 1] - in[2 * 7 + 1]) * c[3];
-				tmp2a =	(in[2 * 2 + 0] - in[2 * 4 + 0] - in[2 * 8 + 0]) * c[6] - in[2 * 6 + 0] + in[2 * 0 + 0];
-				tmp2b =	(in[2 * 2 + 1] - in[2 * 4 + 1] - in[2 * 8 + 1]) * c[6] - in[2 * 6 + 1] + in[2 * 0 + 1];
-
-				MACRO1(1);
-				MACRO2(7);
-			}
-
-			{
-				real tmp1a, tmp2a, tmp1b, tmp2b;
-				tmp1a =	in[2 * 1 + 0] * c[5] - ta33 - in[2 * 5 + 0] * c[7] + in[2 * 7 + 0] * c[1];
-				tmp1b =	in[2 * 1 + 1] * c[5] - tb33 - in[2 * 5 + 1] * c[7] + in[2 * 7 + 1] * c[1];
-				tmp2a =	-in[2 * 2 + 0] * c[8] - in[2 * 4 + 0] * c[2] + ta66 + in[2 * 8 + 0] * c[4];
-				tmp2b =	-in[2 * 2 + 1] * c[8] - in[2 * 4 + 1] * c[2] + tb66 + in[2 * 8 + 1] * c[4];
-
-				MACRO1(2);
-				MACRO2(6);
-			}
-
-			{
-				real tmp1a, tmp2a, tmp1b, tmp2b;
-				tmp1a =	in[2 * 1 + 0] * c[7] - ta33 + in[2 * 5 + 0] * c[1] - in[2 * 7 + 0] * c[5];
-				tmp1b =	in[2 * 1 + 1] * c[7] - tb33 + in[2 * 5 + 1] * c[1] - in[2 * 7 + 1] * c[5];
-				tmp2a =	-in[2 * 2 + 0] * c[4] + in[2 * 4 + 0] * c[8] + ta66 - in[2 * 8 + 0] * c[2];
-				tmp2b =	-in[2 * 2 + 1] * c[4] + in[2 * 4 + 1] * c[8] + tb66 - in[2 * 8 + 1] * c[2];
-
-				MACRO1(3);
-				MACRO2(5);
-			}
-
-			{
-				real sum0, sum1;
-
-				sum0 = in[2 * 0 + 0] - in[2 * 2 + 0] + in[2 * 4 + 0] - in[2 * 6 + 0] + in[2 * 8 + 0];
-				sum1 = (in[2 * 0 + 1] - in[2 * 2 + 1] + in[2 * 4 + 1] - in[2 * 6 + 1] + in[2 * 8 + 1]) * tfcos36[4];
-				MACRO0(4);
-			}
-		}
-#endif
-
-	}
-}
-
-/*
- * new DCT12
- */
-static void dct12(real * in, real * rawout1, real * rawout2, register real * wi, register real * ts)
-{
-
-#define DCT12_PART1()				\
-do {						\
-	in5 = in[5*3];				\
-	in5 += (in4 = in[4*3]);			\
-	in4 += (in3 = in[3*3]);			\
-	in3 += (in2 = in[2*3]);			\
-	in2 += (in1 = in[1*3]);			\
-	in1 += (in0 = in[0*3]);			\
-						\
-	in5 += in3; in3 += in1;			\
-						\
-	in2 *= COS6_1;				\
-	in3 *= COS6_1;				\
-} while (0) 
-
-#define DCT12_PART2()				\
-do {						\
-	in0 += in4 * COS6_2;			\
-						\
-	in4 = in0 + in2;			\
-	in0 -= in2;				\
-						\
-	in1 += in5 * COS6_2;			\
-						\
-	in5 = (in1 + in3) * tfcos12[0];		\
-	in1 = (in1 - in3) * tfcos12[2];		\
-						\
-	in3 = in4 + in5;			\
-	in4 -= in5;				\
-						\
-	in2 = in0 + in1;			\
-	in0 -= in1;				\
-} while (0)
-
-
-	{
-		real in0, in1, in2, in3, in4, in5;
-		register real *out1 = rawout1;
-
-		ts[SBLIMIT * 0] = out1[0];
-		ts[SBLIMIT * 1] = out1[1];
-		ts[SBLIMIT * 2] = out1[2];
-		ts[SBLIMIT * 3] = out1[3];
-		ts[SBLIMIT * 4] = out1[4];
-		ts[SBLIMIT * 5] = out1[5];
-
-		DCT12_PART1();
-
-		{
-			real tmp0, tmp1 = (in0 - in4);
-
-			{
-				real tmp2 = (in1 - in5) * tfcos12[1];
-
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			ts[(17 - 1) * SBLIMIT] = out1[17 - 1] + tmp0 * wi[11 - 1];
-			ts[(12 + 1) * SBLIMIT] = out1[12 + 1] + tmp0 * wi[6 + 1];
-			ts[(6 + 1) * SBLIMIT] = out1[6 + 1] + tmp1 * wi[1];
-			ts[(11 - 1) * SBLIMIT] = out1[11 - 1] + tmp1 * wi[5 - 1];
-		}
-
-		DCT12_PART2();
-
-		ts[(17 - 0) * SBLIMIT] = out1[17 - 0] + in2 * wi[11 - 0];
-		ts[(12 + 0) * SBLIMIT] = out1[12 + 0] + in2 * wi[6 + 0];
-		ts[(12 + 2) * SBLIMIT] = out1[12 + 2] + in3 * wi[6 + 2];
-		ts[(17 - 2) * SBLIMIT] = out1[17 - 2] + in3 * wi[11 - 2];
-
-		ts[(6 + 0) * SBLIMIT] = out1[6 + 0] + in0 * wi[0];
-		ts[(11 - 0) * SBLIMIT] = out1[11 - 0] + in0 * wi[5 - 0];
-		ts[(6 + 2) * SBLIMIT] = out1[6 + 2] + in4 * wi[2];
-		ts[(11 - 2) * SBLIMIT] = out1[11 - 2] + in4 * wi[5 - 2];
-	}
-
-	in++;
-
-	{
-		real in0, in1, in2, in3, in4, in5;
-		register real *out2 = rawout2;
-
-		DCT12_PART1();
-
-		{
-			real tmp0, tmp1 = (in0 - in4);
-
-			{
-				real tmp2 = (in1 - in5) * tfcos12[1];
-
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			out2[5 - 1] = tmp0 * wi[11 - 1];
-			out2[0 + 1] = tmp0 * wi[6 + 1];
-			ts[(12 + 1) * SBLIMIT] += tmp1 * wi[1];
-			ts[(17 - 1) * SBLIMIT] += tmp1 * wi[5 - 1];
-		}
-
-		DCT12_PART2();
-
-		out2[5 - 0] = in2 * wi[11 - 0];
-		out2[0 + 0] = in2 * wi[6 + 0];
-		out2[0 + 2] = in3 * wi[6 + 2];
-		out2[5 - 2] = in3 * wi[11 - 2];
-
-		ts[(12 + 0) * SBLIMIT] += in0 * wi[0];
-		ts[(17 - 0) * SBLIMIT] += in0 * wi[5 - 0];
-		ts[(12 + 2) * SBLIMIT] += in4 * wi[2];
-		ts[(17 - 2) * SBLIMIT] += in4 * wi[5 - 2];
-	}
-
-	in++;
-
-	{
-		real in0, in1, in2, in3, in4, in5;
-		register real *out2 = rawout2;
-
-		out2[12] = out2[13] = out2[14] = out2[15] = out2[16] = out2[17] = 0.0;
-
-		DCT12_PART1();
-
-		{
-			real tmp0, tmp1 = (in0 - in4);
-
-			{
-				real tmp2 = (in1 - in5) * tfcos12[1];
-
-				tmp0 = tmp1 + tmp2;
-				tmp1 -= tmp2;
-			}
-			out2[11 - 1] = tmp0 * wi[11 - 1];
-			out2[6 + 1] = tmp0 * wi[6 + 1];
-			out2[0 + 1] += tmp1 * wi[1];
-			out2[5 - 1] += tmp1 * wi[5 - 1];
-		}
-
-		DCT12_PART2();
-
-		out2[11 - 0] = in2 * wi[11 - 0];
-		out2[6 + 0] = in2 * wi[6 + 0];
-		out2[6 + 2] = in3 * wi[6 + 2];
-		out2[11 - 2] = in3 * wi[11 - 2];
-
-		out2[0 + 0] += in0 * wi[0];
-		out2[5 - 0] += in0 * wi[5 - 0];
-		out2[0 + 2] += in4 * wi[2];
-		out2[5 - 2] += in4 * wi[5 - 2];
-	}
-}
-
-/*
- * III_hybrid
- */
-#ifdef USE_3DNOW
-static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT],
-		       real tsOut[SSLIMIT][SBLIMIT], int ch,
-		       struct gr_info_s *gr_info, struct frame *fr)
-#else
-static void III_hybrid(real fsIn[SBLIMIT][SSLIMIT],
-		       real tsOut[SSLIMIT][SBLIMIT], int ch,
-		       struct gr_info_s *gr_info)
-#endif
-{
-	static real block[2][2][SBLIMIT * SSLIMIT] = { {{0,}} };
-	static int blc[2] = { 0, 0 };
-
-	real *tspnt = (real *) tsOut;
-	real *rawout1, *rawout2;
-	int bt, sb = 0;
-
-	{
-		int b = blc[ch];
-		rawout1 = block[b][ch];
-		b = -b + 1;
-		rawout2 = block[b][ch];
-		blc[ch] = b;
-	}
-
-	if (gr_info->mixed_block_flag)
-	{
-		sb = 2;
-	#ifdef USE_3DNOW
-	     (fr->dct36)(fsIn[0],rawout1,rawout2,win[0],tspnt);
-	     (fr->dct36)(fsIn[1],rawout1+18,rawout2+18,win1[0],tspnt+1);
-	#else
-		dct36(fsIn[0], rawout1, rawout2, win[0], tspnt);
-		dct36(fsIn[1], rawout1 + 18, rawout2 + 18, win1[0], tspnt + 1);
-	#endif
-		rawout1 += 36;
-		rawout2 += 36;
-		tspnt += 2;
-	}
-
-	bt = gr_info->block_type;
-	if (bt == 2)
-	{
-		for (; sb < (int)gr_info->maxb; sb += 2, tspnt += 2, rawout1 += 36, rawout2 += 36)
-		{
-			dct12(fsIn[sb], rawout1, rawout2, win[2], tspnt);
-			dct12(fsIn[sb + 1], rawout1 + 18, rawout2 + 18, win1[2], tspnt + 1);
-		}
-	}
-	else
-	{
-		for (; sb < (int)gr_info->maxb; sb += 2, tspnt += 2, rawout1 += 36, rawout2 += 36)
-		{
-		#ifdef USE_3DNOW
-			(fr->dct36)(fsIn[sb],rawout1,rawout2,win[bt],tspnt);
-			(fr->dct36)(fsIn[sb+1],rawout1+18,rawout2+18,win1[bt],tspnt+1);
-		#else
-			dct36(fsIn[sb], rawout1, rawout2, win[bt], tspnt);
-			dct36(fsIn[sb + 1], rawout1 + 18, rawout2 + 18, win1[bt], tspnt + 1);
-		#endif
-		}
-	}
-
-	for (; sb < SBLIMIT; sb++, tspnt++)
-	{
-		int i;
-		for (i = 0; i < SSLIMIT; i++)
-		{
-			tspnt[i * SBLIMIT] = *rawout1++;
-			*rawout2++ = 0.0;
-		}
-	}
-}
-
-/*
- * main layer3 handler
- */
-int mpg123_do_layer3(struct frame *fr)
-{
-	int gr, ch, ss;
-	int scalefacs[2][39];	/* max 39 for short[13][3] mode, mixed: 38, long: 22 */
-	struct III_sideinfo sideinfo;
-	int stereo = fr->stereo;
-	int single = fr->single;
-	int ms_stereo, i_stereo;
-	int sfreq = fr->sampling_frequency;
-	int stereo1, granules;
-
-	if (stereo == 1)
-	{			/* stream is mono */
-		stereo1 = 1;
-		single = 0;
-	}
-	else if (single >= 0)	/* stream is stereo, but force to mono */
-		stereo1 = 1;
-	else
-		stereo1 = 2;
-
-	if (fr->mode == MPG_MD_JOINT_STEREO)
-	{
-		ms_stereo = (fr->mode_ext & 0x2) >> 1;
-		i_stereo = fr->mode_ext & 0x1;
-	}
-	else
-		ms_stereo = i_stereo = 0;
-
-	granules = fr->lsf ? 1 : 2;
-	if (!III_get_side_info(&sideinfo, stereo, ms_stereo, sfreq, single, fr->lsf))
-		return 0;
-
-	mpg123_set_pointer(sideinfo.main_data_begin);
-
-	for (gr = 0; gr < granules; gr++)
-	{
-		real hybridIn[2][SBLIMIT][SSLIMIT];
-		real hybridOut[2][SSLIMIT][SBLIMIT];
-
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[0].gr[gr]);
-			long part2bits;
-
-			if (fr->lsf)
-				part2bits = III_get_scale_factors_2(scalefacs[0], gr_info, 0);
-			else
-				part2bits = III_get_scale_factors_1(scalefacs[0], gr_info);
-
-			if (III_dequantize_sample(hybridIn[0], scalefacs[0], gr_info, sfreq, part2bits))
-				return 0;
-		}
-
-		if (stereo == 2)
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]);
-			long part2bits;
-
-			if (fr->lsf)
-				part2bits = III_get_scale_factors_2(scalefacs[1], gr_info, i_stereo);
-			else
-				part2bits = III_get_scale_factors_1(scalefacs[1], gr_info);
-
-			if (III_dequantize_sample(hybridIn[1], scalefacs[1], gr_info, sfreq, part2bits))
-				return 0;
-
-			if (ms_stereo)
-			{
-				int i;
-				int maxb = sideinfo.ch[0].gr[gr].maxb;
-
-				if ((int)sideinfo.ch[1].gr[gr].maxb > maxb)
-					maxb = sideinfo.ch[1].gr[gr].maxb;
-				for (i = 0; i < SSLIMIT * maxb; i++)
-				{
-					real tmp0 = ((real *) hybridIn[0])[i];
-					real tmp1 = ((real *) hybridIn[1])[i];
-					((real *) hybridIn[0])[i] = tmp0 + tmp1;
-					((real *) hybridIn[1])[i] = tmp0 - tmp1;
-				}
-			}
-
-			if (i_stereo)
-				III_i_stereo(hybridIn, scalefacs[1], gr_info, sfreq, ms_stereo, fr->lsf);
-
-			if (ms_stereo || i_stereo || (single == 3))
-			{
-				if (gr_info->maxb > sideinfo.ch[0].gr[gr].maxb)
-					sideinfo.ch[0].gr[gr].maxb = gr_info->maxb;
-				else
-					gr_info->maxb = sideinfo.ch[0].gr[gr].maxb;
-			}
-
-			switch (single)
-			{
-				case 3:
-					{
-						register int i;
-						register real *in0 = (real *) hybridIn[0],
-							*in1 = (real *) hybridIn[1];
-						for (i = 0; i < (int)(SSLIMIT * gr_info->maxb); i++, in0++)
-							*in0 = (*in0 + *in1++);	/* *0.5 done by pow-scale */
-					}
-					break;
-				case 1:
-					{
-						register int i;
-						register real *in0 = (real *) hybridIn[0],
-							*in1 = (real *) hybridIn[1];
-						for (i = 0; i < (int)(SSLIMIT * gr_info->maxb); i++)
-							*in0++ = *in1++;
-					}
-					break;
-			}
-		}
-		if (mpg123_info->eq_active)
-		{
-			int i, sb;
-
-			if (single < 0)
-			{
-				for (sb = 0, i = 0; sb < SBLIMIT; sb++)
-				{
-					for (ss = 0; ss < SSLIMIT; ss++)
-					{
-						hybridIn[0][sb][ss] *= mpg123_info->eq_mul[i];
-						hybridIn[1][sb][ss] *= mpg123_info->eq_mul[i++];
-					}
-				}
-			}
-			else
-			{
-				for (sb = 0, i = 0; sb < SBLIMIT; sb++)
-				{
-					for (ss = 0; ss < SSLIMIT; ss++)
-						hybridIn[0][sb][ss] *= mpg123_info->eq_mul[i++];
-				}
-			}
-		}
-
-		for (ch = 0; ch < stereo1; ch++)
-		{
-			struct gr_info_s *gr_info = &(sideinfo.ch[ch].gr[gr]);
-
-			III_antialias(hybridIn[ch], gr_info);
-			if (gr_info->maxb < 1 || gr_info->maxb > SBLIMIT)
-				return 0;
-		#ifdef USE_3DNOW
-			III_hybrid(hybridIn[ch], hybridOut[ch], ch,gr_info,fr);
-		#else
-			III_hybrid(hybridIn[ch], hybridOut[ch], ch, gr_info);
-		#endif
-		}
-
-		for (ss = 0; ss < SSLIMIT; ss++)
-		{
-			if (single >= 0) {
-				(fr->synth_mono) (hybridOut[0][ss], mpg123_pcm_sample, &mpg123_pcm_point);
-			} else {
-				int p1 = mpg123_pcm_point;
-
-				(fr->synth) (hybridOut[0][ss], 0, mpg123_pcm_sample, &p1);
-				(fr->synth) (hybridOut[1][ss], 1, mpg123_pcm_sample, &mpg123_pcm_point);
-			}
-		}
-
-		if (mpg123_info->output_audio) {			
-			//mpg123_ip.add_vis_pcm(mpg123_ip.output->written_time(),
-			//		      mpg123_cfg.resolution == 16 ? FMT_S16_NE : FMT_U8,
-			//		      mpg123_cfg.channels == 2 ? fr->stereo : 1,
-			//		      mpg123_pcm_point, mpg123_pcm_sample);
-			while (esdout_free () < mpg123_pcm_point && mpg123_info->going && mpg123_info->jump_to_time == -1) {
-				usleep (10000);
-			}
-			
-			if (mpg123_info->going && mpg123_info->jump_to_time == -1) {
-				esdout_write (mpg123_pcm_sample, mpg123_pcm_point);
-			}
-		}
-		mpg123_pcm_point = 0;
-	}
-	return 1;
-}
diff --git a/components/music/main.c b/components/music/main.c
deleted file mode 100644
index 5f43548a2..000000000
--- a/components/music/main.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Maciej Stachowiak <mjs@eazel.com>
- */
-
-/* main.c - Main function and object activation function for music
- * view component.
- */
-
-#include <config.h>
-
-#include "nautilus-music-view.h"
-#include <libnautilus/nautilus-view-standard-main.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <eel/eel-debug.h>
-
-#define VIEW_IID    "OAFIID:Nautilus_Music_View"
-#define FACTORY_IID "OAFIID:Nautilus_Music_View_Factory"
-
-int
-main (int argc, char *argv[])
-{
-	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		eel_make_warnings_and_criticals_stop_in_debugger ();
-	}
-
-	return nautilus_view_standard_main ("nautilus-music-view",
-					    VERSION,
-					    GETTEXT_PACKAGE,
-					    GNOMELOCALEDIR,
-					    argc,
-					    argv,
-					    FACTORY_IID,
-					    VIEW_IID,
-					    nautilus_view_create_from_get_type_function,
-					    nautilus_global_preferences_init,
-					    nautilus_music_view_get_type);
-}
diff --git a/components/music/mp3head.c b/components/music/mp3head.c
deleted file mode 100644
index 32051fcf5..000000000
--- a/components/music/mp3head.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * MPEG Layer3 header info extraction routines
- *
- * Author: Erik Gustavsson, <cyrano@algonet.se>
- *
- * This software is released under the GNU General Public License.
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at you own risk!
- */
-
-#include "mp3head.h"
-
-int bitrates[2][16] = {
-{0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},          /* MPEG2 */
-{0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,}}; /* MPEG1 */
-
-long samprates[2][3] = {
-{ 22050, 24000, 16000 },  /* MPEG2 */
-{ 44100, 48000, 32000 }}; /* MPEG1 */
-
-
-static int extractI4(unsigned char *buf)
-{
-	int x;
-	/* big endian extract */
-
-	x = buf[0];
-	x <<= 8;
-	x |= buf[1];
-	x <<= 8;
-	x |= buf[2];
-	x <<= 8;
-	x |= buf[3];
-
-	return(x);
-}
-
-/* check for valid MPEG header */
-static int is_mphead(unsigned char *buf)
-{
-	if (buf[0] != 0xff) return(0);		
-	if ((buf[1] & 0xf0) != 0xf0) return(0);	 /* 12 bits framesync */
-	
-	return(1); 
-}
-
-/* check for valid "Xing" VBR header */
-static int is_xhead(unsigned char *buf)
-{
-	if (buf[0] != 'X') return(0);
-	if (buf[1] != 'i') return(0);
-	if (buf[2] != 'n') return(0);
-	if (buf[3] != 'g') return(0);
-	
-	return(1);
-}
-
-/* return bitrate from MPEG header, average rate for VBR files or -1 on error */
-int get_bitrate (unsigned char *buf,int bufsize)
-{
-	int i=0;
-	int ver,srindex,brindex,xbytes,xframes;
-	float br;
-	
-	while(!is_mphead(buf+i)) {
-		i++;
-		if (i>bufsize-4) return(-1);  /* no valid header, give up */
-	}	
-
-	ver = (buf[i+1] & 0x08) >> 3;
-	brindex = (buf[i+2] & 0xf0) >> 4;
-	srindex = (buf[i+2] & 0x0c) >> 2;
-
-	/* but if there is a Xing header we'll use that instead... */	
-	i=0;
-	while(!is_xhead(buf+i)) {
-		i++;
-		if (i>bufsize-16) return(bitrates[ver][brindex]);
-	}
-
-	xframes = extractI4(buf+i+8);
-	xbytes = extractI4(buf+i+12);
-
-	br = (float)samprates[ver][srindex]*xbytes/(576+ver*576)/xframes/125;
-	return(br);
-}
-
-/* return sample rate from MPEG header */
-int get_samprate(unsigned char *buf, int bufsize)
-{
-	int i=0;
-	int ver,srindex;
-	
-	while(!is_mphead(buf+i))
-	{
-		i++;
-		if (i>bufsize-4) return(-1);  /* no valid header, give up */
-	}	
-
-	ver = (buf[i+1] & 0x08) >> 3;
-	srindex = (buf[i+2] & 0x0c) >> 2;
-
-	return(samprates[ver][srindex]);
-}
-
-
-/* return 1 for MPEG1, 0 for MPEG2, -1 for error */
-int get_mpgver(unsigned char *buf,int bufsize)
-{
-	int i=0;
-	int ver;
-	
-	while(!is_mphead(buf+i))
-	{
-		i++;
-		if (i>bufsize-4) return(-1);  /* no valid header, give up */
-	}	
-
-	ver = (buf[i+1] & 0x08) >> 3;
-
-	return(ver);
-}
-
-/* return 0=mono, 1=dual ch, 2=joint stereo, 3=stereo */
-int get_stereo(unsigned char *buf,int bufsize)
-{
-	int i=0;
-	int st;
-	
-	while(!is_mphead(buf+i))
-	{
-		i++;
-		if (i>bufsize-4) return(-1);  /* no valid header, give up */
-	}	
-
-	st = (buf[i+3] & 0xC0) >> 6;
-
-	return(3-st);
-}
-
-
-static int mp_br_table[2][16] =
-	{{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0},
- 	 {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0}};
- 
-static int mp_sr20_table[2][4] = 
-	{{441, 480, 320, -999}, {882, 960, 640, -999}};
-
-/* mpeg2 */
-static int mp_br_tableL1[2][16] =
-	{{0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0},  
-	 {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0}};
-
-/* mpeg 2 */
-static int mp_br_tableL3[2][16] =
-	{{0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0},      
-	 {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0}};
-
-
-static int 
-compare(unsigned char *buf, unsigned char *buf2)
-{
-	if (buf[0] != buf2[0]) {
-      		return 0;
-      	}
-      	
-	if (buf[1] != buf2[1]) {
-      		return 0;
-      	}
-      	
-	return 1;
-}
-
-
-
-/*------------------------------------------------------*/
-/*---- scan for next sync, assume start is valid -------*/
-/*---- return number bytes to next sync ----------------*/
-static int 
-sync_scan (unsigned char *buf, int n, int i0)
-{
-	int i;
-
-	for (i = i0; i < n; i++) {
-		if (compare (buf, buf + i)) {
-	 		return i;
-	 	}
-	 }
-
-   	return 0;
-}
-
-/*------------------------------------------------------*/
-/*- test consecutative syncs, input isync without pad --*/
-static int 
-sync_test (unsigned char *buf, int n, int isync, int padbytes)
-{
-	int i, nmatch, pad;
-
-	nmatch = 0;
-	for (i = 0;;) {
-		pad = padbytes * ((buf[i + 2] & 0x02) >> 1);
-		i += (pad + isync);
-
-		if (i > n) {
-	 		break;
-	 	}
-	 	
-      		if (!compare(buf, buf + i)) {
-	 		return -nmatch;
-	 	}
-	 	
-      		nmatch++;
-	}
-	
-	return nmatch;
-}
-
-
-static int 
-find_sync (unsigned char *buf, int n)
-{
-	int i0, isync, nmatch, pad;
-	int padbytes, option;
-
-	/* mod 4/12/95 i0 change from 72, allows as low as 8kbits for mpeg1 */
-	i0 = 24;
-	padbytes = 1;
-	option = (buf[1] & 0x06) >> 1;
-	if (option == 3) {
-		padbytes = 4;
-		i0 = 24;	/* for shorter layer I frames */
-   	}
-
-	pad = (buf[2] & 0x02) >> 1;
-
-	n -= 3;			/*  need 3 bytes of header  */
-
-	while (i0 < 2000) {
-		isync = sync_scan (buf, n, i0);
-		i0 = isync + 1;
-		isync -= pad;
-		if (isync <= 0) {
-	 		return 0;
-	 	}
-	 	
-		nmatch = sync_test (buf, n, isync, padbytes);
-		if (nmatch > 0) {
-	 		return isync;
-	 	}
-	}
-	
-	return 0;
-}
-
-
-
-int 
-get_header_info (unsigned char *buf, unsigned int n, MPEGHeader *h)
-{
-	int framebytes;
-	int mpeg25_flag;
-  
-	if (n > 10000) {
-		/* limit scan for free format */
-      		n = 10000;
-      	}
-
-	h->sync = 0;
-	
-   	if ((buf[0] == 0xFF) && ((buf[0+1] & 0xF0) == 0xF0)) {
-		/* mpeg 1 & 2 */
-		mpeg25_flag = 0;		
-
-   	} else if ((buf[0] == 0xFF) && ((buf[0+1] & 0xF0) == 0xE0)) {
-		/* mpeg 2.5 */
-		mpeg25_flag = 1;
-	} else {
-		/* sync fail */
-      		return 0;
-      	}
-
-	h->sync = 1;
-	if (mpeg25_flag) {
-		/* low bit clear signals mpeg25 (as in 0xFFE) */
-		h->sync = 2;
-	}
-
-	h->id = (buf[0+1] & 0x08) >> 3;
-	h->option = (buf[0+1] & 0x06) >> 1;
-	h->prot = (buf[0+1] & 0x01);
-
-	h->br_index = (buf[0+2] & 0xf0) >> 4;
-	h->sr_index = (buf[0+2] & 0x0c) >> 2;
-	h->pad = (buf[0+2] & 0x02) >> 1;
-	h->private_bit = (buf[0+2] & 0x01);
-	h->mode = (buf[0+3] & 0xc0) >> 6;
-	h->mode_ext = (buf[0+3] & 0x30) >> 4;
-	h->cr = (buf[0+3] & 0x08) >> 3;
-	h->original = (buf[0+3] & 0x04) >> 2;
-	h->emphasis = (buf[0+3] & 0x03);
-
-	/* compute framebytes for Layer I, II, III */
-	if (h->option < 1) {
-		return 0;
-	}
-	
-	if (h->option > 3) {
-		return 0;
-	}
-
-  	framebytes = 0;
-
-	if (h->br_index > 0) {
-		if (h->option == 3) {
-			/* layer I */
-	 		framebytes = 240 * mp_br_tableL1[h->id][h->br_index] / mp_sr20_table[h->id][h->sr_index];
-			framebytes = 4 * framebytes;
-		} else if (h->option == 2) {
-			/* layer II */
-			framebytes = 2880 * mp_br_table[h->id][h->br_index] / mp_sr20_table[h->id][h->sr_index];
-		} else if (h->option == 1) {
-			/* layer III */
-			if (h->id) {
-				// mpeg1
-				framebytes = 2880 * mp_br_tableL3[h->id][h->br_index] / mp_sr20_table[h->id][h->sr_index];
-			} else {			
-				/* mpeg2 */
-				if (mpeg25_flag) {
-					/* mpeg2.2 */
-	       				framebytes = 2880 * mp_br_tableL3[h->id][h->br_index] / mp_sr20_table[h->id][h->sr_index];
-	    			} else {
-					framebytes = 1440 * mp_br_tableL3[h->id][h->br_index] / mp_sr20_table[h->id][h->sr_index];
-	    			}
-			}
-		} else {
-			/* free format */
-			framebytes = find_sync (buf, n);
-		}
-	}
-	
-	return framebytes;
-}
-
-int 
-get_header_info_extended (unsigned char *buf, unsigned int n, MPEGHeader *h, int *bitrate)
-{
-	int framebytes;
-
-	/*---  return bitrate (in bits/sec) in addition to frame bytes ---*/
-	*bitrate = 0;
-
-	/*-- assume fail --*/
-   	framebytes = get_header_info (buf, n, h);
-
-	if (framebytes == 0) {
-      		return 0; 
-	}
-
-	/* layer III */
-   	if (h->option == 1) {				
-		if (h->br_index > 0) {
-			*bitrate = 1000 * mp_br_tableL3[h->id][h->br_index];
-		} else {			
-			if (h->id) {
-				/* mpeg1 */
-	    			*bitrate = 1000 * framebytes * mp_sr20_table[h->id][h->sr_index] / (144 * 20);
-	 		} else {
-				/* mpeg2 */
-	    			if ((h->sync & 1) == 0)	{
-	    				/* flags mpeg25 */
-	       				*bitrate = 500 * framebytes * mp_sr20_table[h->id][h->sr_index] / (72 * 20);
-				} else {
-	       				*bitrate = 1000 * framebytes * mp_sr20_table[h->id][h->sr_index] / (72 * 20);
-	 			}
-      			}
-   		}
-   	}
-   	
-	/* layer II */
-	if (h->option == 2) {	
-      		if (h->br_index > 0) {
-	 		*bitrate = 1000 * mp_br_table[h->id][h->br_index];
-		} else {
-	 		*bitrate = 1000 * framebytes * mp_sr20_table[h->id][h->sr_index] / (144 * 20);
-   		}
-   	}
-   	
-	/* layer I */
-   	if (h->option == 3) {				
-      		if (h->br_index > 0) {
-	 		*bitrate = 1000 * mp_br_tableL1[h->id][h->br_index];
-      		} else {
-	 		*bitrate = 1000 * framebytes * mp_sr20_table[h->id][h->sr_index] / (48 * 20);
-		}
-   	}
-
-	return framebytes;
-}
-
diff --git a/components/music/mp3head.h b/components/music/mp3head.h
deleted file mode 100644
index 34070de76..000000000
--- a/components/music/mp3head.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * MPEG Layer3 header info extraction routines
- *
- * Author: Erik Gustavsson, <cyrano@algonet.se>
- *
- * This software is released under the GNU General Public License.
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at you own risk!
- */
-
-#ifndef MP3HEAD_H
-#define MP3HEAD_H
-
-/* mpeg audio header   */
-typedef struct
-{
-	int sync;			/* 1 if valid sync */
-	int id;
-	int option;
-	int prot;
-	int br_index;
-	int sr_index;
-	int pad;
-	int private_bit;
-	int mode;
-	int mode_ext;
-	int cr;
-	int original;
-	int emphasis;
-} MPEGHeader;
-
-
-/* ID3v2 Tag Header */
-typedef struct {
-	char id_str[3];
-	unsigned char version[2];
-	unsigned char flags[1];
-	unsigned char size[4];
-} ID3V2Header;
-
-
-int get_bitrate(unsigned char *buf,int bufsize);
-int get_samprate(unsigned char *buf,int bufsize);
-int get_mpgver(unsigned char *buf,int bufsize);
-int get_stereo(unsigned char *buf,int bufsize);
-
-int get_header_info (unsigned char *buf, unsigned int n, MPEGHeader *h);
-int get_header_info_extended (unsigned char *buf, unsigned int n, MPEGHeader *h, int *bitrate);
-
-#endif
-
diff --git a/components/music/mpg123.c b/components/music/mpg123.c
deleted file mode 100644
index ea087de5f..000000000
--- a/components/music/mpg123.c
+++ /dev/null
@@ -1,845 +0,0 @@
-#include <config.h>
-#include "mpg123.h"
-
-#include "esd-audio.h"
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <libgnome/gnome-i18n.h>
-
-static long outscale = 32768;
-
-static struct frame fr, temp_fr;
-
-PlayerInfo *mpg123_info = NULL;
-static pthread_t decode_thread;
-MPG123Config mpg123_cfg;
-
-static gboolean vbr_set = FALSE, have_xing_header = FALSE;
-static XHEADDATA xing_header;
-static unsigned char xing_toc[100];
-static gboolean audio_error = FALSE;
-gint mpg123_bitrate, mpg123_frequency, mpg123_length, mpg123_layer, mpg123_lsf;
-gchar *mpg123_title = NULL, *mpg123_filename = NULL;
-static gint disp_bitrate, skip_frames = 0;
-gboolean mpg123_stereo, mpg123_mpeg25;
-gint mpg123_mode;
-
-const gchar *mpg123_id3_genres[GENRE_MAX] =
-{
-	N_("Blues"), N_("Classic Rock"), N_("Country"), N_("Dance"),
-	N_("Disco"), N_("Funk"), N_("Grunge"), N_("Hip-Hop"),
-	N_("Jazz"), N_("Metal"), N_("New Age"), N_("Oldies"),
-	N_("Other"), N_("Pop"), N_("R&B"), N_("Rap"), N_("Reggae"),
-	N_("Rock"), N_("Techno"), N_("Industrial"), N_("Alternative"),
-	N_("Ska"), N_("Death Metal"), N_("Pranks"), N_("Soundtrack"),
-	N_("Euro-Techno"), N_("Ambient"), N_("Trip-Hop"), N_("Vocal"),
-	N_("Jazz+Funk"), N_("Fusion"), N_("Trance"), N_("Classical"),
-	N_("Instrumental"), N_("Acid"), N_("House"), N_("Game"),
-	N_("Sound Clip"), N_("Gospel"), N_("Noise"), N_("Alt"),
-	N_("Bass"), N_("Soul"), N_("Punk"), N_("Space"),
-	N_("Meditative"), N_("Instrumental Pop"),
-	N_("Instrumental Rock"), N_("Ethnic"), N_("Gothic"),
-	N_("Darkwave"), N_("Techno-Industrial"), N_("Electronic"),
-	N_("Pop-Folk"), N_("Eurodance"), N_("Dream"),
-	N_("Southern Rock"), N_("Comedy"), N_("Cult"),
-	N_("Gangsta Rap"), N_("Top 40"), N_("Christian Rap"),
-	N_("Pop/Funk"), N_("Jungle"), N_("Native American"),
-	N_("Cabaret"), N_("New Wave"), N_("Psychedelic"), N_("Rave"),
-	N_("Showtunes"), N_("Trailer"), N_("Lo-Fi"), N_("Tribal"),
-	N_("Acid Punk"), N_("Acid Jazz"), N_("Polka"), N_("Retro"),
-	N_("Musical"), N_("Rock & Roll"), N_("Hard Rock"), N_("Folk"),
-	N_("Folk/Rock"), N_("National Folk"), N_("Swing"),
-	N_("Fast-Fusion"), N_("Bebob"), N_("Latin"), N_("Revival"),
-	N_("Celtic"), N_("Bluegrass"), N_("Avantgarde"),
-	N_("Gothic Rock"), N_("Progressive Rock"),
-	N_("Psychedelic Rock"), N_("Symphonic Rock"), N_("Slow Rock"),
-	N_("Big Band"), N_("Chorus"), N_("Easy Listening"),
-	N_("Acoustic"), N_("Humour"), N_("Speech"), N_("Chanson"),
-	N_("Opera"), N_("Chamber Music"), N_("Sonata"), N_("Symphony"),
-	N_("Booty Bass"), N_("Primus"), N_("Porn Groove"),
-	N_("Satire"), N_("Slow Jam"), N_("Club"), N_("Tango"),
-	N_("Samba"), N_("Folklore"), N_("Ballad"), N_("Power Ballad"),
-	N_("Rhythmic Soul"), N_("Freestyle"), N_("Duet"),
-	N_("Punk Rock"), N_("Drum Solo"), N_("A Cappella"),
-	N_("Euro-House"), N_("Dance Hall"), N_("Goa"),
-	N_("Drum & Bass"), N_("Club-House"), N_("Hardcore"),
-	N_("Terror"), N_("Indie"), N_("BritPop"), N_("Negerpunk"),
-	N_("Polsk Punk"), N_("Beat"), N_("Christian Gangsta Rap"),
-	N_("Heavy Metal"), N_("Black Metal"), N_("Crossover"),
-	N_("Contemporary Christian"), N_("Christian Rock"),
-	N_("Merengue"), N_("Salsa"), N_("Thrash Metal"),
-	N_("Anime"), N_("JPop"), N_("Synthpop")
-};
-
-double mpg123_compute_tpf(struct frame *fr)
-{
-	static int bs[4] =
-	{0, 384, 1152, 1152};
-	double tpf;
-
-	tpf = (double) bs[fr->lay];
-	tpf /= mpg123_freqs[fr->sampling_frequency] << (fr->lsf);
-	return tpf;
-}
-
-static void 
-set_mpg123_synth_functions(struct frame *fr)
-{
-	typedef int (*func) (real *, int, unsigned char *, int *);
-	typedef int (*func_mono) (real *, unsigned char *, int *);
-	int ds = fr->down_sample;
-	int p8 = 0;
-
-	static func funcs[2][4] =
-	{
-		{mpg123_synth_1to1,
-		 mpg123_synth_2to1,
-		 mpg123_synth_4to1,
-		 mpg123_synth_ntom},
-		{mpg123_synth_1to1_8bit,
-		 mpg123_synth_2to1_8bit,
-		 mpg123_synth_4to1_8bit,
-		 mpg123_synth_ntom_8bit}
-	};
-
-	static func_mono funcs_mono[2][2][4] =
-	{
-		{
-			{mpg123_synth_1to1_mono2stereo,
-			 mpg123_synth_2to1_mono2stereo,
-			 mpg123_synth_4to1_mono2stereo,
-			 mpg123_synth_ntom_mono2stereo},
-			{mpg123_synth_1to1_8bit_mono2stereo,
-			 mpg123_synth_2to1_8bit_mono2stereo,
-			 mpg123_synth_4to1_8bit_mono2stereo,
-			 mpg123_synth_ntom_8bit_mono2stereo}},
-		{
-			{mpg123_synth_1to1_mono,
-			 mpg123_synth_2to1_mono,
-			 mpg123_synth_4to1_mono,
-			 mpg123_synth_ntom_mono},
-			{mpg123_synth_1to1_8bit_mono,
-			 mpg123_synth_2to1_8bit_mono,
-			 mpg123_synth_4to1_8bit_mono,
-			 mpg123_synth_ntom_8bit_mono}}
-	};
-
-	if (mpg123_cfg.resolution == 8)
-		p8 = 1;
-	fr->synth = funcs[p8][ds];
-	fr->synth_mono = funcs_mono[1][p8][ds];
-
-	if (p8) {
-		mpg123_make_conv16to8_table();
-	}
-}
-
-static void 
-mpg123_init (void)
-{
-	mpg123_make_decode_tables(outscale);
-
-	mpg123_cfg.resolution = 16;
-	mpg123_cfg.channels = 2;
-	mpg123_cfg.downsample = 0;
-	mpg123_cfg.downsample_custom = 44100;
-	mpg123_cfg.proxy_port = 8080;
-	mpg123_cfg.proxy_use_auth = FALSE;
-	mpg123_cfg.proxy_user = NULL;
-	mpg123_cfg.proxy_pass = NULL;
-	mpg123_cfg.cast_title_streaming = FALSE;
-	mpg123_cfg.use_udp_channel = TRUE;
-	mpg123_cfg.use_id3 = TRUE;
-	mpg123_cfg.disable_id3v2 = FALSE;
-	mpg123_cfg.detect_by_content = FALSE;
-	mpg123_cfg.id3_format = g_strdup("%1 - %2");
-	mpg123_cfg.proxy_host = g_strdup("localhost");
-}
-
-static guint32 
-convert_to_header (guint8 * buf)
-{
-
-	return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
-}
-
-static void 
-play_frame (struct frame *fr)
-{
-	if (fr->error_protection) {
-		bsi.wordpointer += 2;
-		/*  mpg123_getbits(16); */	/* skip crc */
-	}
-	
-	if(!fr->do_layer(fr)) {
-		skip_frames = 2;
-		mpg123_info->output_audio = FALSE;
-	} else {
-		if(!skip_frames)
-			mpg123_info->output_audio = TRUE;
-		else
-			skip_frames--;
-	}
-}
-
-/* as defined in WinAmp's Nullsoft Nitrane pllugin preferences
-   default is "%1 - %2" (Artist - Title), %% = '%' */
-enum id3_format_codes
-{
-	ID3_ARTIST = '1', ID3_TITLE, ID3_ALBUM, ID3_YEAR,
-	ID3_COMMENT, ID3_GENRE, FILE_NAME, FILE_PATH,
-	FILE_EXT
-};
-
-static const gchar *get_id3_genre(unsigned char genre_code)
-{
-	return (genre_code < GENRE_MAX) ? mpg123_id3_genres[genre_code] : "";
-};
-
-guint mpg123_strip_spaces(char *src, size_t n)
-/* strips trailing spaces from string of length n
-   returns length of adjusted string */
-{
-	gchar *space = NULL,	/* last space in src */
-	     *start = src;
-
-	while (n--)
-		switch (*src++)
-		{
-			case '\0':
-				n = 0;	/* breaks out of while loop */
-
-				src--;
-				break;
-			case ' ':
-				if (space == NULL)
-					space = src - 1;
-				break;
-			default:
-				space = NULL;	/* don't terminate intermediate spaces */
-
-				break;
-		}
-	if (space != NULL)
-	{
-		src = space;
-		*src = '\0';
-	}
-	return src - start;
-}
-
-/*
- * Function extname (filename)
- *
- *    Return pointer within filename to its extenstion, or NULL if
- *    filename has no extension.
- *
- */
-static gchar *extname(const char *filename)
-{
-	gchar *ext = strrchr(filename, '.');
-
-	if (ext != NULL)
-		++ext;
-
-	return ext;
-}
-
-static gchar *eval_id3_format(const char *id3_format, struct id3tag_t *id3,
-			      const char *filename)
-/* returns ID3 and filename data as specified in format
-   as in Nullsoft's Nitrane plugin v1.31b (their MPEG decoder) */
-{
-	gchar *ans, c, *base, *path, *ext;
-	guint length = 0, allocated, baselen, pathlen, extlen, tmp;
-	const size_t alloc_size = 256;	/* size of memory block allocations */
-	gboolean got_field = FALSE;
-
-	ans = g_malloc (allocated = alloc_size);
-	pathlen = strlen (path = g_path_get_dirname (filename));
-	base = g_path_get_basename (filename);
-	if ((ext = extname(base)) == NULL)
-	{
-		ext = "";
-		extlen = 0;
-	} else {
-		*(ext - 1) = '\0';
-		extlen = strlen(ext);
-	}
-	baselen = strlen(base);
-	while ((c = *id3_format++) != '\0')
-	{
-		tmp = 1;
-		if (c == '%')
-		{
-			switch (*id3_format++)
-			{
-				case 0:
-					id3_format--;	/* otherwise we'll lose terminator */
-
-				case '%':
-					ans[length] = '%';
-					break;
-				case ID3_ARTIST:
-					tmp = strlen(id3->artist);
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->artist, tmp);
-					break;
-				case ID3_TITLE:
-					tmp = strlen(id3->title);
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->title, tmp);
-					break;
-				case ID3_ALBUM:
-					tmp = strlen(id3->album);
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->album, tmp);
-					break;
-				case ID3_YEAR:
-					tmp = strlen(id3->year);
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->year, tmp);
-					break;
-				case ID3_COMMENT:
-					tmp = strlen(id3->comment);					
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->comment, tmp);
-					break;
-				case ID3_GENRE:					
-					tmp = strlen(id3->genre);
-					if(tmp != 0)
-						got_field = TRUE;
-					strncpy(&ans[length], id3->genre, tmp);
-					break;
-				case FILE_NAME:
-					strncpy(&ans[length], base, tmp = baselen);
-					got_field = TRUE;
-					break;
-				case FILE_PATH:
-					strncpy(&ans[length], path, tmp = pathlen);
-					got_field = TRUE;
-					break;
-				case FILE_EXT:
-					strncpy(&ans[length], ext, tmp = extlen);
-					got_field = TRUE;
-					break;
-				default:
-					ans[length] = c;
-					break;
-			}
-		}
-		else
-			ans[length] = c;
-		ans[length += tmp] = '\0';
-		if (allocated - length <= 30)
-			ans = g_realloc(ans, allocated += alloc_size);
-	}
-	ans = g_realloc(ans, length + 1);
-	if(!got_field)
-	{
-		g_free(ans);
-		ans = g_strdup(base);
-	}
-	g_free(base);
-	g_free(path);
-	return ans;
-}
-
-/*
- * Function id3v1_to_id3v2 (v1, v2)
- *
- *    Convert ID3v1 tag `v1' to ID3v2 tag `v2'.
- *
- */
-
-void 
-mpg123_id3v1_to_id3v2 (struct id3v1tag_t *v1, struct id3tag_t *v2)
-{
-	memset(v2,0,sizeof(struct id3tag_t));
-	strncpy(v2->title, v1->title, 30);
-	strncpy(v2->artist, v1->artist, 30);
-	strncpy(v2->album, v1->album, 30);
-	strncpy(v2->year, v1->year, 4);
-	strncpy(v2->comment, v1->comment, 28);
-	g_snprintf(v2->track, sizeof v2->track, "%d", v1->track);
-	strncpy(v2->genre, get_id3_genre(v1->genre), sizeof (v2->genre));
-	mpg123_strip_spaces(v2->title, 30);
-	mpg123_strip_spaces(v2->artist, 30);
-	mpg123_strip_spaces(v2->album, 30);
-	mpg123_strip_spaces(v2->year, 4);
-	mpg123_strip_spaces(v2->comment, 30);
-	mpg123_strip_spaces(v2->genre, sizeof (v2->genre));
-}
-
-/*
- * Function mpg123_format_song_title (tag, filename)
- *
- *    Create song title according to `tag' and/or `filename' and
- *    return it.  The title must be subsequently freed using g_free().
- *
- */
-gchar *mpg123_format_song_title(struct id3tag_t *tag, gchar * filename)
-{
-	gchar *ret = NULL;
-
-	if (mpg123_cfg.use_id3 && tag)
-	{
-		/*
-		 * Format according to tag.
-		 */
-		ret = eval_id3_format(mpg123_cfg.id3_format,
-				      tag, filename);
-	}
-
-	if (!ret)
-	{
-		/*
-		 * Format according to filename.
-		 */
-		ret = g_path_get_basename (filename);
-		if (extname(ret) != NULL)
-			*(extname(ret) - 1) = '\0';	/* removes period */
-	}
-
-	return ret;
-}
-
-/*
- * Function mpg123_get_id3v2 (id3d, tag)
- *
- *    Get desired contents from the indicated id3tag and store it in
- *    `tag'. 
- *
- */
-void mpg123_get_id3v2(id3_t * id3d, struct id3tag_t *tag)
-{
-	id3_frame_t *id3frm;
-	char *txt;
-	int tlen;
-
-#define ID3_SET(_tid,_fld) 						\
-{									\
-	id3frm = id3_get_frame( id3d, _tid, 1 );			\
-	if (id3frm) {							\
-		txt = _tid == ID3_TCON ? id3_get_content(id3frm)	\
-		    : id3_get_text(id3frm);				\
-		if(txt)							\
-		{							\
-			tlen = strlen(txt);				\
-			if ( tlen >= (int)sizeof(tag->_fld) ) 		\
-				tlen = sizeof(tag->_fld)-1;		\
-			strncpy( tag->_fld, txt, tlen );		\
-			tag->_fld[tlen] = 0;				\
-		}							\
-		else							\
-			tag->_fld[0] = 0;				\
-	} else {							\
-		tag->_fld[0] = 0;					\
-	}								\
-}
-	ID3_SET(ID3_TIT2, title);
-	ID3_SET(ID3_TPE1, artist);
-	ID3_SET(ID3_TALB, album);
-	ID3_SET(ID3_TYER, year);
-	ID3_SET(ID3_TXXX, comment);
-	ID3_SET(ID3_TCON, genre);
-}
-
-/*
- * Function get_song_title (fd, filename)
- *
- *    Get song title of file.  File position of `fd' will be
- *    clobbered.  `fd' may be NULL, in which case `filename' is opened
- *    separately.  The returned song title must be subsequently freed
- *    using g_free().
- *
- */
-static gchar *get_song_title(FILE * fd, char *filename)
-{
-	FILE *file = fd;
-	char *ret = NULL;
-	struct id3v1tag_t id3v1tag;
-	struct id3tag_t id3tag;
-
-	if (file || (file = fopen(filename, "rb")) != 0)
-	{
-		id3_t *id3 = NULL;
-
-		/*
-		 * Try reading ID3v2 tag.
-		 */
-		if (!mpg123_cfg.disable_id3v2)
-		{
-			fseek(file, 0, SEEK_SET);
-			id3 = id3_open_fp(file, 0);
-			if (id3)
-			{
-				mpg123_get_id3v2(id3, &id3tag);
-				ret = mpg123_format_song_title(&id3tag, filename);
-				id3_close(id3);
-			}
-		}
-
-		/*
-		 * Try reading ID3v1 tag.
-		 */
-		if (!id3 && (fseek(file, -1 * sizeof (id3v1tag), SEEK_END) == 0) &&
-		    (fread(&id3v1tag, 1, sizeof (id3v1tag), file) == sizeof (id3v1tag)) &&
-		    (strncmp(id3v1tag.tag, "TAG", 3) == 0))
-		{
-			mpg123_id3v1_to_id3v2(&id3v1tag, &id3tag);
-			ret = mpg123_format_song_title(&id3tag, filename);
-		}
-
-		if (!fd)
-			/*
-			 * File was opened in this function.
-			 */
-			fclose(file);
-	}
-
-	if (ret == NULL)
-		/*
-		 * Unable to get ID3 tag.
-		 */
-		ret = mpg123_format_song_title(NULL, filename);
-
-	return ret;
-}
-
-static guint
-get_song_time (FILE * file)
-{
-	guint32 head;
-	guchar tmp[4], *buf;
-	struct frame frm;
-	XHEADDATA xing_header;
-	double tpf, bpf;
-	guint32 len;
-
-	if (!file)
-		return -1;
-
-	fseek(file, 0, SEEK_SET);
-	if (fread(tmp, 1, 4, file) != 4)
-		return 0;
-	head = convert_to_header(tmp);
-	while (!mpg123_head_check(head))
-	{
-		head <<= 8;
-		if (fread(tmp, 1, 1, file) != 1)
-			return 0;
-		head |= tmp[0];
-	}
-	if (mpg123_decode_header(&frm, head))
-	{
-		buf = g_malloc(frm.framesize + 4);
-		fseek(file, -4, SEEK_CUR);
-		fread(buf, 1, frm.framesize + 4, file);
-		xing_header.toc = NULL;
-		tpf = mpg123_compute_tpf(&frm);
-		if (mpg123_get_xing_header(&xing_header, buf))
-		{
-			g_free(buf);
-			return ((guint) (tpf * xing_header.frames * 1000));
-		}
-		g_free(buf);
-		bpf = mpg123_compute_bpf(&frm);
-		fseek(file, 0, SEEK_END);
-		len = ftell(file);
-		fseek(file, -128, SEEK_END);
-		fread(tmp, 1, 3, file);
-		if (!strncmp(tmp, "TAG", 3))
-			len -= 128;
-		return ((guint) ((guint)(len / bpf) * tpf * 1000));
-	}
-	return 0;
-}
-
-void 
-get_song_info (char *filename, char **title_real, int *len_real)
-{
-	FILE *file;
-
-	(*len_real) = -1;
-	(*title_real) = NULL;
-
-	if ((file = fopen(filename, "rb")) != NULL) {
-		(*len_real) = get_song_time (file);
-		(*title_real) = get_song_title (file, filename);
-		fclose(file);
-	}
-}
-
-static void 
-*decode_loop (void *arg)
-{
-	gboolean output_opened = FALSE;
-	gint disp_count = 0, temp_time;
-	gchar *filename = arg;
-
-	mpg123_bitrate = 0;
-
-	mpg123_pcm_sample = (unsigned char *) g_malloc0(32768);
-	mpg123_pcm_point = 0;
-	mpg123_filename = filename;
-
-	mpg123_read_frame_init();
-
-	mpg123_open_stream (filename, -1);
-	if (mpg123_info->eof || !mpg123_read_frame(&fr)) {
-		mpg123_info->eof = TRUE;
-	}
-	
-	if(!mpg123_info->eof) {
-		if (mpg123_cfg.channels == 2) {
-			fr.single = -1;
-		} else {
-			fr.single = 3;
-		}
-		
-		fr.down_sample = mpg123_cfg.downsample;
-		fr.down_sample_sblimit = SBLIMIT >> mpg123_cfg.downsample;
-		set_mpg123_synth_functions(&fr);
-		mpg123_init_layer3 (fr.down_sample_sblimit);
-
-		mpg123_info->tpf = mpg123_compute_tpf (&fr);
-		xing_header.toc = xing_toc;
-		if (mpg123_stream_check_for_xing_header (&fr, &xing_header)) {
-			mpg123_info->num_frames = xing_header.frames;
-			have_xing_header = TRUE;
-			vbr_set = TRUE;
-			mpg123_read_frame (&fr);
-		}
-
-		for(;;) {
-			memcpy (&temp_fr,&fr,sizeof(struct frame));
-			if (!mpg123_read_frame (&temp_fr)) {
-				mpg123_info->eof = TRUE;
-				break;
-			}
-			
-			if (fr.lay != temp_fr.lay || fr.sampling_frequency != temp_fr.sampling_frequency || 
-	        	    fr.stereo != temp_fr.stereo || fr.lsf != temp_fr.lsf) {
-				memcpy(&fr,&temp_fr,sizeof(struct frame));
-			} else {
-				break;
-			}
-		}
-		
-		if(!have_xing_header) { 
-			mpg123_info->num_frames = mpg123_calc_numframes (&fr);
-		}
-
-		memcpy (&fr,&temp_fr,sizeof(struct frame));
-		mpg123_bitrate = disp_bitrate = tabsel_123[fr.lsf][fr.lay - 1][fr.bitrate_index];
-		mpg123_frequency = mpg123_freqs[fr.sampling_frequency];
-		mpg123_stereo = fr.stereo;
-		mpg123_layer = fr.lay;
-		mpg123_lsf = fr.lsf;
-		mpg123_mpeg25 = fr.mpeg25;
-		mpg123_mode = fr.mode;
-
-		mpg123_length = mpg123_info->num_frames * mpg123_info->tpf * 1000;
-		if (!mpg123_title) {
-			mpg123_title = get_song_title(NULL,filename);
-		}
-			
-		output_opened = TRUE;
-		if (!esdout_open (mpg123_cfg.resolution == 16 ? FMT_S16_NE : FMT_U8,
-			mpg123_freqs[fr.sampling_frequency] >> mpg123_cfg.downsample,
-			mpg123_cfg.channels == 2 ? fr.stereo : 1)) {
-			audio_error = TRUE;
-			mpg123_info->eof = TRUE;
-		}
-	}
-
-	mpg123_info->first_frame = FALSE;
-	while (mpg123_info->going) {
-		if (mpg123_info->jump_to_time != -1) {
-			if (!have_xing_header) {
-				mpg123_stream_jump_to_frame(&fr, (int) (mpg123_info->jump_to_time / mpg123_info->tpf));
-			} else {
-				mpg123_stream_jump_to_byte(&fr, mpg123_seek_point(xing_toc, xing_header.bytes, ((double) mpg123_info->jump_to_time * 100.0) / ((double) mpg123_info->num_frames * mpg123_info->tpf)));
-			}
-			esdout_flush (mpg123_info->jump_to_time * 1000);
-			mpg123_info->jump_to_time = -1;
-			mpg123_info->eof = FALSE;
-		}
-		
-		if (!mpg123_info->eof) {
-			if (mpg123_read_frame(&fr) != 0) {
-				if(fr.lay != mpg123_layer || fr.lsf != mpg123_lsf) {
-					memcpy(&temp_fr,&fr,sizeof(struct frame));
-					if(mpg123_read_frame(&temp_fr) != 0) {
-						if(fr.lay == temp_fr.lay && fr.lsf == temp_fr.lsf) {
-							mpg123_layer = fr.lay;
-							mpg123_lsf = fr.lsf;
-							memcpy(&fr,&temp_fr,sizeof(struct frame));
-							set_mpg123_synth_functions(&fr);
-						} else {
-							memcpy(&fr,&temp_fr,sizeof(struct frame));
-							skip_frames = 2;
-							mpg123_info->output_audio = FALSE;
-							continue;
-						}						
-					}
-				}
-				
-				if(mpg123_freqs[fr.sampling_frequency] != mpg123_frequency || mpg123_stereo != fr.stereo) {
-					memcpy(&temp_fr,&fr,sizeof(struct frame));
-					if(mpg123_read_frame(&temp_fr) != 0) {
-						if(fr.sampling_frequency == temp_fr.sampling_frequency && temp_fr.stereo == fr.stereo) {
-							esdout_free ();
-							esdout_free ();
-							while(mpg123_info->going && mpg123_info->jump_to_time == -1) {
-								usleep (20000);
-							}
-							
-							if(!mpg123_info->going) {
-								break;
-							}
-							temp_time = esdout_get_output_time ();
-							esdout_close ();
-							mpg123_frequency = mpg123_freqs[fr.sampling_frequency];
-							mpg123_stereo = fr.stereo;
-
-							if (!esdout_open (mpg123_cfg.resolution == 16 ? FMT_S16_NE : FMT_U8,
-								mpg123_freqs[fr.sampling_frequency] >> mpg123_cfg.downsample,
-				  				mpg123_cfg.channels == 2 ? fr.stereo : 1)) {
-								audio_error = TRUE;
-								mpg123_info->eof = TRUE;
-							}
-							esdout_flush (temp_time);
-							//mpg123_ip.set_info(mpg123_title, mpg123_length, mpg123_bitrate * 1000, mpg123_frequency, mpg123_stereo);
-							memcpy(&fr,&temp_fr,sizeof(struct frame));
-							set_mpg123_synth_functions(&fr);
-						}
-						else
-						{
-							memcpy(&fr,&temp_fr,sizeof(struct frame));
-							skip_frames = 2;
-							mpg123_info->output_audio = FALSE;
-							continue;
-						}
-					}					
-				}
-				
-				if (tabsel_123[fr.lsf][fr.lay - 1][fr.bitrate_index] != mpg123_bitrate) {
-					mpg123_bitrate = tabsel_123[fr.lsf][fr.lay - 1][fr.bitrate_index];
-				}
-				
-				if (!disp_count) {
-					disp_count = 20;
-					if (mpg123_bitrate != disp_bitrate) {
-						disp_bitrate = mpg123_bitrate;
-						if(!have_xing_header) {
-							mpg123_info->num_frames = mpg123_calc_numframes(&fr);
-							mpg123_info->tpf = mpg123_compute_tpf(&fr);
-							mpg123_length = mpg123_info->num_frames * mpg123_info->tpf * 1000;
-						}
-						//mpg123_ip.set_info(mpg123_title, mpg123_length, mpg123_bitrate * 1000, mpg123_frequency, mpg123_stereo);
-					}
-				} else {
-					disp_count--;
-				}
-				play_frame (&fr);				
-			} else {
-				esdout_free ();
-				esdout_free ();
-				mpg123_info->eof = TRUE;
-				usleep(10000);
-			}
-		} else {
-			usleep(10000);
-		}
-	}
-	
-	g_free(mpg123_title);
-	mpg123_title = NULL;
-	mpg123_stream_close();
-	if (output_opened && !audio_error) {
-		esdout_close ();
-	}
-
-	g_free (mpg123_pcm_sample);
-
-	pthread_exit (NULL);
-	return NULL;  /* make GCC happy */
-}
-
-void 
-mpg123_play_file (const char *filename)
-{
-	/* Just to be safe */
-	mpg123_stop ();
-
-	/* Start playback */
-	mpg123_init ();
-
-	memset(&fr, 0, sizeof (struct frame));
-	memset(&temp_fr, 0, sizeof (struct frame));
-
-	mpg123_info = g_malloc0(sizeof (PlayerInfo));
-	mpg123_info->going = TRUE;
-	mpg123_info->paused = FALSE;
-	mpg123_info->first_frame = TRUE;
-	mpg123_info->output_audio = TRUE;
-	mpg123_info->jump_to_time = -1;
-	skip_frames = 0;
-	audio_error = FALSE;
-	have_xing_header = FALSE;
-
-	pthread_create (&decode_thread, NULL, decode_loop, g_strdup (filename));
-}
-
-void 
-mpg123_stop (void)
-{	
-	if (mpg123_info && mpg123_info->going) {
-		g_free (mpg123_filename);
-		mpg123_filename = NULL;
-		mpg123_info->going = FALSE;
-		pthread_join (decode_thread, NULL);
-		g_free (mpg123_info);
-		mpg123_info = NULL;
-	}
-}
-
-void 
-mpg123_seek (int time)
-{
-	mpg123_info->jump_to_time = time;
-
-	while (mpg123_info->jump_to_time != -1) {
-		usleep(10000);
-	}
-}
-
-void 
-mpg123_pause (gboolean pause)
-{
-	esdout_pause (pause);
-}
-
-int 
-get_time (void)
-{
-	if (audio_error)
-		return -2;
-		
-	if (!mpg123_info)
-		return -1;
-		
-	if (!mpg123_info->going || mpg123_info->eof) {
-		return -1;
-	}
-
-	return esdout_get_output_time ();
-}
diff --git a/components/music/mpg123.h b/components/music/mpg123.h
deleted file mode 100644
index 329b79a53..000000000
--- a/components/music/mpg123.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * mpg123 defines 
- * used source: musicout.h from mpegaudio package
- */
-
-#ifndef __MPG123_H__
-#define __MPG123_H__
-
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <math.h>
-
-#include "dxhead.h"
-#include "id3.h"
-
-#define real float
-
-/*  #define         MAX_NAME_SIZE           81 */
-#define         SBLIMIT                 32
-#define         SCALE_BLOCK             12
-#define         SSLIMIT                 18
-
-#define         MPG_MD_STEREO           0
-#define         MPG_MD_JOINT_STEREO     1
-#define         MPG_MD_DUAL_CHANNEL     2
-#define         MPG_MD_MONO             3
-
-/* Pre Shift fo 16 to 8 bit converter table */
-#define AUSHIFT (3)
-
-struct id3v1tag_t {
-	char tag[3]; /* always "TAG": defines ID3v1 tag 128 bytes before EOF */
-	char title[30];
-	char artist[30];
-	char album[30];
-	char year[4];
-	char comment[28];
-	char fill;
-	char track;
-	unsigned char genre;
-};
-
-struct id3tag_t {
-	char title[64];
-	char artist[64];
-	char album[64];
-	char year[5];
-	char comment[256];
-	char genre[256];
-	char track[4];
-};
-
-typedef struct
-{
-	gboolean going, paused;	
-	gint num_frames, eof, jump_to_time, eq_active;
-	gint songtime;
-	gdouble tpf;
-	gfloat eq_mul[576];
-	gboolean output_audio;
-	gboolean first_frame;
-	guint32 filesize;	/* Filesize without junk */
-}
-PlayerInfo;
-
-void mpg123_set_eq(int on, float preamp, float *band);
-void mpg123_file_info_box(char *);
-
-extern PlayerInfo *mpg123_info;
-
-struct al_table
-{
-	short bits;
-	short d;
-};
-
-struct frame
-{
-	struct al_table *alloc;
-	int (*synth) (real *, int, unsigned char *, int *);
-	int (*synth_mono) (real *, unsigned char *, int *);
-#ifdef USE_3DNOW
-	void (*dct36)(real *,real *,real *,real *,real *);
-#endif
-	int stereo;
-	int jsbound;
-	int single;
-	int II_sblimit;
-	int down_sample_sblimit;
-	int lsf;
-	int mpeg25;
-	int down_sample;
-	int header_change;
-	int lay;
-	int (*do_layer) (struct frame * fr);
-	int error_protection;
-	int bitrate_index;
-	int sampling_frequency;
-	int padding;
-	int extension;
-	int mode;
-	int mode_ext;
-	int copyright;
-	int original;
-	int emphasis;
-	int framesize;		/* computed framesize */
-};
-
-void mpg123_configure(void);
-
-typedef struct
-{
-	gint resolution;
-	gint channels;
-	gint downsample;
-	gint downsample_custom;
-	gint http_buffer_size;
-	gint http_prebuffer;
-	gboolean use_proxy;
-	gchar *proxy_host;
-	gint proxy_port;
-	gboolean proxy_use_auth;
-	gchar *proxy_user, *proxy_pass;
-	gboolean save_http_stream;
-	gchar *save_http_path;
-	gboolean cast_title_streaming;
-	gboolean use_udp_channel;
-	gchar *id3_format;
-	gboolean use_id3, disable_id3v2;
-	gboolean detect_by_content;
-}
-MPG123Config;
-
-extern MPG123Config mpg123_cfg;
-
-struct bitstream_info
-{
-	int bitindex;
-	unsigned char *wordpointer;
-};
-
-extern struct bitstream_info bsi;
-
-/* ------ Declarations from "http.c" ------ */
-
-extern int mpg123_http_open(char *url);
-int mpg123_http_read(gpointer data, gint length);
-void mpg123_http_close(void);
-gchar *mpg123_http_get_title(gchar * url);
-gint mpg123_http_get_icy_br(void);
-
-/* ------ Declarations from "common.c" ------ */
-extern unsigned int mpg123_get1bit(void);
-extern unsigned int mpg123_getbits(int);
-extern unsigned int mpg123_getbits_fast(int);
-
-extern void mpg123_open_stream(char *bs_filenam, int fd);
-extern int mpg123_head_check(unsigned long);
-extern void mpg123_stream_close(void);
-
-extern void mpg123_set_pointer(long);
-
-extern unsigned char *mpg123_pcm_sample;
-extern int mpg123_pcm_point;
-
-struct gr_info_s
-{
-	int scfsi;
-	unsigned part2_3_length;
-	unsigned big_values;
-	unsigned scalefac_compress;
-	unsigned block_type;
-	unsigned mixed_block_flag;
-	unsigned table_select[3];
-	unsigned subblock_gain[3];
-	unsigned maxband[3];
-	unsigned maxbandl;
-	unsigned maxb;
-	unsigned region1start;
-	unsigned region2start;
-	unsigned preflag;
-	unsigned scalefac_scale;
-	unsigned count1table_select;
-	real *full_gain[3];
-	real *pow2gain;
-};
-
-struct III_sideinfo
-{
-	unsigned main_data_begin;
-	unsigned private_bits;
-	struct
-	{
-		struct gr_info_s gr[2];
-	}
-	ch[2];
-};
-
-extern void open_stream(char *, int fd);
-extern long mpg123_tell_stream(void);
-extern void mpg123_read_frame_init(void);
-extern int mpg123_read_frame(struct frame *fr);
-extern int mpg123_back_frame(struct frame *fr, int num);
-void mpg123_stream_jump_to_frame(struct frame *fr, int frame);
-void mpg123_stream_jump_to_byte(struct frame *fr, int byte);
-int mpg123_stream_check_for_xing_header(struct frame *fr, XHEADDATA * xhead);
-int mpg123_calc_numframes(struct frame *fr);
-
-extern int mpg123_do_layer3(struct frame *fr);
-extern int mpg123_do_layer2(struct frame *fr);
-extern int mpg123_do_layer1(struct frame *fr);
-
-#ifdef I386_ASSEM
-extern int mpg123_synth_1to1_pent(real *, int, unsigned char *);
-
-#endif
-extern int mpg123_synth_1to1(real *, int, unsigned char *, int *);
-extern int mpg123_synth_1to1_8bit(real *, int, unsigned char *, int *);
-extern int mpg123_synth_1to1_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_1to1_mono2stereo(real *, unsigned char *, int *);
-extern int mpg123_synth_1to1_8bit_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_1to1_8bit_mono2stereo(real *, unsigned char *, int *);
-
-extern int mpg123_synth_2to1(real *, int, unsigned char *, int *);
-extern int mpg123_synth_2to1_8bit(real *, int, unsigned char *, int *);
-extern int mpg123_synth_2to1_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_2to1_mono2stereo(real *, unsigned char *, int *);
-extern int mpg123_synth_2to1_8bit_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_2to1_8bit_mono2stereo(real *, unsigned char *, int *);
-
-extern int mpg123_synth_4to1(real *, int, unsigned char *, int *);
-extern int mpg123_synth_4to1_8bit(real *, int, unsigned char *, int *);
-extern int mpg123_synth_4to1_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_4to1_mono2stereo(real *, unsigned char *, int *);
-extern int mpg123_synth_4to1_8bit_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_4to1_8bit_mono2stereo(real *, unsigned char *, int *);
-
-extern int mpg123_synth_ntom(real *, int, unsigned char *, int *);
-extern int mpg123_synth_ntom_8bit(real *, int, unsigned char *, int *);
-extern int mpg123_synth_ntom_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_ntom_mono2stereo(real *, unsigned char *, int *);
-extern int mpg123_synth_ntom_8bit_mono(real *, unsigned char *, int *);
-extern int mpg123_synth_ntom_8bit_mono2stereo(real *, unsigned char *, int *);
-
-/* 3DNow! optimizations */
-#ifdef USE_3DNOW
-extern int mpg123_getcpuflags(void);
-extern int support_3dnow(void);
-extern void dct36(real *,real *,real *,real *,real *);
-extern void dct36_3dnow(real *,real *,real *,real *,real *);
-extern int mpg123_synth_1to1_3dnow(real *,int,unsigned char *,int *);
-#endif
-
-extern void mpg123_rewindNbits(int bits);
-extern int mpg123_hsstell(void);
-extern void mpg123_set_pointer(long);
-extern void mpg123_huffman_decoder(int, int *);
-extern void mpg123_huffman_count1(int, int *);
-extern int mpg123_get_songlen(struct frame *fr, int no);
-
-extern void mpg123_init_layer3(int);
-extern void mpg123_init_layer2(void);
-extern void mpg123_make_decode_tables(long scale);
-extern void mpg123_make_conv16to8_table(void);
-extern void mpg123_dct64(real *, real *, real *);
-
-extern void mpg123_synth_ntom_set_step(long, long);
-
-int mpg123_decode_header(struct frame *fr, unsigned long newhead);
-double mpg123_compute_bpf(struct frame *fr);
-double mpg123_compute_tpf(struct frame *fr);
-guint mpg123_strip_spaces(char *src, size_t n);
-void mpg123_get_id3v2(id3_t * id3d, struct id3tag_t *tag);
-gchar *mpg123_format_song_title(struct id3tag_t *tag, gchar *filename);
-void mpg123_id3v1_to_id3v2 (struct id3v1tag_t *v1, struct id3tag_t *v2);
-
-
-
-extern unsigned char *mpg123_conv16to8;
-extern long mpg123_freqs[9];
-extern real mpg123_muls[27][64];
-extern real mpg123_decwin[512 + 32];
-extern real *mpg123_pnts[5];
-
-#define GENRE_MAX 0x94
-extern const gchar *mpg123_id3_genres[GENRE_MAX];
-extern int tabsel_123[2][3][16];
-
-
-void get_song_info (char *filename, char **title_real, int *len_real);
-void mpg123_play_file (const char *filename);
-void mpg123_stop (void);
-void mpg123_seek (int time);
-void mpg123_pause (gboolean pause);
-int get_time (void);
-
-#endif
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
deleted file mode 100644
index c5e691443..000000000
--- a/components/music/nautilus-music-view.c
+++ /dev/null
@@ -1,2020 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-/*
- *  Copyright (C) 2000, 2001 Eazel, Inc.
- *  Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License as
- *  by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this library; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Authors: Andy Hertzfeld <andy@eazel.com>
- *           Anders Carlsson <andersca@gnu.org>
- *
- */
-
-/* music view - presents the contents of the directory as an album of music */
-
-#include <config.h>
-#include "nautilus-music-view.h"
-
-#include "esd-audio.h"
-#include "mp3head.h"
-#include "mpg123.h"
-#include "pixmaps.h"
-#include <eel/eel-accessibility.h>
-#include <eel/eel-background.h>
-#include <eel/eel-background-box.h>
-#include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-gtk-extensions.h>
-#include <eel/eel-gtk-macros.h>
-#include <eel/eel-preferences.h>
-#include <eel/eel-stock-dialogs.h>
-#include <eel/eel-string.h>
-#include <esd.h>
-#include <fcntl.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gtypes.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-private/nautilus-directory-background.h>
-#include <libnautilus-private/nautilus-directory-notify.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-sound.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#define SCALED_IMAGE_WIDTH	108
-#define SCALED_IMAGE_HEIGHT 	108
-
-typedef enum {
-	PLAYER_STOPPED,
-	PLAYER_PAUSED,
-	PLAYER_PLAYING
-} PlayerState;
-
-struct NautilusMusicViewDetails {
-        NautilusFile *file;
-	GtkWidget *event_box;
-        
-	int selected_index;
-	int status_timeout;
-	
-	int current_samprate;
-	int current_duration;
-		
-	gboolean slider_dragging;
-	
-        GtkListStore *list_store;
-        GtkWidget *tree_view;
-        
-	GtkVBox   *album_container;
-	GtkWidget *scroll_window;
-	GtkWidget *album_title;
-	GtkWidget *album_image;
-	GtkWidget *image_box;
-	GtkWidget *dialog;
-        
-	GtkWidget *control_box;
-	GtkWidget *play_control_box;
-
-	GtkWidget *song_label;
-	
-	GtkWidget *playtime;
-	GtkWidget *playtime_bar;
-	GtkObject *playtime_adjustment;
-
-	GtkWidget *previous_track_button;
-	GtkWidget *pause_button;
-	GtkWidget *stop_button;
-	GtkWidget *next_track_button;
-	GtkWidget *inactive_play_pixwidget;
-	GtkWidget *active_play_pixwidget;
-	GtkWidget *inactive_pause_pixwidget;
-	GtkWidget *active_pause_pixwidget;
-
-	PlayerState player_state;
-	PlayerState last_player_state;
-
-        guint value_changed_update_handler;
-};
-
-
-/* structure for holding song info */
-typedef struct {
-	int track_number;
-	int bitrate;
-	int track_time;
-	int stereo;
-	int samprate;
-	
-	char *title;
-	char *artist;
-	char *album;
-	char *year;
-	char *comment;
-	char *path_uri;
-} SongInfo;
-
-enum {
-	TARGET_URI_LIST,
-	TARGET_COLOR,  
-	TARGET_BGIMAGE,
-        TARGET_GNOME_URI_LIST
-};
-
-/* list columns */
-enum {
-        TRACK_NUMBER_COLUMN,
-        TITLE_COLUMN,
-        ARTIST_COLUMN,
-        BITRATE_COLUMN,
-        TIME_COLUMN,
-        SAMPLE_RATE_COLUMN,
-        YEAR_COLUMN,
-        COMMENT_COLUMN,
-        PATH_URI_COLUMN,
-        ALBUM_COLUMN,
-        NUM_COLUMNS
-};
-
-/* button commands */
-enum {
-	PREVIOUS_BUTTON,
-	PLAY_BUTTON,
-	PAUSE_BUTTON,
-	STOP_BUTTON,
-	NEXT_BUTTON
-};
-
-static GtkTargetEntry music_dnd_target_table[] = {
-	{ "text/uri-list",  0, TARGET_URI_LIST },
-	{ "application/x-color", 0, TARGET_COLOR },
-	{ "property/bgimage", 0, TARGET_BGIMAGE },
-	{ "x-special/gnome-icon-list",  0, TARGET_GNOME_URI_LIST }
-};
-
-static void nautilus_music_view_drag_data_received            (GtkWidget              *widget,
-                                                               GdkDragContext         *context,
-                                                               int                     x,
-                                                               int                     y,
-                                                               GtkSelectionData       *selection_data,
-                                                               guint                   info,
-                                                               guint                   time,
-                                                               gpointer                user_data);
-static void nautilus_music_view_class_init              (NautilusMusicViewClass *klass);
-static void nautilus_music_view_init                    (NautilusMusicView      *view);
-static void nautilus_music_view_destroy                       (BonoboObject           *object);
-static void nautilus_music_view_finalize                      (GObject                *object);
-
-static void nautilus_music_view_update                        (NautilusMusicView      *music_view);
-static void music_view_background_appearance_changed_callback (EelBackground     *background,
-                                                               NautilusMusicView      *music_view);
-static void music_view_load_location_callback                 (NautilusView           *view,
-                                                               const char             *location,
-                                                               NautilusMusicView      *music_view);
-
-static void selection_changed                                 (GtkTreeSelection       *selection,
-                                                               NautilusMusicView      *music_view);
-static void row_activated_callback                            (GtkTreeView            *tree_view,
-                                                               GtkTreePath            *path,
-                                                               GtkTreeViewColumn      *column,
-                                                               NautilusMusicView      *music_view);
-static void nautilus_music_view_set_album_image               (NautilusMusicView      *music_view,
-                                                               const char             *image_path_uri);
-static void image_button_callback                             (GtkWidget              *widget,
-                                                               NautilusMusicView      *music_view);
-static void go_to_next_track                                  (NautilusMusicView      *music_view);
-static void play_current_file                                 (NautilusMusicView      *music_view,
-                                                               gboolean                from_start);
-static void detach_file                                       (NautilusMusicView      *music_view);
-static void start_playing_file 				      (NautilusMusicView      *music_view, 
-							       const char 	      *file_name);
-static void stop_playing_file 				      (NautilusMusicView      *music_view);
-static PlayerState get_player_state 			      (NautilusMusicView      *music_view);
-static void set_player_state 				      (NautilusMusicView      *music_view, 
-							       PlayerState 	       state);
-
-static void list_reveal_row                                   (GtkTreeView            *view, 
-                                                               int                     row_index);
-static void slider_changed_callback                           (GtkWidget              *bar, 
-                                                               NautilusMusicView      *music_view);
-
-static void nautilus_music_view_load_uri (NautilusMusicView *view,
-                                          const char        *uri);
-
-
-
-EEL_CLASS_BOILERPLATE (NautilusMusicView,
-                                   nautilus_music_view,
-                                   NAUTILUS_TYPE_VIEW)
-
-static void
-nautilus_music_view_class_init (NautilusMusicViewClass *klass)
-{
-	GObjectClass *gobject_class;
-	BonoboObjectClass *object_class;
-
-	gobject_class = G_OBJECT_CLASS (klass);
-	object_class = BONOBO_OBJECT_CLASS (klass);
-
-	object_class->destroy = nautilus_music_view_destroy;
-        gobject_class->finalize = nautilus_music_view_finalize;
-}
-
-
-static void
-track_cell_data_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
-        int track_number;
-        char *str;
-        
-        gtk_tree_model_get (tree_model,
-                            iter,
-                            TRACK_NUMBER_COLUMN, &track_number,
-                            -1);
-
-        /* Don't show the track number if it's lower than 1 */
-        if (track_number < 1) {
-                str = NULL;
-        }
-        else {
-                str = g_strdup_printf ("%d", track_number);
-        }
-
-        g_object_set (cell,
-                      "text", str,
-                      NULL);
-
-                      g_free (str);
-}
-
-static void
-bitrate_cell_data_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
-        int bitrate;
-        char *str;
-        
-        gtk_tree_model_get (tree_model,
-                            iter,
-                            BITRATE_COLUMN, &bitrate,
-                            -1);
-
-        if (bitrate <= 0) {
-                str = g_strdup (_("Unknown"));
-        }
-        else {
-                str = g_strdup_printf ("%d kbps", bitrate);
-        }
-
-        g_object_set (cell,
-                      "text", str,
-                      NULL);
-
-                      g_free (str);
-}
-
-static void
-time_cell_data_func (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
-        int time;
-	int seconds, minutes, remain_seconds;
-        char *str;
-
-        gtk_tree_model_get (tree_model,
-                            iter,
-                            TIME_COLUMN, &time,
-                            -1);
-
-        seconds = time;
-	minutes = seconds / 60;
-	remain_seconds = seconds - (60 * minutes);
-        
-	str = g_strdup_printf ("%d:%02d ", minutes, remain_seconds);
-
-        g_object_set (cell,
-                      "text", str,
-                      NULL);
-
-        g_free (str);
-}
-
-static void
-set_up_tree_view (NautilusMusicView *music_view)
-{
-        GtkCellRenderer *cell;
-        GtkTreeViewColumn *column;
-        GtkTreeView *tree_view;
-
-        tree_view = GTK_TREE_VIEW (music_view->details->tree_view);
-
-        /* The track number column */
-        cell = gtk_cell_renderer_text_new ();
-        g_object_set (cell, "xalign", 1.0, NULL);
-
-        column = gtk_tree_view_column_new ();
-        gtk_tree_view_column_set_title (column, _("Track"));
-        gtk_tree_view_column_pack_start (column, cell, TRUE);
-        gtk_tree_view_column_set_cell_data_func (column, cell,
-                                                 track_cell_data_func,
-                                                 NULL, NULL);
-        gtk_tree_view_column_set_sort_column_id (column, TRACK_NUMBER_COLUMN);
-        gtk_tree_view_column_set_resizable (column, TRUE);
-        gtk_tree_view_append_column (tree_view, column);
-
-        /* The name column */
-        cell = gtk_cell_renderer_text_new ();
-        column = gtk_tree_view_column_new_with_attributes (_("Title"),
-                                                           cell,
-                                                           "text", TITLE_COLUMN,
-                                                           NULL);
-        gtk_tree_view_column_set_sort_column_id (column, TITLE_COLUMN);
-        gtk_tree_view_column_set_resizable (column, TRUE);
-        gtk_tree_view_append_column (tree_view, column);
-
-        /* The artist column */
-        cell = gtk_cell_renderer_text_new ();
-        column = gtk_tree_view_column_new_with_attributes (_("Artist"),
-                                                           cell,
-                                                           "text", ARTIST_COLUMN,
-                                                           NULL);
-        gtk_tree_view_column_set_sort_column_id (column, ARTIST_COLUMN);
-        gtk_tree_view_column_set_resizable (column, TRUE);        
-        gtk_tree_view_append_column (tree_view, column);
-
-        /* The bitrate column */
-        cell = gtk_cell_renderer_text_new ();
-        g_object_set (cell, "xalign", 1.0, NULL);
-        column = gtk_tree_view_column_new ();
-        gtk_tree_view_column_set_title (column, _("Bit Rate"));
-        gtk_tree_view_column_pack_start (column, cell, TRUE);
-        gtk_tree_view_column_set_cell_data_func (column, cell,
-                                                 bitrate_cell_data_func,
-                                                 NULL, NULL);
-        gtk_tree_view_column_set_sort_column_id (column, BITRATE_COLUMN);
-        gtk_tree_view_column_set_resizable (column, TRUE);
-        gtk_tree_view_append_column (tree_view, column);
-
-        /* The time column */
-        cell = gtk_cell_renderer_text_new ();
-        g_object_set (cell, "xalign", 1.0, NULL);
-        column = gtk_tree_view_column_new ();
-        gtk_tree_view_column_set_title (column, _("Time"));
-        gtk_tree_view_column_pack_start (column, cell, TRUE);
-        gtk_tree_view_column_set_cell_data_func (column, cell,
-                                                 time_cell_data_func,
-                                                 NULL, NULL);
-        gtk_tree_view_column_set_sort_column_id (column, TIME_COLUMN);
-        gtk_tree_view_column_set_resizable (column, TRUE);
-        gtk_tree_view_append_column (tree_view, column);
-}
-
-/* initialize ourselves by connecting to the location change signal and allocating our subviews */
-
-static void
-nautilus_music_view_init (NautilusMusicView *music_view)
-{
-	GtkWidget *label;
-	GtkWidget *button;
-	
-	music_view->details = g_new0 (NautilusMusicViewDetails, 1);
-
-
-        music_view->details->event_box = eel_background_box_new ();
-        gtk_widget_show (music_view->details->event_box);
-        
-        g_signal_connect_object (music_view->details->event_box, "drag_data_received",
-                                 G_CALLBACK (nautilus_music_view_drag_data_received), music_view, 0);
-
-	nautilus_view_construct (NAUTILUS_VIEW (music_view), 
-				 music_view->details->event_box);
-	
-    	g_signal_connect_object (music_view, "load_location",
-                                 G_CALLBACK (music_view_load_location_callback), music_view, 0);
-			    
-	g_signal_connect_object (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box)), 
-                                 "appearance_changed",
-                                 G_CALLBACK (music_view_background_appearance_changed_callback), music_view, 0);
-
-	/* NOTE: we don't show the widgets until the directory has been loaded,
-	   to avoid showing degenerate widgets during the loading process */
-	   
-	/* allocate a vbox to contain all of the views */	
-	music_view->details->album_container = GTK_VBOX (gtk_vbox_new (FALSE, 8));
-        gtk_widget_show (GTK_WIDGET (music_view->details->album_container));
-	gtk_container_set_border_width (GTK_CONTAINER (music_view->details->album_container), 4);
-	gtk_container_add (GTK_CONTAINER (music_view->details->event_box), GTK_WIDGET (music_view->details->album_container));
-		
-	/* allocate a widget for the album title */	
-	music_view->details->album_title = gtk_label_new ("");
-        gtk_widget_show (music_view->details->album_title);
-	gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->album_title, FALSE, FALSE, 0);	
-
-        /* Create list model*/
-        music_view->details->list_store = gtk_list_store_new (NUM_COLUMNS,
-                                                              G_TYPE_INT, /* TRACK_NUMBER_COLUMN */
-                                                              G_TYPE_STRING, /* TITLE_COLUMN */
-                                                              G_TYPE_STRING, /* ARTIST_COLUMN */
-                                                              G_TYPE_INT, /* BITRATE_COLUMN */
-                                                              G_TYPE_INT, /* TIME_COLUMN */
-                                                              G_TYPE_INT, /* BITRATE_COLUMN */
-                                                              G_TYPE_STRING, /* YEAR_COLUMN */
-                                                              G_TYPE_STRING, /* COMMENT_COLUMN */
-                                                              G_TYPE_STRING, /* PATH_URI_COLUMN */
-                                                              G_TYPE_STRING /* ALBUM_COLUMN */);
-        music_view->details->tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (music_view->details->list_store));
-        g_signal_connect (music_view->details->tree_view,
-                          "row_activated",
-                          G_CALLBACK (row_activated_callback),
-                          music_view);
-        
-        g_object_unref (music_view->details->list_store);
-        set_up_tree_view (music_view);
-
-        g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (music_view->details->tree_view)),
-                          "changed",
-                          G_CALLBACK (selection_changed),
-                          music_view);
-
-        /* We sort ascending by track number by default */
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (music_view->details->list_store),
-                                              TRACK_NUMBER_COLUMN, GTK_SORT_ASCENDING);
-
-        gtk_widget_show (music_view->details->tree_view);
-
-	music_view->details->scroll_window = gtk_scrolled_window_new (NULL, NULL);
-        gtk_widget_show (music_view->details->scroll_window);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (music_view->details->scroll_window),
-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (music_view->details->scroll_window),
-                                             GTK_SHADOW_ETCHED_IN);
-	gtk_container_add (GTK_CONTAINER (music_view->details->scroll_window), music_view->details->tree_view);	
-
-	gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->scroll_window, TRUE, TRUE, 0);	
-
-	/* make an hbox to hold the optional cover and other controls */
-	music_view->details->control_box = gtk_hbox_new (FALSE, 2);
-        gtk_widget_show (music_view->details->control_box);
-	gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->control_box, FALSE, FALSE, 2);	
-	
-	/* make the "set album button"  and show it */
-  	music_view->details->image_box = gtk_vbox_new (0, FALSE);
-        gtk_widget_show (music_view->details->image_box);
-        button = gtk_button_new ();
-        gtk_widget_show (button);
-	gtk_box_pack_end (GTK_BOX (music_view->details->image_box), button, FALSE, FALSE, 2);
-
-	label = gtk_label_new (_("Set Cover Image"));
-        gtk_widget_show (label);
-	gtk_container_add (GTK_CONTAINER(button), label);
-	gtk_box_pack_end (GTK_BOX(music_view->details->control_box), music_view->details->image_box, FALSE, FALSE, 4);  
- 	g_signal_connect (button, "clicked", G_CALLBACK (image_button_callback), music_view);
- 	
-	/* prepare ourselves to receive dropped objects */
-	gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box),
-			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   music_dnd_target_table, G_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
-
-
-	music_view->details->player_state = PLAYER_STOPPED;
-	music_view->details->last_player_state = PLAYER_STOPPED;
-}
-
-static void
-nautilus_music_view_destroy (BonoboObject *object)
-{
-	NautilusMusicView *music_view;
-
-        music_view = NAUTILUS_MUSIC_VIEW (object);
-
-	/* we'd rather allow the song to keep playing, but it's hard to maintain state */
-	/* so we stop things on exit for now, and improve it post 1.0 */
-	stop_playing_file (music_view);
-	
-	/* Free the status timer callback */
-	if (music_view->details->status_timeout != 0) {
-		gtk_timeout_remove (music_view->details->status_timeout);
-		music_view->details->status_timeout = 0;
-	}
-
-        if (music_view->details->value_changed_update_handler) {
-                g_source_remove (music_view->details->value_changed_update_handler);
-                music_view->details->value_changed_update_handler = 0;
-        }
-
-        detach_file (music_view);
-
-	EEL_CALL_PARENT (BONOBO_OBJECT_CLASS, destroy, (object));
-}
-
-static void
-nautilus_music_view_finalize (GObject *object)
-{
-	NautilusMusicView *music_view;
-
-        music_view = NAUTILUS_MUSIC_VIEW (object);
-
-	g_free (music_view->details);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static gboolean
-string_non_empty (char *str)
-{
-        return (str != NULL && str[0] != '\0');
-}
-
-static void
-get_tree_iter_for_row (NautilusMusicView *music_view, int row, GtkTreeIter *iter)
-{
-        GtkTreePath *path;
-        
-        path = gtk_tree_path_new ();
-        gtk_tree_path_append_index (path, row);
-        gtk_tree_model_get_iter (GTK_TREE_MODEL (music_view->details->list_store), iter, path);
-        gtk_tree_path_free (path);
-}
-
-/* utility to return the text describing a song */
-static char *
-get_song_text (NautilusMusicView *music_view, int row)
-{
-        char *artist_album_string; 
-	char *song_text;
-        char *song_title;
-        GtkTreeIter iter;
-        char *info_title, *info_album, *info_year, *info_artist;
-        gint num_rows;
-        
-	song_text = NULL;
-	artist_album_string = NULL;
-
-	num_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (music_view->details->list_store), NULL);
-        if (num_rows == 0)
-                return g_strdup ("");
-
-        get_tree_iter_for_row (music_view, row, &iter);
-        
-        gtk_tree_model_get (GTK_TREE_MODEL (music_view->details->list_store),
-                            &iter,
-                            ARTIST_COLUMN, &info_artist,
-                            TITLE_COLUMN, &info_title,
-                            ALBUM_COLUMN, &info_album,
-                            YEAR_COLUMN, &info_year,
-                            -1);
-                            
-        if (!string_non_empty (info_title)) {
-                song_title = "-";
-        } else {
-                song_title = info_title;
-        }
-
-	if (string_non_empty (info_album)) {
-                if (string_non_empty (info_artist)) {
-                        artist_album_string = g_strdup_printf ("%s / %s", info_artist, info_album);
-                } else {
-                        artist_album_string = g_strdup (info_album);
-                }
-        } else {
-                if (string_non_empty (info_artist)) {
-                        artist_album_string = g_strdup (info_artist);
-                }
-        }
-                
-	if (string_non_empty (artist_album_string)) {
-		if (string_non_empty (info_year)) {
-			song_text = g_strdup_printf ("%s\n%s (%s)", song_title, artist_album_string, info_year);
-		} else {
-			song_text = g_strdup_printf ("%s\n%s", song_title, artist_album_string);
-                }
-	} else {
-		if (string_non_empty (info_year)) {
-                        song_text = g_strdup_printf ("%s (%s)\n-", song_title, info_year);
-                } else {
-                        song_text = g_strdup_printf ("%s\n-", song_title);
-                }
-        }
-
-        g_free (artist_album_string);
-	
-	return song_text;
-}
-
-/* set the song title to the selected one */
-
-static void 
-music_view_set_selected_song_title (NautilusMusicView *music_view, int row)
-{
-	char *label_text;
-	char *temp_str;
-	char *escaped_label_text;
-        
-	music_view->details->selected_index = row;
-	
-	label_text = get_song_text (music_view, row);
-
-        escaped_label_text = g_markup_escape_text (label_text, -1);
-        temp_str = g_strdup_printf ("<span size=\"x-large\">%s</span>", escaped_label_text);
-        g_free (escaped_label_text);
-        
-	gtk_label_set_markup (GTK_LABEL(music_view->details->song_label), temp_str);
-	g_free (label_text);
-        g_free (temp_str);
-}
-
-static void
-row_activated_callback (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, NautilusMusicView *music_view)
-{
-        PlayerState state;
-	gboolean is_playing_or_paused;
-
-        state = get_player_state (music_view);
-	is_playing_or_paused = (state == PLAYER_PLAYING || state == PLAYER_PAUSED);
-
-        play_current_file (music_view, FALSE);
-}
-
-/* handle a row being selected in the list view by playing the corresponding song */
-static void 
-selection_changed (GtkTreeSelection *selection, NautilusMusicView *music_view)
-{
-	gboolean is_playing_or_paused;
-	PlayerState state;
-	GtkTreePath *path;
-        GtkTreeIter iter;
-        int row;
-        gboolean selected_current_track = FALSE;
-
-	state = get_player_state (music_view);
-	is_playing_or_paused = (state == PLAYER_PLAYING || state == PLAYER_PAUSED);
-
-        if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-                path = gtk_tree_model_get_path (GTK_TREE_MODEL (music_view->details->list_store), &iter);
-                row = gtk_tree_path_get_indices (path)[0];
-                gtk_tree_path_free (path);
-
-                /* If the track selected is currently playing, we'll let it
-                   continue. Otherwise we'll stop any track that is playing. */
-                if (music_view->details->selected_index == row)
-                        selected_current_track = TRUE;
-        
-                music_view_set_selected_song_title (music_view, row);
-        }
-
-	if (is_playing_or_paused && !selected_current_track) {
-		stop_playing_file (music_view);
-        }
-} 
-
-
-/* utility routine to check if the passed-in uri is an image file */
-static gboolean
-ensure_uri_is_image(const char *uri)
-{	
-	gboolean is_image;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo *file_info;
-
-	file_info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info
-		(uri, file_info,
-		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
-		 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-        /* FIXME: can the code really handle any type of image other
-         * than an SVG? Probably not.  
-         */
-         is_image = eel_istr_has_prefix (file_info->mime_type, "image/") && (eel_strcmp (file_info->mime_type, "image/svg") != 0);
-	gnome_vfs_file_info_unref (file_info);
-	return is_image;
-}
-
-/* callback to handle setting the album cover image */
-static void
-set_album_cover (GtkWidget *widget, gpointer *data)
-{
-	char *path_name, *path_uri;
-	NautilusMusicView *music_view;
-	
-	music_view = NAUTILUS_MUSIC_VIEW (data);
-	
-	/* get the file path from the file selection widget */
-	path_name = g_strdup (gtk_file_selection_get_filename (GTK_FILE_SELECTION (music_view->details->dialog)));
-	path_uri = gnome_vfs_get_uri_from_local_path (path_name);
-
-	/* make sure that it's an image */
-	if (!ensure_uri_is_image (path_uri)) {
-		char *message = g_strdup_printf
-			(_("Sorry, but '%s' is not a usable image file."),
-			 path_name);
-		eel_show_error_dialog (message, _("Not an Image"), NULL);
-		g_free (message);
-		
-		g_free (path_uri);
-		g_free (path_name);
-		return;
-	}
-	
-	/* set the meta-data */
-	nautilus_file_set_metadata (music_view->details->file,
-                                    NAUTILUS_METADATA_KEY_CUSTOM_ICON, NULL, path_uri);
-	
-	/* set the album image */
-	nautilus_music_view_set_album_image (music_view, path_uri);
-	g_free (path_uri);
-	
-	/* tell the world the file changed */
-	nautilus_file_changed (music_view->details->file);
-	
-	/* destroy the file dialog */
-	gtk_widget_destroy (music_view->details->dialog);
-	music_view->details->dialog = NULL;
-
-	g_free (path_name);
-}
-
-/* Callback used when the color selection dialog is destroyed */
-static void
-dialog_destroy (GtkObject *object, gpointer callback_data)
-{
-        NAUTILUS_MUSIC_VIEW (callback_data)->details->dialog = NULL;
-}
-
-/* handle the set image button by displaying a file selection dialog */
-static void
-image_button_callback (GtkWidget * widget, NautilusMusicView *music_view)
-{
-	if (music_view->details->dialog) {
-		gtk_widget_show(music_view->details->dialog);
-		if (music_view->details->dialog->window)
-			gdk_window_raise(music_view->details->dialog->window);
-
-	} else {
-		GtkFileSelection *file_dialog;
-
-		music_view->details->dialog = gtk_file_selection_new
-			(_("Select an image file for the album cover:"));
-		file_dialog = GTK_FILE_SELECTION (music_view->details->dialog);
-		
-		g_signal_connect_object (music_view->details->dialog, "destroy",
-                                         G_CALLBACK (dialog_destroy), music_view, 0);
-		g_signal_connect_object (file_dialog->ok_button, "clicked",
-                                         G_CALLBACK (set_album_cover), music_view, 0);
-                
-                g_signal_connect_object (file_dialog->cancel_button, "clicked",
-                                         G_CALLBACK (gtk_widget_destroy), file_dialog, G_CONNECT_SWAPPED);
-
-		gtk_window_set_position (GTK_WINDOW (file_dialog), GTK_WIN_POS_MOUSE);
-		gtk_window_set_wmclass (GTK_WINDOW (file_dialog), "file_selector", "Nautilus");
-		gtk_widget_show (GTK_WIDGET(file_dialog));
-	}
-}
-
-/* here are some utility routines for reading ID3 tags from mp3 files */
-
-/* initialize a songinfo structure */
-static void
-initialize_song_info (SongInfo *info)
-{
-        /* Only called after g_new0. */
-	info->track_number = -1;
-}
-
-/* deallocate a songinfo structure */
-static void
-song_info_free (SongInfo *info)
-{
-        g_free (info->title);
-        g_free (info->artist);
-        g_free (info->album);
-        g_free (info->year);
-        g_free (info->comment);
-        g_free (info->path_uri);
-	g_free (info);
-}
-
-
-/* determine if a file is an mp3 file by looking at the mime type */
-static gboolean
-is_mp3_file (GnomeVFSFileInfo *file_info)
-{
-	return eel_istr_has_prefix (file_info->mime_type, "audio/")
-		&& eel_istr_has_suffix (file_info->mime_type, "mp3");
-}
-
-
-static char *
-filter_out_unset_year (const char *year)
-{
-        /* All-zero year should be interpreted as unset year. */
-        if (strspn (year, "0 ") == strlen (year)) {
-                return g_strdup ("");
-        } else {
-                return g_strdup (year);
-        } 
-}
-
-/* read the id3 tag of the file if present */
-static gboolean
-read_id_tag (const char *song_uri, SongInfo *song_info)
-{
-	char *path;
-	id3_t *id3;
-	struct id3v1tag_t id3v1tag;
-	struct id3tag_t tag;
-	FILE *file;
-	
-	path = gnome_vfs_get_local_path_from_uri (song_uri);
-        if (path == NULL) {
-                return FALSE;
-        }
-
-	file = fopen (path, "rb");
-        g_free (path);
-
-	if (file == NULL) {
-		return FALSE;	
-	}
-	
-	/* Try ID3v2 tag first */
-	fseek (file, 0, SEEK_SET);
-	id3 = id3_open_fp (file, O_RDONLY);
-	if (id3 != NULL) {
-		mpg123_get_id3v2 (id3, &tag);
-		id3_close (id3);
-	} else if ((fseek (file, -1 * sizeof (id3v1tag), SEEK_END) == 0) &&
-            (fread (&id3v1tag, 1, sizeof (id3v1tag), file) == sizeof (id3v1tag)) &&
-	    (strncmp (id3v1tag.tag, "TAG", 3) == 0)) {
-		/* Try reading ID3v1 tag. */
-		mpg123_id3v1_to_id3v2 (&id3v1tag, &tag);
-	} else {
-		/* Failed to read any sort of tag */
-		fclose (file);
-		return FALSE;		
-	}
-	
-	/* Copy data from tag into our info struct */
-	if (!g_utf8_validate (tag.title, -1, NULL)) {
-		song_info->title = g_convert (tag.title, -1, "UTF8", "ISO-8859-1", NULL, NULL, NULL);
-	} else {
-		song_info->title = g_strdup (tag.title);
-	}
-	if (!g_utf8_validate (tag.album, -1, NULL)) {
-		song_info->album = g_convert (tag.album, -1, "UTF8", "ISO-8859-1", NULL, NULL, NULL);
-	} else {
-		song_info->album = g_strdup (tag.album);
-	}
-	if (!g_utf8_validate (tag.artist, -1, NULL)) {
-		song_info->artist = g_convert (tag.artist, -1, "UTF8", "ISO-8859-1", NULL, NULL, NULL);
-	} else {
-		song_info->artist = g_strdup (tag.artist);
-	}
-	if (!g_utf8_validate (tag.comment, -1, NULL)) {
-		song_info->comment = g_convert (tag.comment, -1, "UTF8", "ISO-8859-1", NULL, NULL, NULL);
-	} else {
-		song_info->comment = g_strdup (tag.comment);
-	}
-
-	song_info->year = filter_out_unset_year (tag.year);
-	song_info->track_number = atoi (tag.track);
-
-	/* Clean up */
-	fclose (file);
-	return TRUE;
-}
-
-
-/* fetch_play_time takes the pathname to a file and returns the play time in seconds */
-static int
-fetch_play_time (GnomeVFSFileInfo *file_info, int bitrate)
-{
-        if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) {
-                return 0;
-        }
-
-        /* Avoid divide by zero. */
-	return bitrate == 0 ? 0 : file_info->size / (125 * bitrate);
-}
-
-/* extract a track number from the file name
-   return -1 if there wasn't any */
-static int
-extract_number(const char *name_str)
-{
-	const char *temp_str;
-	gboolean found_digit;
-	int accumulator;
-	
-	found_digit = FALSE;
-	accumulator = 0;
-	if (g_ascii_isdigit (*name_str)) {
-                temp_str = name_str;
-	} else if (strchr(name_str, '(') != NULL) {
-                temp_str = strchr(name_str, '(') + 1;
-        } else {
-                return -1;
-        }
-	
-	while (g_ascii_isdigit (*temp_str)) {
-                found_digit = TRUE;
-                accumulator = (10 * accumulator) + *temp_str - 48;
-		temp_str += 1;
-	}		
-	
-	if (found_digit) {
-		return accumulator;
-        }
-
-	return -1;
-}
-
-/* allocate a return a song info record, from an mp3 tag if present, or from intrinsic info */
-static SongInfo *
-fetch_song_info (const char *song_uri, GnomeVFSFileInfo *file_info, int file_order) 
-{
-	gboolean has_info = FALSE;
-	SongInfo *info; 
-	guchar buffer[8192];
-	GnomeVFSHandle *mp3_file;
-	GnomeVFSResult result;
-	GnomeVFSFileSize length_read;
-	ID3V2Header v2header;
-	long header_size;
-        NautilusFile *file;
-
-	if (!is_mp3_file (file_info)) {
-		return NULL;
-        }
-
-	info = g_new0 (SongInfo, 1); 
-	initialize_song_info (info);
-	
-	has_info = read_id_tag (song_uri, info);
-
-	/* if we couldn't get a track number, see if we can pull one from
-	   the file name */
-	if (info->track_number <= 0) {
-		info->track_number = extract_number(file_info->name);
-	}
-		  	
-	/* there was no id3 tag, so set up the info heuristically from the file name and file order */
-	if (!has_info) {
-                file = nautilus_file_get (song_uri);
-                info->title = nautilus_file_get_display_name (file);
-                nautilus_file_unref (file);
-	}	
-
-	result = gnome_vfs_open (&mp3_file, song_uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_OK) {
-  		result = gnome_vfs_read (mp3_file, buffer, sizeof (buffer), &length_read);
-		if ((result == GNOME_VFS_OK) && (length_read > 512)) {
-			/* Make sure ID3v2 tag is not at start of file */
-			if ( buffer[0] == 'I' && buffer[1] == 'D' && buffer[2] == '3' ) {
-				/* Read in header and determine size */
-				gnome_vfs_seek (mp3_file, GNOME_VFS_SEEK_START, 0);
-				result = gnome_vfs_read (mp3_file, &v2header, sizeof (ID3V2Header), &length_read);
-				if (result != GNOME_VFS_OK) {
-					return info;
-				}
-
-				header_size = ((long) v2header.size[3] | 
-					      ((long) v2header.size[2] << (8 - 1)) |
-	    				      ((long) v2header.size[1] << (16 - 2)) | 
-	    				      ((long) v2header.size[0] << (24 - 3))) 
-	    				      + sizeof (ID3V2Header);
-
-				/* Seek past the tag to the mp3 data */
-				gnome_vfs_seek (mp3_file, GNOME_VFS_SEEK_START, header_size);
-				result = gnome_vfs_read (mp3_file, buffer, sizeof (buffer), &length_read);
-				if (result != GNOME_VFS_OK) {
-					return info;
-				}
-			}
-
-			info->bitrate = get_bitrate (buffer, length_read);
-			info->samprate = get_samprate (buffer, length_read);
-			info->stereo = get_stereo (buffer, length_read);
-			info->track_time = fetch_play_time (file_info, info->bitrate);
-		}
-		gnome_vfs_close (mp3_file);
-	}
-	
-	return	info;
-}
-
-/* utility routine to determine most common attribute in song list.  The passed in boolean selects
-   album or artist. Return NULL if they are heterogenous */
-static char *
-determine_attribute (GList *song_list, gboolean is_artist)
-{
-	SongInfo *info;
-	GList *p;
-	char *current_attribute, *this_attribute;
-	
-	current_attribute = NULL;
-	
-        for (p = song_list; p != NULL; p = p->next) {
-		info = (SongInfo *) p->data;
-		this_attribute = is_artist ? info->artist : info->album;
-		
-		if (this_attribute && eel_strcmp (this_attribute, current_attribute)) {
-			if (current_attribute == NULL) {
-				current_attribute = g_strdup (this_attribute);
-			} else {
-				g_free (current_attribute);
-				return NULL;
-			}
-			
-		}
-	}
-	return current_attribute;
-}
-
-/* update the status feedback of the play controls */
-static void
-update_play_controls_status (NautilusMusicView *music_view, PlayerState state)
-{
-	if (state == PLAYER_PLAYING) {
-		gtk_widget_show (music_view->details->active_play_pixwidget);
-		gtk_widget_hide (music_view->details->inactive_play_pixwidget);
-		//gtk_widget_set_sensitive (music_view->details->pause_button, TRUE);
-	} else {
-		gtk_widget_hide (music_view->details->active_play_pixwidget);
-		gtk_widget_show (music_view->details->inactive_play_pixwidget);		
-	}
-
-	if (state == PLAYER_PAUSED) {
-		gtk_widget_show (music_view->details->active_pause_pixwidget);
-		gtk_widget_hide (music_view->details->inactive_pause_pixwidget);
-		//gtk_widget_set_sensitive (music_view->details->pause_button, FALSE);
-	} else {
-		gtk_widget_hide (music_view->details->active_pause_pixwidget);
-		gtk_widget_show (music_view->details->inactive_pause_pixwidget);
-	}
-}
-
-static void
-set_adjustment_value (NautilusMusicView *music_view,
-                      gdouble value)
-{
-        g_signal_handlers_block_by_func (G_OBJECT (music_view->details->playtime_bar),
-                                         slider_changed_callback,
-                                         music_view);
-        gtk_adjustment_set_value (GTK_ADJUSTMENT (music_view->details->playtime_adjustment),
-                                  value);
-        g_signal_handlers_unblock_by_func (G_OBJECT (music_view->details->playtime_bar),
-                                           slider_changed_callback,
-                                           music_view);
-}
-
-/* utility to reset the playtime to the inactive state */
-static void
-reset_playtime (NautilusMusicView *music_view)
-{
-        set_adjustment_value (music_view, 0.0);
- 	gtk_range_set_adjustment (GTK_RANGE (music_view->details->playtime_bar),
-                                  GTK_ADJUSTMENT (music_view->details->playtime_adjustment));	
-	gtk_widget_set_sensitive (music_view->details->playtime_bar, FALSE);	
-	gtk_label_set_markup (GTK_LABEL (music_view->details->playtime), "<span size=\"x-large\">--:--</span>");
-}
-
-/* status display timer task */
-static int 
-play_status_display (NautilusMusicView *music_view)
-{
-	int minutes, seconds;
-	float percentage;
-	char *play_time_str;
-	int current_time;
-	gboolean is_playing_or_paused;
-	int samps_per_frame;
-	PlayerState status;
-			
-	status = get_player_state (music_view);
-	is_playing_or_paused = (status == PLAYER_PLAYING) || (status == PLAYER_PAUSED);
-	
-        /* Check if we've reached the end of the track. If we have, move to
-           the next track. */
-	if (status == PLAYER_PLAYING) {
-                if (!esdout_playing ()) {
-                        stop_playing_file (music_view);
-                        go_to_next_track (music_view);
-                        return FALSE;
-                }
-	}
-		
-	if (music_view->details->last_player_state != status) {
-		music_view->details->last_player_state = status;
-		update_play_controls_status (music_view, status);
-	}
-	
-	if (is_playing_or_paused) {			
-		if (!music_view->details->slider_dragging) {									
-			samps_per_frame = (music_view->details->current_samprate >= 32000) ? 1152 : 576;
-			
-  			if (music_view->details->current_duration != 0) {
-				current_time = esdout_get_output_time ();
-                     		seconds = current_time / 1000;
-				minutes = seconds / 60;
-				seconds = seconds % 60;
-
-                                play_time_str = g_strdup_printf ("<span size=\"x-large\">%02d:%02d</span>", minutes, seconds);
-												
-				percentage = (float) ((float)current_time / (float)music_view->details->current_duration) * 100.0;
-				
-				set_adjustment_value (music_view, percentage);
-				gtk_range_set_adjustment (GTK_RANGE (music_view->details->playtime_bar),
-                                			  GTK_ADJUSTMENT(music_view->details->playtime_adjustment));	
-
-				if (!music_view->details->slider_dragging) {
-		 			gtk_label_set_markup (GTK_LABEL(music_view->details->playtime),
-                                                            play_time_str);
-                        	}
-                                g_free (play_time_str);
-			}
-		}		
-	} else  {
-		reset_playtime (music_view);
-	}
-	
-	return is_playing_or_paused;
-}
-
-static void
-list_reveal_row (GtkTreeView *view, int row_index)
-{
-        GtkTreePath *path;
-        GtkTreeModel *model;
-
-        model = gtk_tree_view_get_model (view);
-        path = gtk_tree_path_new ();
-        gtk_tree_path_append_index (path, row_index);
-
-        gtk_tree_view_scroll_to_cell (view, path, NULL,
-                                      TRUE, 0.5, 0.5);
-}
-
-/* track incrementing routines */
-static void
-play_current_file (NautilusMusicView *music_view, gboolean from_start)
-{
-	char *song_filename, *title;
-        GnomeVFSResult result;
-        GnomeVFSFileInfo file_info;
-	int length, num_rows;
-        char *path_uri;
-        GtkTreeIter iter;
-	gboolean enable_esd = FALSE;
-	GConfClient *client;
-        
-        /* If there are no tracks in the list, just return. */
-	num_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (music_view->details->list_store), NULL);
-        if (num_rows == 0)
-                return;
-
-	/* Check gconf sound preference */
-	client = gconf_client_get_default ();
-	enable_esd = gconf_client_get_bool (client, "/desktop/gnome/sound/enable_esd", NULL);
-	g_object_unref (client);
-
-	if (!enable_esd) {
-		eel_show_error_dialog (_("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."),
-				            _("Unable to Play File"),
-					    //GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (&music_view->details->event_box->parent))));
-					    NULL);		
-		return;	
-
-	}
-
-	if (!esdout_can_play ()) {
-		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
-					      "Either another program is using or blocking the sound card, "
-					      "or your sound card is not configured properly. Try quitting any "
-					      "applications that may be blocking use of the sound card."),
-				            _("Unable to Play File"),
-					    //GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (&music_view->details->event_box->parent))));
-					    NULL);		
-		return;	
-	}
-       	
-	/* Scroll the list to display the current new selection */
-	list_reveal_row (GTK_TREE_VIEW (music_view->details->tree_view), music_view->details->selected_index);
-        get_tree_iter_for_row (music_view, music_view->details->selected_index, &iter);
-
-        gtk_tree_model_get (GTK_TREE_MODEL (music_view->details->list_store),
-                            &iter,
-                            PATH_URI_COLUMN, &path_uri,
-                            -1);
-
-        /* Make the song selected */
-        gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (music_view->details->tree_view)),
-                                        &iter);
-        
-        song_filename = gnome_vfs_get_local_path_from_uri (path_uri);
-
-	/* for now, we can only play local files, so apologize to the user and give up */	
-        if (song_filename == NULL) {
-                eel_show_error_dialog
-                        ( _("Sorry, but the music view can't play non-local files yet."),
-                          _("Can't Play Remote Files"),
-                          NULL);
-                return;
-	}
-	
-	/* set up the current duration so we can give progress feedback */        
-	get_song_info (song_filename, &title, &length);
-	music_view->details->current_duration = length;
-	g_free (title);
-	
-        result = gnome_vfs_get_file_info (path_uri, &file_info, GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result != GNOME_VFS_OK) {
-		/* File must be unavailable for some reason. Let's yank it from the list */
-                gtk_list_store_remove (music_view->details->list_store, &iter);
-                g_free (song_filename);
-		music_view->details->selected_index -= 1;
-		go_to_next_track (music_view);
-		return;
-	}
-
-	gtk_widget_set_sensitive (music_view->details->playtime_bar, TRUE);
-	
-	if (music_view->details->status_timeout != 0) {
-		gtk_timeout_remove (music_view->details->status_timeout);
-		music_view->details->status_timeout = 0;
-        }
-        
-	music_view->details->status_timeout = gtk_timeout_add (900, (GtkFunction) play_status_display, music_view);
-
-	start_playing_file (music_view, song_filename);
-        g_free (song_filename);
-}
-
-
-static void
-go_to_next_track (NautilusMusicView *music_view)
-{
-	int num_rows;
-        
-	mpg123_stop ();
-
-	num_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (music_view->details->list_store), NULL);
-        
-	if ((music_view->details->selected_index + 1) < num_rows) {
-		music_view->details->selected_index += 1;
-		play_current_file (music_view, TRUE);
-	} else {  
-		update_play_controls_status (music_view, get_player_state (music_view));
-		reset_playtime (music_view);
-	}
-}
-
-static void
-go_to_previous_track (NautilusMusicView *music_view)
-{	
-	/* if we're in the first 3 seconds of the song, go to the previous one, otherwise go to the beginning of this track */	
-	if ((esdout_get_output_time () < 3000) && (music_view->details->selected_index > 0)) {
-		music_view->details->selected_index -= 1;
-	}
-	
-	mpg123_stop ();	
-	play_current_file (music_view, TRUE);
-}
-
-
-/* callback for the play control semantics */
-
-/* callback for buttons */
-static void
-play_button_callback (GtkWidget *widget, NautilusMusicView *music_view)
-{
-	if (get_player_state (music_view) == PLAYER_PLAYING) {
-		return;
-	}
-
-	if (get_player_state (music_view) == PLAYER_PAUSED) {				
-		set_player_state (music_view, PLAYER_PLAYING);
-		mpg123_pause (FALSE);
-	} else {
-		play_current_file (music_view, FALSE);
-	}
-}
-
-static void
-stop_button_callback (GtkWidget *widget, NautilusMusicView *music_view)
-{
-	stop_playing_file (music_view);
-}
-
-static void
-pause_button_callback (GtkWidget *widget, NautilusMusicView *music_view)
-{
-	PlayerState state;
-	state = get_player_state (music_view);
-	
-	if (state == PLAYER_PLAYING) {
-		set_player_state (music_view, PLAYER_PAUSED);
-		mpg123_pause (TRUE);
-	} else if (state == PLAYER_PAUSED) {
-		set_player_state (music_view, PLAYER_PLAYING);
-		mpg123_pause (FALSE);
-	}
-}
-
-static void
-prev_button_callback (GtkWidget *widget, NautilusMusicView *music_view)
-{
-	go_to_previous_track (music_view);
-}
-
-static void
-next_button_callback (GtkWidget *widget, NautilusMusicView *music_view)
-{
-	go_to_next_track (music_view);
-}
-
-/* here are the  callbacks that handle seeking within a song by dragging the progress bar.
-   "Mouse down" sets the slider_dragging boolean, "motion_notify" updates the label on the left, while
-   "mouse up" actually moves the frame index.  */
-
-/* handle slider button press */
-static int
-slider_press_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
-{
-	music_view->details->slider_dragging = TRUE;
-        return FALSE;
-}
-
-/* handle mouse motion by updating the time, but not actually seeking until the user lets go */
-static int
-slider_moved_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
-{	
-	GtkAdjustment *adjustment;
-	char *temp_str;
-	int time, seconds, minutes;
-	float multiplier;
-		
-	if (music_view->details->slider_dragging) {
-		adjustment = gtk_range_get_adjustment (GTK_RANGE (bar));
-		
-		/* don't attempt this if any of the values are zero */	
-		if (music_view->details->current_duration == 0) {
-			return FALSE;
-		}
-
-		multiplier = adjustment->value / 100.0;
-		time = (int) (multiplier * (float)music_view->details->current_duration);
-		
-		seconds = time / 1000; 
-		minutes = seconds / 60;
-		seconds = seconds % 60;
-
-                temp_str = g_strdup_printf ("<span size=\"x-large\">%02d:%02d</span>", minutes, seconds);
-
-		gtk_label_set_markup (GTK_LABEL(music_view->details->playtime), temp_str);
-	}
-        return FALSE;
-}
-	
-/* callback for slider button release - seek to desired location */
-static int
-slider_release_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music_view)
-{
-	GtkAdjustment *adjustment;
-	float multiplier;
-	int time;
-	
-	if (music_view->details->slider_dragging) {
-		adjustment = gtk_range_get_adjustment (GTK_RANGE (bar));
-		
-		if (music_view->details->current_duration == 0) {
-			music_view->details->slider_dragging = FALSE;
-			return FALSE;		
-		}
-
-		/* Seek to time */
-		multiplier = adjustment->value / 100.0;
-		time = (int) (multiplier * (float)music_view->details->current_duration);
-
-		mpg123_seek (time / 1000);
-	}
-	music_view->details->slider_dragging = FALSE;
-	
-        return FALSE;
-}
-
-static gboolean
-changed_idle_callback (gpointer data)
-{
-        float multiplier;
-        int time;
-        NautilusMusicView *music_view;
-
-        music_view = NAUTILUS_MUSIC_VIEW (data);
-        
-        multiplier = GTK_ADJUSTMENT (music_view->details->playtime_adjustment)->value / 100.0;
-        time = (int) (multiplier * (float)music_view->details->current_duration);
-        mpg123_seek (time / 1000);
-
-        music_view->details->slider_dragging = FALSE;
-        music_view->details->value_changed_update_handler = 0;
-
-        return FALSE;
-}
-
-static void
-slider_changed_callback (GtkWidget *bar, 
-                         NautilusMusicView *music_view)
-{
-        if (!music_view->details->slider_dragging && !music_view->details->value_changed_update_handler) {
-                music_view->details->slider_dragging = TRUE;
-                music_view->details->value_changed_update_handler = 
-                        g_idle_add (changed_idle_callback, music_view);
-        }       
-}
-
-/* create a button with an xpm label */
-static GtkWidget *
-xpm_label_box (NautilusMusicView *music_view, char * xpm_data[])
-{
-        GdkPixbuf *pixbuf;
-        GtkWidget *pix_widget;
-        GtkWidget *box;
-        GtkStyle *style;
-
-        box = gtk_hbox_new (FALSE, 0);
-        gtk_container_set_border_width (GTK_CONTAINER (box), 2);
-        style = gtk_widget_get_style (GTK_WIDGET (music_view->details->event_box));
-
-        pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)xpm_data);
-
-        pix_widget = gtk_image_new_from_pixbuf (pixbuf);
-        gtk_box_pack_start (GTK_BOX (box), pix_widget, TRUE, FALSE, 3);
-        gtk_widget_show (pix_widget);
-
-        g_object_unref (pixbuf);
-
-        return box;
-}
-
-/* creates a button with 2 internal pixwidgets, with only one visible at a time */
-
-static GtkWidget *
-xpm_dual_label_box (NautilusMusicView *music_view, char * xpm_data[],
-                    char *alt_xpm_data[],
-                    GtkWidget **main_pixwidget, GtkWidget **alt_pixwidget )
-{
-        GtkWidget *box;
-        GtkStyle *style;
-        GdkPixbuf *pixbuf;
-
-
-        box = gtk_hbox_new (FALSE, 0);
-        gtk_container_set_border_width (GTK_CONTAINER (box), 2);
-
-        style = gtk_widget_get_style (GTK_WIDGET (music_view->details->event_box));
-
-        /* create the main pixwidget */
-        pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)xpm_data);
-        *main_pixwidget = gtk_image_new_from_pixbuf (pixbuf);
-        g_object_unref (pixbuf);
-
-        gtk_box_pack_start (GTK_BOX (box), *main_pixwidget, TRUE, FALSE, 3);
-        gtk_widget_show (*main_pixwidget);
-
-        /* create the alternative pixwidget */
-        pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)alt_xpm_data);
-        *alt_pixwidget = gtk_image_new_from_pixbuf (pixbuf);
-        g_object_unref (pixbuf);
-
-        gtk_box_pack_start (GTK_BOX (box), *alt_pixwidget, TRUE, FALSE, 3);
-        gtk_widget_hide (*alt_pixwidget);
-
-        return box;
-}
-
-/* add the play controls */
-
-static void
-add_play_controls (NautilusMusicView *music_view)
-{
-	GtkWidget *box; 
-	GtkWidget *vbox, *hbox;
-	GtkWidget *button;
-	GtkTooltips *tooltips;
-	
-	tooltips = gtk_tooltips_new ();
-
-	/* Create main vbox */
-	vbox = gtk_vbox_new (0, 0);
-	gtk_box_pack_start (GTK_BOX (music_view->details->control_box), vbox, FALSE, FALSE, 6);
-	gtk_widget_show (vbox);
-	music_view->details->play_control_box = vbox;
-
-	
-	/* Pack the items into the box in reverse order so that the controls are always
-	 * at the bottom regardless of the size of the album image.
-	 */
-	 
-	 /* hbox to hold slider and song progress time */
-	hbox = gtk_hbox_new (0, 0);
-	gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 7);
-	gtk_widget_show (hbox);
-
-	/* progress bar */
-	music_view->details->playtime_adjustment = gtk_adjustment_new (0, 0, 101, 1, 5, 1);
-	music_view->details->playtime_bar = gtk_hscale_new (GTK_ADJUSTMENT (music_view->details->playtime_adjustment));
-	
-	g_signal_connect_object (music_view->details->playtime_bar, "button_press_event",
-                                 G_CALLBACK (slider_press_callback), music_view, 0);
-	g_signal_connect_object (music_view->details->playtime_bar, "button_release_event",
-                                 G_CALLBACK (slider_release_callback), music_view, 0);
- 	g_signal_connect_object (music_view->details->playtime_bar, "motion_notify_event",
-                                 G_CALLBACK (slider_moved_callback), music_view, 0);
-        g_signal_connect_object (music_view->details->playtime_bar, "value_changed",
-                                 G_CALLBACK (slider_changed_callback), music_view, 0);
-   
-   	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->playtime_bar,
-                              _("Drag to seek within track"), NULL);
-	gtk_scale_set_draw_value (GTK_SCALE (music_view->details->playtime_bar), 0);
-	gtk_widget_show (music_view->details->playtime_bar);
-	gtk_widget_set_sensitive (music_view->details->playtime_bar, FALSE);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->playtime_bar, FALSE, FALSE, 4);
-	gtk_widget_set_size_request (music_view->details->playtime_bar, 150, -1);
-	gtk_widget_show (music_view->details->playtime_bar);
-
-	/* playtime label */
-	music_view->details->playtime = gtk_label_new ("");
-        gtk_label_set_markup (GTK_LABEL (music_view->details->playtime), "<span size=\"x-large\">--:--</span>");
-
-	gtk_label_set_justify (GTK_LABEL (music_view->details->playtime), GTK_JUSTIFY_LEFT);
-
-	gtk_misc_set_alignment (GTK_MISC (music_view->details->playtime), 0.0, 0.0);
-	gtk_widget_show (music_view->details->playtime);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->playtime, FALSE, FALSE, 0);
-	 
-	/* Buttons */
-        hbox = gtk_hbox_new (0, 0);
-	gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show (hbox);
-
-	/* previous track button */	
-	box = xpm_label_box (music_view, prev_xpm);
-	gtk_widget_show (box);
-	music_view->details->previous_track_button = gtk_button_new ();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->previous_track_button, _("Previous"), NULL);
-	gtk_container_add (GTK_CONTAINER (music_view->details->previous_track_button), box);
-	g_signal_connect_object (music_view->details->previous_track_button, "clicked",
-                                 G_CALLBACK (prev_button_callback), music_view, 0);
-	gtk_widget_set_sensitive (music_view->details->previous_track_button, TRUE);
-	gtk_button_set_relief (GTK_BUTTON (music_view->details->previous_track_button), GTK_RELIEF_NORMAL);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->previous_track_button, FALSE, FALSE, 0);
-	gtk_widget_show (music_view->details->previous_track_button);
-
-	/* play button */
-	box = xpm_dual_label_box (music_view, play_xpm, play_green_xpm,
-                                  &music_view->details->inactive_play_pixwidget,
-                                  &music_view->details->active_play_pixwidget);
-	gtk_widget_show (box);
-	button = gtk_button_new ();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), button, _("Play"), NULL);
-	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
-	gtk_container_add (GTK_CONTAINER (button), box);
-	gtk_widget_set_sensitive (button, TRUE);
-	g_signal_connect_object (button, "clicked", G_CALLBACK (play_button_callback), music_view, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (button);
-
-	/* pause button */
-	box = xpm_dual_label_box (music_view, pause_xpm, pause_green_xpm,
-                                  &music_view->details->inactive_pause_pixwidget,
-                                  &music_view->details->active_pause_pixwidget);
-	gtk_widget_show (box);
-	music_view->details->pause_button = gtk_button_new ();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->pause_button, _("Pause"), NULL);
-	gtk_button_set_relief (GTK_BUTTON (music_view->details->pause_button), GTK_RELIEF_NORMAL);
-	gtk_container_add (GTK_CONTAINER (music_view->details->pause_button), box);
-	gtk_widget_set_sensitive (music_view->details->pause_button, TRUE);
-
-	g_signal_connect_object (music_view->details->pause_button, "clicked",
-                                 G_CALLBACK (pause_button_callback), music_view, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->pause_button, FALSE, FALSE, 0);
-	gtk_widget_show (music_view->details->pause_button);
-
-	/* stop button */
-	box = xpm_label_box (music_view, stop_xpm);
-	gtk_widget_show (box);
-	music_view->details->stop_button = gtk_button_new ();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->stop_button, _("Stop"), NULL);
-	gtk_button_set_relief (GTK_BUTTON (music_view->details->stop_button), GTK_RELIEF_NORMAL);
-	gtk_container_add (GTK_CONTAINER (music_view->details->stop_button), box);
-	gtk_widget_set_sensitive (music_view->details->stop_button, TRUE);
-
-	g_signal_connect_object (music_view->details->stop_button, "clicked",
-                                 G_CALLBACK (stop_button_callback), music_view, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->stop_button, FALSE, FALSE, 0);
-	gtk_widget_show (music_view->details->stop_button);
-
-	/* next button */
-	box = xpm_label_box (music_view, next_xpm);
-	gtk_widget_show (box);
-	music_view->details->next_track_button = gtk_button_new();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->next_track_button, _("Next"), NULL);
-	gtk_button_set_relief (GTK_BUTTON (music_view->details->next_track_button), GTK_RELIEF_NORMAL);
-	gtk_container_add (GTK_CONTAINER (music_view->details->next_track_button), box);
-	gtk_widget_set_sensitive (music_view->details->next_track_button, TRUE);
-
-	g_signal_connect_object (music_view->details->next_track_button, "clicked",
-                                 G_CALLBACK (next_button_callback), music_view, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->next_track_button, FALSE, FALSE, 0);
-	gtk_widget_show (music_view->details->next_track_button);
-
-	/* Song title label */
-	music_view->details->song_label = gtk_label_new ("");
-	gtk_label_set_justify (GTK_LABEL (music_view->details->song_label), GTK_JUSTIFY_LEFT);
-	gtk_box_pack_end (GTK_BOX (vbox), music_view->details->song_label, FALSE, FALSE, 2);	
-	gtk_widget_show (music_view->details->song_label);	
-}
-
-/* set the album image, or hide it if none */
-static void
-nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *image_path_uri)
-{
-	char* image_path;
-	GdkPixbuf *pixbuf;
-	GdkPixbuf *scaled_pixbuf;
-
-	if (image_path_uri != NULL) {
-  		image_path = gnome_vfs_get_local_path_from_uri (image_path_uri);  		
-  		pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
-		
-		if (pixbuf != NULL) {
-			scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
-			g_object_unref (pixbuf);
-
-			if (music_view->details->album_image == NULL) {
-				music_view->details->album_image = gtk_image_new_from_pixbuf (scaled_pixbuf);
-				gtk_box_pack_start (GTK_BOX (music_view->details->image_box),
-                                                    music_view->details->album_image, FALSE, FALSE, 2);
-                                eel_accessibility_set_name (music_view->details->album_image,
-                                                            _("cover image"));
-			} else {
-				gtk_image_set_from_pixbuf (GTK_IMAGE (music_view->details->album_image), scaled_pixbuf);
-			}
-
-                        g_object_unref (scaled_pixbuf);
-		
-			gtk_widget_show (music_view->details->album_image);
-
- 			g_free (image_path);
-		}
-	} else if (music_view->details->album_image != NULL) {
-		gtk_widget_hide (music_view->details->album_image);
-	}
-}
-
-/* handle callback that's invoked when file metadata is available */
-static void
-metadata_callback (NautilusFile *file, gpointer callback_data)
-{
-	char *album_image_path;
-	NautilusMusicView *music_view;
-	
-	music_view = NAUTILUS_MUSIC_VIEW (callback_data);
-	
-	album_image_path = nautilus_file_get_metadata (file, NAUTILUS_METADATA_KEY_CUSTOM_ICON, NULL);	
-	if (album_image_path != NULL) {
-		nautilus_music_view_set_album_image (music_view, album_image_path);
-		g_free (album_image_path);
-	}
-}
-
-
-/* here's where we do most of the real work of populating the view with info from the new uri */
-static void
-nautilus_music_view_update (NautilusMusicView *music_view)
-{
-	GnomeVFSResult result;
-	GnomeVFSFileInfo *current_file_info;
-	GList *list, *node;
-	
-        char *uri;
-	GList *p;
-	GList *song_list, *attributes;
-	SongInfo *info;
-	char *path_uri, *escaped_name;
-	char *image_path_uri;
-        char *path, *message;
-	GtkTreeIter iter;
-        
-	int file_index;
-	int image_count;
-
-        uri = nautilus_file_get_uri (music_view->details->file);
-	
-	song_list = NULL;
-	image_path_uri = NULL;
-	file_index = 1;
-	image_count = 0;
-	
-	/* connect the music view background to directory metadata */
-	nautilus_connect_background_to_file_metadata (GTK_WIDGET (music_view->details->event_box), 
-                                                      music_view->details->file);
-	nautilus_connect_background_to_file_metadata (GTK_WIDGET (music_view->details->tree_view),
-                                                      music_view->details->file);
-	/* iterate through the directory, collecting mp3 files and extracting id3 data if present */
-	result = gnome_vfs_directory_list_load (&list, uri,
-						GNOME_VFS_FILE_INFO_GET_MIME_TYPE
-                                                | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (result != GNOME_VFS_OK) {
-		path = gnome_vfs_get_local_path_from_uri (uri);
-		message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
-		eel_show_error_dialog (message, _("Can't Read Folder"), 
-                                       GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view->details->event_box))));
-		g_free (path);
-		g_free (message);
-                g_free (uri);
-		return;
-	}
-	
-	for (node = list; node != NULL; node = node->next) {
-		current_file_info = node->data;
-
-		/* skip invisible files, for now */
-		if (current_file_info->name[0] == '.') {
-                        continue;
-                }
-		
- 		escaped_name = gnome_vfs_escape_string (current_file_info->name);
-		path_uri = g_build_filename (uri, escaped_name, NULL);
-		g_free (escaped_name);
-                
-		/* fetch info and queue it if it's an mp3 file */
-		info = fetch_song_info (path_uri, current_file_info, file_index);
-		if (info) {
-			info->path_uri = path_uri;
-			file_index += 1;
-                        song_list = g_list_prepend (song_list, info);
-		} else {
-		        /* it's not an mp3 file, so see if it's an image */
-        		const char *mime_type = gnome_vfs_file_info_get_mime_type (current_file_info);		        	
-		        if (eel_istr_has_prefix (mime_type, "image/")) {
-		        	/* for now, just keep the first image */
-		        	if (image_path_uri == NULL) {
-		        		image_path_uri = g_strdup (path_uri);
-				}
-				image_count += 1;
-		        }
-                        
-		        g_free (path_uri);
-		}
-		
-	}
-	gnome_vfs_file_info_list_free (list);	
-
-        song_list = g_list_reverse (song_list);
-	
-	/* populate the list */
-        gtk_list_store_clear (music_view->details->list_store);
-	
-	for (p = song_list; p != NULL; p = p->next) {
-		info = (SongInfo *) p->data;
-
-                gtk_list_store_append (music_view->details->list_store,
-                                       &iter);
-                gtk_list_store_set (music_view->details->list_store,
-                                    &iter,
-                                    TRACK_NUMBER_COLUMN, info->track_number,
-                                    TITLE_COLUMN, g_strdup (info->title),
-                                    ARTIST_COLUMN, g_strdup (info->artist),
-                                    BITRATE_COLUMN, info->bitrate,
-                                    TIME_COLUMN, info->track_time,
-                                    SAMPLE_RATE_COLUMN, info->samprate,
-                                    YEAR_COLUMN, g_strdup (info->year),
-                                    COMMENT_COLUMN, g_strdup (info->comment),
-                                    PATH_URI_COLUMN, g_strdup (info->path_uri),
-                                    -1);
-
-	}
-	
-	/* if there was more than one image in the directory, don't use any */	
-	if (image_count > 1) {
-		g_free (image_path_uri);
-		image_path_uri = NULL;
-	}
-
-	/* set up the image (including hiding the widget if there isn't one */
-	nautilus_music_view_set_album_image (music_view, image_path_uri);
-	g_free (image_path_uri);
-
-	/* Check if one is specified in metadata; if so, it will be set by the callback */	
-	attributes = g_list_prepend (NULL, NAUTILUS_FILE_ATTRIBUTE_CUSTOM_ICON);
-	nautilus_file_call_when_ready (music_view->details->file, attributes, metadata_callback, music_view);
-	g_list_free (attributes);
-        
-	/* determine the album title/artist line */	
-	if (music_view->details->album_title) {
-		char *basename, *album_name, *artist_name, *temp_str;
-                char *escaped_album_name, *escaped_artist_name;
-
-                album_name = determine_attribute (song_list, FALSE);
-		if (album_name == NULL) {
-			album_name = gnome_vfs_unescape_string_for_display (
-                                basename = g_path_get_basename (uri));                               
-                        g_free (basename);
-                }
-		
-                escaped_album_name = g_markup_escape_text (album_name, -1);
-		artist_name = determine_attribute (song_list, TRUE);
-		if (artist_name != NULL) {
-                        escaped_artist_name = g_markup_escape_text (artist_name, -1);
-
-			temp_str = g_strdup_printf (_("<span size=\"xx-large\">%s - %s</span>"), escaped_album_name, escaped_artist_name);
-			g_free (escaped_artist_name);
-			g_free (artist_name);
-		} else {
-			temp_str = g_strdup_printf ("<span size=\"xx-large\">%s</span>", escaped_album_name);
-                }
-                g_free (escaped_album_name);
-		gtk_label_set_markup (GTK_LABEL (music_view->details->album_title), temp_str);
-		
-		g_free (temp_str);
-		g_free (album_name);
-	}
-
-	/* allocate the play controls if necessary */	
-	if (music_view->details->play_control_box == NULL) {
-		add_play_controls (music_view);
-	}
-	
-	music_view_set_selected_song_title (music_view, 0);
-	
-	/* release the song list */
-	eel_g_list_free_deep_custom (song_list, (GFunc) song_info_free, NULL);
-
-        g_free (uri);
-}
-
-static void
-detach_file (NautilusMusicView *music_view)
-{
-        if (music_view->details->file != NULL) {
-                nautilus_file_cancel_call_when_ready (music_view->details->file,
-                                                      metadata_callback, music_view);
-                nautilus_file_unref (music_view->details->file);
-                music_view->details->file = NULL;
-        }
-}
-
-void
-nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri)
-{
-	stop_playing_file (music_view);
-        detach_file (music_view);
-        music_view->details->file = nautilus_file_get (uri);
-	nautilus_music_view_update (music_view);
-	
-	update_play_controls_status (music_view, get_player_state (music_view));
-}
-
-static void
-music_view_background_appearance_changed_callback (EelBackground *background, NautilusMusicView *music_view)
-{
-        GdkColor color;
-        
-        color = eel_gdk_rgb_to_color (eel_background_is_dark (background) ? EEL_RGB_COLOR_WHITE : EEL_RGB_COLOR_BLACK);
-        
-	if (music_view->details->album_title != NULL) {
-		gtk_widget_modify_fg (music_view->details->album_title,
-                                      GTK_STATE_NORMAL, &color);
-	}
-	if (music_view->details->song_label != NULL) {
-		gtk_widget_modify_fg (music_view->details->song_label,
-                                      GTK_STATE_NORMAL, &color);
-	}
-	if (music_view->details->playtime != NULL) {
-		gtk_widget_modify_fg (music_view->details->playtime,
-                                      GTK_STATE_NORMAL, &color);
-	}
-}
-
-static void
-music_view_load_location_callback (NautilusView *view, 
-                                   const char *location,
-                                   NautilusMusicView *music_view)
-{
-        nautilus_view_report_load_underway (NAUTILUS_VIEW (music_view));
-	nautilus_music_view_load_uri (music_view, location);
-        nautilus_view_report_load_complete (NAUTILUS_VIEW (music_view));
-}
-
-/* handle receiving dropped objects */
-static void  
-nautilus_music_view_drag_data_received (GtkWidget *widget, GdkDragContext *context,
-                                        int x, int y,
-                                        GtkSelectionData *selection_data, 
-                                        guint info, guint time,
-                                        gpointer user_data)
-{
-	char **uris;
-
-	g_return_if_fail (NAUTILUS_IS_MUSIC_VIEW (user_data));
-
-	uris = g_strsplit (selection_data->data, "\r\n", 0);
-
-	switch (info) {
-        case TARGET_GNOME_URI_LIST:
-        case TARGET_URI_LIST: 	
-                /* FIXME bugzilla.gnome.org 42406: 
-                 * the music view should accept mp3 files.
-                 */
-                break;
-  		
-        case TARGET_COLOR:
-                /* Let the background change based on the dropped color. */
-                eel_background_receive_dropped_color
-                        (eel_get_widget_background (widget),
-                         widget, x, y, selection_data);
-                break;
-  
-  	case TARGET_BGIMAGE:
-		eel_background_receive_dropped_background_image
-			(eel_get_widget_background (widget),
-                         uris[0]);
-  		break;              
-
-        default:
-                g_warning ("unknown drop type");
-                break;
-        }
-	
-	g_strfreev (uris);
-}
-
-static void
-start_playing_file (NautilusMusicView *music_view, const char *file_name)
-{
-	set_player_state (music_view, PLAYER_PLAYING);
-	mpg123_play_file (file_name);
-}
-
-static void
-stop_playing_file (NautilusMusicView *music_view)
-{
-	PlayerState state;
-
-	state = get_player_state (music_view);
-	
-	if (state == PLAYER_PLAYING || state == PLAYER_PAUSED) {
-		set_player_state (music_view, PLAYER_STOPPED);
-		mpg123_stop ();
-	}
-}
-
-static PlayerState
-get_player_state (NautilusMusicView *music_view)
-{
-	return music_view->details->player_state;
-}
-
-static void
-set_player_state (NautilusMusicView *music_view, PlayerState state)
-{
-	music_view->details->player_state = state;
-}
diff --git a/components/music/nautilus-music-view.h b/components/music/nautilus-music-view.h
deleted file mode 100644
index 8edeface4..000000000
--- a/components/music/nautilus-music-view.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Andy Hertzfeld
- */
-
-/* header file for the music view component */
-
-#ifndef NAUTILUS_MUSIC_VIEW_H
-#define NAUTILUS_MUSIC_VIEW_H
-
-#include <libnautilus/nautilus-view.h>
-
-
-typedef struct NautilusMusicView      NautilusMusicView;
-typedef struct NautilusMusicViewClass NautilusMusicViewClass;
-
-#define NAUTILUS_TYPE_MUSIC_VIEW	    (nautilus_music_view_get_type ())
-#define NAUTILUS_MUSIC_VIEW(obj)	    (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_MUSIC_VIEW, NautilusMusicView))
-#define NAUTILUS_MUSIC_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_MUSIC_VIEW, NautilusMusicViewClass))
-#define NAUTILUS_IS_MUSIC_VIEW(obj)	    (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_MUSIC_VIEW))
-#define NAUTILUS_IS_MUSIC_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_MUSIC_VIEW))
-
-typedef struct NautilusMusicViewDetails NautilusMusicViewDetails;
-
-struct NautilusMusicView {
-	NautilusView base;
-	NautilusMusicViewDetails *details;
-};
-
-struct NautilusMusicViewClass {
-	NautilusViewClass base;
-};
-
-
-
-/* GObject support */
-GType	nautilus_music_view_get_type	    (void);
-
-#endif /* NAUTILUS_MUSIC_VIEW_H */
diff --git a/components/music/pixmaps.h b/components/music/pixmaps.h
deleted file mode 100644
index 9a5e2b8ae..000000000
--- a/components/music/pixmaps.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* XPM */
-static char * play_xpm[] = {
-"13 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #000000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"......       ",
-".+++++.      ",
-".++++++.     ",
-".+++++++.    ",
-".++++++++.   ",
-".+++++++++.  ",
-".++++++++++. ",
-".++++++++++@#",
-".+++++++++@# ",
-".++++++++@#  ",
-".+++++++@#   ",
-".++++++@#    ",
-".+++++@#     ",
-".+@@@@#      ",
-".#####       "};
-static char * next_xpm[] = {
-"16 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #000000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"..        ......",
-".+.       .+++@#",
-".++.      .+++@#",
-".+++.     .+++@#",
-".++++.    .+++@#",
-".+++++.   .+++@#",
-".++++++.  .+++@#",
-".++++++@# .+++@#",
-".+++++@#  .+++@#",
-".++++@#   .+++@#",
-".+++@#    .+++@#",
-".++@#     .+++@#",
-".+@#      .+++@#",
-".+#       .+@@@#",
-".#        .#####"};
-static char * prev_xpm[] = {
-"16 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #000000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"......        ..",
-".+++@#       .+#",
-".+++@#      .+@#",
-".+++@#     .++@#",
-".+++@#    .+++@#",
-".+++@#   .++++@#",
-".+++@#  .+++++@#",
-".+++@# .++++++@#",
-".+++@#  .+++++@#",
-".+++@#   .++++@#",
-".+++@#    .+++@#",
-".+++@#     .++@#",
-".+++@#      .+@#",
-".+@@@#       .+#",
-".#####        .#"};
-static char * pause_xpm[] = {
-"13 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #000000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"...... ......",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+@@@# .+@@@#",
-".##### .#####"};
-static char * stop_xpm[] = {
-"13 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #000000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-".............",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".++++++++++@#",
-".+@@@@@@@@@@#",
-".############"};
-
-static char * play_green_xpm[] = {
-"13 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #00F000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"......       ",
-".+++++.      ",
-".++++++.     ",
-".+++++++.    ",
-".++++++++.   ",
-".+++++++++.  ",
-".++++++++++. ",
-".++++++++++@#",
-".+++++++++@# ",
-".++++++++@#  ",
-".+++++++@#   ",
-".++++++@#    ",
-".+++++@#     ",
-".+@@@@#      ",
-".#####       "};
-static char * pause_green_xpm[] = {
-"13 15 5 1",
-"       c None",
-".      c #949594",
-"+      c #00F000",
-"@      c #8E8E8E",
-"#      c #FFFFFF",
-"...... ......",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+++@# .+++@#",
-".+@@@# .+@@@#",
-".##### .#####"};
diff --git a/components/music/tabinit.c b/components/music/tabinit.c
deleted file mode 100644
index 8f0ed3f44..000000000
--- a/components/music/tabinit.c
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#include <stdlib.h>
-
-#include "mpg123.h"
-
-real mpg123_decwin[512 + 32];
-static real cos64[16], cos32[8], cos16[4], cos8[2], cos4[1];
-real *mpg123_pnts[] =
-{cos64, cos32, cos16, cos8, cos4};
-
-static unsigned char *mpg123_conv16to8_buf = NULL;
-unsigned char *mpg123_conv16to8;
-
-static long intwinbase[] =
-{
-	0, -1, -1, -1, -1, -1, -1, -2, -2, -2,
-	-2, -3, -3, -4, -4, -5, -5, -6, -7, -7,
-	-8, -9, -10, -11, -13, -14, -16, -17, -19, -21,
-	-24, -26, -29, -31, -35, -38, -41, -45, -49, -53,
-	-58, -63, -68, -73, -79, -85, -91, -97, -104, -111,
-	-117, -125, -132, -139, -147, -154, -161, -169, -176, -183,
-	-190, -196, -202, -208, -213, -218, -222, -225, -227, -228,
-	-228, -227, -224, -221, -215, -208, -200, -189, -177, -163,
-	-146, -127, -106, -83, -57, -29, 2, 36, 72, 111,
-	153, 197, 244, 294, 347, 401, 459, 519, 581, 645,
-	711, 779, 848, 919, 991, 1064, 1137, 1210, 1283, 1356,
-	1428, 1498, 1567, 1634, 1698, 1759, 1817, 1870, 1919, 1962,
-	2001, 2032, 2057, 2075, 2085, 2087, 2080, 2063, 2037, 2000,
-	1952, 1893, 1822, 1739, 1644, 1535, 1414, 1280, 1131, 970,
-	794, 605, 402, 185, -45, -288, -545, -814, -1095, -1388,
-	-1692, -2006, -2330, -2663, -3004, -3351, -3705, -4063, -4425, -4788,
-	-5153, -5517, -5879, -6237, -6589, -6935, -7271, -7597, -7910, -8209,
-	-8491, -8755, -8998, -9219, -9416, -9585, -9727, -9838, -9916, -9959,
-	-9966, -9935, -9863, -9750, -9592, -9389, -9139, -8840, -8492, -8092,
-	-7640, -7134, -6574, -5959, -5288, -4561, -3776, -2935, -2037, -1082,
-	-70, 998, 2122, 3300, 4533, 5818, 7154, 8540, 9975, 11455,
-	12980, 14548, 16155, 17799, 19478, 21189, 22929, 24694, 26482, 28289,
-	30112, 31947, 33791, 35640, 37489, 39336, 41176, 43006, 44821, 46617,
-	48390, 50137, 51853, 53534, 55178, 56778, 58333, 59838, 61289, 62684,
-	64019, 65290, 66494, 67629, 68692, 69679, 70590, 71420, 72169, 72835,
-	73415, 73908, 74313, 74630, 74856, 74992, 75038};
-
-void mpg123_make_decode_tables(long scaleval)
-{
-	int i, j, k, kr, divv;
-	real *table, *costab;
-
-	for (i = 0; i < 5; i++)
-	{
-		kr = 0x10 >> i;
-		divv = 0x40 >> i;
-		costab = mpg123_pnts[i];
-		for (k = 0; k < kr; k++)
-			costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv));
-	}
-
-	table = mpg123_decwin;
-	scaleval = -scaleval;
-	for (i = 0, j = 0; i < 256; i++, j++, table += 32)
-	{
-		if (table < mpg123_decwin + 512 + 16)
-			table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
-		if (i % 32 == 31)
-			table -= 1023;
-		if (i % 64 == 63)
-			scaleval = -scaleval;
-	}
-
-	for ( /* i=256 */ ; i < 512; i++, j--, table += 32)
-	{
-		if (table < mpg123_decwin + 512 + 16)
-			table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
-		if (i % 32 == 31)
-			table -= 1023;
-		if (i % 64 == 63)
-			scaleval = -scaleval;
-	}
-}
-
-void mpg123_make_conv16to8_table(void)
-{
-	int i;
-
-	/*
-	 * ????: 8.0 is right but on SB cards '2.0' is a better value ???
-	 */
-
-	if (!mpg123_conv16to8_buf)
-	{
-		mpg123_conv16to8_buf = (unsigned char *) malloc(8192);
-		if (!mpg123_conv16to8_buf)
-		{
-			fprintf(stderr, "Can't allocate 16 to 8 converter table!\n");
-/*      exit(1); */
-		}
-		mpg123_conv16to8 = mpg123_conv16to8_buf + 4096;
-	}
-
-	for (i = -4096; i < 4096; i++)
-	{
-		mpg123_conv16to8[i] = (i >> 5) + 128;
-	}
-}
diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c
index 6fbb5c754..93710e608 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -1755,11 +1755,13 @@ add_site_from_fields (GtkWidget *widget, News *news)
 
 	/* make sure there's something in the fields */
 	if (site_name == NULL || strlen (site_name) == 0) {
-		eel_show_error_dialog (_("Sorry, but you have not specified a name for the site!"), _("Missing Site Name Error"), NULL);
+		eel_show_error_dialog (_("Sorry, but you have not specified a name for the site."),
+		                       _("Please specify a name and try again."), _("Missing Site Name Error"), NULL);
 		return;
 	}
 	if (site_location == NULL || strlen (site_location) == 0) {
-		eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site!"), _("Missing URL Error"), NULL);
+		eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site."),
+		                       _("Please specify a URL and try again."), _("Missing URL Error"), NULL);
 		return;
 	}
 	
@@ -1776,7 +1778,8 @@ add_site_from_fields (GtkWidget *widget, News *news)
 	g_free (buffer);
 	if (!got_xml_file) {
 		g_free (site_uri);
-		eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file!"), _("Invalid RSS URL"), NULL);
+		eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file."), 
+		                       _("Please check the spelling of the url."), _("Invalid RSS URL"), NULL);
 		return;
 	}
 	
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index b3299bdf5..3e0262933 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -1,7 +1,5 @@
 NULL = 
 
-SUBDIRS = services
-
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Text\"	\
 	-DDATADIR=\""$(datadir)"\" 		\
diff --git a/components/text/services/.cvsignore b/components/text/services/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/text/services/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/text/services/Makefile.am b/components/text/services/Makefile.am
deleted file mode 100644
index d4a4cc36c..000000000
--- a/components/text/services/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-NULL=
-
-servicesdir = $(datadir)/nautilus/services/text
-
-services_DATA =				\
-		google.xml		\
-		webster.xml		\
-		$(NULL)
-
-EXTRA_DIST = $(services_DATA)
diff --git a/components/text/services/google.xml b/components/text/services/google.xml
deleted file mode 100644
index 8610c35f6..000000000
--- a/components/text/services/google.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<service _label="Search Google for Selected Text" source="selection"
-  template="http://www.google.com/search?q=%s" _tooltip="Use Google to search the web for the selected text"/>
diff --git a/components/text/services/webster.xml b/components/text/services/webster.xml
deleted file mode 100644
index 715605c81..000000000
--- a/components/text/services/webster.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<service _label="Look Up Selected Text in Dictionary" source="selection"
-  template="http://www.m-w.com/cgi-bin/dictionary?va=%s" _tooltip="Look up the selected text in the Merriam-Webster dictionary"/>
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
deleted file mode 100644
index 2a04acf19..000000000
--- a/components/tree/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-NULL =
-
-INCLUDES =						\
-	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
-	-DG_LOG_DOMAIN=\"Nautilus-Tree\"		\
-	-I$(top_srcdir)					\
-	$(DISABLE_DEPRECATED_CFLAGS)			\
-	$(COMPONENT_CFLAGS)				\
-	$(NULL)
-
-TREE_VIEW_COMMON_SOURCES =			\
-	nautilus-tree-model.c			\
-	nautilus-tree-model.h			\
-	nautilus-tree-view.c			\
-	nautilus-tree-view.h			\
-	nautilus-tree-view-iids.h		\
-	$(NULL)
-
-bonobodir = $(libdir)/bonobo
-bonobo_LTLIBRARIES = libnautilus-tree-view.la
-
-libnautilus_tree_view_la_SOURCES = $(TREE_VIEW_COMMON_SOURCES) libmain.c 
-
-libnautilus_tree_view_la_LDFLAGS = -module -avoid-version -no-undefined
-
-libnautilus_tree_view_la_LIBADD =               \
-	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(top_builddir)/libnautilus-private/libnautilus-private.la \
-	$(COMPONENT_LIBS)
-	$(NULL)
-
-server_in_files = Nautilus_View_tree.server.in.in
-
-serverdir = $(libdir)/bonobo/servers
-server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
-	sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@
-@INTLTOOL_SERVER_RULE@
-
-EXTRA_DIST = $(server_in_files)
-CLEANFILES = $(server_DATA) $(server_DATA).in
diff --git a/components/tree/Nautilus_View_tree.server.in.in b/components/tree/Nautilus_View_tree.server.in.in
deleted file mode 100644
index a9b29cb04..000000000
--- a/components/tree/Nautilus_View_tree.server.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:Nautilus_Tree_View"
-	type="shlib" location="@BONOBODIR@/libnautilus-tree-view">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-		<item value="IDL:Nautilus/View:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Nautilus Tree view"/>
-	<oaf_attribute name="description" type="string" _value="Nautilus Tree side pane"/>
-	<oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/components/tree/libmain.c b/components/tree/libmain.c
deleted file mode 100644
index 7f7f4d9c6..000000000
--- a/components/tree/libmain.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2000, 2001 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Maciej Stachowiak
- */
-
-/* libmain.c - object activation infrastructure for shared library
-   version of tree view. */
-
-#include <config.h>
-#include <string.h>
-#include "nautilus-tree-view-iids.h"
-#include "nautilus-tree-view.h"
-#include <bonobo.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <libnautilus-private/nautilus-bonobo-extensions.h>
-
-static gboolean shortcut_registered = FALSE;
-
-static CORBA_Object
-create_object (const char *iid,
-	       gpointer callback_data)
-{
-	NautilusTreeView *view;
-
-	if (strcmp (iid, TREE_VIEW_IID) != 0) {
-		return CORBA_OBJECT_NIL;
-	}
-
-	view = NAUTILUS_TREE_VIEW (g_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
-
-	return CORBA_Object_duplicate (BONOBO_OBJREF (view), NULL);
-}
-
-static CORBA_Object
-tree_shlib_make_object (PortableServer_POA poa,
-			const char *iid,
-			gpointer impl_ptr,
-			CORBA_Environment *ev)
-{
-	NautilusTreeView *view;
-
-	if (!shortcut_registered) {
-		nautilus_bonobo_register_activation_shortcut (TREE_VIEW_IID,
-							      create_object, NULL);
-		shortcut_registered = TRUE;
-	}
-
-	if (strcmp (iid, TREE_VIEW_IID) != 0) {
-		return CORBA_OBJECT_NIL;
-	}
-
-	view = NAUTILUS_TREE_VIEW (g_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
-
-	bonobo_activation_plugin_use (poa, impl_ptr);
-
-	return CORBA_Object_duplicate (BONOBO_OBJREF (view), ev);
-}
-
-static const BonoboActivationPluginObject tree_plugin_list[] = {
-	{ TREE_VIEW_IID, tree_shlib_make_object },
-	{ NULL }
-};
-
-const BonoboActivationPlugin Bonobo_Plugin_info = {
-	tree_plugin_list,
-	"Nautilus Tree Sidebar Panel"
-};
diff --git a/components/tree/nautilus-tree-model.h b/components/tree/nautilus-tree-model.h
deleted file mode 100644
index f41a05740..000000000
--- a/components/tree/nautilus-tree-model.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2002 Anders Carlsson
- * Copyright (C) 2002 Bent Spoon Software
- *
- * 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@gnu.org>
- */
-
-/* nautilus-tree-model.h - Model for the tree view */
-
-#ifndef NAUTILUS_TREE_MODEL_H
-#define NAUTILUS_TREE_MODEL_H
-
-#include <glib-object.h>
-#include <gtk/gtktreemodel.h>
-#include <libnautilus-private/nautilus-file.h>
-
-#define NAUTILUS_TYPE_TREE_MODEL	    (nautilus_tree_model_get_type ())
-#define NAUTILUS_TREE_MODEL(obj)	    (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TREE_MODEL, NautilusTreeModel))
-#define NAUTILUS_TREE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TREE_MODEL, NautilusTreeModelClass))
-#define NAUTILUS_IS_TREE_MODEL(obj)	    (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TREE_MODEL))
-#define NAUTILUS_IS_TREE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_TREE_MODEL))
-
-enum {
-	NAUTILUS_TREE_MODEL_DISPLAY_NAME_COLUMN,
-	NAUTILUS_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
-	NAUTILUS_TREE_MODEL_OPEN_PIXBUF_COLUMN,
-	NAUTILUS_TREE_MODEL_FONT_STYLE_COLUMN,
-	NAUTILUS_TREE_MODEL_FONT_WEIGHT_COLUMN,
-	NAUTILUS_TREE_MODEL_NUM_COLUMNS
-};
-
-typedef struct NautilusTreeModelDetails NautilusTreeModelDetails;
-
-typedef struct {
-	GObject parent;
-	NautilusTreeModelDetails *details;
-} NautilusTreeModel;
-
-typedef struct {
-	GObjectClass parent_class;
-
-	void         (* row_loaded)      (NautilusTreeModel *tree_model,
-					  GtkTreeIter       *iter);
-} NautilusTreeModelClass;
-
-GType              nautilus_tree_model_get_type                  (void);
-NautilusTreeModel *nautilus_tree_model_new                       (void);
-void               nautilus_tree_model_set_show_hidden_files     (NautilusTreeModel *model,
-								  gboolean           show_hidden_files);
-void               nautilus_tree_model_set_show_backup_files     (NautilusTreeModel *model,
-								  gboolean           show_backup_files);
-void               nautilus_tree_model_set_show_only_directories (NautilusTreeModel *model,
-								  gboolean           show_only_directories);
-NautilusFile *     nautilus_tree_model_iter_get_file             (NautilusTreeModel *model,
-								  GtkTreeIter       *iter);
-void               nautilus_tree_model_add_root_uri              (NautilusTreeModel *model,
-								  const char        *root_uri,
-								  const char        *display_name,
-								  const char        *icon_name);
-void               nautilus_tree_model_remove_root_uri           (NautilusTreeModel *model,
-								  const char        *root_uri);
-gboolean           nautilus_tree_model_iter_is_root              (NautilusTreeModel *model,
-								  GtkTreeIter *iter);
-gboolean           nautilus_tree_model_file_get_iter             (NautilusTreeModel *model,
-								  GtkTreeIter *iter,
-								  NautilusFile *file,
-								  GtkTreeIter *currentIter);
-
-void               nautilus_tree_model_set_theme                 (NautilusTreeModel *model);
-
-#endif /* NAUTILUS_TREE_MODEL_H */
diff --git a/components/tree/nautilus-tree-view-iids.h b/components/tree/nautilus-tree-view-iids.h
deleted file mode 100644
index e9309a6d5..000000000
--- a/components/tree/nautilus-tree-view-iids.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Maciej Stachowiak <mjs@eazel.com>
- */
-
-/* nautilus-tree-view-iids.h - IIDs for tree view */
-
-#ifndef NAUTILUS_TREE_VIEW_IIDS_H
-#define NAUTILUS_TREE_VIEW_IIDS_H
-
-#define TREE_VIEW_IID         "OAFIID:Nautilus_Tree_View"
-#define TREE_VIEW_FACTORY_IID "OAFIID:Nautilus_Tree_View_Factory"
-
-#endif /* NAUTILUS_TREE_VIEW_IIDS_H */
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
deleted file mode 100644
index 6c64df02f..000000000
--- a/components/tree/nautilus-tree-view.c
+++ /dev/null
@@ -1,743 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2000, 2001 Eazel, Inc
- * Copyright (C) 2002 Anders Carlsson
- * Copyright (C) 2002 Darin Adler
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: 
- *       Maciej Stachowiak <mjs@eazel.com>
- *       Anders Carlsson <andersca@gnu.org>
- *       Darin Adler <darin@bentspoon.com>
- */
-
-/* nautilus-tree-view.c - tree sidebar panel
- */
-
-#include <config.h>
-#include "nautilus-tree-view.h"
-
-#include "nautilus-tree-model.h"
-#include <eel/eel-glib-extensions.h>
-#include <eel/eel-preferences.h>
-#include <eel/eel-string.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
-#include <libnautilus-private/nautilus-tree-view-drag-dest.h>
-#include <libnautilus-private/nautilus-icon-factory.h>
-
-struct NautilusTreeViewDetails {
-	GtkWidget *scrolled_window;
-	GtkTreeView *tree_widget;
-	GtkTreeModelSort *sort_model;
-	NautilusTreeModel *child_model;
-
-	NautilusFile *activation_file;
-
-	NautilusTreeViewDragDest *drag_dest;
-
-	char *selection_location;
-	gboolean selecting;
-
-	guint show_selection_idle_id;
-};
-
-typedef struct {
-	GList *uris;
-	NautilusTreeView *view;
-} PrependURIParameters;
-
-BONOBO_CLASS_BOILERPLATE (NautilusTreeView, nautilus_tree_view,
-			  NautilusView, NAUTILUS_TYPE_VIEW)
-
-static gboolean
-show_iter_for_file (NautilusTreeView *view, NautilusFile *file, GtkTreeIter *iter)
-{
-	GtkTreeModel *model;
-	NautilusFile *parent_file;
-	GtkTreeIter parent_iter;
-	GtkTreePath *path, *sort_path;
-	GtkTreeIter cur_iter;
-
-	if (view->details->child_model == NULL) {
-		return FALSE;
-	}
-	model = GTK_TREE_MODEL (view->details->child_model);
-
-	/* check if file is visible in the same root as the currently selected folder is */
-	gtk_tree_view_get_cursor (view->details->tree_widget, &path, NULL);
-	if (path != NULL) {
-		if (gtk_tree_model_get_iter (model, &cur_iter, path)) {
-			if (nautilus_tree_model_file_get_iter (view->details->child_model,
-							       iter, file, &cur_iter)) {
-				return TRUE;
-			}
-		}
-	}
-	/* check if file is visible at all */
-	if (nautilus_tree_model_file_get_iter (view->details->child_model,
-					       iter, file, NULL)) {
-		return TRUE;
-	}
-
-	parent_file = nautilus_file_get_parent (file);
-
-	if (parent_file == NULL) {
-		return FALSE;
-	}
-	if (!show_iter_for_file (view, parent_file, &parent_iter)) {
-		nautilus_file_unref (parent_file);
-		return FALSE;
-	}
-	nautilus_file_unref (parent_file);
-
-	if (parent_iter.user_data == NULL || parent_iter.stamp == 0) {
-		return FALSE;
-	}
-	path = gtk_tree_model_get_path (model, &parent_iter);
-	sort_path = gtk_tree_model_sort_convert_child_path_to_path
-		(view->details->sort_model, path);
-	gtk_tree_path_free (path);
-	gtk_tree_view_expand_row (view->details->tree_widget, sort_path, FALSE);
-	gtk_tree_path_free (sort_path);
-
-	return FALSE;
-}
-
-static gboolean
-show_selection_idle_callback (gpointer callback_data)
-{
-	NautilusTreeView *view;
-	NautilusFile *file, *old_file;
-	GtkTreeIter iter;
-	GtkTreePath *path, *sort_path;
-
-	view = NAUTILUS_TREE_VIEW (callback_data);
-
-	view->details->show_selection_idle_id = 0;
-
-	file = nautilus_file_get (view->details->selection_location);
-	if (file == NULL) {
-		return FALSE;
-	}
-
-	if (!nautilus_file_is_directory (file)) {
-		old_file = file;
-		file = nautilus_file_get_parent (file);
-		nautilus_file_unref (old_file);
-		if (file == NULL) {
-			return FALSE;
-		}
-	}
-	
-	view->details->selecting = TRUE;
-	if (!show_iter_for_file (view, file, &iter)) {
-		nautilus_file_unref (file);
-		return FALSE;
-	}
-	view->details->selecting = FALSE;
-
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->details->child_model), &iter);
-	sort_path = gtk_tree_model_sort_convert_child_path_to_path
-		(view->details->sort_model, path);
-	gtk_tree_path_free (path);
-	gtk_tree_view_set_cursor (view->details->tree_widget, sort_path, NULL, FALSE);
-	gtk_tree_view_scroll_to_cell (view->details->tree_widget, sort_path, NULL, FALSE, 0, 0);
-	gtk_tree_path_free (sort_path);
-
-	nautilus_file_unref (file);
-
-	return FALSE;
-}
-
-static void
-schedule_show_selection (NautilusTreeView *view)
-{
-	if (view->details->show_selection_idle_id == 0) {
-		view->details->show_selection_idle_id = g_idle_add (show_selection_idle_callback, view);
-	}
-}
-
-static void
-row_loaded_callback (GtkTreeModel     *tree_model,
-		     GtkTreeIter      *iter,
-		     NautilusTreeView *view)
-{
-	NautilusFile *file, *tmp_file, *selection_file;
-
-	if (view->details->selection_location == NULL
-	    || !view->details->selecting
-	    || iter->user_data == NULL || iter->stamp == 0) {
-		return;
-	}
-
-	file = nautilus_tree_model_iter_get_file (view->details->child_model, iter);
-	if (file == NULL) {
-		return;
-	}
-	if (!nautilus_file_is_directory (file)) {
-		nautilus_file_unref(file);
-		return;
-	}
-
-	/* if iter is ancestor of wanted selection_location then update selection */
-	selection_file = nautilus_file_get (view->details->selection_location);
-	while (selection_file != NULL) {
-		if (file == selection_file) {
-			nautilus_file_unref (file);
-			nautilus_file_unref (selection_file);
-
-			schedule_show_selection (view);
-			return;
-		}
-		tmp_file = nautilus_file_get_parent (selection_file);
-		nautilus_file_unref (selection_file);
-		selection_file = tmp_file;
-	}
-	nautilus_file_unref (file);
-}
-
-static NautilusFile *
-sort_model_iter_to_file (NautilusTreeView *view, GtkTreeIter *iter)
-{
-	GtkTreeIter child_iter;
-
-	gtk_tree_model_sort_convert_iter_to_child_iter (view->details->sort_model, &child_iter, iter);
-	return nautilus_tree_model_iter_get_file (view->details->child_model, &child_iter);
-}
-
-static NautilusFile *
-sort_model_path_to_file (NautilusTreeView *view, GtkTreePath *path)
-{
-	GtkTreeIter iter;
-
-	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (view->details->sort_model), &iter, path)) {
-		return NULL;
-	}
-	return sort_model_iter_to_file (view, &iter);
-}
-
-static void
-got_activation_uri_callback (NautilusFile *file, gpointer callback_data)
-{
-        char *uri, *file_uri;
-        NautilusTreeView *view;
-	GdkScreen *screen;
-	
-        view = NAUTILUS_TREE_VIEW (callback_data);
-
-	screen = gtk_widget_get_screen (GTK_WIDGET (view->details->tree_widget));
-
-        g_assert (file == view->details->activation_file);
-
-	/* FIXME: reenable && !eel_uris_match_ignore_fragments (view->details->current_main_view_uri, uri) */
-
-	uri = nautilus_file_get_activation_uri (file);
-	if (uri != NULL
-	    && eel_str_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER)) {
-
-		uri += strlen (NAUTILUS_COMMAND_SPECIFIER);
-		nautilus_launch_application_from_command (screen, NULL, uri, NULL, FALSE);
-
-	} else if (uri != NULL
-	    	   && eel_str_has_prefix (uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER)) {
-		   
-		file_uri = nautilus_file_get_uri (file);
-		nautilus_launch_desktop_file (screen, file_uri, NULL, NULL);
-		g_free (file_uri);
-		
-	} else if (uri != NULL
-		   && nautilus_file_is_executable (file)
-		   && nautilus_file_can_execute (file)
-		   && !nautilus_file_is_directory (file)) {	
-		   
-		file_uri = gnome_vfs_get_local_path_from_uri (uri);
-
-		/* Non-local executables don't get launched. They act like non-executables. */
-		if (file_uri == NULL) {
-			nautilus_view_open_location
-				(NAUTILUS_VIEW (view), 
-				 uri, 
-				 Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
-				 0,
-				 NULL);
-		} else {
-			nautilus_launch_application_from_command (screen, NULL, file_uri, NULL, FALSE);
-			g_free (file_uri);
-		}
-		   
-	} else if (uri != NULL) {
-		if (view->details->selection_location == NULL ||
-		    strcmp (uri, view->details->selection_location) != 0) {
-			if (view->details->selection_location != NULL) {
-				g_free (view->details->selection_location);
-			}
-			view->details->selection_location = g_strdup (uri);
-			nautilus_view_open_location
-				(NAUTILUS_VIEW (view), 
-				 uri,
-				 Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
-				 0,
-				 NULL);
-		}
-	}
-
-	g_free (uri);
-	nautilus_file_unref (view->details->activation_file);
-	view->details->activation_file = NULL;
-}
-
-static void
-cancel_activation (NautilusTreeView *view)
-{
-        if (view->details->activation_file == NULL) {
-		return;
-	}
-	
-	nautilus_file_cancel_call_when_ready
-		(view->details->activation_file,
-		 got_activation_uri_callback, view);
-	nautilus_file_unref (view->details->activation_file);
-        view->details->activation_file = NULL;
-}
-
-static void
-row_activated_callback (GtkTreeView *treeview, GtkTreePath *path, 
-			GtkTreeViewColumn *column, NautilusTreeView *view)
-{
-	if (gtk_tree_view_row_expanded (view->details->tree_widget, path)) {
-		gtk_tree_view_collapse_row (view->details->tree_widget, path);
-	} else {
-		gtk_tree_view_expand_row (view->details->tree_widget, 
-					  path, FALSE);
-	}
-}
-
-
-static void
-selection_changed_callback (GtkTreeSelection *selection,
-			    NautilusTreeView *view)
-{
-	NautilusFileAttributes attributes;
-	GtkTreeIter iter;
-
-	cancel_activation (view);
-
-	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		return;
-	}
-
-	view->details->activation_file = sort_model_iter_to_file (view, &iter);
-	if (view->details->activation_file == NULL) {
-		return;
-	}
-		
-	attributes = NAUTILUS_FILE_ATTRIBUTE_ACTIVATION_URI;
-	nautilus_file_call_when_ready (view->details->activation_file, attributes,
-				       got_activation_uri_callback, view);
-}
-
-static int
-compare_rows (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer callback_data)
-{
-	NautilusFile *file_a, *file_b;
-	int result;
-
-	if (a->user_data == NULL) {
-		return -1;
-	}
-	else if (b->user_data == NULL) {
-		return -1;
-	}
-
-	/* don't sort root nodes */
-	if (nautilus_tree_model_iter_is_root (NAUTILUS_TREE_MODEL (model), a)
-	    || nautilus_tree_model_iter_is_root (NAUTILUS_TREE_MODEL (model), b)) {
-		return 0;
-	}
-
-	file_a = nautilus_tree_model_iter_get_file (NAUTILUS_TREE_MODEL (model), a);
-	file_b = nautilus_tree_model_iter_get_file (NAUTILUS_TREE_MODEL (model), b);
-
-	if (file_a == file_b) {
-		result = 0;
-	} else if (file_a == NULL) {
-		result = -1;
-	} else if (file_b == NULL) {
-		result = +1;
-	} else {
-		result = nautilus_file_compare_for_sort (file_a, file_b,
-							 NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
-							 FALSE, FALSE);
-	}
-
-	nautilus_file_unref (file_a);
-	nautilus_file_unref (file_b);
-
-	return result;
-}
-
-
-static char *
-get_root_uri_callback (NautilusTreeViewDragDest *dest,
-		       gpointer user_data)
-{
-	NautilusTreeView *view;
-	
-	view = NAUTILUS_TREE_VIEW (user_data);
-
-	/* Don't allow drops on background */
-	return NULL;
-}
-
-static NautilusFile *
-get_file_for_path_callback (NautilusTreeViewDragDest *dest,
-			    GtkTreePath *path,
-			    gpointer user_data)
-{
-	NautilusTreeView *view;
-	
-	view = NAUTILUS_TREE_VIEW (user_data);
-
-	return sort_model_path_to_file (view, path);
-}
-
-static void
-move_copy_items_callback (NautilusTreeViewDragDest *dest,
-			  const GList *item_uris,
-			  const char *target_uri,
-			  guint action,
-			  int x,
-			  int y,
-			  gpointer user_data)
-{
-	NautilusTreeView *view;
-
-	view = NAUTILUS_TREE_VIEW (user_data);
-
-	nautilus_file_operations_copy_move
-		(item_uris,
-		 NULL,
-		 target_uri,
-		 action,
-		 GTK_WIDGET (view->details->tree_widget),
-		 NULL, NULL);
-}
-
-static void
-theme_changed_callback (GObject *icon_factory, gpointer callback_data)
-{
-        NautilusTreeView *view; 
-
-        view = NAUTILUS_TREE_VIEW (callback_data);
-	if (view->details->child_model != NULL) {
-		nautilus_tree_model_set_theme (NAUTILUS_TREE_MODEL (view->details->child_model));
-	}
-}
-
-static void
-add_root_for_volume (NautilusTreeView *view,
-		     GnomeVFSVolume *volume)
-{
-	char *icon, *mount_uri, *name;
-
-	if (!gnome_vfs_volume_is_user_visible (volume)) {
-		return;
-	}
-	
-	icon = gnome_vfs_volume_get_icon (volume);
-	mount_uri = gnome_vfs_volume_get_activation_uri (volume);
-	name = gnome_vfs_volume_get_display_name (volume);
-	
-	nautilus_tree_model_add_root_uri (view->details->child_model,
-					  mount_uri, name, icon);
-
-	g_free (icon);
-	g_free (name);
-	g_free (mount_uri);
-	
-}
-
-static void
-volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
-			 GnomeVFSVolume *volume,
-			 NautilusTreeView *view)
-{
-	add_root_for_volume (view, volume);
-}
-
-static void
-volume_unmounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
-			   GnomeVFSVolume *volume,
-			   NautilusTreeView *view)
-{
-	char *mount_uri;
-	
-	mount_uri = gnome_vfs_volume_get_activation_uri (volume);
-	nautilus_tree_model_remove_root_uri (view->details->child_model,
-					     mount_uri);
-	g_free (mount_uri);
-}
-
-
-static void
-create_tree (NautilusTreeView *view)
-{
-	GtkCellRenderer *cell;
-	GtkTreeViewColumn *column;
-	GnomeVFSVolumeMonitor *volume_monitor;
-	char *home_uri;
-	GList *volumes, *l;
-	
-	view->details->child_model = nautilus_tree_model_new ();
-	view->details->sort_model = GTK_TREE_MODEL_SORT
-		(gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (view->details->child_model)));
-	view->details->tree_widget = GTK_TREE_VIEW
-		(gtk_tree_view_new_with_model (GTK_TREE_MODEL (view->details->sort_model)));
-	g_object_unref (view->details->sort_model);
-	g_signal_connect_object
-		(view->details->child_model, "row_loaded",
-		 G_CALLBACK (row_loaded_callback),
-		 view, G_CONNECT_AFTER);
-	home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
-	nautilus_tree_model_add_root_uri (view->details->child_model, home_uri, _("Home Folder"), "gnome-home");
-	g_free (home_uri);
-	nautilus_tree_model_add_root_uri (view->details->child_model, "file:///", _("Filesystem"), "gnome-folder");
-#ifdef NOT_YET_USABLE
-	nautilus_tree_model_add_root_uri (view->details->child_model, "network:///", _("Network Neighbourhood"), "gnome-fs-network");
-#endif
-	
-	volume_monitor = gnome_vfs_get_volume_monitor ();
-	volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
-	for (l = volumes; l != NULL; l = l->next) {
-		add_root_for_volume (view, l->data);
-		gnome_vfs_volume_unref (l->data);
-	}
-	g_list_free (volumes);
-	
-	g_signal_connect_object (volume_monitor, "volume_mounted",
-				 G_CALLBACK (volume_mounted_callback), view, 0);
-	g_signal_connect_object (volume_monitor, "volume_unmounted",
-				 G_CALLBACK (volume_unmounted_callback), view, 0);
-	
-	g_object_unref (view->details->child_model);
-
-	gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (view->details->sort_model),
-						 compare_rows, view, NULL);
-
-	gtk_tree_view_set_headers_visible (view->details->tree_widget, FALSE);
-
-	view->details->drag_dest = 
-		nautilus_tree_view_drag_dest_new (view->details->tree_widget);
-	g_signal_connect_object (view->details->drag_dest, 
-				 "get_root_uri",
-				 G_CALLBACK (get_root_uri_callback),
-				 view, 0);
-	g_signal_connect_object (view->details->drag_dest, 
-				 "get_file_for_path",
-				 G_CALLBACK (get_file_for_path_callback),
-				 view, 0);
-	g_signal_connect_object (view->details->drag_dest,
-				 "move_copy_items",
-				 G_CALLBACK (move_copy_items_callback),
-				 view, 0);
-
-	/* Create column */
-	column = gtk_tree_view_column_new ();
-
-	cell = gtk_cell_renderer_pixbuf_new ();
-	gtk_tree_view_column_pack_start (column, cell, FALSE);
-	gtk_tree_view_column_set_attributes (column, cell,
-					     "pixbuf", NAUTILUS_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
-					     "pixbuf_expander_closed", NAUTILUS_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
-					     "pixbuf_expander_open", NAUTILUS_TREE_MODEL_OPEN_PIXBUF_COLUMN,
-					     NULL);
-	
-	cell = gtk_cell_renderer_text_new ();
-	gtk_tree_view_column_pack_start (column, cell, TRUE);
-	gtk_tree_view_column_set_attributes (column, cell,
-					     "text", NAUTILUS_TREE_MODEL_DISPLAY_NAME_COLUMN,
-					     "style", NAUTILUS_TREE_MODEL_FONT_STYLE_COLUMN,
-					     "weight", NAUTILUS_TREE_MODEL_FONT_WEIGHT_COLUMN,
-					     NULL);
-
-	gtk_tree_view_append_column (view->details->tree_widget, column);
-
-	gtk_widget_show (GTK_WIDGET (view->details->tree_widget));
-
-	gtk_container_add (GTK_CONTAINER (view->details->scrolled_window),
-			   GTK_WIDGET (view->details->tree_widget));
-
-	g_signal_connect_object (gtk_tree_view_get_selection (GTK_TREE_VIEW (view->details->tree_widget)), "changed",
-				 G_CALLBACK (selection_changed_callback), view, 0);
-
-	g_signal_connect (G_OBJECT (view->details->tree_widget), 
-			  "row-activated", G_CALLBACK (row_activated_callback),
-			  view);
-
-	schedule_show_selection (view);
-}
-
-static void
-update_filtering_from_preferences (NautilusTreeView *view)
-{
-	if (view->details->child_model == NULL) {
-		return;
-	}
-
-	nautilus_tree_model_set_show_hidden_files
-		(view->details->child_model,
-		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES));
-	nautilus_tree_model_set_show_backup_files
-		(view->details->child_model,
-		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES));
-	nautilus_tree_model_set_show_only_directories
-		(view->details->child_model,
-		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES));
-}
-
-static void
-tree_activate_callback (BonoboControl *control, gboolean activating, gpointer user_data)
-{
-	NautilusTreeView *view;
-
-	view = NAUTILUS_TREE_VIEW (user_data);
-
-	if (activating && view->details->tree_widget == NULL) {
-		create_tree (view);
-		update_filtering_from_preferences (view);
-	}
-}
-
-static void
-filtering_changed_callback (gpointer callback_data)
-{
-	update_filtering_from_preferences (NAUTILUS_TREE_VIEW (callback_data));
-}
-
-static void
-load_location_callback (NautilusTreeView *view, char *location)
-{
-	if (view->details->selection_location != NULL) {
-		g_free (view->details->selection_location);
-	}
-	view->details->selection_location = g_strdup (location);
-
-	schedule_show_selection (view);
-}
-
-static void
-nautilus_tree_view_instance_init (NautilusTreeView *view)
-{
-	BonoboControl *control;
-	
-	view->details = g_new0 (NautilusTreeViewDetails, 1);
-	
-	view->details->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-	
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->scrolled_window), 
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	
-	gtk_widget_show (view->details->scrolled_window);
-
-	control = bonobo_control_new (view->details->scrolled_window);
-	g_signal_connect_object (control, "activate",
-				 G_CALLBACK (tree_activate_callback), view, 0);
-
-	nautilus_view_construct_from_bonobo_control (NAUTILUS_VIEW (view), control);
-
-	view->details->selection_location = NULL;
-	g_signal_connect_object (view, "load_location",
-				 G_CALLBACK (load_location_callback), view, 0);
-	view->details->selecting = FALSE;
-
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-				      filtering_changed_callback, view);
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-				      filtering_changed_callback, view);
-	eel_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-				      filtering_changed_callback, view);
-
-	g_signal_connect_object (nautilus_icon_factory_get(), "icons_changed",
-				 G_CALLBACK (theme_changed_callback), view, 0);  
-
-}
-
-static void
-nautilus_tree_view_dispose (GObject *object)
-{
-	NautilusTreeView *view;
-	
-	view = NAUTILUS_TREE_VIEW (object);
-	
-	if (view->details->drag_dest) {
-		g_object_unref (view->details->drag_dest);
-		view->details->drag_dest = NULL;
-	}
-
-	if (view->details->show_selection_idle_id) {
-		g_source_remove (view->details->show_selection_idle_id);
-		view->details->show_selection_idle_id = 0;
-	}
-
-	G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static void
-nautilus_tree_view_finalize (GObject *object)
-{
-	NautilusTreeView *view;
-
-	view = NAUTILUS_TREE_VIEW (object);
-
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-					 filtering_changed_callback, view);
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-					 filtering_changed_callback, view);
-	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-					 filtering_changed_callback, view);
-
-	cancel_activation (view);
-
-	if (view->details->selection_location != NULL) {
-		g_free (view->details->selection_location);
-	}
-
-	g_free (view->details);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-nautilus_tree_view_class_init (NautilusTreeViewClass *class)
-{
-	G_OBJECT_CLASS (class)->dispose = nautilus_tree_view_dispose;
-	G_OBJECT_CLASS (class)->finalize = nautilus_tree_view_finalize;
-}
diff --git a/configure.in b/configure.in
index 75145e199..6e1cf0122 100644
--- a/configure.in
+++ b/configure.in
@@ -6,16 +6,16 @@ ART_REQUIRED=2.3.10
 BONOBO_ACTIVATION_REQUIRED=2.1.0
 BONOBO_REQUIRED=2.1.0
 BONOBO_UI_REQUIRED=2.2.0
-EEL_REQUIRED=2.5.1
+EEL_REQUIRED=2.5.4
 ESOUND_REQUIRED=0.2.27
-GLIB_REQUIRED=2
+GLIB_REQUIRED=2.3.0
 GNOME_DESKTOP_REQUIRED=2.1.0
 GNOME_REQUIRED=2.1.1
 GNOME_UI_REQUIRED=2.3.3
 GNOME_VFS_REQUIRED=2.5.1
 ORBIT_REQUIRED=2.4.0
 PANGO_REQUIRED=1.1.2
-GTK_REQUIRED=2.1.1
+GTK_REQUIRED=2.3.0
 MEDUSA_REQUIRED=0.5.1
 RSVG_REQUIRED=2.0.1
 XML_REQUIRED=2.4.7
@@ -43,7 +43,7 @@ AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)
 
 dnl ===========================================================================
 
-AM_INIT_AUTOMAKE(nautilus, 2.5.1.1)
+AM_INIT_AUTOMAKE(nautilus, 2.5.4)
 AM_CONFIG_HEADER(config.h)
 
 AM_SANITY_CHECK
@@ -369,19 +369,6 @@ dnl	-DBONOBO_DISABLE_DEPRECATED
 
 AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 
-dnl
-dnl disable (broken) hardware view
-dnl
-hw_view=disabled
-AC_ARG_ENABLE(hardware,
-[  --enable-hardware		Enable (broken, Linux only) hardware view],
-hw_view=enabled)
-if test "x`(uname -s) 2>/dev/null`" != "xLinux"; then
-	hw_view=disabled
-fi
-AM_CONDITIONAL(ENABLE_HARDWARE_VIEW, test "$hw_view" = "enabled")
-
-
 dnl libbackground
 PKG_CHECK_MODULES(CAPPLET, "gtk+-2.0 gconf-2.0 libgnomeui-2.0 libbonoboui-2.0")
 dnl ==========================================================================
@@ -402,14 +389,10 @@ AC_OUTPUT([
 Makefile
 components/Makefile
 components/adapter/Makefile
-components/hardware/Makefile
-components/hardware/icons/Makefile
 components/history/Makefile
 components/notes/Makefile
 components/text/Makefile
-components/text/services/Makefile
 components/throbber/Makefile
-components/tree/Makefile
 components/emblem/Makefile
 components/image_properties/Makefile
 cut-n-paste-code/Makefile
@@ -449,6 +432,5 @@ nautilus-$VERSION:
 	source code location:	${srcdir}
 	compiler:		${CC}
 
-	hardware view:          ${hw_view}
 	profiling support:      ${profiling_support}
 "
diff --git a/cut-n-paste-code/gsequence/gsequence.c b/cut-n-paste-code/gsequence/gsequence.c
index 074a7b4c7..f13605cbc 100644
--- a/cut-n-paste-code/gsequence/gsequence.c
+++ b/cut-n-paste-code/gsequence/gsequence.c
@@ -378,7 +378,7 @@ g_sequence_ptr_is_end         (GSequencePtr             ptr)
 gboolean
 g_sequence_ptr_is_begin       (GSequencePtr             ptr)
 {
-    return (g_sequence_node_prev (ptr) == NULL);
+    return (g_sequence_node_prev (ptr) == ptr);
 }
 
 gint
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index 660c7cfe3..3671bc39b 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -17,7 +17,7 @@
          <long>
           If set to true, then hidden files are shown in 
           the file manager.  Hidden files are either dotfiles or are
-	  listed in the directory's .hidden file.
+	  listed in the folder's .hidden file.
          </long>
       </locale>
     </schema>
@@ -81,7 +81,7 @@
            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 directory is on a remote server.
+           even if the folder is on a remote server.
            If set to "local_only" then only show previews for local filesystems.
            If set to "never" then never bother to read preview data.
          </long>
@@ -95,11 +95,11 @@
       <type>string</type>
       <default>local_only</default>
       <locale name="C">
-         <short>When to show number of items in a directory</short>
+         <short>When to show number of items in a folder</short>
          <long>
            Speed tradeoff for when to show the number of items in a 
-           directory. If set to "always" then always show item counts, 
-           even if the directory is on a remote server. 
+           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 filesystems.
            If set to "never" then never bother to compute item counts.
          </long>
@@ -166,7 +166,7 @@
          <long>
            Speed tradeoff for when to show an image file as a thumbnail.
            If set to "always" then always thumbnail, 
-           even if the directory is on a remote server.
+           even if the folder is on a remote server.
            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.
@@ -198,13 +198,13 @@
       <type>int</type>
       <default>-1</default>
       <locale name="C">
-         <short>Maximum handled files in a directory</short>
+         <short>Maximum handled files in a folder</short>
          <long>
-	  Directories over this size will be truncated to
+	  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 massive directories.
+	  blowing the heap and killing Nautilus on massive folders.
 	  A negative value denotes no limit. The limit is approximate due
-	  to the reading of directories chunk-wise.
+	  to the reading of folders chunk-wise.
          </long>
       </locale>
     </schema>
@@ -250,9 +250,9 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Show directories first in windows</short>
+         <short>Show folders first in windows</short>
 	 <long>
-	  If set to true, then Nautilus shows directories prior to
+	  If set to true, then Nautilus shows folders prior to
 	  showing files in the icon and list views.
          </long>
       </locale>
@@ -278,7 +278,7 @@
       <applyto>/apps/nautilus/preferences/desktop_font</applyto>
       <owner>nautilus</owner>
       <type>string</type>
-      <default>sans 12</default>
+      <default>Sans 10</default>
       <locale name="C">
          <short>Desktop font</short>
 	 <long>
@@ -294,10 +294,10 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Nautilus uses the users home directory as the desktop</short>
+         <short>Nautilus uses the users home folder as the desktop</short>
 	 <long>
 	  If set to true, then Nautilus will use the user's home
-	  directory as the desktop.  If it is false, then it will use
+	  folder as the desktop.  If it is false, then it will use
 	  ~/Desktop as the desktop.
          </long>
       </locale>
@@ -344,7 +344,7 @@
       <default>false</default>
       <locale name="C">
          <short>Custom Background Set</short>
-         <long>Whether a custom default directory background has been set.</long>
+         <long>Whether a custom default folder background has been set.</long>
       </locale>
     </schema>
     
@@ -356,7 +356,7 @@
       <default>#ffffff</default>
       <locale name="C">
          <short>Default Background Color</short>
-         <long>Filename for the default directory background.  Only used if background_set is true.</long>
+         <long>Filename for the default folder background.  Only used if background_set is true.</long>
       </locale>
     </schema>
     
@@ -368,7 +368,7 @@
       <default></default>
       <locale name="C">
          <short>Default Background Filename</short>
-         <long>Filename for the default directory background.  Only used if background_set is true.</long>
+         <long>Filename for the default folder background.  Only used if background_set is true.</long>
       </locale>
     </schema>
 
@@ -456,7 +456,7 @@
          <short>Default sort order</short>
          <long>
            The default sort-order for items in the icon view. Possible
-	   values are "name", "size", "type", "modification_date", "emblems".
+	   values are "name", "size", "type", "modification_date", and "emblems".
          </long>
       </locale>
     </schema>
@@ -486,9 +486,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Use tighter Layout in new windows</short>
+         <short>Use tighter layout in new windows</short>
          <long>
-           If true, icons will be layed out tighter by default in new windows.
+           If true, icons will be laid out tighter by default in new windows.
          </long>
       </locale>
     </schema>
@@ -547,8 +547,8 @@
       <locale name="C">
          <short>Default sort order</short>
          <long>
-           The default sort-order for the item in the list view. Possible
-	   values are name, size, type, and modification_date.
+           The default sort-order for the items in the list view. Possible
+	   values are "name", "size", "type", and "modification_date".
          </long>
       </locale>
     </schema>    
@@ -692,10 +692,10 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Only show directories in the tree sidebar</short>
+         <short>Only show folders in the tree sidebar</short>
          <long>
-           If set to true, Nautilus will only show directories
-           in the tree side pane. Otherwise it will show both directories
+           If set to true, Nautilus will only show folders
+           in the tree side pane. Otherwise it will show both folders
 	   and files.
          </long>
       </locale>
@@ -722,11 +722,11 @@
       <applyto>/apps/nautilus/desktop/home_icon_visible</applyto>
       <owner>nautilus</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
          <short>Home icon visible on desktop</short>
          <long>
-          If this is set to true, an icon linking to the home directory
+          If this is set to true, an icon linking to the home folder
 	  will be put on the desktop.
          </long>
       </locale>
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 47532f3ff..d2dc4a2a0 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -35,6 +35,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
+#include <gtk/gtkmessagedialog.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkstock.h>
 #include <libgnome/gnome-i18n.h>
@@ -90,27 +91,21 @@ nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor,
 					   NautilusDesktopLink *link,
 					   GtkWidget *parent_view)
 {
-	/* FIXME: Is this right? How to get them back?
-	 * Do we disallow this, or add a prefs ui to get them back? */
-	
 	switch (nautilus_desktop_link_get_link_type (link)) {
 	case NAUTILUS_DESKTOP_LINK_HOME:
-		eel_preferences_set_boolean (NAUTILUS_PREFERENCES_DESKTOP_HOME_VISIBLE, FALSE);
-		break;
 	case NAUTILUS_DESKTOP_LINK_COMPUTER:
-		eel_preferences_set_boolean (NAUTILUS_PREFERENCES_DESKTOP_COMPUTER_VISIBLE, FALSE);
-		break;
 	case NAUTILUS_DESKTOP_LINK_TRASH:
-		eel_preferences_set_boolean (NAUTILUS_PREFERENCES_DESKTOP_TRASH_VISIBLE, FALSE);
+		/* just ignore. We don't allow you to delete these */
 		break;
 	default:
 		eel_run_simple_dialog
 			(parent_view, 
 			 FALSE,
-			 _("You cannot delete a volume icon. If you want to eject "
-			   "the volume, please use Eject in the right-click menu of "
-			   "the volume."), 
-			 _("Can't delete volume"),
+			 GTK_MESSAGE_ERROR,
+			 _("You cannot delete a volume icon."),
+			 _("If you want to eject the volume, please use Eject in the "
+			   "right-click menu of the volume."),
+			 _("Can't Delete Volume"),
 			 GTK_STOCK_OK, NULL);
 		break;
 	}
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 7c2fd2e19..9a8e5913f 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -120,6 +120,8 @@ nautilus_directory_class_init (NautilusDirectoryClass *klass)
 		              G_TYPE_NONE, 1, G_TYPE_INT);
 
 	klass->get_name_for_self_as_new_file = real_get_name_for_self_as_new_file;
+
+	g_type_class_add_private (klass, sizeof (NautilusDirectoryDetails));
 }
 
 static void
@@ -129,7 +131,7 @@ nautilus_directory_init (gpointer object, gpointer klass)
 
 	directory = NAUTILUS_DIRECTORY(object);
 
-	directory->details = g_new0 (NautilusDirectoryDetails, 1);
+	directory->details = G_TYPE_INSTANCE_GET_PRIVATE ((directory), NAUTILUS_TYPE_DIRECTORY, NautilusDirectoryDetails);
 	directory->details->file_hash = g_hash_table_new (g_str_hash, g_str_equal);
 	directory->details->high_priority_queue = nautilus_file_queue_new ();
 	directory->details->low_priority_queue = nautilus_file_queue_new ();
@@ -215,8 +217,6 @@ nautilus_directory_finalize (GObject *object)
 	g_assert (directory->details->dequeue_pending_idle_id == 0);
 	gnome_vfs_file_info_list_unref (directory->details->pending_file_info);
 
-	g_free (directory->details);
-
 	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c
index 4612d8ccf..b80fc94f9 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@@ -341,12 +341,10 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
 		}
 		return;
 	} else if (eel_uri_is_desktop (target_uri_string)) {
-		if (actions & GDK_ACTION_MOVE) {
-			*action = GDK_ACTION_MOVE;
-		} else {
-			*action = context->suggested_action;
-		}
-		return;
+		char *desktop_uri;
+		desktop_uri = nautilus_get_desktop_directory_uri ();
+		target_uri = gnome_vfs_uri_new (desktop_uri);
+		g_free (desktop_uri);
 	} else {
 		target_uri = gnome_vfs_uri_new (target_uri_string);
 	}
diff --git a/libnautilus-private/nautilus-emblem-utils.c b/libnautilus-private/nautilus-emblem-utils.c
index 2aafeafaa..ddb9e9558 100644
--- a/libnautilus-private/nautilus-emblem-utils.c
+++ b/libnautilus-private/nautilus-emblem-utils.c
@@ -49,11 +49,11 @@
 GList *
 nautilus_emblem_list_availible (void)
 {
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme *icon_theme;
 	GList *list;
 	
 	icon_theme = nautilus_icon_factory_get_icon_theme ();
-	list = gnome_icon_theme_list_icons (icon_theme, "Emblems");
+	list = gtk_icon_theme_list_icons (icon_theme, "Emblems");
 	g_object_unref (icon_theme);
 	return list;
 }
@@ -61,10 +61,10 @@ nautilus_emblem_list_availible (void)
 void
 nautilus_emblem_refresh_list (void)
 {
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme *icon_theme;
 	
 	icon_theme = nautilus_icon_factory_get_icon_theme ();
-	gnome_icon_theme_rescan_if_needed (icon_theme);
+	gtk_icon_theme_rescan_if_needed (icon_theme);
 	g_object_unref (icon_theme);
 }
 
@@ -194,12 +194,14 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
 				const char *display_name)
 {
 	if (keyword == NULL || strlen (keyword) == 0) {
-		eel_show_error_dialog (_("Sorry, but you must specify a non-blank keyword for the new emblem."), 
-				       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
+		eel_show_error_dialog (_("The emblem cannot be installed."),
+				       _("Sorry, but you must specify a non-blank keyword for the new emblem."), 
+				       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
 		return FALSE;
 	} else if (!emblem_keyword_valid (keyword)) {
-		eel_show_error_dialog (_("Sorry, but emblem keywords can only contain letters, spaces and numbers."), 
-				       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
+		eel_show_error_dialog (_("The emblem cannot be installed."),
+				       _("Sorry, but emblem keywords can only contain letters, spaces and numbers."), 
+				       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
 		return FALSE;
 	} else if (is_reserved_keyword (keyword)) {
 		char *error_string;
@@ -208,8 +210,8 @@ nautilus_emblem_verify_keyword (GtkWindow *parent_window,
 		 * what a keyword is, and people should be passing a unique
 		 * keyword to us anyway
 		 */
-		error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\".  Please choose a different name for it."), display_name);
-		eel_show_error_dialog (error_string, 
+		error_string = g_strdup_printf (_("Sorry, but there is already an emblem named \"%s\"."), display_name);
+		eel_show_error_dialog (_("Please choose a different emblem name."), error_string,
 				       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
 		g_free (error_string);
 		return FALSE;
@@ -252,8 +254,10 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
 
 	/* save the image */
 	if (eel_gdk_pixbuf_save_to_file (pixbuf, path) != TRUE) {
-		eel_show_error_dialog (_("Sorry, unable to save custom emblem."), 
-				       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
+		eel_show_error_dialog (_("The emblem cannot be installed."),
+				       _("Sorry, unable to save custom emblem."), 
+				       _("Couldn't Install Emblem"), 
+				       GTK_WINDOW (parent_window));
 		g_free (dir);
 		g_free (stat_dir);
 		g_free (path);
@@ -267,8 +271,9 @@ nautilus_emblem_install_custom_emblem (GdkPixbuf *pixbuf,
 		file = fopen (path, "w+");
 		
 		if (file == NULL) {
-			eel_show_error_dialog (_("Sorry, unable to save custom emblem name."), 
-					       _("Couldn't install emblem"), GTK_WINDOW (parent_window));
+			eel_show_error_dialog (_("The emblem cannot be installed."),
+					       _("Sorry, unable to save custom emblem name."), 
+					       _("Couldn't Install Emblem"), GTK_WINDOW (parent_window));
 			g_free (stat_dir);
 			g_free (dir);
 			return;
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 12bf76d73..85933359d 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -82,9 +82,10 @@ struct NautilusFileOperationsProgressDetails {
 	const char *from_prefix;
 	const char *to_prefix;
 
-	gulong bytes_copied;
 	gulong files_total;
-	gulong bytes_total;
+	
+	GnomeVFSFileSize bytes_copied;
+	GnomeVFSFileSize bytes_total;
 
 	/* system time (microseconds) when show timeout was started */
 	gint64 start_time;
@@ -373,7 +374,7 @@ nautilus_file_operations_progress_new (const char *title,
 				       const char *from_prefix,
 				       const char *to_prefix,
 				       gulong total_files,
-				       gulong total_bytes,
+				       GnomeVFSFileSize total_bytes,
 				       gboolean use_timeout)
 {
 	GtkWidget *widget;
@@ -405,7 +406,7 @@ nautilus_file_operations_progress_new (const char *title,
 void
 nautilus_file_operations_progress_set_total (NautilusFileOperationsProgress *progress,
 					     gulong files_total,
-					     gulong bytes_total)
+					     GnomeVFSFileSize bytes_total)
 {
 	g_return_if_fail (NAUTILUS_IS_FILE_OPERATIONS_PROGRESS (progress));
 
@@ -434,7 +435,7 @@ nautilus_file_operations_progress_new_file (NautilusFileOperationsProgress *prog
 					    const char *from_prefix,
 					    const char *to_prefix,
 					    gulong file_index,
-					    gulong size)
+					    GnomeVFSFileSize size)
 {
 	char *progress_count;
 
@@ -489,8 +490,8 @@ nautilus_file_operations_progress_clear (NautilusFileOperationsProgress *progres
 
 void
 nautilus_file_operations_progress_update_sizes (NautilusFileOperationsProgress *progress,
-						gulong bytes_done_in_file,
-						gulong bytes_done)
+						GnomeVFSFileSize bytes_done_in_file,
+						GnomeVFSFileSize bytes_done)
 {
 	g_return_if_fail (NAUTILUS_IS_FILE_OPERATIONS_PROGRESS (progress));
 
diff --git a/libnautilus-private/nautilus-file-operations-progress.h b/libnautilus-private/nautilus-file-operations-progress.h
index d790e8991..627cead0a 100644
--- a/libnautilus-private/nautilus-file-operations-progress.h
+++ b/libnautilus-private/nautilus-file-operations-progress.h
@@ -30,6 +30,7 @@
 #define NAUTILUS_FILE_OPERATIONS_PROGRESS_H
 
 #include <gtk/gtkdialog.h>
+#include <libgnomevfs/gnome-vfs-file-size.h>
 
 typedef struct NautilusFileOperationsProgressDetails NautilusFileOperationsProgressDetails;
 
@@ -55,14 +56,14 @@ NautilusFileOperationsProgress *nautilus_file_operations_progress_new
 											const char                     *from_prefix,
 											const char                     *to_prefix,
 											gulong                          files_total,
-											gulong                          bytes_total,
+											GnomeVFSFileSize                bytes_total,
 											gboolean			use_timeout);
 void                            nautilus_file_operations_progress_done                 (NautilusFileOperationsProgress *dialog);
 void                            nautilus_file_operations_progress_set_progress_title   (NautilusFileOperationsProgress *dialog,
 											const char                     *progress_title);
 void                            nautilus_file_operations_progress_set_total            (NautilusFileOperationsProgress *dialog,
 											gulong                          files_total,
-											gulong                          bytes_total);
+											GnomeVFSFileSize                bytes_total);
 void                            nautilus_file_operations_progress_set_operation_string (NautilusFileOperationsProgress *dialog,
 											const char                     *operation_string);
 void                            nautilus_file_operations_progress_clear                (NautilusFileOperationsProgress *dialog);
@@ -74,10 +75,10 @@ void                            nautilus_file_operations_progress_new_file
 											const char                     *from_prefix,
 											const char                     *to_prefix,
 											gulong                          file_index,
-											gulong                          size);
+											GnomeVFSFileSize                size);
 void                            nautilus_file_operations_progress_update_sizes         (NautilusFileOperationsProgress *dialog,
-											gulong                          bytes_done_in_file,
-											gulong                          bytes_done);
+											GnomeVFSFileSize                bytes_done_in_file,
+											GnomeVFSFileSize                bytes_done);
 void				nautilus_file_operations_progress_pause_timeout	       (NautilusFileOperationsProgress *progress);
 void				nautilus_file_operations_progress_resume_timeout       (NautilusFileOperationsProgress *progress);
 
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 2278f8771..5bf91318c 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -37,19 +37,14 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-vfs-extensions.h>
 
-#include <libgnome/gnome-i18n.h>
+#include <gnome.h>
 #include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkvbox.h>
 #include <libgnomevfs/gnome-vfs-async-ops.h>
 #include <libgnomevfs/gnome-vfs-find-directory.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <stdio.h>
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-private.h"
 #include "nautilus-desktop-icon-file.h"
@@ -391,9 +386,11 @@ handle_transfer_ok (const GnomeVFSXferProgressInfo *progress_info,
 	if (transfer_info->cancelled
 		&& progress_info->phase != GNOME_VFS_XFER_PHASE_COMPLETED) {
 		/* If cancelled, delete any partially copied files that are laying
-		 * around and return.
+		 * around and return. Don't delete the source though..
 		 */
 		if (progress_info->target_name != NULL
+		    && progress_info->source_name != NULL
+		    && strcmp (progress_info->source_name, progress_info->target_name) != 0
 		    && progress_info->bytes_total != progress_info->bytes_copied) {
 			GList *delete_me;
 
@@ -521,12 +518,13 @@ typedef enum {
 } NautilusFileOperationsErrorLocation;
 
 
-static char *
+static void
 build_error_string (const char *source_name, const char *target_name,
 		    TransferKind operation_kind,
 		    NautilusFileOperationsErrorKind error_kind,
 		    NautilusFileOperationsErrorLocation error_location,
-		    GnomeVFSResult error)
+		    GnomeVFSResult error,
+		    char **error_string, char **detail_string)
 {
 	/* Avoid clever message composing here, just use brute force and
 	 * duplicate the different flavors of error messages for all the
@@ -535,11 +533,14 @@ build_error_string (const char *source_name, const char *target_name,
 	 * order of the words in the messages easily.
 	 */
 
-	const char *error_string;
-	char *result;
+	char *error_format;
+	char *detail_format;
+	
+	error_format = NULL;
+	detail_format = NULL;
 
-	error_string = NULL;
-	result = NULL;
+	*error_string = NULL;
+	*detail_string = NULL;
 
 	if (error_location == ERROR_LOCATION_SOURCE_PARENT) {
 
@@ -547,9 +548,9 @@ build_error_string (const char *source_name, const char *target_name,
 		case TRANSFER_MOVE:
 		case TRANSFER_MOVE_TO_TRASH:
 			if (error_kind == ERROR_READ_ONLY) {
-				error_string = _("Error while moving.\n\n"
-						 "\"%s\" cannot be moved because it is on "
-						 "a read-only disk.");
+				*error_string = g_strdup (_("Error while moving."));
+				detail_format = _("\"%s\" cannot be moved because it is on "
+						  "a read-only disk.");
 			}
 			break;
 
@@ -558,15 +559,15 @@ build_error_string (const char *source_name, const char *target_name,
 			switch (error_kind) {
 			case ERROR_NOT_ENOUGH_PERMISSIONS:
 			case ERROR_NOT_WRITABLE:
-				error_string = _("Error while deleting.\n\n"
-						 "\"%s\" cannot be deleted because you do not have "
-						 "permissions to modify its parent folder.");
+				*error_string = g_strdup (_("Error while deleting."));
+				detail_format = _("\"%s\" cannot be deleted because you do not have "
+						  "permissions to modify its parent folder.");
 				break;
 			
 			case ERROR_READ_ONLY:
-				error_string = _("Error while deleting.\n\n"
-						 "\"%s\" cannot be deleted because it is on "
-						 "a read-only disk.");
+				*error_string = g_strdup (_("Error while deleting."));
+				detail_format = _("\"%s\" cannot be deleted because it is on "
+						  "a read-only disk.");
 				break;
 
 			default:
@@ -579,8 +580,8 @@ build_error_string (const char *source_name, const char *target_name,
 			break;
 		}
 		
-		if (error_string != NULL && source_name != NULL) {
-			result = g_strdup_printf (error_string, source_name);
+		if (detail_format != NULL && source_name != NULL) {
+			*detail_string = g_strdup_printf (detail_format, source_name);
 		}
 
 	} else if (error_location == ERROR_LOCATION_SOURCE_OR_PARENT) {
@@ -595,14 +596,14 @@ build_error_string (const char *source_name, const char *target_name,
 		case TRANSFER_MOVE:
 			switch (error_kind) {
 			case ERROR_NOT_ENOUGH_PERMISSIONS:
-				error_string = _("Error while moving.\n\n"
-						 "\"%s\" cannot be moved because you do not have "
-						 "permissions to change it or its parent folder.");
+				*error_string = g_strdup (_("Error while moving."));
+				detail_format = _("\"%s\" cannot be moved because you do not have "
+						  "permissions to change it or its parent folder.");
 				break;
 			case ERROR_SOURCE_IN_TARGET:
-				error_string = _("Error while moving.\n\n"
-						 "\"%s\" cannot be moved because it or its parent folder "
-						 "are contained in the destination.");
+				*error_string = g_strdup (_("Error while moving. "));
+				detail_format = _("Cannot move \"%s\" because it or its parent folder "
+						  "are contained in the destination.");
 				break;
 			default:
 				break;
@@ -610,9 +611,9 @@ build_error_string (const char *source_name, const char *target_name,
 			break;
 		case TRANSFER_MOVE_TO_TRASH:
 			if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
-				error_string = _("Error while moving.\n\n"
-						 "\"%s\" cannot be moved to the Trash because you do not have "
-						 "permissions to change it or its parent folder.");
+				*error_string = g_strdup (_("Error while moving."));
+				detail_format = _("Cannot move \"%s\" to the trash because you do not have "
+						  "permissions to change it or its parent folder.");
 			}
 			break;
 
@@ -621,8 +622,8 @@ build_error_string (const char *source_name, const char *target_name,
 			break;
 		}
 
-		if (error_string != NULL && source_name != NULL) {
-			result = g_strdup_printf (error_string, source_name);
+		if (detail_format != NULL && source_name != NULL) {
+			*detail_string = g_strdup_printf (detail_format, source_name);
 		}
 
 	} else if (error_location == ERROR_LOCATION_SOURCE) {
@@ -633,9 +634,9 @@ build_error_string (const char *source_name, const char *target_name,
 		case TRANSFER_COPY:
 		case TRANSFER_DUPLICATE:
 			if (error_kind == ERROR_NOT_READABLE) {
-				error_string = _("Error while copying.\n\n"
-						 "\"%s\" cannot be copied because you do not have "
-						 "permissions to read it.");
+				*error_string = g_strdup (_("Error while copying."));
+				detail_format = _("\"%s\" cannot be copied because you do not have "
+						  "permissions to read it.");
 			}
 			break;
 
@@ -644,8 +645,8 @@ build_error_string (const char *source_name, const char *target_name,
 			break;
 		}
 
-		if (error_string != NULL && source_name != NULL) {
-			result = g_strdup_printf (error_string, source_name);
+		if (detail_format != NULL && source_name != NULL) {
+			*detail_string = g_strdup_printf (detail_format, source_name);
 		}
 
 	} else if (error_location == ERROR_LOCATION_TARGET) {
@@ -654,17 +655,17 @@ build_error_string (const char *source_name, const char *target_name,
 			switch (operation_kind) {
 			case TRANSFER_COPY:
 			case TRANSFER_DUPLICATE:
-				error_string = _("Error while copying to \"%s\".\n\n"
-				   		 "There is not enough space on the destination.");
+				error_format = _("Error while copying to \"%s\".");
+				*detail_string = g_strdup (_("There is not enough space on the destination."));
 				break;
 			case TRANSFER_MOVE_TO_TRASH:
 			case TRANSFER_MOVE:
-				error_string = _("Error while moving to \"%s\".\n\n"
-				   		 "There is not enough space on the destination.");
+				error_format = _("Error while moving to \"%s\".");
+				*detail_string = g_strdup (_("There is not enough space on the destination."));
 				break;
 			case TRANSFER_LINK:
-				error_string = _("Error while creating link in \"%s\".\n\n"
-				   		 "There is not enough space on the destination.");
+				error_format = _("Error while creating link in \"%s\".");
+				*detail_string = g_strdup (_("There is not enough space on the destination."));
 				break;
 			default:
 				g_assert_not_reached ();
@@ -675,34 +676,34 @@ build_error_string (const char *source_name, const char *target_name,
 			case TRANSFER_COPY:
 			case TRANSFER_DUPLICATE:
 				if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
-					error_string = _("Error while copying to \"%s\".\n\n"
-					   		 "You do not have permissions to write to "
-					   		 "this folder.");
+					error_format = _("Error while copying to \"%s\".");
+					*detail_string = g_strdup (_("You do not have permissions to write to "
+					   		            "this folder."));
 				} else if (error_kind == ERROR_NOT_WRITABLE) {
-					error_string = _("Error while copying to \"%s\".\n\n"
-					   		 "The destination disk is read-only.");
+					error_format = _("Error while copying to \"%s\".");
+					*detail_string = g_strdup (_("The destination disk is read-only."));
 				} 
 				break;
 			case TRANSFER_MOVE:
 			case TRANSFER_MOVE_TO_TRASH:
 				if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
-					error_string = _("Error while moving items to \"%s\".\n\n"
-					   		 "You do not have permissions to write to "
-					   		 "this folder.");
+					error_format = _("Error while moving items to \"%s\".");
+					*detail_string = g_strdup (_("You do not have permissions to write to "
+					   		            "this folder."));
 				} else if (error_kind == ERROR_NOT_WRITABLE) {
-					error_string = _("Error while moving items to \"%s\".\n\n"
-					   		 "The destination disk is read-only.");
+					error_format = _("Error while moving items to \"%s\".");
+					*detail_string = g_strdup (_("The destination disk is read-only."));
 				} 
 
 				break;
 			case TRANSFER_LINK:
 				if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
-					error_string = _("Error while creating links in \"%s\".\n\n"
-					   		 "You do not have permissions to write to "
-					   		 "this folder.");
+					error_format = _("Error while creating links in \"%s\".");
+					*detail_string = g_strdup (_("You do not have permissions to write to "
+					   		             "this folder."));
 				} else if (error_kind == ERROR_NOT_WRITABLE) {
-					error_string = _("Error while creating links in \"%s\".\n\n"
-					   		 "The destination disk is read-only.");
+					error_format = _("Error while creating links in \"%s\".");
+					*detail_string = g_strdup (_("The destination disk is read-only."));
 				} 
 				break;
 			default:
@@ -710,12 +711,12 @@ build_error_string (const char *source_name, const char *target_name,
 				break;
 			}
 		}
-		if (error_string != NULL && target_name != NULL) {
-			result = g_strdup_printf (error_string, target_name);
+		if (error_format != NULL && target_name != NULL) {
+			*error_string = g_strdup_printf (error_format, target_name);
 		}
 	}
 	
-	if (result == NULL) {
+	if (*error_string == NULL) {
 		/* None of the specific error messages apply, use a catch-all
 		 * generic error
 		 */
@@ -729,62 +730,61 @@ build_error_string (const char *source_name, const char *target_name,
 			switch (operation_kind) {
 			case TRANSFER_COPY:
 			case TRANSFER_DUPLICATE:
-				error_string = _("Error \"%s\" while copying \"%s\".\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while copying \"%s\".");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_MOVE:
-				error_string = _("Error \"%s\" while moving \"%s\".\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while moving \"%s\".");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_LINK:
-				error_string = _("Error \"%s\" while creating a link to \"%s\".\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while creating a link to \"%s\".");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_DELETE:
 			case TRANSFER_EMPTY_TRASH:
 			case TRANSFER_MOVE_TO_TRASH:
-				error_string = _("Error \"%s\" while deleting \"%s\".\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while deleting \"%s\".");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			default:
 				g_assert_not_reached ();
 				break;
 			}
 	
-			result = g_strdup_printf (error_string, 
-						  gnome_vfs_result_to_string (error),
-						  source_name);
+			*error_string = g_strdup_printf (error_format, 
+							 gnome_vfs_result_to_string (error),
+							 source_name);
 		} else {
 			switch (operation_kind) {
 			case TRANSFER_COPY:
 			case TRANSFER_DUPLICATE:
-				error_string = _("Error \"%s\" while copying.\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while copying.");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_MOVE:
-				error_string = _("Error \"%s\" while moving.\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while moving.");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_LINK:
-				error_string = _("Error \"%s\" while linking.\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while linking.");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			case TRANSFER_DELETE:
 			case TRANSFER_EMPTY_TRASH:
 			case TRANSFER_MOVE_TO_TRASH:
-				error_string = _("Error \"%s\" while deleting.\n\n"
-						 "Would you like to continue?");
+				error_format = _("Error \"%s\" while deleting.");
+				*detail_string = g_strdup (_("Would you like to continue?"));
 				break;
 			default:
 				g_assert_not_reached ();
 				break;
 			}
 	
-			result = g_strdup_printf (error_string, 
-						  gnome_vfs_result_to_string (error));
+			*error_string = g_strdup_printf (error_format, 
+						         gnome_vfs_result_to_string (error));
 		}
 	}
-	return result;
 }
 
 static int
@@ -799,6 +799,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 	int error_dialog_button_pressed;
 	int error_dialog_result;
 	char *text;
+	char *detail;
 	char *formatted_source_name;
 	char *formatted_target_name;
 	const char *dialog_title;
@@ -889,26 +890,27 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 			error_kind = ERROR_SOURCE_IN_TARGET;
 		}
 
-		text = build_error_string (formatted_source_name, formatted_target_name,
-					   transfer_info->kind,
-					   error_kind, error_location,
-					   progress_info->vfs_status);
+		build_error_string (formatted_source_name, formatted_target_name,
+				    transfer_info->kind,
+				    error_kind, error_location,
+				    progress_info->vfs_status,
+				    &text, &detail);
 
 		switch (transfer_info->kind) {
 		case TRANSFER_COPY:
 		case TRANSFER_DUPLICATE:
-			dialog_title = _("Error while copying.");
+			dialog_title = _("Error While Copying");
 			break;
 		case TRANSFER_MOVE:
-			dialog_title = _("Error while moving.");
+			dialog_title = _("Error While Moving");
 			break;
 		case TRANSFER_LINK:
-			dialog_title = _("Error while linking.");
+			dialog_title = _("Error While Linking");
 			break;
 		case TRANSFER_DELETE:
 		case TRANSFER_EMPTY_TRASH:
 		case TRANSFER_MOVE_TO_TRASH:
-			dialog_title = _("Error while deleting.");
+			dialog_title = _("Error While Deleting");
 			break;
 		default:
 			dialog_title = NULL;
@@ -919,7 +921,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 		    error_kind == ERROR_SOURCE_IN_TARGET) {
 			/* We can't continue, just tell the user. */
 			eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
-				TRUE, text, dialog_title, GTK_STOCK_OK, NULL);
+				TRUE, GTK_MESSAGE_ERROR, text, detail, dialog_title, GTK_STOCK_OK, NULL);
 			error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT;
 
 		} else if ((error_location == ERROR_LOCATION_SOURCE
@@ -932,9 +934,10 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 			 * continue. Allow the user to skip.
 			 */
 			error_dialog_button_pressed = eel_run_simple_dialog
-				(parent_for_error_dialog (transfer_info), TRUE, text, 
-				dialog_title,
-				 GTK_STOCK_CANCEL, _("Skip"), NULL);
+				(parent_for_error_dialog (transfer_info), TRUE, 
+				 GTK_MESSAGE_ERROR, text, 
+				 detail, dialog_title,
+				 GTK_STOCK_CANCEL, _("_Skip"), NULL);
 				 
 			switch (error_dialog_button_pressed) {
 			case 0:
@@ -952,9 +955,10 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 		} else {
 			/* Generic error, offer to retry and skip. */
 			error_dialog_button_pressed = eel_run_simple_dialog
-				(parent_for_error_dialog (transfer_info), TRUE, text, 
-				 dialog_title,
-				 _("Skip"), GTK_STOCK_CANCEL, _("Retry"), NULL);
+				(parent_for_error_dialog (transfer_info), TRUE, 
+				 GTK_MESSAGE_ERROR, text, 
+				 detail, dialog_title,
+				 _("_Skip"), GTK_STOCK_CANCEL, _("_Retry"), NULL);
 
 			switch (error_dialog_button_pressed) {
 			case 0:
@@ -973,6 +977,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 		}
 			
 		g_free (text);
+		g_free (detail);
 		g_free (formatted_source_name);
 		g_free (formatted_target_name);
 
@@ -1008,7 +1013,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 		           TransferInfo *transfer_info)
 {
 	int result;
-	char *text, *formatted_name;
+	char *text, *primary_text, *secondary_text, *formatted_name;
 
 	nautilus_file_operations_progress_pause_timeout (transfer_info->progress_dialog);	
 
@@ -1019,23 +1024,25 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 			 progress_info->target_name);
 		
 		if (transfer_info->kind == TRANSFER_MOVE) {
-			text = g_strdup_printf (_("\"%s\" could not be moved to the new location, "
-						  "because its name is already used for a special item that "
-						  "cannot be removed or replaced.\n\n"
-						  "If you still want to move \"%s\", rename it and try again."),
-						formatted_name, formatted_name);
-		} else {
-			text = g_strdup_printf (_("\"%s\" could not be copied to the new location, "
-						  "because its name is already used for a special item that "
-						  "cannot be removed or replaced.\n\n"
-						  "If you still want to copy \"%s\", rename it and try again."),
-						formatted_name, formatted_name);
+			primary_text = g_strdup_printf (_("Could not move \"%s\" to the new location."),
+			                                formatted_name);
+						
+			secondary_text = _("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.");
+		} else {						
+			primary_text = g_strdup_printf (_("Could not copy \"%s\" to the new location."),
+			                                formatted_name);
+						
+			secondary_text = _("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.");
 		}
 		
-		eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
-				       _("Unable to replace file."), GTK_STOCK_OK, NULL, NULL);
+		eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_ERROR, primary_text, secondary_text,
+				       _("Unable to Replace File"), GTK_STOCK_OK, NULL, NULL);
 
-		g_free (text);
+		g_free (primary_text);
 		g_free (formatted_name);
 
 		nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog);
@@ -1046,37 +1053,41 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 	/* transfer conflict, prompt the user to replace or skip */
 	formatted_name = format_and_ellipsize_uri_for_dialog (
 		parent_for_error_dialog (transfer_info), progress_info->target_name);
-	text = g_strdup_printf (_("File \"%s\" already exists.\n\n"
-				  "Would you like to replace it?"), 
-				formatted_name);
+	text = g_strdup_printf (_("The file \"%s\" already exists.  Would you like to replace it?"), 
+	                        formatted_name);
 	g_free (formatted_name);
 
 	if (progress_info->duplicate_count == 1) {
 		/* we are going to only get one duplicate alert, don't offer
 		 * Replace All
 		 */
-		result = eel_run_simple_dialog
-			(parent_for_error_dialog (transfer_info), TRUE, text, 
-			 _("Conflict while copying"),
-			 _("Replace"), _("Skip"), NULL);
+		result = eel_run_simple_dialog 
+			(parent_for_error_dialog (transfer_info),
+			 TRUE,
+			 GTK_MESSAGE_QUESTION, 
+			 text, 
+			 _("If you replace an existing file, its contents will be overwritten."), 
+			 _("Conflict While Copying"),
+			 _("_Skip"), _("_Replace"), NULL);
 		g_free (text);	 
 
 		nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog);
 					 
 		switch (result) {
 		case 0:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
 		default:
 			g_assert_not_reached ();
 			/* fall through */
 		case 1:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		}
 	} else {
 		result = eel_run_simple_dialog
-			(parent_for_error_dialog (transfer_info), TRUE, text, 
-			 _("Conflict while copying"),
-			 _("Replace All"), _("Replace"), _("Skip"), NULL);
+			(parent_for_error_dialog (transfer_info), TRUE, GTK_MESSAGE_QUESTION, text, 
+			 _("If you replace an existing file, its contents will be overwritten."),  
+			 _("Conflict While Copying"),
+			 _("Replace _All"), _("_Skip"), _("_Replace"), NULL);
 		g_free (text);
 
 		nautilus_file_operations_progress_resume_timeout (transfer_info->progress_dialog);
@@ -1085,12 +1096,12 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
 		case 0:
 			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL;
 		case 1:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
 		default:
 			g_assert_not_reached ();
 			/* fall through */
 		case 2:
-			return GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP;
+			return GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE;
 		}
 	}
 }
@@ -1914,8 +1925,10 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 			eel_run_simple_dialog
 				(parent_view, 
 				 FALSE,
-				 _("You cannot copy items into the Trash."), 
-				 _("Can't Copy to Trash"),
+				 GTK_MESSAGE_ERROR,
+				 _("You cannot copy items into the trash."),
+				 _("Files and folders can only be moved into the trash."), 
+				 NULL,
 				 GTK_STOCK_OK, NULL);
 			result = GNOME_VFS_ERROR_NOT_PERMITTED;
 		}
@@ -1936,9 +1949,11 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 				eel_run_simple_dialog
 					(parent_view,
 					 FALSE,
+					 GTK_MESSAGE_ERROR,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
 						 ? _("You cannot move this trash folder.")
 						 : _("You cannot copy this trash folder."),
+					 _("A trash folder is used for storing items moved to the trash."),
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
 						 ? _("Can't Change Trash Location")
 						 : _("Can't Copy Trash"),
@@ -1963,9 +1978,11 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
+					 GTK_MESSAGE_ERROR,
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
 					 ? _("You cannot move a folder into itself.")
 					 : _("You cannot copy a folder into itself."), 
+					 _("The destination folder is inside the source folder."), 
 					 ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0) 
 					 ? _("Can't Move Into Self")
 					 : _("Can't Copy Into Self"),
@@ -1980,7 +1997,9 @@ nautilus_file_operations_copy_move (const GList *item_uris,
 				eel_run_simple_dialog
 					(parent_view, 
 					 FALSE,
-					 _("You cannot copy a file over itself."), 
+					 GTK_MESSAGE_ERROR,
+					 _("You cannot copy a file over itself."),
+					 _("The destination and source are the same file."), 
 					 _("Can't Copy Over Self"), 
 					 GTK_STOCK_OK, NULL, NULL);			
 
@@ -2033,17 +2052,16 @@ handle_new_folder_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewF
 	error_string_to_free = NULL;
 
 	if (progress_info->vfs_status == GNOME_VFS_ERROR_ACCESS_DENIED) {
-		error_string = _("Error creating new folder.\n\n"
-				 "You do not have permissions to write to the destination.");
+		error_string = _("You do not have permissions to write to the destination.");
 	} else if (progress_info->vfs_status == GNOME_VFS_ERROR_NO_SPACE) {
-		error_string = _("Error creating new folder.\n\n"
-				 "There is no space on the destination.");
+		error_string = _("There is no space on the destination.");
 	} else {
 		error_string = g_strdup_printf (_("Error \"%s\" creating new folder."), 
-						gnome_vfs_result_to_string(progress_info->vfs_status));
+						gnome_vfs_result_to_string (progress_info->vfs_status));
+		error_string_to_free = (char *)error_string;
 	}
 	
-	eel_show_error_dialog (error_string, _("Error creating new folder"),
+	eel_show_error_dialog (_("Error creating new folder."), error_string, _("Error Creating New Folder"),
 				    GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
 	
 	g_free (error_string_to_free);
@@ -2073,7 +2091,7 @@ new_folder_transfer_callback (GnomeVFSAsyncHandle *handle,
 		case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
 			nautilus_file_changes_consume_changes (TRUE);
 			(* state->done_callback) (progress_info->target_name, state->data);
-			return 0;
+			return 1;
 	
 		case GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE:
 	
@@ -2149,6 +2167,208 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view,
 	gnome_vfs_uri_unref (parent_uri);
 }
 
+typedef struct {
+	GnomeVFSAsyncHandle *handle;
+	void (* done_callback)(const char *new_folder_uri, gpointer data);
+	gpointer data;
+	GtkWidget *parent_view;
+	char *empty_file;
+	GHashTable *debuting_uris;
+} NewFileTransferState;
+
+
+static int
+handle_new_file_vfs_error (const GnomeVFSXferProgressInfo *progress_info, NewFileTransferState *state)
+{
+	const char *error_string;
+	char *error_string_to_free;
+
+	error_string_to_free = NULL;
+
+	if (progress_info->vfs_status == GNOME_VFS_ERROR_ACCESS_DENIED) {
+		error_string = _("You do not have permissions to write to the destination.");
+	} else if (progress_info->vfs_status == GNOME_VFS_ERROR_NO_SPACE) {
+		error_string = _("There is no space on the destination.");
+	} else {
+		error_string = g_strdup_printf (_("Error \"%s\" creating new document."), 
+						gnome_vfs_result_to_string (progress_info->vfs_status));
+		error_string_to_free = (char *)error_string;
+	}
+	
+	eel_show_error_dialog (_("Error creating new document."), error_string, _("Error Creating New Document"),
+			       GTK_WINDOW (gtk_widget_get_toplevel (state->parent_view)));
+	
+	g_free (error_string_to_free);
+	
+	return GNOME_VFS_XFER_ERROR_ACTION_ABORT;
+}
+
+static void
+get_new_file_uri (gpointer       key,
+		  gpointer       value,
+		  gpointer       user_data)
+{
+	char *uri;
+	char **uri_out;
+
+	uri = key;
+	uri_out = user_data;
+
+	*uri_out = uri;
+}
+
+
+static int
+new_file_transfer_callback (GnomeVFSAsyncHandle *handle,
+			      GnomeVFSXferProgressInfo *progress_info,
+			      gpointer data)
+{
+	NewFileTransferState *state;
+	char *temp_string;
+	char *uri;
+	
+	state = (NewFileTransferState *) data;
+
+	switch (progress_info->phase) {
+
+	case GNOME_VFS_XFER_PHASE_COMPLETED:
+		uri = NULL;
+		g_hash_table_foreach (state->debuting_uris,
+				      get_new_file_uri, &uri);
+
+		(* state->done_callback) (uri, state->data);
+		/* uri is owned by hashtable, don't free */
+
+		if (state->empty_file != NULL) {
+			unlink (state->empty_file);
+			g_free (state->empty_file);
+		}
+		eel_remove_weak_pointer (&state->parent_view);
+		g_hash_table_destroy (state->debuting_uris);
+		g_free (state);
+		return 0;
+
+	default:
+		switch (progress_info->status) {
+		case GNOME_VFS_XFER_PROGRESS_STATUS_OK:
+			nautilus_file_changes_consume_changes (TRUE);
+			return 1;
+	
+		case GNOME_VFS_XFER_PROGRESS_STATUS_DUPLICATE:
+	
+			temp_string = progress_info->duplicate_name;
+	
+			if (progress_info->vfs_status == GNOME_VFS_ERROR_NAME_TOO_LONG) {
+				/* special case an 8.3 file system */
+				progress_info->duplicate_name = g_strndup (temp_string, 8);
+				progress_info->duplicate_name[8] = '\0';
+				g_free (temp_string);
+				temp_string = progress_info->duplicate_name;
+				progress_info->duplicate_name = g_strdup_printf
+					("%s.%d", 
+					 progress_info->duplicate_name,
+					 progress_info->duplicate_count);
+			} else {
+				progress_info->duplicate_name = g_strdup_printf
+					("%s%%20%d", 
+					 progress_info->duplicate_name,
+					 progress_info->duplicate_count);
+			}
+			g_free (temp_string);
+			return GNOME_VFS_XFER_ERROR_ACTION_SKIP;
+	
+		case GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR:
+			return handle_new_file_vfs_error (progress_info, state);
+		
+	
+
+		default:
+			g_warning (_("Unknown GnomeVFSXferProgressStatus %d"),
+				   progress_info->status);
+			return 0;
+		}
+	}
+}
+
+void 
+nautilus_file_operations_new_file (GtkWidget *parent_view, 
+				   const char *parent_dir,
+				   const char *source_uri_text,
+				   void (*done_callback) (const char *, gpointer),
+				   gpointer data)
+{
+	GList *target_uri_list;
+	GList *source_uri_list;
+	GnomeVFSURI *target_uri, *parent_uri, *source_uri;
+	char *filename;
+	NewFileTransferState *state;
+	SyncTransferInfo *sync_transfer_info;
+
+	state = g_new (NewFileTransferState, 1);
+	state->done_callback = done_callback;
+	state->data = data;
+	state->parent_view = parent_view;
+	state->empty_file = NULL;
+
+	/* pass in the target directory and the new folder name as a destination URI */
+	parent_uri = gnome_vfs_uri_new (parent_dir);
+
+	if (source_uri_text != NULL) {
+		source_uri = gnome_vfs_uri_new (source_uri_text);
+		if (source_uri == NULL) {
+			(*done_callback) (NULL, data);
+			g_free (state);
+			return;
+		}
+		filename = gnome_vfs_uri_extract_short_path_name (source_uri);
+		target_uri = gnome_vfs_uri_append_string (parent_uri, filename);
+		g_free (filename);
+	} else {
+		char empty_file[] = "/tmp/emptyXXXXXX";
+		char *empty_uri;
+		int fd;
+
+		fd = mkstemp (empty_file);
+		if (fd == -1) {
+			(*done_callback) (NULL, data);
+			g_free (state);
+		}
+		close (fd);
+
+		empty_uri = gnome_vfs_get_uri_from_local_path (empty_file);
+		source_uri = gnome_vfs_uri_new (empty_uri);
+		g_free (empty_uri);
+		
+		state->empty_file = g_strdup (empty_file);
+		
+		filename = g_filename_from_utf8 (_("new file"), -1, NULL, NULL, NULL);
+		target_uri = gnome_vfs_uri_append_file_name (parent_uri, filename);
+		g_free (filename);
+	}
+	
+	state->debuting_uris = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	eel_add_weak_pointer (&state->parent_view);
+
+	target_uri_list = g_list_prepend (NULL, target_uri);
+	source_uri_list = g_list_prepend (NULL, source_uri);
+
+	sync_transfer_info = g_new (SyncTransferInfo, 1);
+	sync_transfer_info->iterator = NULL;
+	sync_transfer_info->debuting_uris = state->debuting_uris;
+	
+	gnome_vfs_async_xfer (&state->handle, source_uri_list, target_uri_list,
+	      		      GNOME_VFS_XFER_USE_UNIQUE_NAMES,
+	      		      GNOME_VFS_XFER_ERROR_MODE_QUERY, 
+	      		      GNOME_VFS_XFER_OVERWRITE_MODE_QUERY,
+			      GNOME_VFS_PRIORITY_DEFAULT,
+			      new_file_transfer_callback, state,
+	      		      sync_transfer_callback, sync_transfer_info);
+
+	gnome_vfs_uri_list_free (target_uri_list);
+	gnome_vfs_uri_list_free (source_uri_list);
+	gnome_vfs_uri_unref (parent_uri);
+}
+
 void 
 nautilus_file_operations_delete (const GList *item_uris, 
 				 GtkWidget *parent_view)
@@ -2287,6 +2507,7 @@ confirm_empty_trash (GtkWidget *parent_view)
 
 	image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
 					  GTK_ICON_SIZE_DIALOG);
+	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
 	gtk_widget_show (image);
 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
 
@@ -2294,10 +2515,10 @@ confirm_empty_trash (GtkWidget *parent_view)
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
 
-	str = g_strconcat ("<b>", 
+	str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", 
 		_("Are you sure you want to empty "
 		"all of the items from the trash?"), 
-		"</b>", 
+		"</span>", 
 		NULL);
 		
 	label = gtk_label_new (str);  
@@ -2367,47 +2588,47 @@ void
 nautilus_self_check_file_operations (void)
 {
 	/* 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)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".bashrc"), 1), _(".bashrc (copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_(".foo.txt"), 1), _(".foo (copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo"), 1), _("foo foo (copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo.txt"), 1), _("foo (copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt"), 1), _("foo foo (copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo.txt txt"), 1), _("foo foo (copy).txt txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo...txt"), 1), _("foo.. (copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo..."), 1), _("foo... (copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo. (copy)"), 1), _("foo. (another copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy)"), 1), _("foo (another copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (copy).txt"), 1), _("foo (another copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy)"), 1), _("foo (3rd copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (another copy).txt"), 1), _("foo (3rd copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (another copy).txt"), 1), _("foo foo (3rd copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy)"), 1), _("foo (14th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (13th copy).txt"), 1), _("foo (14th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy)"), 1), _("foo (22nd copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (21st copy).txt"), 1), _("foo (22nd copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy)"), 1), _("foo (23rd copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (22nd copy).txt"), 1), _("foo (23rd copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy)"), 1), _("foo (24th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (23rd copy).txt"), 1), _("foo (24th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy)"), 1), _("foo (25th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (24th copy).txt"), 1), _("foo (25th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy)"), 1), _("foo foo (25th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (24th copy).txt"), 1), _("foo foo (25th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo foo (100000000000000th copy).txt"), 1), _("foo foo (copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy)"), 1), _("foo (11th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (10th copy).txt"), 1), _("foo (11th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy)"), 1), _("foo (12th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (11th copy).txt"), 1), _("foo (12th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy)"), 1), _("foo (13th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (12th copy).txt"), 1), _("foo (13th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (110th copy)"), 1), _("foo (111th copy)"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (110th copy).txt"), 1), _("foo (111th copy).txt"));
-	EEL_CHECK_STRING_RESULT (get_duplicate_name (_("foo (122nd copy)"), 1), _("foo (123rd copy)"));
-	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"));
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1), " (another copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1), "foo (copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (".bashrc", 1), ".bashrc (copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name (".foo.txt", 1), ".foo (copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo", 1), "foo foo (copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo.txt", 1), "foo (copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt", 1), "foo foo (copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo.txt txt", 1), "foo foo (copy).txt txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...txt", 1), "foo.. (copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo...", 1), "foo... (copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo. (copy)", 1), "foo. (another copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy)", 1), "foo (another copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (copy).txt", 1), "foo (another copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy)", 1), "foo (3rd copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (another copy).txt", 1), "foo (3rd copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (another copy).txt", 1), "foo foo (3rd copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy)", 1), "foo (14th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (13th copy).txt", 1), "foo (14th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy)", 1), "foo (22nd copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (21st copy).txt", 1), "foo (22nd copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy)", 1), "foo (23rd copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (22nd copy).txt", 1), "foo (23rd copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy)", 1), "foo (24th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (23rd copy).txt", 1), "foo (24th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy)", 1), "foo (25th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (24th copy).txt", 1), "foo (25th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy)", 1), "foo foo (25th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (24th copy).txt", 1), "foo foo (25th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo foo (100000000000000th copy).txt", 1), "foo foo (copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy)", 1), "foo (11th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (10th copy).txt", 1), "foo (11th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy)", 1), "foo (12th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (11th copy).txt", 1), "foo (12th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy)", 1), "foo (13th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (12th copy).txt", 1), "foo (13th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy)", 1), "foo (111th copy)");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (110th copy).txt", 1), "foo (111th copy).txt");
+	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (122nd copy)", 1), "foo (123rd copy)");
+	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");
 }
 
 #endif
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index 3fe6918ca..ead8f44ad 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -34,22 +34,30 @@ typedef void (* NautilusCopyCallback)      (GHashTable *debuting_uris,
 					    gpointer    callback_data);
 typedef void (* NautilusNewFolderCallback) (const char *new_folder_uri,
 					    gpointer    callback_data);
+typedef void (* NautilusNewFileCallback)   (const char *new_file_uri,
+					    gpointer    callback_data);
 
 /* FIXME: int copy_action should be an enum */
 
-void  nautilus_file_operations_copy_move               (const GList               *item_uris,
-							GArray            	  *target_item_points,
-							const char                *target_dir_uri,
-							GdkDragAction              copy_action,
-							GtkWidget                 *parent_view,
-							NautilusCopyCallback       done_callback,
-							gpointer                   done_callback_data);
-void  nautilus_file_operations_empty_trash             (GtkWidget                 *parent_view);
-void  nautilus_file_operations_new_folder              (GtkWidget                 *parent_view,
-							const char                *parent_dir_uri,
-							NautilusNewFolderCallback  done_callback,
-							gpointer                   done_callback_data);
-void  nautilus_file_operations_delete                  (const GList               *item_uris,
-							GtkWidget                 *parent_view);
+void nautilus_file_operations_copy_move   (const GList               *item_uris,
+					   GArray                    *target_item_points,
+					   const char                *target_dir_uri,
+					   GdkDragAction              copy_action,
+					   GtkWidget                 *parent_view,
+					   NautilusCopyCallback       done_callback,
+					   gpointer                   done_callback_data);
+void nautilus_file_operations_empty_trash (GtkWidget                 *parent_view);
+void nautilus_file_operations_new_folder  (GtkWidget                 *parent_view,
+					   const char                *parent_dir_uri,
+					   NautilusNewFolderCallback  done_callback,
+					   gpointer                   done_callback_data);
+void nautilus_file_operations_new_file    (GtkWidget                 *parent_view,
+					   const char                *parent_dir,
+					   const char                *source_uri_text,
+					   NautilusNewFileCallback    done_callback,
+					   gpointer                   data);
+void nautilus_file_operations_delete      (const GList               *item_uris,
+					   GtkWidget                 *parent_view);
+
 
 #endif /* NAUTILUS_FILE_OPERATIONS_H */
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index b7aae13db..18446722b 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -138,6 +138,8 @@ struct NautilusFileDetails
 	eel_boolean_bit has_volume                    : 1;
 	eel_boolean_bit has_drive                     : 1;
 
+	/* TRUE if the file is open in a spatial window */
+	eel_boolean_bit has_open_window               : 1;
 };
 
 NautilusFile *nautilus_file_new_from_info                  (NautilusDirectory      *directory,
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 1e6bd302c..94b25e135 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -166,6 +166,35 @@ nautilus_get_desktop_directory_uri_no_create (void)
 	return desktop_uri;
 }
 
+char *
+nautilus_get_templates_directory (void)
+{
+	return  g_build_filename (g_get_home_dir(),
+				  "Templates", NULL);
+}
+
+void
+nautilus_create_templates_directory (void)
+{
+	char *dir;
+
+	dir = nautilus_get_templates_directory ();
+	if (!g_file_test (dir, G_FILE_TEST_EXISTS)) {
+		mkdir (dir, DEFAULT_NAUTILUS_DIRECTORY_MODE);
+	}
+	g_free (dir);
+}
+
+char *
+nautilus_get_templates_directory_uri (void)
+{
+	char *directory, *uri;
+
+	directory = nautilus_get_templates_directory ();
+	uri = gnome_vfs_get_uri_from_local_path (directory);
+	g_free (directory);
+	return uri;
+}
 
 /* These need to be reset to NULL when desktop_is_home_dir changes */
 static char *escaped_desktop_dir = NULL;
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 9f83dd565..831e353b6 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -43,6 +43,10 @@ gboolean nautilus_is_desktop_directory_escaped       (char *escaped_dir);
 char *   nautilus_get_gmc_desktop_directory          (void);
 char *   nautilus_get_pixmap_directory               (void);
 
+char *   nautilus_get_templates_directory            (void);
+char *   nautilus_get_templates_directory_uri        (void);
+void     nautilus_create_templates_directory         (void);
+
 /* This function returns something that needs to be freed with g_free,
  * is not NULL, but is not garaunteed to exist */
 char *   nautilus_get_desktop_directory_uri_no_create (void);
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index ffed02311..2bbf1c7ac 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -167,6 +167,8 @@ nautilus_file_instance_init (NautilusFile *file)
 {
 	file->details = g_new0 (NautilusFileDetails, 1);
 
+	file->details = G_TYPE_INSTANCE_GET_PRIVATE ((file), NAUTILUS_TYPE_FILE, NautilusFileDetails);
+
 	nautilus_file_invalidate_extension_info_internal (file);
 }
 
@@ -499,8 +501,6 @@ finalize (GObject *object)
 	
 	eel_g_list_free_deep (file->details->mime_list);
 
-	g_free (file->details);
-
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -5405,6 +5405,25 @@ nautilus_file_invalidate_attributes_internal (NautilusFile *file,
 }
 
 gboolean
+nautilus_file_has_open_window (NautilusFile *file)
+{
+	return file->details->has_open_window;
+}
+
+void
+nautilus_file_set_has_open_window (NautilusFile *file,
+				   gboolean has_open_window)
+{
+	has_open_window = (has_open_window != FALSE);
+
+	if (file->details->has_open_window != has_open_window) {
+		file->details->has_open_window = has_open_window;
+		nautilus_file_changed (file);
+	}
+}
+
+
+gboolean
 nautilus_file_is_thumbnailing (NautilusFile *file)
 {
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
@@ -5692,6 +5711,8 @@ nautilus_file_class_init (NautilusFileClass *class)
 		              NULL, NULL,
 			      g_cclosure_marshal_VOID__VOID,
 		              G_TYPE_NONE, 0);
+	
+	g_type_class_add_private (class, sizeof (NautilusFileDetails));
 }
 
 static GnomeVFSFileInfo *
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index b8dec39a0..22971972e 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -311,6 +311,10 @@ char *                  nautilus_file_get_drop_target_uri               (Nautilu
 char *                  nautilus_file_get_custom_icon                   (NautilusFile                   *file);
 
 
+gboolean                nautilus_file_has_open_window                   (NautilusFile                   *file);
+void                    nautilus_file_set_has_open_window               (NautilusFile                   *file,
+									 gboolean                        has_open_window);
+
 /* Thumbnailing handling */
 gboolean                nautilus_file_is_thumbnailing                   (NautilusFile                   *file);
 
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 97403972c..5eb0b2a71 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -26,6 +26,8 @@
 #include <math.h>
 #include "nautilus-icon-canvas-item.h"
 
+#include <libgnome/gnome-i18n.h>
+
 #include "nautilus-file-utilities.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-icon-factory.h"
@@ -142,6 +144,8 @@ enum {
 
 typedef struct {
         char *action_descriptions[LAST_ACTION];
+	char *image_description;
+	char *description;
 } NautilusIconCanvasItemAccessiblePrivate;
 
 typedef struct {
@@ -2148,7 +2152,7 @@ nautilus_icon_canvas_item_accessible_action_set_description (AtkAction *accessib
 	}
 	priv->action_descriptions[i] = g_strdup (description);
 
-	return FALSE;
+	return TRUE;
 }
 
 static void
@@ -2167,11 +2171,14 @@ nautilus_icon_canvas_item_accessible_get_name (AtkObject *accessible)
 {
 	NautilusIconCanvasItem *item;
 
+	if (accessible->name) {
+		return accessible->name;
+	}
+
 	item = eel_accessibility_get_gobject (accessible);
 	if (!item) {
 		return NULL;
 	}
-
 	return item->details->editable_text;
 }
 
@@ -2301,16 +2308,16 @@ nautilus_icon_canvas_item_accessible_initialize (AtkObject *accessible,
 static void
 nautilus_icon_canvas_item_accessible_finalize (GObject *object)
 {
-        NautilusIconCanvasItemAccessiblePrivate *priv;
-        int i;
+	NautilusIconCanvasItemAccessiblePrivate *priv;
+	int i;
 
-        priv = accessible_get_priv (ATK_OBJECT (object));
+	priv = accessible_get_priv (ATK_OBJECT (object));
 
-        for (i = 0; i < LAST_ACTION; i++) {
-                if (priv->action_descriptions[i]) {
-                        g_free (priv->action_descriptions[i]);
-                }
-        }
+	for (i = 0; i < LAST_ACTION; i++) {
+		g_free (priv->action_descriptions[i]);
+	}
+	g_free (priv->image_description);
+	g_free (priv->description);
 
         g_free (priv);
 
@@ -2340,9 +2347,28 @@ static G_CONST_RETURN gchar *
 nautilus_icon_canvas_item_accessible_get_image_description
 	(AtkImage *image)
 {
-	return _("file icon");
-}
+	NautilusIconCanvasItemAccessiblePrivate *priv;
+	NautilusIconCanvasItem *item;
+	NautilusIcon *icon;
+	NautilusIconContainer *container;
+	char *description;
 
+	priv = accessible_get_priv (ATK_OBJECT (image));
+	if (priv->image_description) {
+		return priv->image_description;
+	} else {
+		item = eel_accessibility_get_gobject (ATK_OBJECT (image));
+		if (item == NULL) {
+			return NULL;
+		}
+		icon = item->user_data;
+		container = NAUTILUS_ICON_CONTAINER (EEL_CANVAS_ITEM (item)->canvas);
+		description = nautilus_icon_container_get_icon_description (container, icon->data);
+		g_free (priv->description);
+		priv->description = description;
+		return priv->description;
+	}
+}
 
 static void
 nautilus_icon_canvas_item_accessible_get_image_size
@@ -2416,8 +2442,14 @@ nautilus_icon_canvas_item_accessible_set_image_description
 	(AtkImage    *image,
 	 const gchar *description)
 {
-	g_warning (G_STRLOC "this api seems broken");
-	return FALSE;
+	NautilusIconCanvasItemAccessiblePrivate *priv;
+
+	priv = accessible_get_priv (ATK_OBJECT (image));
+
+	g_free (priv->image_description);
+	priv->image_description = g_strdup (description);
+
+	return TRUE;
 }
 
 static void
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index dcacd67bc..5c1e26523 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -149,7 +149,8 @@ typedef struct {
 static GType         nautilus_icon_container_accessible_get_type (void);
 
 static void          activate_selected_items                        (NautilusIconContainer *container);
-static void          activate_selected_items_alternate              (NautilusIconContainer *container);
+static void          activate_selected_items_alternate              (NautilusIconContainer *container,
+								     NautilusIcon          *icon);
 static void          nautilus_icon_container_theme_changed          (gpointer               user_data);
 static void          compute_stretch                                (StretchState          *start,
 								     StretchState          *current);
@@ -1716,6 +1717,51 @@ invalidate_label_sizes (NautilusIconContainer *container)
 }
 
 static gboolean
+select_range (NautilusIconContainer *container,
+	      NautilusIcon *icon1,
+	      NautilusIcon *icon2)
+{
+	gboolean selection_changed;
+	GList *p;
+	NautilusIcon *icon;
+	NautilusIcon *unmatched_icon;
+	gboolean select;
+
+	selection_changed = FALSE;
+
+	unmatched_icon = NULL;
+	select = FALSE;
+	for (p = container->details->icons; p != NULL; p = p->next) {
+		icon = p->data;
+
+		if (unmatched_icon == NULL) {
+			if (icon == icon1) {
+				unmatched_icon = icon2;
+				select = TRUE;
+			} else if (icon == icon2) {
+				unmatched_icon = icon1;
+				select = TRUE;
+			}
+		}
+		
+		selection_changed |= icon_set_selected
+			(container, icon, select);
+
+		if (unmatched_icon != NULL && icon == unmatched_icon) {
+			select = FALSE;
+		}
+		
+	}
+	
+	if (selection_changed && icon2 != NULL) {
+		AtkObject *atk_object = eel_accessibility_for_object (icon2->item);
+		atk_focus_tracker_notify (atk_object);
+	}
+	return selection_changed;
+}
+
+
+static gboolean
 select_one_unselect_others (NautilusIconContainer *container,
 			    NautilusIcon *icon_to_select)
 {
@@ -2529,6 +2575,7 @@ keyboard_move_to (NautilusIconContainer *container,
 		clear_keyboard_focus (container);
 		clear_keyboard_rubberband_start (container);
 		
+		container->details->range_selection_base_icon = icon;
 		if (select_one_unselect_others (container, icon)) {
 			g_signal_emit (container,
 					 signals[SELECTION_CHANGED], 0);
@@ -2736,6 +2783,9 @@ keyboard_space (NautilusIconContainer *container,
 		if (container->details->keyboard_focus != NULL) {
 			icon_toggle_selected (container, container->details->keyboard_focus);
 			g_signal_emit (container, signals[SELECTION_CHANGED], 0);
+			if  (container->details->keyboard_focus->is_selected) {
+				container->details->range_selection_base_icon = container->details->keyboard_focus;
+			} 
 		} else {
 			icon = find_best_selected_icon (container,
 							NULL,
@@ -2843,6 +2893,7 @@ select_matching_name (NautilusIconContainer *container,
 	/* Select icons and get rid of the special keyboard focus. */
 	clear_keyboard_focus (container);
 	clear_keyboard_rubberband_start (container);
+	container->details->range_selection_base_icon = icon;
 	if (select_one_unselect_others (container, icon)) {
 		g_signal_emit (container,
 				 signals[SELECTION_CHANGED], 0);
@@ -3115,6 +3166,13 @@ button_press_event (GtkWidget *widget,
 		return TRUE;
 	}
 
+	if ((event->button == DRAG_BUTTON || event->button == MIDDLE_BUTTON) &&
+	    event->type == GDK_BUTTON_PRESS) {
+		/* Clear the last click icon for double click */
+		container->details->double_click_icon[1] = container->details->double_click_icon[0];
+		container->details->double_click_icon[0] = NULL;
+	}
+	
 	/* Button 1 does rubber banding. */
 	if (event->button == RUBBERBAND_BUTTON) {
 		if (! button_event_modifies_selection (event)) {
@@ -3167,12 +3225,16 @@ nautilus_icon_container_did_not_drag (NautilusIconContainer *container,
 		
 	details = container->details;
 
-	if (details->icon_selected_on_button_down) {
+	if (details->icon_selected_on_button_down &&
+	    ((event->state & GDK_CONTROL_MASK) != 0 ||
+	     (event->state & GDK_SHIFT_MASK) == 0)) {
 		if (button_event_modifies_selection (event)) {
+			details->range_selection_base_icon = NULL;
 			icon_toggle_selected (container, details->drag_icon);
 			g_signal_emit (container,
 				       signals[SELECTION_CHANGED], 0);
 		} else {
+			details->range_selection_base_icon = details->drag_icon;
 			selection_changed = select_one_unselect_others 
 				(container, details->drag_icon);
 			
@@ -3217,7 +3279,7 @@ nautilus_icon_container_did_not_drag (NautilusIconContainer *container,
 			 * much more link-like.
 			 */
 			if (event->button == MIDDLE_BUTTON) {
-				activate_selected_items_alternate (container);
+				activate_selected_items_alternate (container, NULL);
 			} else {
 				activate_selected_items (container);
 			}
@@ -3689,8 +3751,11 @@ key_press_event (GtkWidget *widget,
 			break;
 		case GDK_Up:
 		case GDK_KP_Up:
-			keyboard_up (container, event);
-			handled = TRUE;
+			/* Don't eat Alt-Up, as that is used for alt-shift-Up */
+			if ((event->state & GDK_MOD1_MASK) == 0) {
+				keyboard_up (container, event);
+				handled = TRUE;
+			}
 			break;
 		case GDK_Right:
 		case GDK_KP_Right:
@@ -4246,6 +4311,10 @@ handle_icon_button_press (NautilusIconContainer *container,
 
 	details = container->details;
 
+	if (event->type == GDK_3BUTTON_PRESS) {
+		return TRUE;
+	}
+
 	if (details->single_click_mode &&
 	    event->type == GDK_2BUTTON_PRESS) {
 		/* Don't care about double clicks in single click mode */
@@ -4270,12 +4339,16 @@ handle_icon_button_press (NautilusIconContainer *container,
 		details->drag_button = 0;
 		details->drag_icon = NULL;
 		
-		if (icon == details->double_click_icon[1] &&
-		    !button_event_modifies_selection (event)) {
-			if (event->button == MIDDLE_BUTTON) {
-				activate_selected_items_alternate (container);
-			} else {
-				activate_selected_items (container);
+		if (icon == details->double_click_icon[1]) {
+			if (!button_event_modifies_selection (event)) {
+				if (event->button == MIDDLE_BUTTON) {
+					activate_selected_items_alternate (container, NULL);
+				} else {
+					activate_selected_items (container);
+				}
+			} else if (event->button == DRAG_BUTTON &&
+				   (event->state & GDK_SHIFT_MASK) != 0) {
+				activate_selected_items_alternate (container, icon);
 			}
 		}
 		return TRUE;
@@ -4303,7 +4376,22 @@ handle_icon_button_press (NautilusIconContainer *container,
 	 * the same way for contextual menu as it would be without. 
 	 */
 	details->icon_selected_on_button_down = icon->is_selected;
-	if (!details->icon_selected_on_button_down) {
+	
+	if ((event->button == DRAG_BUTTON || event->button == MIDDLE_BUTTON) &&
+	    (event->state & GDK_CONTROL_MASK) == 0 &&
+	    (event->state & GDK_SHIFT_MASK) != 0) {
+		NautilusIcon *start_icon;
+
+		start_icon = details->range_selection_base_icon;
+		if (start_icon == NULL || !start_icon->is_selected) {
+			start_icon = icon;
+		} 
+		if (select_range (container, start_icon, icon)) {
+			g_signal_emit (container,
+				       signals[SELECTION_CHANGED], 0);
+		}
+	} else if (!details->icon_selected_on_button_down) {
+		details->range_selection_base_icon = icon;
 		if (button_event_modifies_selection (event)) {
 			icon_toggle_selected (container, icon);
 			g_signal_emit (container,
@@ -4564,9 +4652,15 @@ icon_destroy (NautilusIconContainer *container,
 	if (details->drop_target == icon) {
 		details->drop_target = NULL;
 	}
+	if (details->range_selection_base_icon == icon) {
+		details->range_selection_base_icon = NULL;
+	}
 	if (details->pending_icon_to_reveal == icon) {
 		set_pending_icon_to_reveal (container, NULL);
 	}
+	if (details->stretch_icon == icon) {
+		details->stretch_icon = NULL;
+	}
 
 	if (icon->is_monitored) {
 		nautilus_icon_container_stop_monitor_top_left (container,
@@ -4599,13 +4693,18 @@ activate_selected_items (NautilusIconContainer *container)
 }
 
 static void
-activate_selected_items_alternate (NautilusIconContainer *container)
+activate_selected_items_alternate (NautilusIconContainer *container,
+				   NautilusIcon *icon)
 {
 	GList *selection;
 
 	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
 
-	selection = nautilus_icon_container_get_selection (container);
+	if (icon != NULL) {
+		selection = g_list_prepend (NULL, icon->data);
+	} else {
+		selection = nautilus_icon_container_get_selection (container);
+	}
 	if (selection != NULL) {
 	  	g_signal_emit (container,
 				 signals[ACTIVATE_ALTERNATE], 0,
@@ -4636,14 +4735,15 @@ nautilus_icon_container_get_icon_images (NautilusIconContainer *container,
 					 NautilusIconData      *data,
 					 GList                **emblem_icons,
 					 char                 **embedded_text,
-					 gboolean              *embedded_text_needs_loading)
+					 gboolean              *embedded_text_needs_loading,
+					 gboolean              *has_open_window)
 {
 	NautilusIconContainerClass *klass;
 
 	klass = NAUTILUS_ICON_CONTAINER_GET_CLASS (container);
 	g_return_val_if_fail (klass->get_icon_images != NULL, NULL);
 
-	return klass->get_icon_images (container, data, emblem_icons, embedded_text, embedded_text_needs_loading);
+	return klass->get_icon_images (container, data, emblem_icons, embedded_text, embedded_text_needs_loading, has_open_window);
 }
 
 
@@ -4769,6 +4869,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	char *embedded_text;
 	GdkRectangle embedded_text_rect;
 	gboolean embedded_text_needs_loading;
+	gboolean has_open_window;
+	char *modifier;
 	
 	if (icon == NULL) {
 		return;
@@ -4782,7 +4884,8 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	icon_name = nautilus_icon_container_get_icon_images (
 		container, icon->data, 
 		&emblem_icon_names,
-		&embedded_text, &embedded_text_needs_loading);
+		&embedded_text, &embedded_text_needs_loading,
+		&has_open_window);
 
 	/* compute the maximum size based on the scale factor */
 	min_image_size = MINIMUM_IMAGE_SIZE * EEL_CANVAS (container)->pixels_per_unit;
@@ -4793,10 +4896,18 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 
 	icon_size = MAX (icon_size, min_image_size);
 	icon_size = MIN (icon_size, max_image_size);
+
+	modifier = NULL;
+	if (has_open_window) {
+		modifier = "visiting";
+	}
+	if (icon == details->drop_target) {
+		modifier = "accept";
+	}
 	
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_icon
 		(icon_name,
-		(icon == details->drop_target) ? "accept" : NULL,
+		 modifier,
 		 icon_size,
 		 &attach_points,
 		 &embedded_text_rect,
@@ -6416,6 +6527,28 @@ nautilus_icon_container_set_font_size_table (NautilusIconContainer *container,
 	}
 }
 
+/**
+ * nautilus_icon_container_get_icon_description
+ * @container: An icon container widget.
+ * @data: Icon data 
+ * 
+ * Gets the description for the icon. This function may return NULL.
+ **/
+char*
+nautilus_icon_container_get_icon_description (NautilusIconContainer *container,
+				              NautilusIconData      *data)
+{
+	NautilusIconContainerClass *klass;
+
+	klass = NAUTILUS_ICON_CONTAINER_GET_CLASS (container);
+
+	if (klass->get_icon_description) {
+		return klass->get_icon_description (container, data);
+	} else {
+		return NULL;
+	}
+}
+
 /* NautilusIconContainerAccessible */
 
 static NautilusIconContainerAccessiblePrivate *
@@ -6866,23 +6999,24 @@ nautilus_icon_container_accessible_initialize (AtkObject *accessible,
 			    accessible_private_data_quark, 
 			    priv);
 
-	nautilus_icon_container_accessible_update_selection 
-		(ATK_OBJECT (accessible));
-
-	container = NAUTILUS_ICON_CONTAINER (GTK_ACCESSIBLE (accessible)->widget);
-	g_signal_connect (G_OBJECT (container), "selection_changed",
-			  G_CALLBACK (nautilus_icon_container_accessible_selection_changed_cb), 
-			  accessible);
-	g_signal_connect (G_OBJECT (container), "icon_added",
-			  G_CALLBACK (nautilus_icon_container_accessible_icon_added_cb), 
-			  accessible);
-	g_signal_connect (G_OBJECT (container), "icon_removed",
-			  G_CALLBACK (nautilus_icon_container_accessible_icon_removed_cb), 
-			  accessible);
-	g_signal_connect (G_OBJECT (container), "cleared",
-			  G_CALLBACK (nautilus_icon_container_accessible_cleared_cb), 
-			  accessible);
-
+	if (GTK_IS_ACCESSIBLE (accessible)) {
+		nautilus_icon_container_accessible_update_selection 
+			(ATK_OBJECT (accessible));
+		
+		container = NAUTILUS_ICON_CONTAINER (GTK_ACCESSIBLE (accessible)->widget);
+		g_signal_connect (G_OBJECT (container), "selection_changed",
+				  G_CALLBACK (nautilus_icon_container_accessible_selection_changed_cb), 
+				  accessible);
+		g_signal_connect (G_OBJECT (container), "icon_added",
+				  G_CALLBACK (nautilus_icon_container_accessible_icon_added_cb), 
+				  accessible);
+		g_signal_connect (G_OBJECT (container), "icon_removed",
+				  G_CALLBACK (nautilus_icon_container_accessible_icon_removed_cb), 
+				  accessible);
+		g_signal_connect (G_OBJECT (container), "cleared",
+				  G_CALLBACK (nautilus_icon_container_accessible_cleared_cb), 
+				  accessible);
+	}
 }
 
 static void
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index 727f1c665..98e1fb384 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -116,11 +116,14 @@ typedef struct {
 						   NautilusIconData *data,
 						   GList **emblem_icons,
 						   char **embedded_text,
-						   gboolean *embedded_text_needs_loading);
+						   gboolean *embedded_text_needs_loading,
+						   gboolean *has_window_open);
 	void         (* get_icon_text)            (NautilusIconContainer *container,
 						   NautilusIconData *data,
 						   char **editable_text,
 						   char **additional_text);
+	char *       (* get_icon_description)     (NautilusIconContainer *container,
+						   NautilusIconData *data);
 	int          (* compare_icons)            (NautilusIconContainer *container,
 						   NautilusIconData *icon_a,
 						   NautilusIconData *icon_b);
@@ -266,5 +269,7 @@ void              nautilus_icon_container_set_margins                   (Nautilu
 									 int                     bottom_margin);
 void              nautilus_icon_container_set_use_drop_shadows          (NautilusIconContainer  *container,
 									 gboolean                use_drop_shadows);
+char*             nautilus_icon_container_get_icon_description          (NautilusIconContainer  *container,
+                                                                         NautilusIconData       *data);
 
 #endif /* NAUTILUS_ICON_CONTAINER_H */
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 618f39653..ccccaf87c 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -718,6 +718,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 {
 #if 0
 	const char *message;
+	const char *detail;
 	GtkDialog *dialog;
 	int response;
 
@@ -728,25 +729,26 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 	 */
 	if (nautilus_icon_container_has_stored_icon_positions (container)) {
 		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave this item where you dropped it? "
+			message = _("Do you want to switch to manual layout and leave this item where you dropped it? "
 			"This will clobber the stored manual layout.");
+			detail = _("This folder uses automatic layout.");
 		} else {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave these items where you dropped them? "
+			message = _("Do you want to switch to manual layout and leave these items where you dropped them? "
 			"This will clobber the stored manual layout.");
+			detail = _("This folder uses automatic layout.");
 		}
 	} else {
 		if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list)) {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave this item where you dropped it?");
+			message = _("Do you want to switch to manual layout and leave this item where you dropped it?");
+			detail = _("This folder uses automatic layout.");
 		} else {
-			message = _("This folder uses automatic layout. "
-			"Do you want to switch to manual layout and leave these items where you dropped them?");
+			message = _("Do you want to switch to manual layout and leave these items where you dropped them?");
+			detail = _("This folder uses automatic layout.");
+
 		}
 	}
 
-	dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
+	dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
 					 _("Switch"), GTK_STOCK_CANCEL,
 					 GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
 
@@ -959,6 +961,7 @@ selection_is_image_file (GList *selection_list)
 	mime_type = gnome_vfs_get_mime_type (selected_item->uri);
 
 	result = (g_ascii_strcasecmp (mime_type, "image/svg") != 0 &&
+		  g_ascii_strcasecmp (mime_type, "image/svg+xml") != 0 &&
 		  eel_istr_has_prefix (mime_type, "image/"));
 	
 	g_free (mime_type);
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 6584f5d8e..2e73e6f28 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -49,6 +49,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtksettings.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtkicontheme.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-macros.h>
@@ -105,7 +106,13 @@ typedef struct {
 	guint ref_count;
 	
 	GdkPixbuf *pixbuf;
-	GnomeIconData *icon_data;
+	GdkRectangle *embedded_text_rect;
+
+	GdkPoint *attach_points;
+	int n_attach_points;
+	
+	char *display_name;
+	
 	time_t mtime; /* Only used for absolute filenames */
 
 	CircularList recently_used_node;
@@ -129,7 +136,7 @@ typedef struct {
 	GdkPixbuf *thumbnail_frame;
 
 	/* Used for icon themes according to the freedesktop icon spec. */
-	GnomeIconTheme *icon_theme;
+	GtkIconTheme *icon_theme;
 	GnomeThumbnailFactory *thumbnail_factory;
 
 	CircularList recently_used_dummy_head;
@@ -174,7 +181,9 @@ static gboolean   cache_key_equal                        (gconstpointer
 static void       cache_key_destroy                      (CacheKey                 *key);
 static void       cache_icon_unref                       (CacheIcon                *icon);
 static CacheIcon *cache_icon_new                         (GdkPixbuf                *pixbuf,
-							  GnomeIconData            *icon_data);
+							  GtkIconInfo              *icon_info,
+							  double                    scale_x,
+							  double                    scale_y);
 static CacheIcon *get_icon_from_cache                    (const char               *icon,
 							  const char               *modifier,
 							  guint                     nominal_size);
@@ -248,7 +257,7 @@ icon_theme_changed_callback (GnomeIconTheme *icon_theme,
 		       signals[ICONS_CHANGED], 0);
 }
 
-GnomeIconTheme *
+GtkIconTheme *
 nautilus_icon_factory_get_icon_theme (void)
 {
 	NautilusIconFactory *factory;
@@ -335,8 +344,7 @@ nautilus_icon_factory_instance_init (NautilusIconFactory *factory)
 						     (GDestroyNotify)cache_key_destroy,
 						     (GDestroyNotify)cache_icon_unref);
 	
-	factory->icon_theme = gnome_icon_theme_new ();
-	gnome_icon_theme_set_allow_svg (factory->icon_theme, TRUE);
+	factory->icon_theme = gtk_icon_theme_get_default ();
 	g_signal_connect_object (factory->icon_theme,
 				 "changed",
 				 G_CALLBACK (icon_theme_changed_callback),
@@ -360,7 +368,7 @@ nautilus_icon_factory_instance_init (NautilusIconFactory *factory)
 					   NULL, /* don't destroy data */
 					   NULL);
 	
-	factory->fallback_icon = cache_icon_new (pixbuf, NULL);
+	factory->fallback_icon = cache_icon_new (pixbuf, NULL, 1.0, 1.0);
 
 	factory->image_mime_types = g_hash_table_new (g_str_hash, g_str_equal);
 	for (i = 0; i < G_N_ELEMENTS (types); i++) {
@@ -398,10 +406,13 @@ cache_key_destroy (CacheKey *key)
 }
 
 static CacheIcon *
-cache_icon_new (GdkPixbuf     *pixbuf,
-		GnomeIconData *icon_data)
+cache_icon_new (GdkPixbuf *pixbuf,
+		GtkIconInfo *info,
+		double scale_x, double scale_y)
 {
 	CacheIcon *icon;
+	GdkRectangle rect;
+	int i;
 
 	/* Grab the pixbuf since we are keeping it. */
 	g_object_ref (pixbuf);
@@ -410,8 +421,30 @@ cache_icon_new (GdkPixbuf     *pixbuf,
 	icon = g_new0 (CacheIcon, 1);
 	icon->ref_count = 1;
 	icon->pixbuf = pixbuf;
-	icon->icon_data = icon_data;
 	icon->mtime = 0;
+
+	if (info) {
+		icon->display_name = g_strdup (gtk_icon_info_get_display_name (info));
+		
+		if (gtk_icon_info_get_embedded_rect (info, &rect)) {
+			rect.x *= scale_x;
+			rect.width *= scale_x;
+			rect.y *= scale_y;
+			rect.height *= scale_y;
+			icon->embedded_text_rect = g_memdup (&rect, sizeof (rect));
+			
+		}
+
+		if (gtk_icon_info_get_attach_points (info,
+						     &icon->attach_points,
+						     &icon->n_attach_points)) {
+			for (i = 0; i < icon->n_attach_points; i++) {
+				icon->attach_points[i].x *= scale_x;
+				icon->attach_points[i].y *= scale_x;
+			}
+		}
+		
+	}
 	
 	return icon;
 }
@@ -468,11 +501,8 @@ cache_icon_unref (CacheIcon *icon)
 	check_recently_used_list ();
 	
 	g_object_unref (icon->pixbuf);
-	
-	if (icon->icon_data) {
-		gnome_icon_data_free (icon->icon_data);
-		icon->icon_data = NULL;
-	}
+	g_free (icon->embedded_text_rect);
+	g_free (icon->attach_points);
 
 	g_free (icon);
 }
@@ -810,7 +840,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, gboolean embedd_tex
 		thumb_factory = NULL;
 	}
 
-	lookup_flags = GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES;
+	lookup_flags = GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES | GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES;
 	if (embedd_text) {
 		lookup_flags |= GNOME_ICON_LOOKUP_FLAGS_EMBEDDING_TEXT;
 	}
@@ -980,34 +1010,14 @@ get_smaller_icon_size (guint size)
 }
 
 
-static void
-scale_icon_data (GnomeIconData *icon_data,
-		 double scale_x,
-		 double scale_y)
-{
-	int num_points, i;
-	
-	if (icon_data->has_embedded_rect) {
-		icon_data->x0 = icon_data->x0 * scale_x;
-		icon_data->y0 = icon_data->y0 * scale_y;
-		icon_data->x1 = icon_data->x1 * scale_x;
-		icon_data->y1 = icon_data->y1 * scale_y;
-	}
-	
-	num_points = icon_data->n_attach_points;
-	for (i = 0; i < num_points; i++) {
-		icon_data->attach_points[i].x = icon_data->attach_points[i].x * scale_x;
-		icon_data->attach_points[i].y = icon_data->attach_points[i].y * scale_y;
-	}
-}
-
 
 /* This loads an SVG image, scaling it to the appropriate size. */
 static GdkPixbuf *
 load_pixbuf_svg (const char *path,
 		 guint size_in_pixels,
 		 guint base_size,
-		 GnomeIconData *icon_data)
+		 double *scale_x,
+		 double *scale_y)
 {
 	double zoom;
 	int width, height;
@@ -1028,11 +1038,11 @@ load_pixbuf_svg (const char *path,
 		return NULL;
 	}
 
-	if (icon_data != NULL) {
-		width = gdk_pixbuf_get_width (pixbuf);
-		height = gdk_pixbuf_get_height (pixbuf);
-		scale_icon_data (icon_data, width / 1000.0, height / 1000.0);
-	}
+	width = gdk_pixbuf_get_width (pixbuf);
+	height = gdk_pixbuf_get_height (pixbuf);
+	*scale_x = width / 1000.0;
+	*scale_y = height / 1000.0;
+
 	return pixbuf;
 }
 
@@ -1069,21 +1079,25 @@ scale_icon (GdkPixbuf *pixbuf,
 }
 
 static GdkPixbuf *
-load_icon_file (char          *filename,
+load_icon_file (const char    *filename,
 		guint          base_size,
 		guint          nominal_size,
-		GnomeIconData *icon_data)
+		double        *scale_x,
+		double        *scale_y)
 {
 	GdkPixbuf *pixbuf, *scaled_pixbuf;
 	int width, height, size;
 	double scale;
 	gboolean is_thumbnail;
 
+	*scale_x = 1.0;
+	*scale_y = 1.0;
+	
 	if (path_represents_svg_image (filename)) {
 		pixbuf = load_pixbuf_svg (filename,
 					  nominal_size,
 					  base_size,
-					  icon_data);
+					  scale_x, scale_y);
 	} else {
 		is_thumbnail = strstr (filename, "/.thumbnails/")  != NULL;
 
@@ -1118,9 +1132,8 @@ load_icon_file (char          *filename,
 		if (base_size != nominal_size) {
 			scale = (double)nominal_size/base_size;
 			scaled_pixbuf = scale_icon (pixbuf, &scale);
-			if (icon_data != NULL) {
-				scale_icon_data (icon_data, scale, scale);
-			}
+			*scale_x = scale;
+			*scale_y = scale;
 			g_object_unref (pixbuf);
 			pixbuf = scaled_pixbuf;
 		}
@@ -1135,19 +1148,19 @@ create_normal_cache_icon (const char *icon,
 			  guint       nominal_size)
 {
 	NautilusIconFactory *factory;
-	char *filename;
+	const char *filename;
 	char *name_with_modifier;
-	const GnomeIconData *src_icon_data;
-	GnomeIconData *icon_data;
+	GtkIconInfo *info;
 	CacheIcon *cache_icon;
 	GdkPixbuf *pixbuf;
 	int base_size;
 	struct stat statbuf;
 	time_t mtime;
+	double scale_x, scale_y;
 		
 	factory = get_icon_factory ();
 
-	icon_data = NULL;
+	info = NULL;
 	filename = NULL;
 
 	mtime = 0;
@@ -1168,38 +1181,41 @@ create_normal_cache_icon (const char *icon,
 			name_with_modifier = (char *)icon;
 		}
 
-		filename = gnome_icon_theme_lookup_icon (factory->icon_theme,
-							 name_with_modifier,
-							 nominal_size,
-							 &src_icon_data,
-							 &base_size);
+		info = gtk_icon_theme_lookup_icon (factory->icon_theme,
+						   name_with_modifier,
+						   nominal_size,
+						   GTK_ICON_LOOKUP_FORCE_SVG);
 		if (name_with_modifier != icon) {
 			g_free (name_with_modifier);
 		}
-
-		/* Make a copy of the icon data */
-		icon_data = NULL;
-		if (src_icon_data) {
-			icon_data = gnome_icon_data_dup (src_icon_data);
+		
+		if (info == NULL) {
+			return NULL;
 		}
+		
+		gtk_icon_info_set_raw_coordinates (info, TRUE);
+		base_size = gtk_icon_info_get_base_size (info);
+		filename = gtk_icon_info_get_filename (info);
 	}
 
-	if (filename == NULL) {
-		return NULL;
-	}
-
+	
 	pixbuf = load_icon_file (filename,
 				 base_size,
 				 nominal_size,
-				 icon_data);
-	g_free (filename);
+				 &scale_x, &scale_y);
 	if (pixbuf == NULL) {
+		if (info) {
+			gtk_icon_info_free (info);
+		}
 		return NULL;
 	}
 	
-	cache_icon = cache_icon_new (pixbuf, icon_data);
+	cache_icon = cache_icon_new (pixbuf, info, scale_x, scale_y);
 	cache_icon->mtime = mtime;
 
+	if (info) {
+		gtk_icon_info_free (info);
+	}
 	g_object_unref (pixbuf);
 	
 	return cache_icon;
@@ -1311,7 +1327,6 @@ nautilus_icon_factory_get_pixbuf_for_icon (const char                  *icon,
 {
 	NautilusIconFactory *factory;
 	CacheIcon *cached_icon;
-	GnomeIconData *icon_data;
 	GdkPixbuf *pixbuf;
 	int i;
 	
@@ -1321,25 +1336,20 @@ nautilus_icon_factory_get_pixbuf_for_icon (const char                  *icon,
 					   nominal_size);
 
 	if (attach_points != NULL) {
-		if (cached_icon->icon_data != NULL) {
-			icon_data = cached_icon->icon_data;
-			attach_points->num_points = MIN (icon_data->n_attach_points,
+		if (cached_icon->attach_points != NULL) {
+			attach_points->num_points = MIN (cached_icon->n_attach_points,
 							 MAX_ATTACH_POINTS);
 			for (i = 0; i < attach_points->num_points; i++) {
-				attach_points->points[i].x = icon_data->attach_points[i].x;
-				attach_points->points[i].y = icon_data->attach_points[i].y;
+				attach_points->points[i].x = cached_icon->attach_points[i].x;
+				attach_points->points[i].y = cached_icon->attach_points[i].y;
 			}
 		} else {
 			attach_points->num_points = 0;
 		}
 	}
 	if (embedded_text_rect) {
-		if (cached_icon->icon_data != NULL &&
-		    cached_icon->icon_data->has_embedded_rect) {
-			embedded_text_rect->x = cached_icon->icon_data->x0;
-			embedded_text_rect->y = cached_icon->icon_data->y0;
-			embedded_text_rect->width = cached_icon->icon_data->x1 - cached_icon->icon_data->x0;
-			embedded_text_rect->height = cached_icon->icon_data->y1 - cached_icon->icon_data->y0;
+		if (cached_icon->embedded_text_rect != NULL) {
+			*embedded_text_rect = *cached_icon->embedded_text_rect;
 		} else {
 			embedded_text_rect->x = 0;
 			embedded_text_rect->y = 0;
@@ -1349,12 +1359,7 @@ nautilus_icon_factory_get_pixbuf_for_icon (const char                  *icon,
 	}
 
 	if (display_name != NULL) {
-		if (cached_icon->icon_data != NULL &&
-		    cached_icon->icon_data->display_name != NULL) {
-			*display_name = g_strdup (cached_icon->icon_data->display_name);
-		} else {
-			*display_name = NULL;
-		}
+		*display_name = g_strdup (cached_icon->display_name);
 	}
 	
 	/* if we don't want a default icon and one is returned, return NULL instead */
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h
index 4162267b6..c7cfe9a8a 100644
--- a/libnautilus-private/nautilus-icon-factory.h
+++ b/libnautilus-private/nautilus-icon-factory.h
@@ -146,7 +146,7 @@ GdkPixbuf *           nautilus_icon_factory_get_pixbuf_from_name         (const
 									  guint                        size_in_pixels,
 									  char                       **display_name);
 
-GnomeIconTheme *       nautilus_icon_factory_get_icon_theme               (void);
+GtkIconTheme *         nautilus_icon_factory_get_icon_theme               (void);
 GnomeThumbnailFactory *nautilus_icon_factory_get_thumbnail_factory        (void);
 gboolean               nautilus_icon_factory_remove_from_cache (const char *icon_name,
 								const char *modifier,
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index 22192f939..e173e05c3 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -164,6 +164,8 @@ struct NautilusIconContainerDetails {
 	gboolean icon_selected_on_button_down;
 	NautilusIcon *double_click_icon[2]; /* Both clicks in a double click need to be on the same icon */
 
+	NautilusIcon *range_selection_base_icon;
+	
 	/* Renaming Details */
 	gboolean renaming;
 	GtkWidget *rename_widget;	/* Editable text item */
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index 79dad5655..2fe274d6c 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -983,17 +983,6 @@ launch_mime_capplet (NautilusFile *file,
 }
 
 static void
-launch_mime_capplet_on_ok (GtkDialog *dialog, int response, gpointer callback_data)
-{
-	g_assert (GTK_IS_DIALOG (dialog));
-
-	if (response == GTK_RESPONSE_YES) {
-		launch_mime_capplet (callback_data, dialog);
-	}
-	gtk_object_destroy (GTK_OBJECT (dialog));
-}
-
-static void
 launch_mime_capplet_and_close_dialog (GtkButton *button, gpointer callback_data)
 {
 	ProgramFilePair *file_pair;
@@ -1594,6 +1583,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
 	char *file_name;
 	char *dialog_title;
 	GtkDialog *dialog;
+	int response;
 
 	file_name = get_file_name_for_display (file);
 
@@ -1612,22 +1602,22 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
 	 * user can't add components to the complete list even from the capplet.
 	 * (They can add applications though.)
 	 */
-	prompt = g_strdup_printf (_("%s\n\n"
-				    "You can configure GNOME to associate applications "
-				    "with file types. Do you want to associate an "
-				    "application with this file type now?"),
-				  unavailable_message);
-	
-	dialog = eel_show_yes_no_dialog 
-		(prompt, dialog_title, _("Associate Application"), GTK_STOCK_CANCEL, parent_window);
+	prompt = _("You can configure GNOME to associate applications "
+		   "with file types. Do you want to associate an "
+		   "application with this file type now?");
+
+	dialog = eel_show_yes_no_dialog (unavailable_message, prompt, dialog_title, 
+	                                 _("_Associate Application"), GTK_STOCK_CANCEL, parent_window);
+
+	response = gtk_dialog_run (dialog);
+	gtk_object_destroy (GTK_OBJECT (dialog));
 		
-	g_signal_connect_object (dialog, "response",
-				 G_CALLBACK (launch_mime_capplet_on_ok),
-				 file, 0);
+	if (response == GTK_RESPONSE_YES) {
+		launch_mime_capplet (file, dialog);	 
+	}
 
 	g_free (unavailable_message);
 	g_free (file_name);
-	g_free (prompt);
 	g_free (dialog_title);
 }
 
@@ -1641,6 +1631,7 @@ nautilus_program_chooser_show_invalid_message (GnomeVFSMimeActionType  action_ty
 	char *file_name;
 	char *dialog_title;
 	GtkDialog *dialog;
+	int response;
 
 	file_name = get_file_name_for_display (file);
 
@@ -1655,21 +1646,21 @@ nautilus_program_chooser_show_invalid_message (GnomeVFSMimeActionType  action_ty
 		dialog_title = g_strdup (_("Invalid Action Associated"));
 	}		
 
-	prompt = g_strdup_printf (_("%s\n\n"
-				    "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?"),
-				  unavailable_message);
+	prompt = _("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?");
 
-	dialog = eel_show_yes_no_dialog 
-		(prompt, dialog_title, _("Associate Action"), GTK_STOCK_CANCEL, parent_window);
+	dialog = eel_show_yes_no_dialog (unavailable_message, prompt, dialog_title, 
+	                                 _("_Associate Action"), GTK_STOCK_CANCEL, parent_window);
 	
-	g_signal_connect_object (dialog, "response",
-	G_CALLBACK (launch_mime_capplet_on_ok),
-	file, 0);
+	response = gtk_dialog_run (dialog);
+	gtk_object_destroy (GTK_OBJECT (dialog));
+		
+	if (response == GTK_RESPONSE_YES) {
+		launch_mime_capplet (file, dialog);	 
+	}
 
 	g_free (unavailable_message);
 	g_free (file_name);
-	g_free (prompt);
 	g_free (dialog_title);
 }
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index a0ac18cbc..900ce1806 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -493,6 +493,7 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 {
 	GtkDialog *message_dialog;
 	LaunchParameters *launch_parameters;
+	char *prompt;
 	char *message;
 	char *file_name;
 	int response;
@@ -501,17 +502,20 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 
 	if (nautilus_mime_has_any_applications_for_file (file)) {
 		if (application != NULL) {
+			prompt = _("Open Failed, would you like to choose another application?");
 			message = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-						     "locations.  Would you like to choose another application?"),
+						     "locations."),
 						   application->name, file_name, 
 						   application->name, uri_scheme);
 		} else {
+			prompt = _("Open Failed, would you like to choose another action?");
 			message = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\" "
-						     "locations.  Would you like to choose another action?"),
+						     "locations."),
 						   file_name, uri_scheme);
 		}
 		
-		message_dialog = eel_show_yes_no_dialog (message, 
+		message_dialog = eel_show_yes_no_dialog (prompt, 
+		                                         message,
 							 _("Can't Open Location"), 
 							 GTK_STOCK_OK,
 							 GTK_STOCK_CANCEL,
@@ -528,26 +532,28 @@ application_cannot_open_location (GnomeVFSMimeApplication *application,
 				 launch_parameters);
 				 
 		}
-		
+		g_free (message);
 	} else {
 		if (application != NULL) {
-			message = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-						     "locations.  No other applications are available to view this file.  "
-						     "If you copy this file onto your computer, you may be able to open "
-						     "it."), application->name, file_name, 
-						   application->name, uri_scheme);
+			prompt = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+						    "locations."), application->name, file_name, 
+						    application->name, uri_scheme);
+			message = _("No other applications are available to view this file.  "
+				    "If you copy this file onto your computer, you may be able to open "
+				    "it.");
 		} else {
-			message = g_strdup_printf (_("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."), file_name, uri_scheme);
+			prompt = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\"."
+						    "locations."), file_name, uri_scheme);
+     			message = _("No other actions are available to view this file.  "
+				    "If you copy this file onto your computer, you may be able to open "
+				    "it.");
 		}
 				
-		eel_show_info_dialog (message, _("Can't Open Location"), parent_window);
+		eel_show_info_dialog (prompt, message, _("Can't Open Location"), parent_window);
+		g_free (prompt);
 	}	
 
 	g_free (file_name);
-	g_free (message);
 }
 
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -1159,8 +1165,9 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
 				     EEL_VFS_CAPABILITY_SAFE_TO_EXECUTE)) {
 		eel_show_error_dialog
 			(_("Sorry, but you can't execute commands from "
-			   "a remote site due to security considerations."), 
-			 _("Can't execute remote links"),
+			   "a remote site."), 
+			 _("This is disabled due to security considerations."),
+			 _("Can't Execute Remote Links"),
 			 parent_window);
 			 
 		return;
@@ -1170,11 +1177,11 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
 	ditem = gnome_desktop_item_new_from_uri (desktop_file_uri, 0,
 						&error);	
 	if (error != NULL) {
-		message = g_strconcat (_("There was an error launching the application.\n\n"
-					 "Details: "), error->message, NULL);
+		message = g_strconcat (_("Details: "), error->message, NULL);
 		eel_show_error_dialog
-			(message,
-			 _("Error launching application"),
+			(_("There was an error launching the application."),
+			 message,
+			 _("Error Launching Application"),
 			 parent_window);			
 			 
 		g_error_free (error);
@@ -1202,10 +1209,10 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
 		if (count == 0) {
 			/* all files are non-local */
 			eel_show_error_dialog
-				(_("This drop target only supports local files.\n\n"
-				   "To open non-local files copy them to a local folder and then"
+				(_("This drop target only supports local files."),
+				 _("To open non-local files copy them to a local folder and then"
 				   " drop them again."),
-				 _("Drop target only supports local files"),
+				 _("Drop Target Only Supports Local Files"),
 				 parent_window);
 			
 			gnome_desktop_item_unref (ditem);
@@ -1214,10 +1221,10 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
 		} else if (count != total) {
 			/* some files were non-local */
 			eel_show_warning_dialog
-				(_("This drop target only supports local files.\n\n"
-				   "To open non-local files copy them to a local folder and then"
+				(_("This drop target only supports local files."),
+				 _("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."),
-				 _("Drop target only supports local files"),
+				 _("Drop Target Only Supports Local Files"),
 				 parent_window);
 		}		
 	}
@@ -1236,11 +1243,11 @@ nautilus_launch_desktop_file (GdkScreen   *screen,
 					    flags, envp,
 					    &error);
 	if (error != NULL) {
-		message = g_strconcat (_("There was an error launching the application.\n\n"
-					 "Details: "), error->message, NULL);
+		message = g_strconcat (_("Details: "), error->message, NULL);
 		eel_show_error_dialog
-			(message,
-			 _("Error launching application"),
+			(_("There was an error launching the application."),
+			 message,
+			 _("Error Launching Application"),
 			 parent_window);			
 			 
 		g_error_free (error);
diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c
index 3361f4f35..aebbfb0f1 100644
--- a/libnautilus-private/nautilus-trash-directory.c
+++ b/libnautilus-private/nautilus-trash-directory.c
@@ -55,35 +55,6 @@ static void add_volume (NautilusTrashDirectory *trash,
 GNOME_CLASS_BOILERPLATE (NautilusTrashDirectory, nautilus_trash_directory,
 			 NautilusMergedDirectory, NAUTILUS_TYPE_MERGED_DIRECTORY)
 
-#define TRASH_SEARCH_TIMED_WAIT_DELAY 20000
-
-static int pending_find_directory_count = 0;
-
-static void
-find_directory_start (void)
-{
-	if (pending_find_directory_count == 0) {
-		eel_timed_wait_start_with_duration (TRASH_SEARCH_TIMED_WAIT_DELAY,
-						    NULL,
-						    add_volume,
-						    _("Searching Disks"),
-						    _("Nautilus is searching your disks for trash folders."),
-						    NULL);
-	}
-
-	++pending_find_directory_count;
-}
-
-static void
-find_directory_end (void)
-{
-	--pending_find_directory_count;
-
-	if (pending_find_directory_count == 0) {
-		eel_timed_wait_stop (NULL, add_volume);
-	}
-}
-
 static void
 find_directory_callback (GnomeVFSAsyncHandle *handle,
 			 GList *results,
@@ -102,8 +73,6 @@ find_directory_callback (GnomeVFSAsyncHandle *handle,
 	g_assert (trash_volume->real_directory == NULL);
 	g_assert (trash_volume->handle == handle);
 
-	find_directory_end ();
-	
 	/* We are done with the async. I/O. */
 	trash_volume->handle = NULL;
 
@@ -188,7 +157,6 @@ add_volume (NautilusTrashDirectory *trash,
 	vfs_uri_as_list.prev = NULL;
 
 	/* Search for Trash directories but don't create new ones. */
-	find_directory_start ();
 	gnome_vfs_async_find_directory
 		(&trash_volume->handle, &vfs_uri_as_list, 
 		 GNOME_VFS_DIRECTORY_KIND_TRASH, FALSE, TRUE, 0777,
@@ -246,7 +214,6 @@ remove_trash_volume (TrashVolume *trash_volume, gboolean finalizing)
 	
 	if (trash_volume->handle != NULL) {
 		gnome_vfs_async_cancel (trash_volume->handle);
-		find_directory_end ();
 	}
 	if (trash_volume->real_directory != NULL) {
 		if (! finalizing) {
diff --git a/po/ChangeLog b/po/ChangeLog
index c22833d43..b83208ac4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,170 @@
+2004-01-06  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2004-01-05  Danilo Å egan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2004-01-04  Jordi Mallach  <jordi@sindominio.net>
+
+	* POTFILES.in: Removed components/text files.
+	* ca.po: Updated Catalan translation.
+
+2004-01-02  Sanlig Badral  <Badral@openmn.org>
+
+	* mn.po: Updated Mongolian translation.
+    
+2004-01-02  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation by
+	Luca Ferretti <elle.uca@infinito.it>.
+
+2004-01-02  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po Updated Spanish translation.
+
+2004-01-01  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Partial update of Danish translation.
+
+2004-01-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+=== nautilus 2.5.4 ===
+
+2003-12-29  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2003-12-27 Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated Malay translation. 
+
+2003-12-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2003-12-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2003-12-22  Gustavo Noronha Silva  <kov@debian.org>
+
+	* pt_BR.po: updated translation and tried to have
+	  some translations more standardized.
+
+2003-12-21  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Updated German translation.
+
+2003-12-18  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2003-12-17  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2003-12-16  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2003-12-16  Paisa Seeluangsawat  <paisa@users.sf.net>
+
+	* th.po: Updated Thai (th) translation.
+
+2003-12-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2003-12-14  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
+2003-12-14  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2003-12-14  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2003-12-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2003-12-14  Danilo Å egan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2003-12-12  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2003-12-12  Christian Neumair  <chris@gnome-de.org>
+
+	* POTFILES.in: Removed obsolete hardware view.
+
+2003-12-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2003-12-10  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+	* no.po: Corrected some errors in Norwegian Bokmål translation.
+
+2003-12-09   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Reinout van Schouwen.
+
+2003-12-09   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Reinout van Schouwen.
+
+=== nautilus 2.5.3 ===
+
+2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
+
+	* th.po: Updated Thai (th) translation.
+
+2003-12-04   Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Dutch translation updated by Reinout van Schouwen.
+
+2003-12-03  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2003-12-03  Sanlig Badral  <badral@openmn.org>
+
+	* mn.po: Updated Mongolian translation. 
+
+2003-12-03  Danilo Å egan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2003-11-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Update Norwegian translation.
+
+2003-11-27  Danilo Å egan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbain translation.
+
+2003-11-26  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation by 
+	Young-Ho Cha <ganadist at mizi.com>.
+
+=== nautilus 2.5.2 ===
+
+2003-11-24  Alexander Larsson  <alexl@redhat.com>
+
+	* POTFILES.in: add fm-icon-container.c
+
 2003-11-20  Danilo Å egan  <dsegan@gmx.net>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc354c5d3..5aca45e18 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,6 @@ components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in
 components/adapter/main.c
 components/emblem/Nautilus_View_emblem.server.in.in
 components/emblem/nautilus-emblem-view.c
-components/hardware/Nautilus_View_hardware.server.in.in
-components/hardware/nautilus-hardware-view.c
 components/history/Nautilus_View_history.server.in.in
 components/history/nautilus-history-view.c
 components/image_properties/Nautilus_View_image_properties.server.in.in
@@ -15,8 +13,6 @@ components/notes/nautilus-notes.c
 components/text/Nautilus_View_text.server.in.in
 components/text/nautilus-text-view-ui.xml
 components/text/nautilus-text-view.c
-components/text/services/google.xml
-components/text/services/webster.xml
 components/throbber/Nautilus_Control_throbber.server.in.in
 components/throbber/nautilus-throbber.c
 components/tree/Nautilus_View_tree.server.in.in
@@ -79,6 +75,7 @@ src/Nautilus_shell.server.in
 src/file-manager/fm-desktop-icon-view.c
 src/file-manager/fm-directory-view.c
 src/file-manager/fm-error-reporting.c
+src/file-manager/fm-icon-container.c
 src/file-manager/fm-icon-view.c
 src/file-manager/fm-list-view.c
 src/file-manager/fm-properties-window.c
diff --git a/po/am.po b/po/am.po
index 3ffd99f6f..32c56e7bc 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -38,8 +38,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "አርማዎች"
 
@@ -53,180 +53,115 @@ msgstr "የNautilus አርማ ዕይታ"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+msgid "Couldn't remove emblem with name '%s'."
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
+msgstr "አርማን እንደገና ሰይ�"
+
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
-msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+msgid "Couldn't rename emblem with name '%s'."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:240
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
+msgstr "አርማን እንደገና ሰይ�"
+
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "አርማን እንደገና ሰይ�"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "እንደገና ሰይ�"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "አርማዎች ጨ�ር..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
+msgstr "አርማዎች ጨ�ር..."
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-msgid "The dragged text was not a valid file location."
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
+msgstr "አርማዎች ጨ�ር..."
+
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "ደ�ስስ"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "ሀርድዌር"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "የሀርድዌር ተመ�ካች"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "የሀርድዌር ዕይታ"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "እንደ ሀርድዌር አሳይ"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "የሀርድዌር ዕይታ"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "ታሪክ"
@@ -890,6 +825,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "ሀርድዌር"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr ""
@@ -1172,27 +1111,27 @@ msgid "Desktop trash icon name"
 msgstr "ሠሌዳ እና የማይ�ለ�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1205,8 +1144,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1234,8 +1173,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1269,7 +1208,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1283,7 +1222,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1300,7 +1239,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1326,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1350,7 +1289,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1368,11 +1307,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1390,8 +1329,9 @@ msgid "Reverse sort order in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr ""
+#, fuzzy
+msgid "Show folders first in windows"
+msgstr "�ሉን� የNautilus መስኮቶች �ጋ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1426,7 +1366,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1434,30 +1374,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1498,8 +1438,9 @@ msgid "Use manual layout in new windows"
 msgstr "�ሉን� የNautilus መስኮቶች �ጋ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr ""
+#, fuzzy
+msgid "Use tighter layout in new windows"
+msgstr "�ሉን� የNautilus መስኮቶች �ጋ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1521,7 +1462,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1534,7 +1475,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1691,65 +1632,76 @@ msgstr "እንደ�በረ አድረ�"
 msgid "on the desktop"
 msgstr "በሠሌዳ ላይ"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
-msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
 msgstr ""
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+msgid ""
+"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:108
+#, fuzzy
+msgid "Can't Delete Volume"
+msgstr "የተመረጠ�ን ��ክት ተጎታች ድር�"
+
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "የማይ�ለ�"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "ተወ�"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+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:276
+msgid "Couldn't Install Emblem"
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1758,18 +1710,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1788,282 +1746,256 @@ msgstr "ከ�"
 msgid "To:"
 msgstr "ወደ�"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while copying to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while moving to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while moving items to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+msgid "Error while creating links in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while deleting \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while linking."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "�ለ�"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "እንደገና ሞክር"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "ወደመጀመሪያ አቅጣጫ ሂድ"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "ወደመጀመሪያ አቅጣጫ ሂድ"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "ተካ"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "�ሉን� ተካ"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -2072,25 +2004,25 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -2100,554 +2032,588 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (ቅጂ)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (ሌላ ቅጂ)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "ኛ ቅጂ)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ኛ ቅጂ)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ኛ ቅጂ)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ኛ ቅጂ)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (ቅጂ)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ሌላ ቅጂ)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dኛ ቅጂ)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dኛ ቅጂ)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dኛ ቅጂ)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
+msgstr "ቅርጫቱ �ስጥ ያሉትን �ሉን� �ገሮች አጥ�"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "በዚህ መያዣ �ስጥ አዲስ ባዶ መያዣ �ጠር"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
 msgstr ""
 
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
+msgstr "የቤት ዶሴ"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "ያ�ተሰየመ ዶሴ"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 �ይ�"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "�ይሎችን በማጥ�ት ላይ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "የጠ� �ይሎች�"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "በማጥ�ት ላይ"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "የማይ�ለ� ማድረጊያ�ን ባዶ አድር�"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "ባዶ (_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo.. (ቅጂ).txt.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (ሌላ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (ሌላ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (ሌላ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ሌላ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123ኛ ቅጂ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124ኛ ቅጂ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124ኛ ቅጂ).txt"
 
@@ -2666,64 +2632,64 @@ msgstr "foo (124ኛ ቅጂ).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "ዛሬ በ 00:00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "ዛሬ በ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "ዛሬ በ 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "ዛሬ በ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "ዛሬ� 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "ዛሬ� %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "ዛሬ"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ትናንት በ 00:00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ትናንት በ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ትናንት በ 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ትናንት በ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ትናንት�  00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ትናንት� %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ትናንት"
 
@@ -2732,151 +2698,151 @@ msgstr "ትናንት"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Wednesday� September 00 0000 at 00:00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A� %B %-d %Y በ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mon� Oct 00 0000 በ 00:00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a� %b %-d %Y በ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mon� Oct 00 0000 በ 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a� %b %-d %Y በ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Oct 00 0000 በ 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y በ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Oct 00 0000� 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y� %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00� 00:00 ከሰዓት"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 ዕቃዎች"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 ዶሴዎች"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 �ይሎች"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 ዕቃ"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 ዶሴ"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 �ይ�"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u ዕቃዎች"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u ዶሴዎች"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u �ይሎች"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? ዕቃዎች"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ያ�ታወቀ ዓይ�ት"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ያ�ታወቀ"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "�ሮ�ራ�"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "አያያ�"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "የተሰበረ አያያ�"
 
@@ -2997,11 +2963,13 @@ msgid "Search for files by file name and file properties"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "��ክት ዕይታ"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "�ር�ር ዕይታ"
@@ -3145,138 +3113,139 @@ msgstr "የ%s ቤት"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "_Courier"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "የ�ይ� ��ክት"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr ""
 
@@ -3369,119 +3338,119 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "ለ�ጡ \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "ስ�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "�ኔታ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "�ረጡ (_h)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "ጨርሷ�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "ለ�ጡ... (_M)"
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "ወደዛ ሂድ (_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\"ን ለመክ�ት አንድ የመጠቀ�ያ �ሮ�ራ� ይ�ረጡ�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "ከሌላ ተመ�ካች ጋር ይክ�ቱ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "ለ\"%s\" ዕይታ ይ�ረጡ�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr ""
 
@@ -3489,140 +3458,158 @@ msgstr ""
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr ""
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
+msgstr "መጠቀሚያ �ሮ�ራ�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "በ... ክ�ት %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3868,14 +3855,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "አስተካክ�"
@@ -4072,96 +4051,105 @@ msgstr "መደቡ"
 msgid "Empty Trash"
 msgstr "የማይ�ለ� ማድረጊያ�ን ባዶ አድር�"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "%d መስኮቶች ክ�ት?"
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
 #, c-format
-msgid "Open %d Windows?"
-msgstr "%d መስኮቶች ክ�ት?"
+msgid "This will open %d separate windows."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "የተመረጡትን �ሉን� አርዕስተ ጉዳዮች እስከመጨረሻ� አጥ�ቸ�"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "አጥ�?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "የተለመደ�ን ��ክት �ረጡ... (_S)"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "ንድ�ች (_P)"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ተመርጠዋ�"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 ዶሴ ተመርጠዋ�"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d ዶሴዎች ተመርጠዋ�"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 �ገሮችን የያዘ)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (1 �ገርን የያዘ)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d �ገሮችን የያዘ)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\"ን ተመርጠዋ� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -4173,7 +4161,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s� %s"
@@ -4182,107 +4170,119 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "አ�ኑኑ አጥ�?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "ከማይ�ለ� አጥ�"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "ሌላ መጠቀሚያ _�ሮ�ራ�..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "መጠቀሚያ _�ሮ�ራ�..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "ሌላ _ተመ�ካች..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_ተመ�ካች..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "በአንዱ በተመረጡት �ገሮች ላይ \"%s\"ን አስኪድ"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4304,176 +4304,179 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "አ�ጣ (_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "በአዲስ መስኮት �ስጥ ክ�ት (_I)"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "በ%d አዲስ መስኮቶች �ስጥ ክ�ት (_I)"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "የቤት ዶሴ"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "የቤት ዶሴ"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "ከማይ�ለ� አጥ� (_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "የተመረጡትን �ሉን� አርዕስተ ጉዳዮች እስከመጨረሻ� አጥ�ቸ�"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ወደማይ�ለገ� ማድረጊያ ተሸጋገር (_V)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "እያንዳንዱ የተመረጠ�ን አርዕስተ ጉዳይ ወደ ቅርጫቱ አንቀሳቅስ"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "አጥ� (_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "አያያዥ አድር� (_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "የማይ�ለ� ማድረጊያ�ን ባዶ አድር� (_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "�ይሉ �ረጥ (_U)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "�ይሎች �ረጥ (_U)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "�ይሉ ቅጂ (_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "�ይሎች ቅጂ (_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
-msgid "Run or Display?"
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "አሳይ (_D)"
+#: src/file-manager/fm-directory-view.c:5923
+msgid "Run or Display?"
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "በተርሚናሉ �ስጥ አስኪድ (_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "አሳይ (_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "አስኪድ (_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
-msgstr ""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
+msgstr "በ... ክ�ት %s"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr ""
 
@@ -4494,107 +4497,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr ""
 
@@ -4652,123 +4675,131 @@ msgstr ""
 msgid "Restore Icon's Original Si_ze"
 msgstr "የ��ክቶቹን መጠን ወደ መጀመሪያ� መ�ስ (_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "የ�ይ� ስ�"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "መጠን"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "ዓይ�ት"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "የተቀየረ ቀን"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "�ስሎች ብቻ"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "�ርጫዎች (_P)"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s �ርጫዎች"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "�ን� የ��"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4778,190 +4809,189 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "ይዞታዎች�"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "ቀላ�"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "ስ�� (_N)"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "ስ�� (_N)"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "ዓይ�ት�"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "መጠን�"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "ቦታ�"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "የአያያዥ ኢላማ�"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "የMIME ዓይ�ት�"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "የተሻሻለ�"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "መረጃ �ለጋ�"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "የተለመደ�ን ��ክት �ረጡ... (_S)"
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "የተለመደ�ን ��ክት አስወ�ድ (_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "አንብብ (_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "ጻ� (_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "አስኪድ (_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "�ቃዶች"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "የ�ይ� ባለቤት�"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "የ�ይ� ባለቤት�"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "የ�ይ� መድረክ�"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "የ�ይ� መድረክ�"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "ባለቤት�"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "መድረክ�"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "ሌሎች�"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "የጽሑ� ዕይታ�"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "የ�ጥር ዕይታ�"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "የመጨረሻ ለ�ጥ�"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "የተለመደ�ን ��ክት �ረጡ... (_S)"
@@ -4978,81 +5008,97 @@ msgid "Search Results"
 msgstr "የአሰሳ �ጤቶች"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr ""
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5061,53 +5107,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr ""
 
@@ -5116,7 +5182,7 @@ msgstr ""
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5127,7 +5193,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5136,13 +5202,15 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr ""
 
@@ -5157,12 +5225,12 @@ msgid "Create L_auncher"
 msgstr "አዲስ ማስጀመሪያ (_A)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "አዲስ ማስጀመሪያ �ጠር"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "ቅርጫቱ �ስጥ ያሉትን �ሉን� �ገሮች አጥ�"
 
@@ -5182,7 +5250,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "የማይቀየር መደብን ተጠቀ� (_D)"
@@ -5205,183 +5273,202 @@ msgstr "የተመረጠá‹�ን áŠ�ገር ለማየት ሌላ ተመáˆ�ካች áˆ�á
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "የቤት ዶሴ"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "የቤት ዶሴ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "በዚህ መያዣ �ስጥ አዲስ ባዶ መያዣ �ጠር"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "በዚህ መያዣ �ስጥ አዲስ ባዶ መያዣ �ጠር"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "ለእያንዳንዱ ለተመረጠ� �ገር ባለ��ክት ማያያዣ �ጠር"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "አባዛ (_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "እያንዳንዱ የተመረጡትን አርዕስተ ጉዳይ ወደቅርጫቱ ሳያንቀሳቅሱ ያጥ�ቸ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "እያንዳንዱን የተመረጠ�ን አርዕስተ ጉዳይ አባዙ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "ማስጀመሪያ�ን ያስተካክሉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "የማስጀመሪያ መረጃን ያስተካክሉ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "የተመረጠ�ን ��ክት ተጎታች ድር�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "በ... ክ�ት (_h)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "እያንዳንዱ የተመረጠ�ን �ገር በአዲስ መስኮት ክ�ት"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "በአዲስ መስኮት �ስጥ ክ�ት (_I)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "የተመረጠ�ን �ገር በእዚህ መስኮት �ስጥ ክ�ት"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "የተመረጡትን �ይሎች ከለጥ� �ይ� ትእዛ� ጋር እንዲገለበጡ አዘጋጃቸ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "የተመረጡትን �ይሎች ከለጥ� �ይ� ትእዛ� ጋር እንዲንቀሳቀሱ አዘጋጃቸ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "የተመረጠ�ን አርዕስተ ጉዳይ እንደገና ሰይ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "ለ�ባሮቹ ዕይታ�ን እንደገና አስጀ�ር (_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "ለዚህ ዕይታ ቅደ� ተከተ� እና የቅርበት እርቀት ደረጃን ከ�ርጫዎቹ ጋር ለማመሳሰ� እንደገና አስጀ�ር"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "ከ~/Nautilus/scripts ጽሑ�ችን አክኪድ ወይን� �ራ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "�ሉን� �ይሎች �ረጡ (_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "ንድ�ች (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "በዚህ መስኮት �ስጥ ያሉትን አርዕስተ ጉዳዮች �ሉ �ረጡ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "በዚህ መስኮት �ስጥ ያሉትን አርዕስተ ጉዳዮች �ሉ �ረጡ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "ለእያንዳንዱ ለተመረጠ� �ገር የተለየ ባህሪያቸ�ን አሳይ ወይን� ቀይር"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "�ይሉ ቅጂ (_C)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "�ርማት (_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "ክ�ት (_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "ክ�ት የጽሑ�ች ዶሴ (_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "�ይሎች ለጥ� (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "�ይሎች ለጥ� (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "�ርጫዎች (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "እንደገና ሰይ�... (_R)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "ጽሑ�ች (_S)"
 
@@ -5466,44 +5553,55 @@ msgstr "በእጅ የሚሰራ (_M)"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5527,48 +5625,55 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "በሠሌዳ ላይ"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "በሠሌዳ ላይ"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5580,7 +5685,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5588,7 +5693,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5617,31 +5722,40 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -5677,33 +5791,44 @@ msgstr ""
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+#, fuzzy
+msgid "Can't Connect to Server"
+msgstr "የመረብ ሰርቨር"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "የመረብ ሰርቨር"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "ስ�� (_N)"
+msgid "_Location:"
+msgstr "ቦታ�"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -5900,6 +6025,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5910,24 +6043,22 @@ msgstr "በ... ክ�ት %s"
 msgid "Open with..."
 msgstr "በ... ክ�ት..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "አዲስ ማስጀመሪያ (_A)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "የማይ�ለ� ማድረጊያ�ን ባዶ አድር� (_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5935,114 +6066,124 @@ msgstr ""
 msgid "Go To:"
 msgstr "ሂድ ወደ�"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr ""
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
+msgstr "ወደሚቀጥለ� የሚጎበኘ� አቅጣጫ ሂድ"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "ቦታ�"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ጂኦሜትሪ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "ከNautilus �ጣ�"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus እንደገና አስጀ�ር�"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "የ�ይ� ጉባኤ"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "ታሪክ ሰር�"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "አስወ�ድ (_R)"
 
@@ -6075,7 +6216,6 @@ msgid "Close _All Windows"
 msgstr "_�ሉን� መስኮቶች �ጋ"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "�ሉን� የNautilus መስኮቶች �ጋ"
@@ -6098,107 +6238,119 @@ msgid "Forward"
 msgstr "ወደ�ት"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "ወደ የማይ�ለ� ማድረጊያ መያዣ� ሂድ"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "ወደሚቀጥለ� የሚጎበኘ� አቅጣጫ ሂድ"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "ወደቀድሞ� የተጎበኘ� አቅጣጫ ሂድ"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "ወደ የማይ�ለ� ማድረጊያ መያዣ� ሂድ"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "መጀመሪያ"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "የቦታ ባር (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "እንደገና ይጫን"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "�ይሎች ለማ�ኘት ይህንን ኮ���ተር አስስ"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "ስታተስባር (_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "አ��"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "ወደ ላይ"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "መለያ ��ክት ጨ�ር (_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "ወደኋላ (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "መለያ ��ክቶች (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "ታሪክ ሰር� (_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "መለያ ��ክቶች ያስተካክሉ (_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "ወደ�ት (_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "ሂድ ወደ (_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "መጀመሪያ (_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "ቦታ... (_L)"
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "የማይ�ለ� (_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "ወደ ላይ (_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "ተመ�ከት (_V)"
 
@@ -6216,28 +6368,32 @@ msgstr "እንደ አሳይ..."
 msgid "File Browser: %s"
 msgstr "የ�ይ� ባለቤት�"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6271,147 +6427,176 @@ msgstr "አዲስ ጨ�ር... (_A)"
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
+msgstr "የተለመደ�ን ��ክት �ረጡ... (_S)"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr ""
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "��� ቃላት� (_K)"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "�ስ�� (_I)"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr ""
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "የቀለሙ ስ�� (_N)"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
-msgid "Select a Category:"
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
 msgstr ""
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "አዲስ ንድ� ጨ�ር... (_A)"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "አዲስ ቀለ� ጨ�ር... (_A)"
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "አዲስ አርማ ጨ�ር... (_A)"
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "ለማስወገድ ንድ� ላይ ያቃጭሉ"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "ለማስወገድ ቀለሙ ላይ ያቃጭሉ"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "ለማስወገድ አርማ� ላይ ያቃጭሉ"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "ንድ�ች�"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "ቀለሞች�"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "አርማዎች�"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "ንድ� አስወ�ዱ... (_R)"
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "ቀለ� አስወ�ዱ... (_R)"
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "አርማ አስወ�ዱ... (_R)"
 
@@ -6795,7 +6980,12 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
+msgstr "_�ሉን� መስኮቶች �ጋ"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
 msgstr "_�ሉን� መስኮቶች �ጋ"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
@@ -6803,26 +6993,26 @@ msgstr "_�ሉን� መስኮቶች �ጋ"
 msgid "Go to Computer"
 msgstr "ወደ የማይ�ለ� ማድረጊያ መያዣ� ሂድ"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "ወደ የማይ�ለ� ማድረጊያ መያዣ� ሂድ"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "ቦታ... (_L)"
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "ክ�ት የጽሑ�ች ዶሴ (_O)"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "ንድ�ች (_P)"
@@ -6853,9 +7043,11 @@ msgstr ""
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6863,85 +7055,106 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "የይዞታ ዕይታ"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr ""
 
@@ -6953,7 +7166,7 @@ msgstr "በዚህ ��ክት የተጠቀሰ� ቦታ ጋር ሂድ"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "የቅጂ� መብት (�) 1999-2001 Eazel, Inc."
 
@@ -6961,11 +7174,11 @@ msgstr "የቅጂ� መብት (�) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "ዘ�ዕ� Frontier Foundation"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -6979,39 +7192,43 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "ይህንን ቦታ ከ\"%s\" ጋር አሳይ"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "የቀይ ባርኔታ መረብ"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "የ�ደ� ቅርጾች (_o)"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "ጭብጦች"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "ወደ የማይ�ለ� ማድረጊያ መያዣ� ሂድ"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "የመጠቀሚያ �ሮ�ራ� ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "መጠቀሚያ �ሮ�ራ�"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7047,6 +7264,37 @@ msgstr "የመረብ ሰርቨር"
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#~ msgid "Hardware Viewer"
+#~ msgstr "የሀርድዌር ተመ�ካች"
+
+#~ msgid "Hardware view"
+#~ msgstr "የሀርድዌር ዕይታ"
+
+#~ msgid "View as Hardware"
+#~ msgstr "እንደ ሀርድዌር አሳይ"
+
+#~ msgid "hardware view"
+#~ msgstr "የሀርድዌር ዕይታ"
+
+#~ 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 "file icon"
+#~ msgstr "የ�ይ� ��ክት"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "ስ�� (_N)"
+
 #~ msgid "Unknown"
 #~ msgstr "ያ�ታወቀ"
 
@@ -7092,9 +7340,6 @@ msgstr ""
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Music"
 #~ msgstr "ሙዚቃ"
 
@@ -7173,9 +7418,6 @@ msgstr ""
 #~ msgid "Re_move Custom Icon"
 #~ msgstr "የተለመደ�ን ��ክትን አስወ�ድ (_M)"
 
-#~ msgid "Themes"
-#~ msgstr "ጭብጦች"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "የአዲስ መስኮት ጠባይ"
 
diff --git a/po/ar.po b/po/ar.po
index 369fa38ec..04d183d15 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2002-05-31 19:25-0300\n"
 "Last-Translator: Isam Bayazidi <bayazidi@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() �شل"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "شعارات"
 
@@ -56,191 +56,121 @@ msgid "Nautilus Emblem view"
 msgstr "عرض الأمثلة �ي ناوتيلاس"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "تعذر حذ� التيمة"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
+#: components/emblem/nautilus-emblem-view.c:205
 #, fuzzy
-msgid "Couldn't remove emblem"
+msgid "Couldn't Remove Emblem"
 msgstr "تعذر حذ� التيمة"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "لا يمكن تنصيب الشعار"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
+#: components/emblem/nautilus-emblem-view.c:241
 #, fuzzy
-msgid "Couldn't rename emblem"
+msgid "Couldn't Rename Emblem"
 msgstr "لا يمكن تنصيب الشعار"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "احذ� شعارا..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 #, fuzzy
 msgid "Enter a new name for the displayed emblem:"
 msgstr "اختر مل� صورة للشعار الجديد:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "إعادة تسمية"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "أض� شعارا جديدا..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "ع�وا، لا يمكن تنصيب الصورة �ي %s كشعار."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
 #, fuzzy
-msgid "Couldn't add emblems"
+msgid "Couldn't Add Emblems"
 msgstr "تعذر إضا�ة التيمة"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
+msgstr "ع�وا، لا يمكن تنصيب الصورة �ي %s كشعار."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
 #, fuzzy
-msgid "Couldn't add emblem"
+msgid "Couldn't Add Emblem"
 msgstr "تعذر إضا�ة التيمة"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "مسح"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "مصنع لعرض العتاد"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "العتاد"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "عارض العتاد"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "عرض العتاد"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "عرض كعتاد"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "عرض العتاد"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "اسم الأيقونة لعرض العتاد"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "ملخص لمعلومات العتاد"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s معالج\n"
-"%s ميجاهيرتز\n"
-"%s ك حجم الكاش"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu ج.ب رام"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu م.ب رام"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu ج.ب"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu م.ب"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "وقت العمل : %d ايام، %d ساعات، %d دقائق"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "نظرة عامة على العتاد"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "هذا هو رمز استبدال لص�حة المعالج."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "هذا هو رمز استبدال لص�حة الذاكرة."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "هذا هو رمز استبدال لص�حة IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "تاريخ"
@@ -917,6 +847,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "العتاد"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "عالمي"
@@ -1205,27 +1139,27 @@ msgid "Desktop trash icon name"
 msgstr "سطح المكتب وسلة المهملات"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1239,8 +1173,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1267,10 +1201,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "يجب أن تبقى سلة المهملات على سطح المكتب."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1303,10 +1238,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "يجب أن تبقى سلة المهملات على سطح المكتب."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1318,7 +1254,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1335,7 +1271,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1361,7 +1297,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1385,7 +1321,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1405,11 +1341,11 @@ msgstr "استخدم ناوتيلاس لرسم سطح المكتب"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "استخدم مجلد الموطن كسطح للمكتب"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1429,7 +1365,7 @@ msgstr "اعرض الشريط الجانبي �ي نوا�ذ جديدة"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "حاول الوصول للملائمة �ي النا�ذة"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1469,7 +1405,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1477,30 +1413,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1546,7 +1482,7 @@ msgstr "استخدم تخطيطا أكثر إحكاما"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "ا�تح أي عنصر منتقى �ي نا�ذة جديدة"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1570,8 +1506,9 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
-msgstr ""
+#, fuzzy
+msgid "When to show number of items in a folder"
+msgstr "أظهر الصور اﻹبهامية لمل�ات الصور"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 #, fuzzy
@@ -1585,7 +1522,7 @@ msgstr "أظهر الصور اﻹبهامية لمل�ات الصور"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "استخدم الخل�ية الا�تراضية لسطح المكتب"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1748,68 +1685,81 @@ msgstr "إعادة الضبط"
 msgid "on the desktop"
 msgstr "على سطح المكتب"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "تعذر حذ� التيمة الحالية"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "تعذر حذ� التيمة الحالية"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "سلة المهملات"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "انقل هنا"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "انسخ هنا"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "اربط هنا"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "تعيين كخل�ية"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 #, fuzzy
 msgid "Set as background for _all folders"
 msgstr "تعيين كخل�ية"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 #, fuzzy
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "ع�وا، لا يمكن تنصيب التيمة \"%s\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "ع�وا، يجب أن تحدد كلمة مميزة غير �ارغة للشعار الجديد."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "لا يمكن تنصيب الشعار"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1819,18 +1769,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "ع�وا، �إن \"%s\" هي كلمة مميزة موجودة مسبقا. �ضلا اختر اسما آخر له."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "لا يمكن تنصيب الشعار"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1849,22 +1805,28 @@ msgstr "من:"
 msgid "To:"
 msgstr "إلى:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "حدث خطأ عند النقل."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "خطأ عند النقل.\n"
 "\n"
 "\"%s\"لا أستطيع نقله لأنه قرص للقراءة �قط"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "حدث خطأ عند الحذ�."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1872,22 +1834,17 @@ msgstr ""
 "\n"
 "\"%s\"لا تستطيع حذ�ه لأنك لا تملك صلاحية التعديل �ي دليله الأبوي"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "خطأ عند الحذ�.\n"
 "\n"
 "\"%s\"لا أستطيع حذ�ه لأنه قرص للقراءة �قط"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1895,24 +1852,25 @@ msgstr ""
 "\n"
 "\"%s\"لا تستطيع نقله لأنك لا تملك صلاحية التعديل �ي دليله الأبوي."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "حدث خطأ عند النقل."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "خطأ عند النقل.\n"
 "\n"
 "\"%s\"لا أستطيع نقله لأنه قرص للقراءة �قط"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "خطأ عند النقل.\n"
@@ -1920,295 +1878,244 @@ msgstr ""
 "\"%s\"لا تستطيع نقله إلى سلة المهملات لأنك لا تملك صلاحية التعديل �ي دليله "
 "الأبوي."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "حدث خطأ عند النسخ."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "خطأ عند النسخ.\n"
 "\n"
 "\"%s\" لا تستطيع نسخه لأنك لا تملك صلاحية قراءته."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"خطا خلال النسخ إلى الـ \"%s\".\n"
-"\n"
-"ليست هناك مساحة كا�ية على المرسل اليه"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "حدث خطأ عند النسخ."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "حدث خطأ أثناء التحريك إلى \"%s\".\n"
 "\n"
 "ليست هناك مساحة كا�ية على المرسل إليه."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"حدث خطأ أثناء إنشاء وصلة �ي \"%s\".\n"
-"\n"
-"ليست هناك مساحة كا�ية على المرسل إليه."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "حدث خطأ عند النقل."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "حدث خطأ عند الربط."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "حدث خطأ عند النسخ إلى \"%s\".\n"
 "\n"
 "انت لا تملك صلاحية الكتابة �ي الدليل."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "حدث خطأ عند النسخ إلى \"%s\".\n"
 "\n"
 "القرص المرسل إليه هو للقراءة �قط."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"خطأ عند نقل العناصر إلى \"%s\".\n"
-"\n"
-"انت لا تملك صلاحية الكتابة �ي الدليل."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"خطأ عند نقل العناصر إلى \"%s\".\n"
-"\n"
-"القرص المرسل إليه هو للقراءة �قط."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"خطأ عند انشاء وصلات �ي \"%s\".\n"
-"\n"
-"انت لا تملك صلاحية الكتابة لهذا الدليل"
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "حدث خطأ عند النقل."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"خطأ عند انشاء وصلات �ي \"%s\".\n"
-"\n"
-"القرص المرسل إليه هو للقراءة �قط."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند نسخ \"%s\".\n"
-"\n"
-"هل تريد المتابعة؟"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "حدث خطأ عند الربط."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "حدث خطأ عند النسخ."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"خطأ \"%s\" عند نقل \"%s\".\n"
+"خطأ \"%s\" عند النقل.\n"
 "\n"
 "هل تريد المتابعة؟"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند انشاء الوصلات �ي \"%s\".\n"
-"\n"
-"هل تريد المتابعة؟"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "حدث خطأ عند النقل."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"خطأ \"%s\" عند حذ� \"%s\".\n"
+"خطأ \"%s\" عند انشاء الوصلات �ي \"%s\".\n"
 "\n"
 "هل تريد المتابعة؟"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند النسخ.\n"
-"\n"
-"هل تريد المتابعة؟"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "حدث خطأ عند الحذ�."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند النقل.\n"
-"\n"
-"هل تريد المتابعة؟"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "حدث خطأ عند النسخ."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند الربط.\n"
-"\n"
-"هل تريد المتابعة؟"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "حدث خطأ عند النقل."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"خطأ \"%s\" عند الحذ�\n"
-"\n"
-"هل تريد المتابعة؟"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "حدث خطأ عند الربط."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "حدث خطأ عند الحذ�."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "حدث خطأ عند النسخ."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "حدث خطأ عند النقل."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "حدث خطأ عند الربط."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "حدث خطأ عند الحذ�."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "تخطي"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "إعادة"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "اذهب إلى "
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" لا يمكن ان ينقل إلى المنطقة الجديدة، لأن اسمه مستخدم من قبل عنصر خاص "
 "لايمكن حذ�ه او استبداله.\n"
 "\n"
 "اذا كنت تريد نقل \"%s\"، أعد تسميته ثم حاول ثانيةً."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "اذهب إلى "
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" لا يمكن ان ينسخ إلى المنطقة الجديدة، لأن اسمه مستخدم من قبل عنصر خاص "
 "لايمكن حذ�ه او استبداله.\n"
 "\n"
 "اذا كنت تريد نسخ \"%s\"، أعد تسميته ثم حاول ثانيةً."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "لايمكن استبدال المل�"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "المل� \"%s\" موجود.\n"
 "\n"
 "هل تريد استبداله؟"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "حدث تضارب أثناء النسخ"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "استبدل"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "استبدل الكل"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "اربط إلى %s "
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "ربط آخر إلى %s"
@@ -2217,25 +2124,25 @@ msgstr "ربط آخر إلى %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dالوصلة الأولى إلى %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dالوصلة الثانية إلى %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dالوصلة الثالثة إلى %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d الوصلة إلى %s"
@@ -2245,562 +2152,601 @@ msgstr "%d الوصلة إلى %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (نسخة)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (نسخة أخرى)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "النسخ)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "النسخة الأولى)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "النسخة الثانية)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "النسخة الثالثة)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (نسخة)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (نسخة أخرى)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dنسخة)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst نسخة)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd نسخة)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd نسخة)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "'GnomeVFSXferProgressStatus' مجهول %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "نقل المل� إلى سلة المهملات"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "مل� القيت إلى الخارج:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "نقل"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "جاري التحضير للنقل إلى سلى المهملات..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "نقل المل�ات"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "المل�ات المنقولة:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "جاري التحضير للنقل..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "انتهى النقل..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "انشاء وصلات إلى المل�ات"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "المل�ات الموصولة:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "ربط"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "جاري التحضير لانشاء الوصلات..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "انتهى انشاء الوصلات..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "نسخ المل�ات"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "المل�ات المنسوخة:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "نسخ"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "جاري التحضير للنسخ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "لا تستطيع نسخ عناصر داخل لمهملات"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "لا يمكن النسخ لسلة المهملات"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "لا تستطيع نقل دليل سلة المهملات هذا"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "لا تستطيع نسخ دليل سلة المهملات هذه."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "لا يمكن تغيير مكان سلة المهملات"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "لا يمكن نسخ سلة المهملات"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "لا تستطيع نقل دليل إلى ن�سه."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "لا تستطيع نسخ دليل إلى ن�سه."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "أنشيء مجلد جديد و�ارغ داخل هذا المجلد"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "لا يمكن نقله إلى ن�سه"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "لا يمكن نسخه إلى ن�سه"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "لا يمكنك نسخ مل� على ن�سه."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "ﻻ استطيع النسخ على ن�سه"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "حدث خطأ أثناء إنشاء المجلد الجديد.\n"
 "\n"
 "ليست لديك صلاحية الكتابة �ي المرسل إليه."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "حدث خطأ أثناء إنشاء المجلد الجديد.\n"
 "\n"
 "ليست هناك مساحة كا�ية على المرسل إليه."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "حدث خطأ \"%s\" عند انشاء المجلد الجديد."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "حدث خطأ أثناء إنشاء دليل جديد"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "حدث خطأ أثناء إنشاء دليل جديد"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "دليل غير مسمى"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "حدث خطأ \"%s\" عند انشاء المجلد الجديد."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "حدث خطأ أثناء إنشاء دليل جديد"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "حدث خطأ أثناء إنشاء دليل جديد"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "مل� واحد"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "حذ� المل�ات"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "المل�ات المحذو�ة:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "حذ�"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "جاري التحضير لحذ� المل�ات..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "أ�رغ سلة المهملات"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "جاري التحضير لا�راغ سلة المهملات...."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "هل أنت متأكد من أنك تريد حذ� كل العناصر �ي سلة المهملات نهائيا؟"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 #, fuzzy
 msgid "_Empty"
 msgstr "�ارغ"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (نسخة).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (نسخة أخرى)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (نسخة أخرى)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (نسخة أخرى).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (ثالث نسخة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (ثالث نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (نسخة أخرى).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (ثالث نسخة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (النسخة الثالثة عشر)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (النسخة الرابعة عشر)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (النسخة الثالثة عشر).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (النسخة الرابعة عشر).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (النسخة الحادية والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (النسخة الثانية والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (النسخة الحادية والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (النسخة الثانية والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (النسخة الثالثة والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (النسخة الثالثة والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (النسخة الرابعة والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (النسخة الرابعة والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (النسخة الخامسة والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (النسخة الخامسة والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (النسخة الرابعة والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (النسخة الخامسة والعشرون)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (النسخة الرابعة و العشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (النسخة الخامسة والعشرون).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000النسخة الـ ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (النسخة العاشرة)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (النسخة الحادية عشر)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (النسخة العاشرة).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (النسخة الحادية عشر).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (النسخة الثانية عشر)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (النسخة الثانية عشر).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110النسخة الـ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (النسخة الـ111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110النسخة الـ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111النسخة الـ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122النسخة الـ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123النسخة الـ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122النسخة الـ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123النسخة الـ).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124النسخة الـ)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th النسخة الـ).txt"
 
@@ -2819,64 +2765,64 @@ msgstr "foo (124th النسخة الـ).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "اليوم عند 00:00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "اليوم عند %-I:%د:%ث %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "اليوم عند 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "اليوم عند %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "اليوم, 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "اليوم, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "اليوم"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "أمس عند 00:00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "أمس عند %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "أمس عند 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "أمس عند %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "أمس، 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "أمس، %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "أمس"
 
@@ -2885,133 +2831,133 @@ msgstr "أمس"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "الأربعاء، سبتمبر 00 0000 عند 00:00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "الاثنين، اكتوبر 00 0000 عند 00:00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "الاثنين، اكتوبر 00 0000 عند 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "أكتوبر 00 0000 عند 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "أكتوبر 00 0000 عند 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00، 00:00 مساءً"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 عنصر"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 دليل"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 مل�"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "عنصر واحد"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "دليل واحد"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "مل� واحد"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u عناصر"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u دلائل"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u مل�ات"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "؟ عناصر"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? بايت"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "نوع غير معرو�"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "غير معرو�"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "برنامج"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3020,7 +2966,7 @@ msgstr ""
 "تعذر العثور على وص� حتى إلى \"x-directory/normal\". من المحتمل أن يعني هذا "
 "أن مل� gnome-vfs.keys موجود �ي الموقع الخطأ أو لا يمكن العثور عليه لسبب آخر."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3029,11 +2975,11 @@ msgstr ""
 "لا يوجد وص� متو�ر لنوع mime \"%s\" (المل� هو \"%s\"), و أرجو أن تخبر قائمة "
 "مراسلات gnome-vfs "
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "وصلة"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "وصلة (مكسورة)"
 
@@ -3155,11 +3101,13 @@ msgid "Search for files by file name and file properties"
 msgstr "ابحث عن المل�ات بواسطة اسم المل� و خصائص المل�"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "عرض الأيقونات"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "عرض قائمة"
@@ -3303,151 +3251,156 @@ msgstr "الدليل الموطن إلى %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "كونترتوب"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ايقونة المل�"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "نص قابل للتحرير"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "العنوان القابل للتحرير"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "نص إضا�ي"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "المزيد من النص"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "مميز للاختيار"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "ما إذا سنميز للاختيار"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "مميز حين التسليط عليه بلوحة الم�اتيح"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "ما إذا سنكون مميزين لترجمة التسليط بلوحة الم�اتيح"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "مميز للإ�لات"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "ما إذا سنميز لإ�لات D&D"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "مستطيل الاختيار"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 #, fuzzy
 msgid "Frame Text"
 msgstr "الصق النص"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "اذهب إلى "
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "اختر الجميع"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Opacity of the highlight for selected icons"
 msgstr "مميز للاختيار"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 #, fuzzy
 msgid "Dark Info Color"
 msgstr "كورك غامق"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "يستخدم هذا المجلد تخطيطا آليا. هل تريد التغيير للتخطيط اليدوي وترك هذا "
 "العنصر حيثما رميته؟"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "يستخدم هذا المجلد تخطيطا آليا. هل تريد التغيير للتخطيط اليدوي وترك هذه "
 "العناصر حيثما رميتهم؟"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "تحويل إلى الهيئة اليدوية؟"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "تحويل"
 
@@ -3554,73 +3507,73 @@ msgstr "الا�تراضي للعناصر \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "الا�تراضي للعناصر \"%s\" كلها."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "عدّل \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "ضع �ي القائمة �قط لعناصر \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "استخدم كا�تراضي للعناصر \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, fuzzy, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "ضع �ي القائمة �قط لعناصر \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, fuzzy, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "استخدم كا�تراضي للعناصر \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "لا تضع �ي القائمة للعناصر \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "الاسم"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "الحالة"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 #, fuzzy
 msgid "C_hoose"
 msgstr "اختر"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "تمت"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "تعديل..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "أنواع وبرامج المل�ات"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "اذهب هناك"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -3628,51 +3581,51 @@ msgid ""
 msgstr ""
 "بإمكانك إعداد أي البرامج التي تتو�ر ﻷي أنواع المل�ات �ي مركز تحكم جينوم."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 #, fuzzy
 msgid "Open with Other Application"
 msgstr "تطبيق آخر..."
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "اختر البرنامج الذي تريد �يه �تح \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 #, fuzzy
 msgid "Open with Other Viewer"
 msgstr "ا�تح بآخر"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, fuzzy, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "اختر عرض إلى \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "لا تتو�ر معاينات إلى \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "لا يوجد عارض متاح"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, fuzzy, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 #, fuzzy
 msgid "No Application Associated"
 msgstr "لا تتو�ر تطبيقات"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "لا تتو�ر تطبيقات"
@@ -3681,156 +3634,186 @@ msgstr "لا تتو�ر تطبيقات"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
+#: libnautilus-private/nautilus-program-chooser.c:1610
 #, fuzzy
-msgid "Associate Application"
+msgid "_Associate Application"
 msgstr "التطبيقات الم�ضلة"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "لا تتو�ر تطبيقات"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "لا تتو�ر تطبيقات"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "التطبيقات الم�ضلة"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
+"\"%s\". هل تريد اختيار تطبيق آخر؟"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
 "\"%s\". هل تريد اختيار تطبيق آخر؟"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
 "\"%s\". هل تريد اختيار تطبيق آخر؟"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "تعذر �تح الموقع"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
+"\"%s\". هل تريد اختيار تطبيق آخر؟"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
 "\"%s\". لا تتو�ر تطبيقات أخرى لعرض هذا المل�. قد تستطيع �تح المل� إذا قمت "
 "بنسخه إلى كمبيوترك."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
+"\"%s\". هل تريد اختيار تطبيق آخر؟"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند المواقع "
 "\"%s\". لا تتو�ر تطبيقات أخرى لعرض هذا المل�. قد تستطيع �تح المل� إذا قمت "
 "بنسخه إلى كمبيوترك."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "�تح \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "أعتذر لعدم استطاعتك تن�يذ اﻷوامر من مواقع عن بعد وذلك لاعتبارات أمنية."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "لا يمكن إجراء الوصلات عن بعد"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
+msgstr "التطبيقات الم�ضلة"
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
 #, fuzzy
-msgid "Error launching application"
+msgid "Error Launching Application"
 msgstr "التطبيقات الم�ضلة"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "السحب واﻹ�لات مدعوم �ي أنظمة المل�ات المحلية �قط."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
 #, fuzzy
-msgid "Drop target only supports local files"
+msgid "Drop Target Only Supports Local Files"
 msgstr "السحب واﻹ�لات مدعوم �ي أنظمة المل�ات المحلية �قط."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4081,14 +4064,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "العناصر التي تحوي \"medusa\" �ي أسمائها وهي مجلدات"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "جاري البحث �ي اﻷقراص"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "يبحث ناوتيلاس �ي أقراصك عن مجلدات المهملات."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "حرّر"
@@ -4289,96 +4264,106 @@ msgstr "الخل�ية"
 msgid "Empty Trash"
 msgstr "أ�رغ سلة المهملات"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "هذا سي�تح %d نوا�ذ من�صلة. هل أنت متأكد من أنك تريد القيام بذلك؟"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "هل أ�تح %d نوا�ذ؟"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "هل أنت متأكد من أنك تريد حذ� \"%s\" نهائيا؟"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "هذا سي�تح %d نوا�ذ من�صلة. هل أنت متأكد من أنك تريد القيام بذلك؟"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "هل أنت متأكد من أنك تريد حذ� \"%s\" نهائيا؟"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "هل أنت متأكد من أنك تريد حذ� العناصر %d المنتقاة نهائيا؟"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "احذ� كل عناصر المنتقاة كليا"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "هل أحذ�؟"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "اختر �ئة:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "أنماط"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" منتقاة"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "تم انتقاء مجلد واحد"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "تم انتقاء %d مجلد"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (يحوي 0 عنصر)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (يحوي 1 عنصر)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (يحوي %d عناصر)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (يحوي ما مجموعه 0 عنصر)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (يحوي ما مجموعه 1 عنصر)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (يحوي ما مجموعه %d عناصر)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" منتقاة (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d عناصر منتقاة (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 عنصر آخر منتقى (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d عناصر أخرى منتقاة (%s)"
@@ -4390,7 +4375,7 @@ msgstr "%d عناصر أخرى منتقاة (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4399,114 +4384,130 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "المجلد \"%s\" يحوي مل�ات أكثر من تلك التي يستطيع ناوتيلاس التعامل معها.  لن "
 "يتم عرض بعض المل�ات."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "مل�ات عديدة جدا"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "لا يمكن نقل \"%s\" إلى سلة المهملات. هل تريد حذ�ه حالا؟"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"لا يمكن نقل العناصر المنتقاة الـ %d إلى سلة المهملات. هل تريد حذ�ها حالا؟"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "لا يمكن نقل \"%s\" إلى سلة المهملات. هل تريد حذ�ه حالا؟"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"لا يمكن نقل العناصر الـ %d المنتقاة إلى سلة المهملات. هل تريد حذ�ه العناصر "
-"الـ %d حالا؟"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "لا يمكن نقل \"%s\" إلى سلة المهملات. هل تريد حذ�ه حالا؟"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "حذ� حالا؟"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "هل أنت متأكد من أنك تريد حذ� \"%s\" من سلة المهملات؟"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "هل أنت متأكد من أنك تريد حذ� العناصر الـ %d المنتقاة من سلة المهملات؟"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "حذ� من سلة المهملات؟"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "استخدم \"%s\" ل�تح العنصر المنتقى"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "تطبيق آخر..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "تطبيق..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "معاين آخر..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "معاين..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "ن�ذ \"%s\" على أي عنصر منتقى"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"كل المل�ات القابلة للإجراء �ي هذا المجلد ستبدو �ي قائمة النصوص البرمجية. "
+"اختيار نص برمجي من القائمة سي�جريه وسيكون أي عنصر منتقى من مدخلاته."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "كل المل�ات القابلة للإجراء �ي هذا المجلد ستبدو �ي قائمة النصوص البرمجية. "
 "اختيار نص برمجي من القائمة سي�جريه وسيكون أي عنصر منتقى من مدخلاته."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "حول النصوص البرمجية"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4546,191 +4547,197 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: موقع وحجم النا�ذة الحالية"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "سيتم تحريك \"%s\" إذا اخترت أمر ' الصق المل�ات '"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "سيتم لصق \"%s\" إذا اخترت أمر ' الصق المل�ات '"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "سيتم تحريك العناصر %d المنتقاة إذا اخترت أمر ' الصق المل�ات '"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "سيتم لصق العناصر %d المنتقاة إذا اخترت أمر ' الصق المل�ات '"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "لا يوجد شيء �ي الحا�ظة للصقه."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "خطأ �ي التجهيز"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "خطأ �ي إزالة التجهيز"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "خطأ �ي التجهيز"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 #, fuzzy
 msgid "E_ject"
 msgstr "تن�يذ"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 #, fuzzy
 msgid "_Unmount Volume"
 msgstr "أزل التجهيز لوسيط التخزين"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "ا�تح �ي نا�ذة جديدة"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "ا�تح �ي %d نوا�ذ جديدة"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "الدليل الموطن"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "الدليل الموطن"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 #, fuzzy
 msgid "_Delete from Trash"
 msgstr "احذ� من سلة المهملات"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "احذ� كل عناصر المنتقاة كليا"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Mo_ve to Trash"
 msgstr "انقل إلى سلة المهملات"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "انقل كل عنصر إلى سلة المهملات"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 #, fuzzy
 msgid "_Delete"
 msgstr "احذ�"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 #, fuzzy
 msgid "Ma_ke Links"
 msgstr "أنشيء وصلات"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 #, fuzzy
 msgid "Ma_ke Link"
 msgstr "أنشيء وصلة"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "أ�رغ سلة المهملات"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "قص مل�ا"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "قص مل�ات"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "انسخ مل�ا"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "انسخ مل�ات"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5848
 #, fuzzy
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "لا يمكن استخدام هذه الوصلة لعدم وجود وجهة لها. هل تريد وضع هذه الوصلة �ي سلة "
 "المهملات؟"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"لا يمكن استخدام هذه الوصلة لعدم وجود وجهة لها. هل تريد وضع هذه الوصلة �ي سلة "
+"المهملات؟"
+
+#: src/file-manager/fm-directory-view.c:5852
 #, fuzzy, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "لا يمكن استخدام هذه الوصلة لعدم وجود وجهتها \"%s\". هل تريد وضع هذه الوصلة "
 "�ي سلة المهملات؟"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "وصلة مكسورة"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "\"%s\" هو مل� نصي قابل للإجراء. هل تريد تن�يذه أم عرض محتوياته؟"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "تن�يذ أم عرض؟"
 
-#: src/file-manager/fm-directory-view.c:5430
-#, fuzzy
-msgid "_Display"
-msgstr "اعرض"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 #, fuzzy
 msgid "Run in _Terminal"
 msgstr "نهاية طر�ية جديدة"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+#, fuzzy
+msgid "_Display"
+msgstr "اعرض"
+
+#: src/file-manager/fm-directory-view.c:5928
 #, fuzzy
 msgid "_Run"
 msgstr "ن�ذ"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "�تح \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "إلغاء ال�تح؟"
 
@@ -4751,107 +4758,132 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "أعتذر لعدم استطاعتي عرض كل محتويات \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "لا يمكن تحديد تصاريح \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "حدث خطأ أثناء عرض المجلد"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "الاسم \"%s\" مستخدم �ي هذا المجلد سابقا. �ضلا استخدم اسما آخر."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "لا يوجد \"%s\" �ي هذا المجلد. من المحتمل أنه نقل أو حذ�؟"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "ليست لديك التصاريح الضرورية لإعادة تسمية \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "الاسم \"%s\" غير صحيح لاحتوائه على الرمز \"/\". �ضلا استخدم اسما آخر."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "الاسم \"%s\" غير صحيح. �ضلا استخدم اسما آخر."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "تعذر تغيير اسم \"%s\" ﻷنه على قرص قابل للقراءة �قط"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "آس�، �قد تعذرت إعادة تسمية \"%s\" إلى \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "ع�وا، لا يمكن حذ� تلك التيمة!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "خطأ �ي إعادة التسمية"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "ليست لديك التصاريح الضرورية لتغيير مجموعة \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "تعذر تغيير مجموعة \"%s\" ﻷنه على قرص قابل للقراءة �قط"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "آس�، �قد تعذر تغيير مجموعة \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "لا يمكن تحديد تصاريح \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "خطأ �ي تعيين المجموعة"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "تعذر تغيير مالك \"%s\" ﻷنه على قرص قابل للقراءة �قط"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "آس�، �قد تعذر تغيير مالك \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "لا يمكن تحديد تصاريح \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "خطأ �ي تعيين المالك"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "تعذر تغيير تصاريح \"%s\" ﻷنه على قرص قابل للقراءة �قط"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "آس�، �قد تعذر تغيير تصاريح \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "لا يمكن تحديد تصاريح \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "خطأ �ي تعيين التصاريح"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "إعادة تسمية \"%s\" إلى \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "إلغاء إعادة التسمية؟"
 
@@ -4911,126 +4943,147 @@ msgstr "استرجع الأحجام اﻷصليّة للأيقونات"
 msgid "Restore Icon's Original Si_ze"
 msgstr "استرجع الحجم اﻷصلي للأيقونة"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "يشير إلى \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "السحب واﻹ�لات مدعوم �ي أنظمة المل�ات المحلية �قط."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "السحب واﻹ�لات مدعوم �ي أنظمة المل�ات المحلية �قط."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "خطأ �ي السحب واﻹ�لات"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "تم استخدام نوع غير صحيح للسحب."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "اسم المل�"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "الحجم"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "النوع"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "تاريخ التعديل"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "ليس بإمكانك ربط أكثر من أيقونة مخصصة واحدة �ي ن�س الوقت! �ضلا اسحب صورة "
 "واحدة �قط لتعيين أيقونة مخصصة."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"ليس بإمكانك ربط أكثر من أيقونة مخصصة واحدة �ي ن�س الوقت! �ضلا اسحب صورة "
+"واحدة �قط لتعيين أيقونة مخصصة."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "أكثر من صورة واحدة"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"المل� الذي رميته ليس محليا. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "المل� الذي رميته ليس محليا. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "صور محلية �قط"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"المل� الذي رميته ليس صورة. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
+"المل� الذي رميته ليس محليا. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "الصور �قط"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "خصائص"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "خصائص %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "إلغاء تغيير المجموعة؟"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "تغيير المجموعة"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "إلغاء تغيير المالك؟"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "تغيير المالك"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ﻻ شئ"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "غير قابل للقراءة"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "عنصر 1، بالحجم %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d عناصر، بمجموع %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(بعض العناصر غير قابلة للقراءة)"
 
@@ -5040,210 +5093,211 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "المحتويات:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "أساسي"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "الاسم"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 #, fuzzy
 msgid "_Name:"
 msgstr "الاسم"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "النوع:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "الحجم:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "المكان:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "تسمية دي �ي دي"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 #, fuzzy
 msgid "Free space:"
 msgstr "مظهر حر"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 #, fuzzy
 msgid "Link target:"
 msgstr "وجهة الوصلة:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 #, fuzzy
 msgid "MIME type:"
 msgstr "نوع MIME"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "عدلت:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "تم الوصول لها:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "اختر أيقونة مخصصة..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "احذ� أيقونة مخصصة"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 #, fuzzy
 msgid "_Read"
 msgstr "قراءة"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 #, fuzzy
 msgid "_Write"
 msgstr "كتابة"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 #, fuzzy
 msgid "E_xecute"
 msgstr "تن�يذ"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 #, fuzzy
 msgid "Set _user ID"
 msgstr "تعيين هوية المستخدم"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 #, fuzzy
 msgid "Special flags:"
 msgstr "الأعلام الخاصة:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 #, fuzzy
 msgid "Set gro_up ID"
 msgstr "تعيين هوية المجموعة"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 #, fuzzy
 msgid "_Sticky"
 msgstr "ملتصق"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "التصاريح"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "أنت لست المالك، ولذلك ليس باستطاعتك تغيير هذه التصاريح."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "مالك المل�:"
+
+#: src/file-manager/fm-properties-window.c:2900
 #, fuzzy
 msgid "File owner:"
 msgstr "مالك المل�:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 #, fuzzy
 msgid "_File group:"
 msgstr "مجموعة المل�:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 #, fuzzy
 msgid "File group:"
 msgstr "مجموعة المل�:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "المالك:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "المجموعة:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "الأخرى:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 #, fuzzy
 msgid "Text view:"
 msgstr "عرض النصوص"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 #, fuzzy
 msgid "Number view:"
 msgstr "عرض الرقم:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 #, fuzzy
 msgid "Last changed:"
 msgstr "آخر تعديل:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "لا يمكن تحديد تصاريح \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "لا يمكن تحديد تصاريح \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, fuzzy, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
 msgstr "ع�واً، لكن هناك خطأ قراءة %s."
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3348
 #, fuzzy
-msgid "Couldn't show help"
+msgid "Couldn't Show Help"
 msgstr "تعذر إضا�ة التيمة"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "إلغاء عرض نا�ذة الخصائص؟"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "انشاء نا�ذة الخصائص"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "اختر أيقونة:"
@@ -5262,93 +5316,131 @@ msgid "Search Results"
 msgstr "نتائج البحث"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "آس�، �خدمة البحث ميدوسا غير متو�رة ﻷنها غير منصبة."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "آس�، �خدمة البحث ميدوسا غير متو�رة."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "خدمة البحث غير متو�رة"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "البحث الذي اخترته أحدث من ال�هرس الموجود على نظامك. لن يرجع البحث أي نتائج "
 "�ي الوقت الحاضر. باستطاعتك إنشاء �هرس جديد بتن�يذ \"medusa-indexd\" كمستخدم "
 "جذري على سطر اﻷوامر."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"لا يستطيع البحث �تح �هرس نظام مل�اتك. قد يكون ال�هرس م�قودا أو معطوبا. "
+"باستطاعتك إنشاء �هرس جديد بإجراء \"medusa-indexd\" كمستخدم جذري �ي سطر "
+"اﻷوامر."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "ابحث عن العناصر الجديدة جدا"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"كل مل� م�هرس على كمبيوترك يطابق المقياس الذي اخترته. باستطاعتك �حص إملاء "
+"اختياراتك أو إضا�ة مقاييس أكثر للتقليل من نتائج البحث لديك."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "كل مل� م�هرس على كمبيوترك يطابق المقياس الذي اخترته. باستطاعتك �حص إملاء "
 "اختياراتك أو إضا�ة مقاييس أكثر للتقليل من نتائج البحث لديك."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "حدث خطأ أثناء البحث"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "لا يستطيع البحث �تح �هرس نظام مل�اتك. قد يكون ال�هرس م�قودا أو معطوبا. "
 "باستطاعتك إنشاء �هرس جديد بإجراء \"medusa-indexd\" كمستخدم جذري �ي سطر "
 "اﻷوامر."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "حدث خطأ أثناء قراءة �هرس المل�"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "وقع خطا أثناء تحميل محتويات هذا البحث: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يستطيع البحث "
+"الوصول إلى �هرسك اﻵن."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يستطيع البحث "
+"الوصول إلى �هرسك اﻵن."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "يتطلب البحث �هرسا للمل�ات على نظامك للقيام بالبحث السريع. لا يستطيع البحث "
 "الوصول إلى �هرسك اﻵن لذلك سيتم القيام ببحث بطيء لا يستخدم ال�هرس."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يستطيع البحث "
-"الوصول إلى �هرسك اﻵن."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "البحث السريع غير متو�ر"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "بحث المحتويات غير متو�ر"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5362,52 +5454,84 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "يتطلب البحث �هرسا للمل�ات على نظامك للقيام بالبحث السريع. ينشيء كمبيوترك ذلك "
 "ال�هرس اﻵن. قد يستغرق هذا البحث عدة دقائق لعدم تمكن البحث من استخدام ال�هرس."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. ينشيء كمبيوترك "
 "ذلك ال�هرس اﻵن. سيتو�ر بحث المحتويات حالما تتم ال�هرسة."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "لا يتو�ر بحث م�هرس"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يستطيع البحث "
+"الوصول إلى �هرسك اﻵن."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يستطيع البحث "
+"الوصول إلى �هرسك اﻵن."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "يتطلب البحث �هرسا للمل�ات على نظامك للقيام بالبحث السريع. لا يتو�ر �هرس اﻵن. "
 "باستطاعتك إنشاء �هرس بتن�يذ \"medusa-indexd\" كمستخدم جذري على سطر اﻷوامر. "
 "سيستغرق أي بحث عدة دقائق ما لم تكتمل ال�هرسة."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "يتطلب البحث �هرسا للمحتويات على نظامك للقيام ببحث المحتويات. لا يتو�ر �هرس "
 "اﻵن. باستطاعتك إنشاء �هرس بنت�يذ \"medusa-indexd\" كمستخدم جذري على سطر "
 "اﻷوامر. لا يمكن القيام ببحث المحتويات ما لم تكتمل ال�هرسة."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "البحث السريع غير م�عل على كمبيوترك"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5416,11 +5540,12 @@ msgstr ""
 "يتطلب البحث �هرسا للمل�ات على نظامك للقيام بالبحث السريع. قام مدير نظامك "
 "بتعطيل البحث السريع على كمبيوترك، ولذلك لا يتو�ر أي �هرس."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "البحث السريع غير م�عل على كمبيوترك"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "البحث السريع غير متو�ر"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "الموقع"
 
@@ -5429,7 +5554,7 @@ msgstr "الموقع"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "اكش� �ي نا�ذة جديدة"
@@ -5440,7 +5565,7 @@ msgstr "اكش� �ي نا�ذة جديدة"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "اكش� �ي %d نوا�ذ جديدة"
@@ -5449,15 +5574,21 @@ msgstr "اكش� �ي %d نوا�ذ جديدة"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "وجد ناوتيلاس نتائج بحث أكثر من تلك التي يستطيع عرضها. لن يتم عرض بعض العناصر "
 "المطابقة."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"وجد ناوتيلاس نتائج بحث أكثر من تلك التي يستطيع عرضها. لن يتم عرض بعض العناصر "
+"المطابقة."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "تطابقات كثيرة جدا"
 
@@ -5473,12 +5604,12 @@ msgid "Create L_auncher"
 msgstr "مشغل جديد"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "أنشيء مشغلا جديدا"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "احذ� كل العناصر �ي سلة المهملات"
 
@@ -5498,7 +5629,7 @@ msgstr "أظهر نا�ذة تمكنك من تعيين نمط و لون خل�ي
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 #, fuzzy
 msgid "Use _Default Background"
@@ -5522,62 +5653,72 @@ msgstr "اختر معاينا آخر لعرض العنصر المنتقى به"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "غير قادر على قراءة الدليل"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "غير قادر على قراءة الدليل"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "أنشيء مجلد جديد و�ارغ داخل هذا المجلد"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "أنشيء مجلد جديد و�ارغ داخل هذا المجلد"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "انشيء وصلة رمزية لأي عنصر منتقى"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 #, fuzzy
 msgid "D_uplicate"
 msgstr "استنسخ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "احذ� أي عنصر منتقى، من غير تحريكه إلى سلة المهملات"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "استنسخ أي عنصر منتقى"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
 msgid "Edit Launcher"
 msgstr "مشغل جديد"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 #, fuzzy
 msgid "Format the selected volume"
 msgstr "لم يستطع ناوتيلاس تجهيز وسيط التخزين المنتقى."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Medi_a Properties"
 msgstr "خصائص الوسيط"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "لم يستطع ناوتيلاس تجهيز وسيط التخزين المنتقى."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "انقل أو انسخ المل�ات المنتقاة مسبقا باستخدام أمر ' قص المل�ات ' أو ' انسخ "
 "المل�ات '"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5586,135 +5727,144 @@ msgstr ""
 "انقل أو انسخ المل�ات المنتقاة مسبقا باستخدام أمر ' قص المل�ات ' أو ' انسخ "
 "المل�ات '"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "ا�تح باستخدام"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "ا�تح أي عنصر منتقى �ي نا�ذة جديدة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "ا�تح �ي نا�ذة جديدة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "ا�تح العنصر المنتقى �ي هذه النا�ذة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "قم بتحضير المل�ات المنتقاة حتى يتم نسخها بواسطة أمر ' لصق المل�ات '"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "قم بتحضير المل�ات المنتقاة حتى يتم تحريكها بواسطة أمر ' لصق المل�ات '"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 #, fuzzy
 msgid "Prot_ect"
 msgstr "حماية"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 #, fuzzy
 msgid "Protect the selected volume"
 msgstr "احذ� العنصر(العناصر) المحدد"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "أعد تسمية العنصر المنتقى"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "أعد تعيين العرض للا�تراضيات"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "أعد تعيين الترتيب ومستوى التحجيم للأصل حتى تطابق ت�ضيلات هذا العرض"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "ن�ّذ أو قم بإدارة النصوص البرمجية �ي ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "اختر كل المل�ات"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "أنماط"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "اختر كل العناصر �ي هذه النا�ذة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "اختر كل العناصر �ي هذه النا�ذة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Show media properties for the selected volume"
 msgstr "اعرض أوعدّل خصائص كل عنصر منتقى"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "أظهر المجلد الذي يحتوي على النصوص البرمجية التي تظهر �ي هذه القائمة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 #, fuzzy
 msgid "Unmount the selected volume"
 msgstr "لم يستطع ناوتيلاس تجهيز وسيط التخزين المنتقى."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "استخدم الخل�ية الا�تراضية لهذا الموقع"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "اعرض أوعدّل خصائص كل عنصر منتقى"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "انسخ مل�ا"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 #, fuzzy
 msgid "_Format"
 msgstr "التهيئة"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "أزل التجهيز لوسيط التخزين"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "ا�تح"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "ا�تح مجلدات النصوص البرمجية"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "الصق المل�ات"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "الصق المل�ات"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "خصائص"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 #, fuzzy
 msgid "_Rename..."
 msgstr "إعادة تسمية"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 #, fuzzy
 msgid "_Scripts"
 msgstr "النصوص البرمجية"
@@ -5810,31 +5960,38 @@ msgstr "يدوي"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "تمت �هرسة مل�اتك ﻵخر مرة �ي %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "تتم �هرسة مل�اتك ومحتويات النصوص مرة واحدة كل يوم لتسريع بحثك �يهم."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "حالة ال�هرسة"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "تمت �هرسة مل�اتك ﻵخر مرة �ي %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
-msgstr ""
-"تتم �هرسة مل�اتك ومحتويات النصوص مرة واحدة كل يوم لتسريع بحثك �يهم. اﻵن تتم "
-"�هرسة مل�اتك."
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr "تتم �هرسة مل�اتك ومحتويات النصوص مرة واحدة كل يوم لتسريع بحثك �يهم."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "لا يوجد �هرس لمل�اتك �ي الوقت الحالي."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5843,15 +6000,19 @@ msgstr ""
 "حينما يتم تمكين البحث السريع، �إن البحث سينشيء �هرسا لتسريع التنقيب. البحث "
 "السريع غير ممكن على كمبيوترك، لذلك ليس لديك �هرسا �ي الوقت الحاضر."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "لا يوجد �هرس لمل�اتك �ي الوقت الحالي."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "آس�، �خدمة البحث ميدوسا غير متو�رة."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5876,31 +6037,36 @@ msgstr "أظهر حالة ال�هرسة"
 msgid "Show status of indexing used when searching"
 msgstr "أظهر حالة ال�هرسة المستخدمة أثناء البحث"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "تعذر إنشاء المجلد المطلوب"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "تعذر إنشاء المجلدات المطلوبة"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "لم يستطع ناوتيلاس إنشاء المجلد المطلوب %s. قبل القيام بتشغيل ناوتيلاس، قم "
 "بإنشاء هذا المجلد رجاء، أو قم بتعيين التصاريح حتى يستطيع ناوتيلاس إنشائه."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "تعذر إنشاء المجلدات المطلوبة"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5911,21 +6077,25 @@ msgstr ""
 "قبل القيام بتشغيل ناوتيلاس، قم بإنشاء هذه المجلدات رجاء، أو قم بتعيين "
 "التصاريح حتى يستطيع ناوتيلاس إنشائهم."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "على سطح المكتب"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "على سطح المكتب"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5937,7 +6107,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5948,7 +6118,7 @@ msgstr ""
 "تنصيب ناوتيلاس مرة أخرى."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5992,12 +6162,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "لا يمكن استخدام ناوتيلاس اﻵن لحدوث خطأ غير متوقع."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6005,7 +6175,7 @@ msgstr ""
 "لا يمكن استخدام ناوتيلاس اﻵن لحدوث خطأ غير متوقع من بونوبو أثناء المحاولة �ي "
 "تسجيل خادم عرض مدير المل�ات."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6015,7 +6185,7 @@ msgstr ""
 "العثور على المصنع. القيام بإنهاء bonobo-activation-server ثم إعادة تشغيل "
 "ناوتيلاس قد يساعد �ي حل المشكلة."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6025,6 +6195,15 @@ msgstr ""
 "العثور على كائن الغلا�. القيام بإنهاء bonobo-activation-server ثم إعادة "
 "تشغيل ناوتيلاس قد يساعد �ي حل المشكلة."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, fuzzy, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr "ع�واً، لكن هناك خطأ قراءة %s."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -6061,34 +6240,44 @@ msgstr "خيارات أقل"
 msgid "Find Them!"
 msgstr "ابحث عنهم!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "لا يمكن نقله إلى ن�سه"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "أعتذر، ﻷن \"%s\" ليس اسم مل� صحيحا."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" ليس موقعا صحيحا. �ضلا تأكد من اﻹملاء وعاود المحاولة مرة أخرى."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "تعذر العثور على \"%s\". �ضلا تأكد من اﻹملاء وعاود المحاولة مرة أخرى."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "نيترا�يرس"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "الاسم"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "المكان:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "كونيكتي�ا"
@@ -6313,6 +6502,19 @@ msgstr ""
 "\n"
 "باستطاعتك حذ� هذا المل� يدويا لعرض المساعد مرة أخرى.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"ليس بإمكانك ربط أكثر من أيقونة مخصصة واحدة �ي ن�س الوقت! �ضلا اسحب صورة "
+"واحدة �قط لتعيين أيقونة مخصصة."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"المل� الذي رميته ليس محليا. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6323,25 +6525,23 @@ msgstr "ا�تح بواسطة %s"
 msgid "Open with..."
 msgstr "ا�تح بواسطة..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "مشغل جديد"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "أ�رغ سلة المهملات"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6349,120 +6549,133 @@ msgstr ""
 msgid "Go To:"
 msgstr "اذهب إلى:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "هل تريد عرض المواقع %d هذه �ي نوا�ذ متعدّدة؟"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "هل أعرض �ي نوا�ذ متعدّدة؟"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "تعذر �تح الموقع"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "قم بإجراء مجموعة تجارب سريعة لل�حص الذاتي."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "أنشيء النا�ذة الابتدائية بالهندسة المعطاة."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "الهندسة"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "أنشيء نوا�ذ �قط إلى URI المحددة بصراحة"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "لا تقم بإدارة سطح المكتب (تجاهل مجموعة الت�ضيلات �ي مربع حوار الت�ضيلات)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "أغلق ناوتيلاس."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "أعد تشغيل ناوتيلاس."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "اسم المل�"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "ناوتيلاس"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "ناوتيلاس: لا يمكن استخدام --check مع URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "ناوتيلاس: لا يمكن استخدام --check مع خيارات أخرى.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "ناوتيلاس: لا يمكن استخدام --quit مع URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "ناوتيلاس: لا يمكن استخدام --restart مع URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "ناوتيلاس: لا يمكن استخدام --geometry مع أكثر من 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "هل أنت متأكد من أنك تريد حذ� \"%s\" نهائيا؟"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "هل أنت متأكد من أنك تريد نسيان التاريخ؟ إدا كان كذلك، �سو� تتعب جدا حتى "
 "تعيده مرة أخرى."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 #, fuzzy
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "هل أنت متأكد من أنك تريد من ناوتيلاس أن ينسى المواقع التي زرتها؟"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 #, fuzzy
 msgid "Clear History"
 msgstr "امسح التاريخ"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "الموقع \"%s\" غير موجود. هل تريد حذ� أي علامات مواقع لهذ الموقع من قائمتك؟"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "الموقع \"%s\" غير موجود"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "علامة موقع لموقع غير موجود"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "احذ�"
 
@@ -6495,7 +6708,6 @@ msgid "Close _All Windows"
 msgstr "أغلق كل النوا�ذ"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "أغلق كل نوا�ذ ناوتيلاس"
@@ -6518,113 +6730,125 @@ msgid "Forward"
 msgstr "تقدم"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "اذهب إلى مجلد ابدأ هنا"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "اذهب إلى الموقع التالي �ي الزيارة"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "اذهب إلى الموقع السابق �ي الزيارة"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 #, fuzzy
 msgid "Go to the trash folder"
 msgstr "اذهب إلى مجلد ابدأ هنا"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "المنزل"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 #, fuzzy
 msgid "Location _Bar"
 msgstr "إخ�اء شريط المكان"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "أعد التحميل"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "ابحث عن مل�ات �ي هذا الكمبيوتر"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 #, fuzzy
 msgid "St_atusbar"
 msgstr "إخ�اء شريط الحالة"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "إيقا�"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "أعلى"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "أض� علامة موقع"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "تراجع"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "علامات موقع"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "امسح التاريخ"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "كورير"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "حرّر علامات المواقع"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "تقدم"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "اذهب"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "الدار"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "المكان..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 #, fuzzy
 msgid "_Side Pane"
 msgstr "لوحات مهام الشريط الجانبي"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "تايمز"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 #, fuzzy
 msgid "_Trash"
 msgstr "سلة المهملات"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 #, fuzzy
 msgid "_Up"
 msgstr "أعلى"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "اعرض"
 
@@ -6643,35 +6867,40 @@ msgstr "اعرض كـ..."
 msgid "File Browser: %s"
 msgstr "مالك المل�:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "إحدى لوحات المهام للشريط الجانبي واجهت خطأ ولا تستطيع المتابعة. للأس� لا "
 "أستطيع تحديد أي واحدة."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "واجه العرض %s خطا أثناء البدء �ي التشغيل."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "واجهت لوحة المهام للشريط الجانبي %s خطأ ولذلك لا تستطيع المتابعة. إذا استمر "
 "هذا �ي الحدوث، �بإمكانك تعطيل لوحة المهام هذه."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "�شلت لوحة المهام للشريط الجانبي"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 #, fuzzy
 msgid "Side Pane"
 msgstr "لوحات مهام الشريط الجانبي"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6705,148 +6934,180 @@ msgstr "أض� جديد..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "آس�، �النمط %s لا يمكن حذ�ه."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "لا يمكن حذ� النمط"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "آس�، �الشعار %s لا يمكن حذ�ه."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "تعذر حذ� التيمة"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "انشيء شعارا جديدا:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "الكلمة المميزة:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "الصورة:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "اختر مل� صورة للشعار الجديد:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "أنشيء لونا جديدا:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "اسم اللون:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "قيمة اللون:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "أعتذر، ﻷن \"%s\" ليس اسم مل� صحيحا."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "أعتذر، �إنك لم تعط اسم مل� صحيحا."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "لا يمكن تنصيب النمط"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "ع�وا، لا يمكنك تبديل صورة إعادة الضبط."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "ليست صورة"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "أعتذر، �النمط \"%s\" لا يمكن تنصيبه."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "اختر مل� صورة ﻹضا�ته كنمط"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "ع�وا، يجب أن تحدد اسما غير �ارغ للون الجديد."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "لا يمكن تنصيب اللون"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "اختر لونا ﻹضا�ته"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "ع�واً، لكن '%s' صورة غير قابلة للاستعمال"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "اختر �ئة:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "إلغاء الحذ�"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "أض� نمطا جديدا..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "أض� لونا جديدا..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "أض� شعارا جديدا..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "انقر على نمط لحذ�ه"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "انقر على لون لحذ�ه"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "انقر على شعار لحذ�ه"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "الأنماط:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "الألوان:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "الشعارات:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "احذ� نمطا..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "احذ� لونا..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "احذ� شعارا..."
 
@@ -7236,34 +7497,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "أغلق كل النوا�ذ"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "لوحة شريط الملاحظات"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "اذهب إلى مجلد ابدأ هنا"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "اذهب إلى مجلد ابدأ هنا"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "المكان..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[العناصر التي هي ] مجلدات"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "أنماط"
@@ -7293,10 +7559,13 @@ msgid "View Failed"
 msgstr "�شل العرض"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "واجه العرض %s خطا أثناء البدء �ي التشغيل."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "واجه العرض %s خطا ولا يستطيع المتابعة. باستطاعتك اختيار عرض آخر أو الذهاب "
 "لموقع ثاني."
@@ -7306,95 +7575,125 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "واجه العرض %s خطا أثناء البدء �ي التشغيل."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
+
+#: src/nautilus-window-manage-views.c:987
 #, fuzzy
 msgid "Content View"
 msgstr "Content Loser Viewer"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 #, fuzzy
 msgid "View of the current file or folder"
 msgstr "اذهب إلى مجلد ابدأ هنا"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "تعذر العثور على \"%s\". �ضلا تأكد من اﻹملاء وعاود المحاولة مرة أخرى."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "لا أستطيع تحميل %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "لا أستطيع تحميل %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "تعذر عرض \"%s\" لعدم استطاعة ناوتيلاس تحديد نوع المل�."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "لا يوجد لناوتيلاس معاين مثبت قادر على عرض \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "تعذر عرض \"%s\" لعدم استطاعة ناوتيلاس التعامل مع %s: مواقع."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "تعذر عرض \"%s\" ل�شل محاولة تسجيل الدخول."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "تعذر عرض \"%s\" ﻷن الوصول كان ممنوعا."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "تعذر عرض \"%s\" لعدم العثور على المضي� \"%s\". تأكد من صحة الإملاء وكون "
 "إعدادات البروكسي لديك صحيحة."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "تعذر عرض \"%s\" ﻷن اسم المضي� كان �ارغا. تأكد من صحة إعدادات البروكسي لديك."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "تعذر عرض \"%s\" لعدم استطاعة ناوتيلاس التعامل مع %s: مواقع."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"تعذر عرض \"%s\" لعدم استطاعة ناوتيلاس الاتصال بمتص�ح SMB الرئيسي.\n"
-"تأكد من كون خادم SMB يعمل �ي الشبكة المحلية."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"بحث غير متو�ر اﻵن بسبب عدم وجود �هرس لديك أو أن خدمة البحث غير جارية. تأكد "
+"من أنك شغلت خدمة البحث ميدوسا؛ و�ي حال عدم وجود �هرس لديك تأكد من أن م�هرس "
+"ميدوسا يعمل."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "بحث غير متو�ر اﻵن بسبب عدم وجود �هرس لديك أو أن خدمة البحث غير جارية. تأكد "
 "من أنك شغلت خدمة البحث ميدوسا؛ و�ي حال عدم وجود �هرس لديك تأكد من أن م�هرس "
 "ميدوسا يعمل."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "البحث غير متو�ر"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "ليس باستطاعة ناوتيلاس عرض \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "تعذر عرض الموقع"
 
@@ -7406,7 +7705,7 @@ msgstr "اذهب إلى موقع محدد من علامات الموقع هذه"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "حقوق النشر (C) 1999-2001 شركة إيزيل."
 
@@ -7414,11 +7713,11 @@ msgstr "حقوق النشر (C) 1999-2001 شركة إيزيل."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "شكر للمترجمين"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7433,39 +7732,44 @@ msgstr "ارجع وراء عدة ص�حات"
 msgid "Go forward a number of pages"
 msgstr "اذهب لأمام عدة ص�حات"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "اعرض هذا الموقع �ي \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "شبكة ريد هات"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "خطوط"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "تايمز"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "اذهب إلى مجلد ابدأ هنا"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "هوية التطبيق"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "هوية التطبيق لهذه النا�ذة."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "التطبيق"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "تطبيق ناوتيلاس المرتبط بهذه النا�ذة."
 
@@ -7503,6 +7807,244 @@ msgstr "نيترا�يرس"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "اعرض الدليل الموطن لديك �ي مدير مل�ات ناوتيلاس"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "مصنع لعرض العتاد"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "عارض العتاد"
+
+#~ msgid "Hardware view"
+#~ msgstr "عرض العتاد"
+
+#~ msgid "View as Hardware"
+#~ msgstr "عرض كعتاد"
+
+#~ msgid "hardware view"
+#~ msgstr "عرض العتاد"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "اسم الأيقونة لعرض العتاد"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "ملخص لمعلومات العتاد"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s معالج\n"
+#~ "%s ميجاهيرتز\n"
+#~ "%s ك حجم الكاش"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu ج.ب رام"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu م.ب رام"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu ج.ب"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu م.ب"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "وقت العمل : %d ايام، %d ساعات، %d دقائق"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "نظرة عامة على العتاد"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "هذا هو رمز استبدال لص�حة المعالج."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "هذا هو رمز استبدال لص�حة الذاكرة."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "هذا هو رمز استبدال لص�حة IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "خطا خلال النسخ إلى الـ \"%s\".\n"
+#~ "\n"
+#~ "ليست هناك مساحة كا�ية على المرسل اليه"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "حدث خطأ أثناء إنشاء وصلة �ي \"%s\".\n"
+#~ "\n"
+#~ "ليست هناك مساحة كا�ية على المرسل إليه."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "خطأ عند نقل العناصر إلى \"%s\".\n"
+#~ "\n"
+#~ "انت لا تملك صلاحية الكتابة �ي الدليل."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "خطأ عند نقل العناصر إلى \"%s\".\n"
+#~ "\n"
+#~ "القرص المرسل إليه هو للقراءة �قط."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "خطأ عند انشاء وصلات �ي \"%s\".\n"
+#~ "\n"
+#~ "انت لا تملك صلاحية الكتابة لهذا الدليل"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "خطأ عند انشاء وصلات �ي \"%s\".\n"
+#~ "\n"
+#~ "القرص المرسل إليه هو للقراءة �قط."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند نسخ \"%s\".\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند نقل \"%s\".\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند حذ� \"%s\".\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند النسخ.\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند الربط.\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "خطأ \"%s\" عند الحذ�\n"
+#~ "\n"
+#~ "هل تريد المتابعة؟"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "لا يمكن النسخ لسلة المهملات"
+
+#, fuzzy
+#~ 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 ""
+#~ "لا يستطيع \"%s\" �تح \"%s\" ﻷنه ليس بإمكان \"%s\" قراءة المل�ات عند "
+#~ "المواقع \"%s\". لا تتو�ر تطبيقات أخرى لعرض هذا المل�. قد تستطيع �تح المل� "
+#~ "إذا قمت بنسخه إلى كمبيوترك."
+
+#~ msgid "Searching Disks"
+#~ msgstr "جاري البحث �ي اﻷقراص"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "يبحث ناوتيلاس �ي أقراصك عن مجلدات المهملات."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "لا يمكن نقل العناصر المنتقاة الـ %d إلى سلة المهملات. هل تريد حذ�ها حالا؟"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "لا يمكن نقل العناصر الـ %d المنتقاة إلى سلة المهملات. هل تريد حذ�ه "
+#~ "العناصر الـ %d حالا؟"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "المل� الذي رميته ليس صورة. بإمكانك استخدام صور محلية �قط كأيقونات مخصصة."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "آس�، �خدمة البحث ميدوسا غير متو�رة ﻷنها غير منصبة."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "تتم �هرسة مل�اتك ومحتويات النصوص مرة واحدة كل يوم لتسريع بحثك �يهم. اﻵن "
+#~ "تتم �هرسة مل�اتك."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" ليس موقعا صحيحا. �ضلا تأكد من اﻹملاء وعاود المحاولة مرة أخرى."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "ع�وا، �إن '%s' مل� صورة غير قابل للاستعمال!"
+
+#~ 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 ""
+#~ "تعذر عرض \"%s\" لعدم استطاعة ناوتيلاس الاتصال بمتص�ح SMB الرئيسي.\n"
+#~ "تأكد من كون خادم SMB يعمل �ي الشبكة المحلية."
+
+#~ msgid "file icon"
+#~ msgstr "ايقونة المل�"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "الاسم"
+
 #~ msgid "Unknown"
 #~ msgstr "غير معرو�"
 
@@ -7622,9 +8164,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "_Toolbar"
 #~ msgstr "إخ�اء شريط اﻷدوات"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "الموقع \"%s\" غير موجود"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "اذهب إلى موقع غير موجود"
 
@@ -7649,9 +8188,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "Authentication Required"
 #~ msgstr "يتطلب المصادقة"
 
-#~ msgid "_Location:"
-#~ msgstr "المكان:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "يجب أن تبقى سلة المهملات على سطح المكتب."
 
@@ -7691,9 +8227,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "_Helvetica"
 #~ msgstr "هل�تيكا"
 
-#~ msgid "_Times"
-#~ msgstr "تايمز"
-
 #~ msgid "Content Loser"
 #~ msgstr "Content Loser"
 
@@ -8240,9 +8773,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "Set Cover Image"
 #~ msgstr "ضبط صورة الغلا�"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "ع�واً، لكن '%s' صورة غير قابلة للاستعمال"
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "اختر صورة لغلا� الألبوم"
 
@@ -8334,9 +8864,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "لا أستطيع تحميل %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "جاري تحميل %s"
 
@@ -8914,9 +9441,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "Display %s tab in sidebar"
 #~ msgstr "اعرض الشريط %s  �ي الشريط الجانبي"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "ع�وا، لا يمكن تنصيب الصورة �ي %s كشعار."
-
 #~ msgid "New Window"
 #~ msgstr "نا�ذة جديدة"
 
@@ -8944,9 +9468,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "ع�وا، \"%s\" ليس مجلد تيمات صحيح."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "ع�وا، لا يمكن تنصيب التيمة \"%s\"."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "تعذر تنصيب التيمة"
 
@@ -8961,9 +9482,6 @@ msgstr "اعرض الدليل الموطن لديك Ù�ÙŠ مدير ملÙ�ات Ù†Ø
 #~ "theme before removing this one."
 #~ msgstr "ع�وا، لا يمكنك حذ� التيمة الحالية. �ضلا غيّر لتيمة أخرى قبل حذ� هذه."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "ع�وا، لا يمكن حذ� تلك التيمة!"
-
 #~ msgid "Add New Theme..."
 #~ msgstr "أض� تيمة جديد..."
 
diff --git a/po/az.po b/po/az.po
index 5a1cec02f..7106a605c 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus.HEAD.az\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-11 17:01+0200\n"
 "Last-Translator: Mətin �mirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <gnome@azitt.com>\n"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() iflas etdi."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemlər"
 
@@ -53,48 +53,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus Emblem nümayişi"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Emblem silinə bilmədi"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "'%s' emblemi silinə bilmədi.  Yəqin ki bunun səbəbi emblemin sizin əlavə "
 "etdiyiniz deyil, silinməz olan olmasıdır."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Emblem silinə bilmədi"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Emblem yenidən adlandırıla bilmədi"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "'%s' emblemi yenidən adlandırıla bilmədi.  Yəqin ki bunun səbəbi emblemin "
 "sizin əlavə etdiyiniz deyil, silinməz olan olmasıdır."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Emblem yenidən adlandırıla bilmədi"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Emblemi Yenidən Adlandır"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Nümayiş edilən emblem üçün yeni ad daxil et:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Yenidən adlandır"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Emblemlər �lavə Et..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -102,7 +114,7 @@ msgstr ""
 "Hər emblemin yanına təsviri ad daxil edin.  Bu ad emblemi başqa yerlərdə "
 "təsvir edəcək."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -110,139 +122,64 @@ msgstr ""
 "Emblemin yanına təsviri ad daxil edin.  Bu ad emblemi başqa yerlərdə təsvir "
 "edəcək."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Fayllardan bəziləri hökmlü rəsm olmadıqları üçün emblem olaraq əlavə edilə "
 "bilmədilər."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "'%s' faylı hökmlü rəsm deyil."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Emblemlər əlavə edilə bilmədi"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Fayllardan heç biri hökmlü rəsm olmadığına görə emblem olaraq əlavə edilə "
 "bilmədi."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Sürünən mətn hökmlü fayl mövqeyi deyil."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Emblem əlavə edilə bilmədi"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'%s' faylı hökmlü rəsm deyil."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Sürünən fayl hökmlü rəsm deyil."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Sil"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Avadanlıq nümayişi e'malatxanası"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Avadanlıq"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Avadanlıq Nümayişçisi"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Avadanlıq nümayişi"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Avadanlıq olaraq Göstər"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "avadanlıq nümayişi"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "avadanlıq nümayişi üçün timsalın adı"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "avadanlıq mə'lumatı icmalı"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K ön yaddaş böyüklüyü"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Fəaliyyət müddəti %d gün, %d saat, %d dəqiqədir"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Avadanlıq İcmalı"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Bura, CPU səhifəsinin yeridir."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Bura, RAM səhifəsinin yeridir."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Bura, IDE səhifəsinin yeridir."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Keçmiş"
@@ -908,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Avadanlıq"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Beynəlmilləl"
@@ -1192,29 +1133,19 @@ msgid "Desktop trash icon name"
 msgstr "Masa üstündəki zibil qutusu timsalının adı"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Bu böyüklüyün üstündə olan qovluqlar bu böyüklüyə yaxın qısaldılacaq. Bu, "
-"həddindən artıq böyük qovluqlarda Nautilis'un iflas etməməsi üçündür. Mənfi "
-"qiymət hüdud yoxdur deməkdir."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Xassələr dialoqunda 'xüsusi' bayraqları fəallaşdır"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "�sas cərgə arxa plan rəsmi. Yalnız background_set seçilidirsə istifadə "
 "edilir."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1222,6 +1153,18 @@ msgstr ""
 "Yan panelin əsas arxa plan rəsmi. Yalnız side_pane_background_set "
 "seçilidirsə istifadə edilir."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Bu böyüklüyün üstündə olan qovluqlar bu böyüklüyə yaxın qısaldılacaq. Bu, "
+"həddindən artıq böyük qovluqlarda Nautilis'un iflas etməməsi üçündür. Mənfi "
+"qiymət hüdud yoxdur deməkdir."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Nişanlar menyusunda əsas nişanları gizlət"
@@ -1231,9 +1174,10 @@ msgid "Home icon visible on desktop"
 msgstr "Ev timsalı masa üstündə göstərilsin"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Seçilidirsə, Nautilus yan paneldə yalnız qovluqları göstərəcək. �ks halda o "
 "həm qovluq həm də faylları göstərəcək."
@@ -1264,9 +1208,10 @@ msgstr ""
 "seçənəkləri dəyişdirmə hüququ verəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Seçilidirsə, Nautilus həm timsal həm də siyahı görünüşündə qovluqları "
 "fayllardan əvvəl göstərəcək."
@@ -1308,8 +1253,9 @@ msgstr ""
 "göstərəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Seçilidirsə, Nautilus istifadəçinin ev cərgəsini masa üstü olaraq istifadə "
@@ -1326,9 +1272,10 @@ msgstr ""
 "nüsxəsi faylı sayılır."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Seçilidirsə, fayl idarəçisində gizli fayllar göstəriləcək. Gizli fayllar ya "
 "nöqtə ilə başlayan fayllar ya da adları qovluqların içindəki .hidden "
@@ -1351,8 +1298,9 @@ msgstr ""
 "Seçilidirsə, masa üstündə zibil qutusuna körpü verən timsal göstəriləcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Seçilidirsə, masa üstündə ev cərgəsinə körpü verən timsal göstəriləcək."
@@ -1382,7 +1330,8 @@ msgstr ""
 "Seçilidirsə, yeni pəncərələrdəki fayllar tərs ardıcıllıqda sıralanacaq."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Seçilidirsə, yeni pəncərələrdəki timsallar birbirinə daha yaxın "
 "yerləşdiriləcək."
@@ -1411,7 +1360,8 @@ msgid "List of possible captions on icons"
 msgstr "Timsalların mümkün olan adlarının siyahısı"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Qovluqdakı maksimal fayl ədədi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1431,11 +1381,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Masa üstünü Nautilus göstərsin"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus istifadəçinin ev cərgəsini masa üstü olaraq istifadə edir"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Qovluqları yalnız yan ağac çubuğunda göstər"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1455,7 +1407,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Yeni pəncərələrdə tərs sıralama ardıcıllığı"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Pəncərələrdə əvvəlcə qovluqları göstər"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1491,10 +1444,11 @@ msgstr ""
 "ediləcək. \"never\" seçilidirsə, səslər ön nümayiş edilməyəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1505,12 +1459,13 @@ msgstr ""
 "edilməyəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Rəsm faylının nə zaman ön nümayiş ediləcəyini tə'yin edir.\"always\" isə, "
 "rəsmlər uzaq qovşaqda olsa bilə ön nümayiş ediləcək. \"local_only\" "
@@ -1518,10 +1473,11 @@ msgstr ""
 "\"never\" seçilidirsə, rəsmlər ön nümayiş edilməyəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Qovluqda yer alan faylların ədədinin nə zaman göstəriləcəyini tə'yin edir. "
@@ -1530,17 +1486,19 @@ msgstr ""
 "ədədi göstəriləcək. \"never\" seçilidirsə, üzv ədədi hesab edilməyəcək."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Üzvlərin masa üstündə əsas düzülüş qaydası. Mümkün qiymətlər: \"name\", "
 "\"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Üzvlərin siyahı görünüşündə əsas düzülüş qaydası. Mümükün qiymətlər: name, "
 "size, type vÉ™ modification_date."
@@ -1586,7 +1544,8 @@ msgid "Use manual layout in new windows"
 msgstr "Yeni pəncərələrdə əllə düzülüşü işlət"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Yeni pəncərələrdə gərgin düzülüş işlət"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1615,7 +1574,8 @@ msgstr ""
 "ediləcək. Mümkün qiymətlər: \"list_view\" və \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Qovluqdakı üzvlərin ədədini nə vaxt göstəriləcəyi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1627,7 +1587,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Rəsm fayllarının ön nümayişlərinin göstərilməsi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Qovluq üçün xüsusi arxa planının seçildiyi."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1784,67 +1745,81 @@ msgstr "sıfırla"
 msgid "on the desktop"
 msgstr "masa üstündə"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Həcm silinə bilmir"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Həcm timsalını silə bilməzsiniz. Həcmi/sürücünü çıxartmaq istəyirsənizsə ona "
 "sağ tıqlayıb Çıxart menyusunu seçin."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Həcm silinə bilmir"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Zibil"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Buraya _daşı"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "Buraya _köçür"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Burada k_örpü yarad"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Arxa plan olaraq _döşə"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "_Bütün qovluqlara arxa plan olaraq döşə"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "B_u qovluğa arxa plan olaraq döşə"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Təəsüf ki yeni emblem üçün boş olmayan bir açar kəlmə seçməlisiniz."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Emblem qurula bilmir"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1855,20 +1830,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Təəsüf ki \"%s\" adında bir emblem hazırda mövcuddur. Xahiş edirik başqa ad "
 "seçin."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Emblem qurula bilmir"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Şəxsi emblem qeyd edilə bilmədi bağışlayın."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Şəxsi emblem adın qeyd edilə bilmədi, bağışlayın."
 
@@ -1887,22 +1868,28 @@ msgstr "Mənbə:"
 msgid "To:"
 msgstr "Hədəf:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Daşınarkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Daşıma sırasında xəta oldu.\n"
 "\n"
 "\"%s\" yalnız oxuna bilən diskdə olduğu üçün daşına bilmir."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Silərkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1910,22 +1897,17 @@ msgstr ""
 "\n"
 "\"%s\" üstündə lazımi səlahiyyətləriniz olmadığı üçün silinə bilmədi."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Silmə sırasında xəta oldu.\n"
 "\n"
 "\"%s\" yalnız oxuna bilən diskdə olduğu üçün silinə bilmir."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1933,12 +1915,15 @@ msgstr ""
 "\n"
 "\"%s\" üstündə lazımi səlahiyyətləriniz olmadığı üçün daşına bilmədi."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Daşınarkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Daşıma sırasında xəta oldu.\n"
@@ -1946,12 +1931,10 @@ msgstr ""
 "\"%s\" daşına bilmir çünki ya özü ya da onun qohum cərgəsi daşınılan "
 "yerdədir."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Daşıma sırasında xəta oldu.\n"
@@ -1959,250 +1942,194 @@ msgstr ""
 "\"%s\" və ya alt cərgələri üstündə lazımi səlahiyyətləriniz olmadığı üçün "
 "zibilə atıla bilmədi."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Köçürülərkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Köçürmə sırasında xəta.\n"
 "\n"
 "\"%s\" üstündə oxuma səlahiyyətləriniz olmadığı üçün oxuna bilmədi."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"a(ə) köçürmə sırasında xəta.\n"
-"\n"
-"Hədəfdə lazımi yer yoxdur."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Köçürülərkən xəta oldu."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "\"%s\"a(ə) köçürmə sırasında xəta.\n"
 "\n"
 "Hədəfdə lazımi yer yoxdur."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"da(də) körpu qurma sırasında xəta.\n"
-"\n"
-"Hədəfdə lazımi yer yoxdur."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Daşınarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Körpü qurarkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "\"%s\"a(ə) köçürmə sırasında xəta.\n"
 "\n"
 "Bu qovluğa yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "\"%s\"a(ə) köçürmə sırasında xəta.\n"
 "\n"
 "Hədəf disk sırx oxunandır."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Üzvlərin \"%s\"a(ə) köçürmə sırasında xəta.\n"
-"\n"
-"Bu qovluğa yazma səlahiyyətiniz yoxdur."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Üzvlərin \"%s\"a(ə) köçürmə sırasında xəta.\n"
-"\n"
-"Hədəf disk yalnız oxuna biləndir."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\"da(də) körpulər qurma sırasında xəta.\n"
-"\n"
-"Bu qovluğa yazma səlahiyyətiniz yoxdur."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Daşınarkən xəta oldu."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\"da(də) körpulər qurma sırasında xəta.\n"
-"\n"
-"Hədəf disk yalnız oxuna biləndir."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Xəta \"%s\", \"%s\" köçürülürkən oldu.\n"
-"Davam etmək istəyirsiniz ?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Körpü qurarkən xəta oldu."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%2$s\" daşınırkən \"%1$s\" xətası oldu.\n"
-"\n"
-"Davam etmək istəyirsiniz?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Köçürülərkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Xəta \"%s\", \"%s\"a körpülənərkən oldu.\n"
+"Xəta \"%s\", daşınarkən oldu.\n"
 "\n"
 "Davam etmək istəyirsiniz ?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Xəta \"%s\" \"%s\"i silərkən oldu.\n"
-"\n"
-"Davam etmək istəyirsiniz ?"
+#: libnautilus-private/nautilus-file-operations.c:735
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Daşınarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Xəta \"%s\", köçürərkən oldu.\n"
+"Xəta \"%s\", \"%s\"a körpülənərkən oldu.\n"
 "\n"
 "Davam etmək istəyirsiniz ?"
 
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Silərkən xəta oldu."
+
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Xəta \"%s\", daşınarkən oldu.\n"
-"\n"
-"Davam etmək istəyirsiniz ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Köçürülərkən xəta oldu."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Xəta \"%s\", körpü qurarkən oldu.\n"
-"\n"
-"Davam etmək istəyirsiniz ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Daşınarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Xəta \"%s\", silərkən oldu.\n"
-"\n"
-"Davam etmək istəyirsiniz ?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Körpü qurarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Silərkən xəta oldu."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Köçürülərkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Daşınarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Körpü qurarkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Silərkən xəta oldu."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Keç"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Yenidən Sına"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Verilən hərəkəti tamamlaya bilmədim."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" yeni yerinə daşına bilmədi, çünkü eyni ad onsuz da başqa üzvə "
 "verilibdir. Bu da silinə ya da dəyişdirilə bilməz.\n"
 "\n"
 "Hələ də \"%s\"ni daşımaq istəyirsinizsə, adını dəyişdirib yenidən sınayın."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Verilən hərəkəti tamamlaya bilmədim."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" yeni yerinə köçürülə bilmədi, çünkü eyni ad onsuz da başqa üzvə "
 "verilibdir. Bu da silinə ya da dəyişdirilə bilməz.\n"
@@ -2210,44 +2137,50 @@ msgstr ""
 "Hələ də \"%s\"ni(nı) köçürmək  istəyirsinizsə, adını dəyişdirib yenidən "
 "sınayın."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Fayl əvəz edilə bilmir."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "\"%s\" onsuz da mövcud olan bir fayldır.\n"
 "\n"
 "�vəz edilsin?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Köçürülərkən toqquşma oldu"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "�vəz Et"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Hamısını �vəz Et"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s-a baÄŸ"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s-a baÅŸqa baÄŸ"
@@ -2256,25 +2189,25 @@ msgstr "%s-a baÅŸqa baÄŸ"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s'yÉ™ %1$d'ci baÄŸ"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s'yÉ™ %1$d'ci baÄŸ"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s'yə %1$d'cü bağ"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s'yə %1$d'cü bağ"
@@ -2284,567 +2217,606 @@ msgstr "%2$s'yə %1$d'cü bağ"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (nüsxə)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (başqa nüsxə)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". nüsxə)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". nüsxə)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (nüsxə)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (başqa nüsxə)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. nüsxə)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "NamÉ™'lum GnomeVFSXferProgressStatus %d"
 
 #  localizers: progress dialog title
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Fayllar zibil qutusuna daşınır"
 
 #  localizers: label prepended to the progress count
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Atılan fayllar:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Daşınır"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Zibil qutusuna daşımaya hazırlanır..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Fayllar daşınır"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Daşınmış fayllar:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Daşımaya Hazırlanır..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Daşıma Qurtarır..."
 
 #  localizers: progress dialog title
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Fayllara körpü qurulur"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Körpü qurulmuş fayllar:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Körpü Qurulur"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Köpüləri Yaratmaya Hazırlanır..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Körpü Qurma �məliyyatı Qurtarır..."
 
 #  localizers: progress dialog title
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Fayllar köçürülür"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Köçürülmüş fayllar:"
 
 #  localizers: label prepended to the name of the current file copied
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Köçürülən"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Köçürməyə Hazırlanır..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Üzvləri zibil qutusuna köçürə bilməzsiniz."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Zibil Qutusuna Köçürülə Bilmədi."
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Bu zibil qutusunu daşıya bilməzsiniz."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Bu zibil qutusunu köçürə bilməzsiniz."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Zibil Qutusunun Yeri Dəyişdirilə Bilməz"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Zibil Qutusu Köçürülə Bilməz"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Bir qovluğu öz içinə daşıya bilməzsiniz."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Bir qovluğu öz içinə köçürə bilməzsiniz."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Bu qovluq içində yeni boş bir qovluq yarat"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Öz İçinə Daşına Bilməz"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Öz İçinə Köçürülə Bilməz"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Bir faylı öz üstünə köçürülə bilməz."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Özünün Üstünə Köçürülə Bilməz"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Yeni qovluq yaratma xətası.\n"
 "\n"
 "Bu hədəfə yazma səlahiyyətiniz yoxdur."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Yeni qovluq yaratma xətası.\n"
 "\n"
 "Hədəfdə boş yer yoxdur."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "\"%s\" yeni qovluq yaratma xətası."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Yeni qovluq yaratma xətası"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Yeni qovluq yaratma xətası"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "adsız qovluq"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "\"%s\" yeni qovluq yaratma xətası."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Yeni qovluq yaratma xətası"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Yeni qovluq yaratma xətası"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fayl"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Fayllar silinir"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Silinən fayllar:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Silinir"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Fayllar Silinməyə Hazırlanır..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Zibil Qutusu Boşaldılır"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Zibil Qutusu Boşaldılmaya Hazırlanır..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Həqiqətən də zibil vedrəsindəki bütün üzvləri həmişəlik silmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_BoÅŸ"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (nüsxə)txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (nüsxə).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (başqa nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (başqa nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (başqa nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (başqa nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-cu nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10-cu nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10-cu nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110-cu nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (11-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (11-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122-ci nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (112-ci nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (113-cü nüsxə).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (114-cü nüsxə)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (114-cü nüsxə).txt"
 
@@ -2863,64 +2835,64 @@ msgstr "foo (114-cü nüsxə).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "bugün 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "bugün %-I:%M %S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "bugün 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "bugün %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "bugün, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "bugün %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "bugün"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "dünən 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "dünən %-H:%M :%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "dünən 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "dünən %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "dünən, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "dünən %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "dünən"
 
@@ -2929,133 +2901,133 @@ msgstr "dünən"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Çərşənbə, Sentyabr 00 0000 saat 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y  %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "B.E, Okt 00 0000 saat 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y saat %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "B.E, Okt 00 0000 saat 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y saat %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Okt 00 0000 saat 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y saat %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Okt 00 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 üzv"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 qovluq"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fayl"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 üzv"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 qovluq"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fayl"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u üzv"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u qovluq"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fayl"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? üzv"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bayt"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "namə'lum növ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "namə'lum MIME növü"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "namÉ™'lum"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "proqram"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3064,7 +3036,7 @@ msgstr ""
 "\"x-directory/normal\" üçün izahat tapa bilmirəm. Bu sizin gnome-vfs.keys "
 "faylınızın səhv yerdə olduğunu ya da nədənsə tapıla bilmədiyini göstərir."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3073,11 +3045,11 @@ msgstr ""
 "\"%s\" mime növü üçün izahat (\"%s\" faylı) tapıla bilmədi, gnome-vfs "
 "məktublaşma qrupuna məktub yazın."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "körpü qoy"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "körpü (qopuqdur)"
 
@@ -3198,11 +3170,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Faylları fayl adı və xüsusiyyətlərinə görə axtar"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Timsal Görünüşü"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Sıra Görünüşü"
@@ -3353,148 +3327,153 @@ msgstr "Ev %.0s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "PiÅŸtaxta"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "fayl timsalı"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "dəyişdirilə bilən mətn"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "dəyişdirilə bilən etiket adı"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "əlavə mətn"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "biraz daha mətn"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "seçim üçün işıqlandırılmış"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "seçmədə işıqlandırılmış olacağı"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "klaviatura fokuslayanda işıqlandır"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "klaviatura fokusunda işıqlandırılmış olacağı"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "buraxma üçün işıqlandırılmış"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "sür və buraxda işıqlandırılmış olacağı"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Seçim sahəsi"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Çərçivə Mətni"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Seçilməmiş mətnin ətrafında çərçivə göstər"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Seçki Qutusu Rəngi"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Seçki qutusunun rəngi"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Seçki Qutusu Şəfflaflığı"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Seçki qutusunun matlığı"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "İşıqlandırma Alfası"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Seçilmiş timsallar üçün işıqlandırma matlığı"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Açıq Mə'lumat Rəngi"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Tünt arxa plana qarşı işlədiləcək mə'lumat mətninin rəngi"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tünt Mə'lumat Rəngi"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Açıq arxa plana qarşı işlədiləcək mə'lumat mətninin rəngi"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Bu qovluq avtomatik düzülüş istifadə edir. Bu üzvü daşıdığın yerə buraxıb "
 "həm də əllə düzülüşə keçmək istəyirsiniz? Bu qeyd edilmiş əllə düzəlişi "
 "xəsərə uğradacaqdır."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Bu qovluq avtomatik düzülüş istifadə edir. Bu üzvləri daşıdığın yerə buraxıb "
 "həm də əllə düzülüşə keçmək istəyirsiniz? Bu qeyd edilmiş əllə düzəlişi "
 "xəsərə uğradacaqdır."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Bu qovluq avtomatik düzülüş istifadə edir. Bu üzvü daşıdığın yerə buraxıb "
 "həm də əllə düzülüşə keçmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Bu qovluq avtomatik düzülüş istifadə edir. Bu üzvləri daşıdığın yerə buraxıb "
 "həm də əllə düzülüşə keçmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "�llə Düzülüşə Keçilsin?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Keç"
 
@@ -3602,72 +3581,72 @@ msgstr "Bütün \"%s\" üçün əsası olsun."
 msgid "Is the default for all \"%s\" items."
 msgstr "Bütün \"%s\" üzvləri üçün əsası olsun."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\"i təkmilləşdir"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Bütün \"%s\" üzvləri üçün menyularında var olsun."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Bütün \"%s\" üçün əsası olsun"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Ancaq \"%s\" üçün menyuda var olsun"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Ancaq \"%s\" üçün əsas olsun"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Bütün \"%s\" üçün menyularda var olmasın"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Ad"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Vəziyyət"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "S_eç"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Oldu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Təkmilləşdir..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Fayl Növləri və Proqramlar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Oraya Get"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3675,48 +3654,48 @@ msgstr ""
 "Fayl Növləri və Proqramlar dialoqunda hansı fayl növünü hansı proqram ilə "
 "əlaqələndirməsini bildirə bilərsiniz."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Başqa Proqramla Aç"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\" faylını açacaq başqa bir proqram tə'minatını seçin:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Başqa Nümayişçi ilə Aç"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\" üçün bir nümayiş seçin:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" üçün nümayişçi mövcud deyil."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Uyğun Nümayişçi Mövcud Deyil"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" ilə heç bir proqram əlaqələndirilməyib."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�laqələndirilmiş Proqram Yoxdur"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\" ilə heçbir proqram əlaqələndirilməyib."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Heç Bir Gedişat �laqələndirilməyib"
 
@@ -3724,11 +3703,9 @@ msgstr "Heç Bir Gedişat �laqələndirilməyib"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3737,42 +3714,41 @@ msgstr ""
 "GNOME'u proqramlarla fayl növlərini əlaqələndirməsi üçün sazlaya bilərsiniz. "
 "İndi bu fayl növü ilə hər hansı bir proqramı əlaqələndirmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Proqram �laqələndir"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" ilə əlaqələndirilən nümayişçi hökmsüzdür."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Səhv Nümayişci �laqələndirilib"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" ilə əlaqələndirilən proqram hökmsüzdür."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Səhv Proqram �laqələndirilib"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\" ilə əlaqələndirilən gedişat hökmsüzdür."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Səhv Gedişat �laqələndirilib"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3783,107 +3759,148 @@ msgstr ""
 "bilərsiniz. İndi bu fayl növü ilə hər hansı bir proqramı ya da nümayişçini "
 "əlaqələndirmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Gedişat �laqələndir"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" \"%s\"i aça bilmir ona görə ki \"%s\" \"%s\"dakı fayllara yetişə "
+"bilmir. Başqa proqram seçmək istəyirsiniz?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" \"%s\"i aça bilmir ona görə ki \"%s\" \"%s\"dakı fayllara yetişə "
 "bilmir. Başqa proqram seçmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "�sas gedişat \"%s\" faylını aça bilmir ona görə ki o \"%s\" mövqeyinə yetişə "
 "bilmir. Başqa qedişat seçmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Mövqe Açıla Bilmir"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" \"%s\"i aça bilmir ona görə ki \"%s\" \"%s\"dakı fayllara yetişə "
+"bilmir. Başqa proqram seçmək istəyirsiniz?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" \"%s\"i \"%s\"in \"%s\"dakı(dəki) fayllara yetişə bilmədiyi üçün aça "
 "bilmir. Bu fayl üçün də başqa nümayişçi proqram mövcud deyildir. Bu faylı "
 "kompüterinizə köçürsəniz, ona baxa bilməyəcəksiniz."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "�sas gedişat \"%s\" faylını aça bilmir ona görə ki o \"%s\" mövqeyinə yetişə "
-"bilmir. Bu faylı görə bilmək üçün başqa nümayişci qalmadı. �gər faylı öz "
-"kompüterinizə köçürsəniz onu aça bilərsiniz."
+"bilmir. Başqa qedişat seçmək istəyirsiniz?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" \"%s\"i \"%s\"in \"%s\"dakı(dəki) fayllara yetişə bilmədiyi üçün aça "
+"bilmir. Bu fayl üçün də başqa nümayişçi proqram mövcud deyildir. Bu faylı "
+"kompüterinizə köçürsəniz, ona baxa bilməyəcəksiniz."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılır"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Təhlükəsizlik tədbiri olaraq uzaq sistemlərdə əmr işə sala bilməzsiniz."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Uzaqdakı körpü işə salına bilməz"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Proqram başlarkən xəta meydana gəldi.\n"
 "\n"
 "�traflı: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Proqramı başlama xətası"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Hədəfə buraxma ancaq yerli fayl sistemlərdə dəstəklənir"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Hədəfə buraxma ancaq yerli faylları dəstəkləyir.\n"
 "\n"
 "Yerli olmayan faylları yerli bir qovluğa köçürüp hədəfə buraxa bilərsiniz."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Hədəfə buraxma ancaq yerli fayl sistemlərdə dəstəklənir"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4137,14 +4154,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Qovluq olan və adlarında \"medusa\" daxil edən üzvlər"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Disklər Axtarılıq"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus diskinizdə zibil qutusu olan qovluqları axtarır."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Düzəlt"
@@ -4343,98 +4352,108 @@ msgstr "Arxa Plan"
 msgid "Empty Trash"
 msgstr "Zibili BoÅŸalt"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "%d Pəncərə Aç"
+
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "\"%s\"i(ı) həmişəlik silmək istəyirsən?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
 msgstr ""
 "Bu, %d qədər müxtalif pəncərə açacaqdır. Həqiqətən də bunu etmək "
 "istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:499
-#, c-format
-msgid "Open %d Windows?"
-msgstr "%d Pəncərə Aç"
-
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "\"%s\"i(ı) həmişəlik silmək istəyirsən?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "%d seçili üzvü həmişəlik silmək istəyirsən?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Bütün seçili üzvləri həmişəlik sil"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Silim?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Kateqoriya Seç:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Naxışlar"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 qovluq seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d qovluq seçilidir"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "( 0 üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr "( 1 üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr "( %d üzv daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " ( 0 üzvün tamamını daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr "( 1 üzvün tamamını daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr "( %d üzvün tamamını daxil edir )"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d üzv seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 başqa üzv seçilidir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d başqa üzv seçilidir (%s)"
@@ -4446,7 +4465,7 @@ msgstr "%d başqa üzv seçilidir (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4455,104 +4474,120 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Bu, \"%s\" qovluğu Nautilisun icazə verdiyi miqdardan artıq fayl daxil edir. "
 "Bə'zi fayllar göstərilməyəcəkdir."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Həddindən Artıq Fayl"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" zibilə atıla bilmədi. Bunu elə hal hazırda silmək istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d qədər seçili üzv zibilə atıla bilmir. Bunları elə hal hazırda silmək "
-"istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" zibilə atıla bilmədi. Bunu elə hal hazırda silmək istəyirsiniz?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"Seçili üzvlərdən %d qədəri zibilə atıla bilmir. Bu, %d üzvlərini elə hal "
-"hazırda silmək istəyirsiniz?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" zibilə atıla bilmədi. Bunu elə hal hazırda silmək istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Həmən Silim?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "\"%s\"i(ı) zibil qutusunda həmişəlik silmək istəyirsən?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "%d seçili üzvü zibil qutusundan həmişəlik silmək istəyirsən?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Zibil Qutusundan Sillimmi?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Seçili üzvü açmaq üçün \"%s\"dan(dən) istifadə et"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "BaÅŸqa _Proqram..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Proqram..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Başqa _Nümayişçi..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Nümayişçi..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Verilən hərəkəti tamamlaya bilmədim:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Verilən hərəkəti tamamlaya bilmədim."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "\"%s\"i hər hansı seçili üzv üstündə icra et"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Bu qovluqdakı bütün icra edilə bilənlər Skriptlər menyusunda "
+"görünəcəklərdir. Menyudan skriptin tıqlanması ilə skript seçili üzvü giriş "
+"olaraq alıb icra ediləcəkdir."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4560,11 +4595,11 @@ msgstr ""
 "görünəcəklərdir. Menyudan skriptin tıqlanması ilə skript seçili üzvü giriş "
 "olaraq alıb icra ediləcəkdir."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Skriptlər Haqqında"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4603,184 +4638,191 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: hazırkı pəncərənin yeri və böyüklüyü"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "�gər �mrləri Yapışdır əmrini seçərsəniz, \"%s\" daşınacaqdır"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "�gər �mrləri Yapışdır əmrini seçərsəniz, \"%s\" köçürüləcəkdir"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d qədər seçili üzv �mrləri Yapışdır əmrini seçərsəniz daşınacaqlardır"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d qədər seçili üzv �mrləri Yapışdır əmrini seçərsəniz köçürüləcəklərdir"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Ara yaddaşda yapışdırılacaq bir şey yoxdur."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Bağlama Xətası"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Ayırma Xətası"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Bağlama Xətası"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Çıxart"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Sürücünü _Ayır"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Yeni Pəncərə _içində Aç"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "\"%d\" _Yeni Pəncərə _içində Aç"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Ev QovluÄŸu"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Ev QovluÄŸu"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Zibil Qutusundan _Sil"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Bütün seçili üzvləri həmişəlik sil"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Zibil Qutusuna _Daşı"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Hər seçili üzvü zibil qutusuna daşı"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Sil"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Körpüləri _Yarad"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Körpü Y_arat"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Zibil Qutusunu _BoÅŸalt"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Faylı Kə_s"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Fayllları Kə_s"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Faylı K_öçürt"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Faylları K_çürt"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Bu körpü hədəfi olmadığı üçün işlədilə bilməz. Bu körpünü zibil qutusuna "
 "atmaq istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Bu körpü hədəfi olmadığı üçün işlədilə bilməz. Bu körpünü zibil qutusuna "
+"atmaq istəyirsiniz?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Bu körpü hədəfi \"%s\" mövcud olmadığı üçün işlədilə bilməz. Bu körpünü "
 "zibil qutusuna atmaq istəyirsiniz?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Qırıq Körpü"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" işə salına bilən mətn faylıdır. Bunu işə salmaq yoxsa içindəkiləri "
 "görmək istəyirsiniz*"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "İşə salımmı yoxsa Göstərimmi?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Göstər"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "_Terminalda Ä°cra Et"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Göstər"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Ä°cra Et"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" açılır"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Açmayı Ləğv Edimmi ?"
 
@@ -4801,10 +4843,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) içindəkiləri göstərə bilmirəm."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Qovluq Nümayiş Xətası"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4812,19 +4859,19 @@ msgstr ""
 "\"%s\" adı bu qovluqda onsuz da istifadə edilməkdədir.\n"
 "XahiÅŸ edirik baÅŸqa bir ad istifadÉ™ edin."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "\"%s\" bu qovluqda deyildir. Silinmiş və ya daşınmış ola bilərmi?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 "\"%s\"i(ı) yenidən adlandırmaq üçün lazımi səlahiyyətlərinə sahib deyilsən."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4833,26 +4880,31 @@ msgstr ""
 "\"%s\" adı \"/\" işarəsi daxil etdiyi üçün hökmsüzdür. Xahiş edirik başqa "
 "bir ad istifadÉ™ edin."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" adı hökmsüzdür. Xahiş edirik başqa bir ad istifadə edin."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\"in(ın) adı dəyişdirilə bilmir, çünkü yalnız oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Təəssüf ki \"%s\"nin(nın) adını \"%s\"'ye dəyişdirə bilmədim."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Təzədən Adlandırma Xətası"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: src/file-manager/fm-error-reporting.c:165
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
@@ -4860,35 +4912,45 @@ msgstr ""
 "\"%s\"nin(nın) qrupunu dəyişdirmek üçün lazımi səlahiyyətlərinə sahib "
 "deyilsən ."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\"in(ın) qrupu dəyişdirilə bilmir, çünkü yalnız oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) qrupunu dəyişdirə bilmədim."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Qruplaşdırma Xətası"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "\"%s\"in(ın) yiyəsi dəyişdirilə bilmir, çünkü yalnız oxunan diskdədir"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) yiyəsini dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Yiyə Düzəlşi Xətası"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4896,21 +4958,26 @@ msgstr ""
 "Təəsüf ki \"%s\"nin(nın) səlahiyyətlərnı sorf oxunan diskdə yerləşdiyi üçün "
 "dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Təəsüf ki \"%s\"nin(nın) səlahiyyətlərnı dəyişdirə bilmədim ."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Səlahiyyət Dəyişdirmə Xətası"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\"nin(nın) adı \"%s\"a(ə) dəyişdirildi ."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Təzədən Adlandırmayı Ləğv Edimmi?"
 
@@ -4968,128 +5035,150 @@ msgstr "Timsalları �sl Böyüklüklərinə _Gətir"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Timsalı �sl Böyüklüyünə _Gətir"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" göstərilər"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Sürüklə-burax təkcə yerli fayl sistemlərində dəstəklənir"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Sürüklə-burax təkcə yerli fayl sistemlərində dəstəklənir"
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Sürüklə-Burax xətası"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Səhv sürükləmə növü işlədilib."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Fayl adı"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Böyüklük"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Növ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Təkmilləşdirmə Tarixi"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Eyni vaxtda bir neçə timsal işlədə bilərsiniz! �sad timsal üçün xahiş edirik "
 "birini sürükləyin."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Eyni vaxtda bir neçə timsal işlədə bilərsiniz! �sad timsal üçün xahiş edirik "
+"birini sürükləyin."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Bir Rəsmdən Daha Çox"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Sürüklənən fayl yerli deyil. �sas rəsmlər üçün takcə yerli rəsmləri işlədə "
 "bilərsiniz."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Sürüklənən fayl yerli deyil. �sas rəsmlər üçün takcə yerli rəsmləri işlədə "
+"bilərsiniz."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Təkcə Yerli Rəsmlər"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Sürüklədiyiniz fayl rəsm deyildir. �sas rəsmlər üçün takcə yerli rəsmləri "
-"işlədə bilərsiniz."
+"Sürüklənən fayl yerli deyil. �sas rəsmlər üçün takcə yerli rəsmləri işlədə "
+"bilərsiniz."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Təkcə Rəsmlər"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Xassələr"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "\"%s\" Xüsusiyyətlər"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Qrup Dəyişikliyini Ləğv Edimmi?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Qrup dəyişdirilir"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Yiyə Dəyişikliyini Ləğv Edimmi?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Yiyə dəyişdirilir"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "heç bir şey"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "oxuna bilmir"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 üzv, böyüklüyü %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d üzv, toplam böyüklük %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "( bə'zi girişlər oxuna bilmədi )"
 
@@ -5099,191 +5188,191 @@ msgstr "( bə'zi girişlər oxuna bilmədi )"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Məzmun:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "�sas"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Adlar:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Növ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Böyüklük:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Mövqe:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Həcm:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "BoÅŸ sahÉ™:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Körpü hədəfi:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME növü:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Təkmilləşdirmə tarixi:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "YetiÅŸmÉ™ tarixi:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Xüsusi Timsal Seç..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Xüsusi Timsalı _Sil"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Oxuma"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Yazma"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Ä°_cra EtmÉ™"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "_İstifadəçi ID'sini seç"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Xüsusi bayraqlar:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Qr_up ID'sini seç"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Yapışıq"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Səlahiyyətlər"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Yiyəsi olmadığın üçün, Səlahiyyətləri dəyişdirə bilməzsən."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Fayl yiyəsi:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Fayl yiyəsi:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Fayl qrupu:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Fayl qrupu:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "YiyÉ™:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Qrup:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Digərləri:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Mətn Görünüşü:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Rəqəm Görünüşü:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Son dəyişiklik:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"nin səlahiyyətləri öyrənilə bilmədi."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Seçili faylın səlahiyyətləri öyrənilə bilmədi."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Yardım göstərilərkən xəta oldu: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Yardım göstərilərkən xəta oldu: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Yardım göstərilə bilmədi"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Xüsusiyyətler Pəncərəsinin Nümayişi Ləğv Edilsin?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Xüsusiyyətlər Pəncərəsi Yaradılır"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Timsal seç"
 
@@ -5301,68 +5390,109 @@ msgid "Search Results"
 msgstr "Axtarış Nəticələri"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Medusa axtarış xidməti qurulmadığı üçün istifadə edilə bilmir."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Bağışlayın, Medusa axtarış xidməti fəal deyil."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Axtarış Xidməti İstifadə Edilə Bilmir"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Axtarış sürücü indeksləndikdən sonra aparılıb. Axtarış nəticələi həmən indi "
 "verməyəcək. Yeni indeksi indi yaratmaq istəyirsiniz*"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find fayl sisemi indeksinizi tapa bilmir.  Ä°ndeksiniz ya yoxdur ya da "
+"xəsərlidir. Yeni indeksi indi yaratmaq üçün \"medusa-indexd\" əmrini ali "
+"istifadəçi olaraq əmr sətirindən verin."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Çox yeni üzvləri axtar"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Kompüterinizdaki hər indekslənən fayl sizin klriteriyanıza uyğun gəlir. "
+"Kriteriyanızda heca yoxlaması aparıb yeni kriteriyalar əlavə edərək nəticəni "
+"daralda bilərsiniz."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Kompüterinizdaki hər indekslənən fayl sizin klriteriyanıza uyğun gəlir. "
 "Kriteriyanızda heca yoxlaması aparıb yeni kriteriyalar əlavə edərək nəticəni "
 "daralda bilərsiniz."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Axtarış sırasında xəta oldu"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find fayl sisemi indeksinizi tapa bilmir.  Ä°ndeksiniz ya yoxdur ya da "
 "xəsərlidir. Yeni indeksi indi yaratmaq üçün \"medusa-indexd\" əmrini ali "
 "istifadəçi olaraq əmr sətirindən verin."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Fayl indeks oxuma xətası"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Axtarış möhtəviyyatı yüklənərkən xəta oldu: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"İçindəkiləri axtamaq üçün \"Find\" sisteminizdəki faylların indekslənməsini "
+"tələb edir. \"Find\" indeksə indi yetişə bilmir"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"İçindəkiləri axtamaq üçün \"Find\" sisteminizdəki faylların indekslənməsini "
+"tələb edir. \"Find\" indeksə indi yetişə bilmir"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5370,25 +5500,23 @@ msgstr ""
 "indekslənməsini tələb edir. \"Find\" indeksə indi yetişə bilmir, ona görə də "
 "indeks istifadə edilmədən yavaş axtarış aparılacaqdır."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"İçindəkiləri axtamaq üçün \"Find\" sisteminizdəki faylların indekslənməsini "
-"tələb edir. \"Find\" indeksə indi yetişə bilmir"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Sür'ətli axtarış aparıla bilmir"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "İçindəkilərə görə axtarış aparıla bilmir"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5401,55 +5529,87 @@ msgstr ""
 "sonra bu əmri sətirdən girin:\n"
 " medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Sür'ətli axtarış aparmaq üçün \"Find\" sisteminizdəki faylların "
 "indekslənməsini tələb edir. \"Find\" indeksə indi yetişə bilmir, ona görə də "
 "indeks istifadə edilmədən yavaş axtarış aparılacaqdır."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "İçindəkilərə görə axtarış aparmaq üçün \"Find\" sisteminizdəki faylların "
 "indekslənməsini tələb edir. Bu dəqiqə kompüterinizdəki faylların indeksi "
 "yaradılır. İçindəkilərə görə axtarış bu fayl yaradıldıqdan sonra aparıla "
 "biləcəkdir."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "İndekslənmiş axtarışlar aparıla bilmir"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"İçindəkiləri axtamaq üçün \"Find\" sisteminizdəki faylların indekslənməsini "
+"tələb edir. \"Find\" indeksə indi yetişə bilmir"
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"İçindəkiləri axtamaq üçün \"Find\" sisteminizdəki faylların indekslənməsini "
+"tələb edir. \"Find\" indeksə indi yetişə bilmir"
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Sür'ətli axtarış aparmaq üçün \"Find\" sisteminizdəki faylların "
 "indekslənməsini tələb edir. İndeks hal hazırda yaradıla bilməz. İndeks "
 "mövcud olmadığı vaxt axtarışlar bir az uzun çəkər."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "İçindəkilərə görə axtarış aparmaq üçün \"Find\" sisteminizdəki faylların "
 "indekslənməsini tələb edir. Bu dəqiqə kompüterinizdəki fayllar "
 "indekslənməyib. İndeks faylsız içindəkilərə görə axtarış mümkün deyil."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Kompüterinizdə sür'ətli axtarış fəal deyil"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5459,11 +5619,12 @@ msgstr ""
 "indekslənməsini tələb edir. Amma sistem idaracisi kompüterinizdəki "
 "indeksləməyi bağladığı üçün indeks mövcud deyildir."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Kompüterinizdə sür'ətli axtarış fəal deyil"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Sür'ətli axtarış aparıla bilmir"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Harda"
 
@@ -5472,7 +5633,7 @@ msgstr "Harda"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Yeni Pəncərəde _Açığa Çıxart"
@@ -5483,7 +5644,7 @@ msgstr "Yeni Pəncərəde _Açığa Çıxart"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d Yeni _Pəncərəde Açığa Çıxart"
@@ -5492,15 +5653,21 @@ msgstr "%d Yeni _Pəncərəde Açığa Çıxart"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Mautilus nümayiş etdirə biləcəyindən daha çox axtarış nəticəsi tapdı. Bə'zi "
+"uyğun gələn üzvlər göstərilməyəcəkdir."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Mautilus nümayiş etdirə biləcəyindən daha çox axtarış nəticəsi tapdı. Bə'zi "
 "uyğun gələn üzvlər göstərilməyəcəkdir."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Həddindən Artıq Oxşarlar"
 
@@ -5514,12 +5681,12 @@ msgid "Create L_auncher"
 msgstr "B_aşladıcı Yarat"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Yeni bir başladıcı yarat"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Zibil qutusundakı bütün üzvləri sil"
 
@@ -5540,7 +5707,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "�sas Arxa Planı _İşlət"
@@ -5562,58 +5729,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Seçili üzvü göstərəcək başqa bir göstəriciyi seç"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "_Qovluq Yarad"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "_Qovluq Yarad"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Bu qovluq içində yeni boş bir qovluq yarat"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Bu qovluq içində yeni boş bir qovluq yarat"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Bütün seçili üzvlərə yumşaq körpü yarat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "İki_ləşdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Hər seçili üzvü zibil qutusuna daşımadan sil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Bütün seçili üzvləri cütləşdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Başladıcını Dəyişdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Başladıcı mə'lumatını dəyişdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Seçili sürücünü formatla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medi_a Xassələri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Seçili sürücünü ayır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Faylları Kəs ya da Faylları Köçür əmrləri tərəfindən seçili faylları daşı ya "
 "da köçür"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5621,130 +5798,139 @@ msgstr ""
 "Faylları Kəs ya da Faylları Köçür əmrləri tərəfindən seçilən faylları seçili "
 "qovluğa daşı ya da köçür"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "_Fərqli aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Hər bir seçili üzvü yeni bir pəncərəde aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Yeni Pəncərə _içində Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Seçili üzvü bu pəncərəde aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Faylları Yapışdır əmri ilə seçili faylları köçürməyə hazırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Faylları Yapışdır əmri ilə seçili faylları daşımağa hazırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Qoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Seçili sürücünü qoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Seçili üzvü yenidən adlandır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Görünüşü _əsaslara sıfırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Sıralama düzülüşü və yaxınlıq dərəcəsini bu görünüş üçün seşənəklərə görə "
 "sıfırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "~/Nautilus/scripts qovluğundaku skriptləri icra et ya da düzəlt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Bütün Faylları Seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Naxışlar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Bu pəncərədeki bütün üzvləri seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Bu pəncərədeki bütün üzvləri seç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Seçili sürücünün media xüsusiyyətlərini göstər"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Bu menyuda görünən skrriptlərin qovluqlarını göstər"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Seçili sürücünü ayır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Bu yer üçün əsas arxa planı işlət"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Hər seçili üzvün xüsusiyyətlərini göstər ya da dəyişdir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Faylı K_öçürt"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Şəkilləndirmə"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Sürücünü _Ayır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Skritplər Qovluğunu _Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Faylları Y_apışdır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Faylları Qovluğun İçinə Y_apışdır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Xassələr"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Yenidən Adlandır..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skriptlər"
 
@@ -5829,7 +6015,12 @@ msgstr "_�llə"
 msgid "Indexing is %d%% complete."
 msgstr "İndeksləmə %d%% bitdi."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Fayllarınız axırıncı dəfə \"%s\"da(də) aparıldı"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5837,25 +6028,29 @@ msgstr ""
 "Bir neçə gün əvvəl sisteminiz indekslənmişdi. Ona görə də axtarışlarınız "
 "sür'ətli aparılır."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "İndeksləmə Vəziyyəti"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Fayllarınız axırıncı dəfə \"%s\"da(də) aparıldı"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Bir neçə gün əvvəl sisteminiz indekslənmişdi. Ona görə də axtarışlarınız "
-"sür'ətli aparılır. Fayllarınız hal hazırda indekslənir."
+"sür'ətli aparılır."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Bu dəqiqə indeks faylınız yoxdur."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5864,15 +6059,19 @@ msgstr ""
 "Sür'ətli axtarışla \"Find\" axtarışları cəldləşdirir. KompüterinizdəSür'ətli "
 "axtarış fəal deyil. Ona görə də bu dəqiqə indeksiniz yoxudr."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Bu dəqiqə indeks faylınız yoxdur."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Bağışlayın, Medusa axtarış xidməti fəal deyil."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5896,32 +6095,37 @@ msgstr "İndeksləmə _Vəziyyətini Göstər"
 msgid "Show status of indexing used when searching"
 msgstr "Axtarışlarda işlətdiyin indeksləmənin vəziyyəti göstər"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Lazımi Qovluq Yaradıla Bilmir"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Lazımi Qovluqlar Yaradıla Bilmir"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus lazımi \"%s\" qovluğunu yarada bilmir. Nautilusu işə salmadan "
 "əvvəl, xahiş edirik, bu qovluğu yaradın. Ya da Nautilusun özünün yarada "
 "bilməsi üçün səlahiyyətləri dəyişdirin."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Lazımi Qovluqlar Yaradıla Bilmir"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5932,22 +6136,27 @@ msgstr ""
 "Nautilusu işə salmadan əvvəl, xahiş edirik, bu qovluğu yaradın. Ya da "
 "Nautilusun özünün yarada bilməsi üçün səlahiyyətləri dəyişdirin."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Köhnə Masa Üstünə Körpü"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Masa üstü cərgəsinin yeri GNOME 2.4'də dəyişdirilib. \"Köhnə Masa Üstünə "
 "Körpü\" adında bir körpü masa üstünüzdə yaradılıb. Onun köməyi ilə köhnə "
 "masa üstünüzdəki sənədlərinizi yeni masa üstünüzə daşıya bilərsiniz."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Köhnə masa üstü"
 
 #. Can't register myself due to trouble locating the
@@ -5960,7 +6169,7 @@ msgstr "Köhnə masa üstü"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5971,7 +6180,7 @@ msgstr ""
 "yenidən qura bilərsiniz."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6015,12 +6224,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus indi gözlənilməz bir xətadan ötrü istifadə edilməz ."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6028,7 +6237,7 @@ msgstr ""
 "Nautilus indi gözlənilməz bir Bonobo xətasından ötrü istifadə edilməz . "
 "Bonobo'ya fayl idarəçisi görünüşlər vericisini başladarkən xəta oldu ."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6038,7 +6247,7 @@ msgstr ""
 "gözlənilməz bir xəta oldu. bonobo-activation-server-nin dayandırılması və "
 "Nautilus yenidən başladılması problemi həll edə bilər."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6048,6 +6257,17 @@ msgstr ""
 "gözlənilməz bir xəta oldu. bonobo-activation-server-nin dayandırılması və "
 "Nautilusun yenidən başladılması problemi həll edə bilər."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Yardım göstərilərkən xəta oldu: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "TÉ™'yin edilmiÅŸ niÅŸanlar yoxdur"
@@ -6081,36 +6301,47 @@ msgstr "Daha Qısa"
 msgid "Find Them!"
 msgstr "Onları Axtar!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Öz İçinə Daşına Bilməz"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Təəssüf ki \"%s\" hökmlü bir fayl adı deyildir."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" hökmlü bir yer deyildir. Xahiş edirik, yazmaq istədiyini doğru yazıb "
-"yazmadığını yoxla."
+"\"%s\"i(ı) tapa bilmədim. Xahiş edirik yazmaq istədiyini doğru yazıb "
+"yazmadığını yoxla "
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Şəbəkə Vericiləri"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Ad:"
+msgid "_Location:"
+msgstr "Mövqe:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_BaÄŸlan"
@@ -6312,6 +6543,20 @@ msgstr ""
 "Sehirbazı yenidən ortaya çıxartmaq üçün bu faylı silə bilərsən.\n"
 "\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Eyni vaxtda bir neçə timsal işlədə bilərsiniz! �sad timsal üçün xahiş edirik "
+"birini sürükləyin."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Sürüklənən fayl yerli deyil. �sas rəsmlər üçün takcə yerli rəsmləri işlədə "
+"bilərsiniz."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6322,26 +6567,25 @@ msgstr "%s ilə aç"
 msgid "Open with..."
 msgstr "Fərqli aç ..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "CD yazıcı proqram başladıla bilmədi:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "CD yazıcı başladıla bilmədi"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Zibili BoÅŸalt"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Məzmunu CD'yə yaz"
 
@@ -6349,82 +6593,82 @@ msgstr "_Məzmunu CD'yə yaz"
 msgid "Go To:"
 msgstr "Sətirə Get:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Bu %d məkanları həmişə başqa pəncərələrdə görmək istəyirsən mi?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Çoxlu pəncərələrdə göstərilsinmi ?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Mövqe Açıla Bilmir"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Çox sür'ətli yoxlama sınaq dəstələrini işə sal."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Bildirilən ölçülərdə başlanğıc pəncəreəsi yarat."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Təkcə bildirilan URIlər üçün pəncərə yarat."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Masa üstünü idarə etmə (seşənəklər dialoqundakı seşənəkləri nəzərə alma)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Nautilusdan çıx."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilusu Yenidən Başlat."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Fayl İdarəçisi"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus : --check URI'lərlə bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus : --check başqa seçənəklə istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus : --quit URI'lerle bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus : --restart URI'lərlə bərabər istifadə edilə bilməz.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus : --geometry birdən çox URI ilə bərabər istifadə edilə bilməz.\n"
@@ -6432,36 +6676,49 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "\"%s\"i(ı) həmişəlik silmək istəyirsən?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "Keçmişi unutmaq istəyirsiniz? Vay Vay Vay. A kişi bu nə deyir alə?"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Həqiqətən də Nautilusdan indiyə qədər getdiyiniz yerlərin unudulmasını "
 "istəyirsiniz?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Keçmişi Təmizlə"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" yeri yoxdur. Bu yerlə əlaqəli bütün nişanlarını siyahıdan silmək "
 "istəyirsən?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "\"%s\" mövqeyi artıq mövcud deyil."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Mövcud Olmayan Yerin Nişanı"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Çıxart"
 
@@ -6494,7 +6751,6 @@ msgid "Close _All Windows"
 msgstr "_Bütün Pəncərələri Bağla"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Bütün Nautilus pəncərələrini bağla"
@@ -6518,107 +6774,118 @@ msgid "Forward"
 msgstr "QabaÄŸa"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Zibil qovluÄŸuna get"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Sonrakı yerə get"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "�vvəlki yerə get"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Zibil qovluÄŸuna get"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Ev"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Ünvan _Çubuğu"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "YenilÉ™"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Faylları bu kompüterdə axtar"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Vəziyyət Çubuğu"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Dayan"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Yuxarı"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "CD'yÉ™ yaz"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Nişan əlavə et"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Geri"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_NiÅŸanlar"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Keçmişi _Təmizlə"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "PiÅŸtaxta"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Nişanları _Düzəlt"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_İrəii"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "G_et"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Ev"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Mövqe..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Yan _Çubuq"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Zibil Qutusu"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Yuxarı"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Nümayişlər"
 
@@ -6636,34 +6903,39 @@ msgstr "Fərqli göstər ..."
 msgid "File Browser: %s"
 msgstr "Fayl yiyəsi:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Yan çubuqlardan birində xəta oldu və davam edə bilmədi. Amma hansı olduğunu "
 "təəsüf ki bilmirəm."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s nümayişində başlaqkən xəta oldu."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s yan çubuğunda xəta oldu və davam edə bilmədi. Belə davam edərsə paneli "
 "bağlasanız daha yaxşı olar."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Yan Çubuğu Paneli İflas Etdi"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Yan Çubuq"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Yan çubuq nümayişinə sahəbdir"
 
@@ -6697,147 +6969,180 @@ msgstr "Yenisini ə_lavə et..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Bağışlayın, %s naxışı silinə bilməz."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Naxış silinə bilməz"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Bağışlayın, %s emblemi silinə bilməz."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Emblem silinə bilmədi"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Yeni bir Emblem yarat:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Açar kəlmə:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Rəsm:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Yeni emblem üçün bir rəsm seç:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Yeni bir Rəng Yarat:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Rəng _adı:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Rəng _qiyməti:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Təəssüf ki \"%s\" hökmlü bir fayl adı deyildir."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Təəssüf ki hökmlü fayl adı verə bilmirsiniz."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Baxış qurula bilmir"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Təəsüf ki rəsmi dəyişdirə bilmirsiniz."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Rəsm deyildir"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Təəsüf ki %s naxışı qurula bilmir."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Naxış olaraq əlavə ediləcək rəsmi seç :"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Təəsüf ki rəng olaraq boş olmaan rəsm seçməlisiniz."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Rəng qurula bilmir"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "�lavə ediləcək rəngi seç"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Təəssüf ki `%s' hökmlü bir rəsm deyildir!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "'%s' faylı hökmlü rəsm deyil."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Kateqoriya Seç:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Silməyi _Ləğv Et"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Yeni Naxış _�lavə Et..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Yeni Rəng �_lavə Et..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Yeni E_mblem �lavə Et..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Silmək üçün naxışa tıqla"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Silmək üçün rəngə tıqla"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Silmək üçün emblemə tıqla"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Naxışlar:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Rənglər:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemlər:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Naxışı Sil..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Rəngi Sil..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Emblemi Sil..."
 
@@ -7226,34 +7531,39 @@ msgstr "_CD Yaradıcı"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "_Bütün Pəncərələri Bağla"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Yan çubuğu bağla"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "BoÅŸ CD QovluÄŸuna get"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Zibil qovluÄŸuna get"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Mövqe..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "Qovluq olanlar"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Naxışlar"
@@ -7283,10 +7593,13 @@ msgid "View Failed"
 msgstr "Nümayiş Bacarılmadı"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s nümayişində başlaqkən xəta oldu."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s nümayişində xəta oldu. Davam edə bilmirəm. Başqa yerdən başqa birini seçə "
 "bilərsiniz."
@@ -7296,103 +7609,132 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "%s nümayişində başlaqkən xəta oldu."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Bu pəncərə ilə əlaqələndirilmiş Nautilus Tə'minatı"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Məzmun Görünüşü"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Hazırkı fayl ya da qovluğun nümayişi"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"\"%s\"i(ı) tapa bilmədim. Xahiş edirik yazmaq istədiyini doğru yazıb "
-"yazmadığını yoxla "
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Emblemlər əlavə edilə bilmədi"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "\"%s\" Nautilus tərəfindən göstərilə bilmir ."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "\"%s\" göstərilə bilmədi, çünki \"Nautilus\" hansı növ fayl olduğunu tapa "
 "bilmədi."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "\"%s\" Nautilus tərəfindən nümayiş qabiliyyəti qurulmadığı üçün göstərilə "
 "bilmir."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\" göstərilə bilmədi, çünki \"Nautilus\"un %s: məkanları üçün bir "
 "idarəçisi yoxdur."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\" göstərilə bilmədi, çünki giriş qadağan edildi."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr ""
 "\"%s\" göstərilə bilmədi, çünki \"Nautilus\"un qeyd etmə cəhdi "
 "müvəffəqiyyətsiz oldu."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" göstərilə bilmədi, çünki \"%s\" yuvası tapılmadı. Vəkil verici "
 "qurğularınızı  və imla xətası edib etmədiyinizi yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "\"%s\" göstərilə bilmədi. Vəkil verici qurğularınızı yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"\"%s\" göstərilə bilmədi, çünki Nautilus əsas SMB master səyyarı ilə əlaqə "
-"qura bilmir.\n"
-"SMB vericinin yerli şəbəkədə fəaliyyət göstərdiyini yoxlayın."
+"\"%s\" göstərilə bilmədi, çünki \"Nautilus\"un %s: məkanları üçün bir "
+"idarəçisi yoxdur."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Axtarış indi aparıla bilmir. Ya indeksiniz yoxdur ya da axtarış proqramınız "
+"açıq deyildir. \"Medusa\" axtarış sisteminizin açıq olub olmadığını bir "
+"yoxlayın. İndeksiniz yoxsa \"Medusa\" indeksləyicinizi də bir yoxlayın."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Axtarış indi aparıla bilmir. Ya indeksiniz yoxdur ya da axtarış proqramınız "
 "açıq deyildir. \"Medusa\" axtarış sisteminizin açıq olub olmadığını bir "
 "yoxlayın. İndeksiniz yoxsa \"Medusa\" indeksləyicinizi də bir yoxlayın."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Axtarış Aparıla Bilmir"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"%s\" Nautilus tərəfindən göstərilə bilmir ."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Bu Yeri Göstərə Bilmirəm"
 
@@ -7404,7 +7746,7 @@ msgstr "Nişanın göstərdiyi yerə get"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Tə'lif Hüququ (c) 1999-2001 Eazel, İnc."
 
@@ -7412,13 +7754,13 @@ msgstr "Tə'lif Hüququ (c) 1999-2001 Eazel, İnc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Vasif Ä°smailoÄŸlu <linuxaz@azerimail.net>\n"
 "Mətin �mirov <metin@karegen.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7434,39 +7776,43 @@ msgstr "Bir neçə səhifə geri get"
 msgid "Go forward a number of pages"
 msgstr "Bir neçə səhifə irəli get"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Bu yeri \"%s\" ilə göstər"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Şəbəkəsi"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Nöqtələr"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD Yaradıcı"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Proqram ID'si"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Pəncərənin tə'minat ID'si"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Proqram"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Bu pəncərə ilə əlaqələndirilmiş Nautilus Tə'minatı"
 
@@ -7502,6 +7848,243 @@ msgstr "Şəbəkə Vericiləri"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Nautilus fayl idarəçisində şəbəkə vericilərinizi görün"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Avadanlıq nümayişi e'malatxanası"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Avadanlıq Nümayişçisi"
+
+#~ msgid "Hardware view"
+#~ msgstr "Avadanlıq nümayişi"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Avadanlıq olaraq Göstər"
+
+#~ msgid "hardware view"
+#~ msgstr "avadanlıq nümayişi"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "avadanlıq nümayişi üçün timsalın adı"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "avadanlıq mə'lumatı icmalı"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K ön yaddaş böyüklüyü"
+
+#~ 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 "Fəaliyyət müddəti %d gün, %d saat, %d dəqiqədir"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Avadanlıq İcmalı"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Bura, CPU səhifəsinin yeridir."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Bura, RAM səhifəsinin yeridir."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Bura, IDE səhifəsinin yeridir."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"a(ə) köçürmə sırasında xəta.\n"
+#~ "\n"
+#~ "Hədəfdə lazımi yer yoxdur."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"da(də) körpu qurma sırasında xəta.\n"
+#~ "\n"
+#~ "Hədəfdə lazımi yer yoxdur."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Üzvlərin \"%s\"a(ə) köçürmə sırasında xəta.\n"
+#~ "\n"
+#~ "Bu qovluğa yazma səlahiyyətiniz yoxdur."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Üzvlərin \"%s\"a(ə) köçürmə sırasında xəta.\n"
+#~ "\n"
+#~ "Hədəf disk yalnız oxuna biləndir."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\"da(də) körpulər qurma sırasında xəta.\n"
+#~ "\n"
+#~ "Bu qovluğa yazma səlahiyyətiniz yoxdur."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\"da(də) körpulər qurma sırasında xəta.\n"
+#~ "\n"
+#~ "Hədəf disk yalnız oxuna biləndir."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Xəta \"%s\", \"%s\" köçürülürkən oldu.\n"
+#~ "Davam etmək istəyirsiniz ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\" daşınırkən \"%1$s\" xətası oldu.\n"
+#~ "\n"
+#~ "Davam etmək istəyirsiniz?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Xəta \"%s\" \"%s\"i silərkən oldu.\n"
+#~ "\n"
+#~ "Davam etmək istəyirsiniz ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Xəta \"%s\", köçürərkən oldu.\n"
+#~ "\n"
+#~ "Davam etmək istəyirsiniz ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Xəta \"%s\", körpü qurarkən oldu.\n"
+#~ "\n"
+#~ "Davam etmək istəyirsiniz ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Xəta \"%s\", silərkən oldu.\n"
+#~ "\n"
+#~ "Davam etmək istəyirsiniz ?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Zibil Qutusuna Köçürülə Bilmədi."
+
+#~ 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 ""
+#~ "�sas gedişat \"%s\" faylını aça bilmir ona görə ki o \"%s\" mövqeyinə "
+#~ "yetişə bilmir. Bu faylı görə bilmək üçün başqa nümayişci qalmadı. �gər "
+#~ "faylı öz kompüterinizə köçürsəniz onu aça bilərsiniz."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Disklər Axtarılıq"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus diskinizdə zibil qutusu olan qovluqları axtarır."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d qədər seçili üzv zibilə atıla bilmir. Bunları elə hal hazırda silmək "
+#~ "istəyirsiniz?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Seçili üzvlərdən %d qədəri zibilə atıla bilmir. Bu, %d üzvlərini elə hal "
+#~ "hazırda silmək istəyirsiniz?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Sürüklədiyiniz fayl rəsm deyildir. �sas rəsmlər üçün takcə yerli rəsmləri "
+#~ "işlədə bilərsiniz."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Medusa axtarış xidməti qurulmadığı üçün istifadə edilə bilmir."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Bir neçə gün əvvəl sisteminiz indekslənmişdi. Ona görə də axtarışlarınız "
+#~ "sür'ətli aparılır. Fayllarınız hal hazırda indekslənir."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" hökmlü bir yer deyildir. Xahiş edirik, yazmaq istədiyini doğru "
+#~ "yazıb yazmadığını yoxla."
+
+#~ 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 ""
+#~ "\"%s\" göstərilə bilmədi, çünki Nautilus əsas SMB master səyyarı ilə "
+#~ "əlaqə qura bilmir.\n"
+#~ "SMB vericinin yerli şəbəkədə fəaliyyət göstərdiyini yoxlayın."
+
+#~ msgid "file icon"
+#~ msgstr "fayl timsalı"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Ad:"
+
 #~ msgid "Unknown"
 #~ msgstr "NamÉ™'lum"
 
@@ -7594,8 +8177,5 @@ msgstr "Nautilus fayl idarəçisində şəbəkə vericilərinizi görün"
 #~ msgid "_Toolbar"
 #~ msgstr "_Vasitə Çubuğu"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "\"%s\" mövqeyi artıq mövcud deyil."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Mövcud Olmayan Yerə Get"
diff --git a/po/be.po b/po/be.po
index c97e46fda..8aa72661b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-12 09:36+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Збой bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Эмблемы"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "Прагл�дальнік �мблемаў �аўтылю�а"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�емагчыма выдаліць �мблему"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "�е атрымала�� выдаліць �мблему з назвай \"%s\". Г�та можа азначаць, што "
 "�мблема убудавана�, а не з тых, што даданы ўла�на вамі."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "�емагчыма выдаліць �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�емагчыма зьм�ніць назву �мблемы"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "�� атрымала�� зьм�ніць назву �мблемы \"%s\". Г�та можа адзначаць, што "
 "�мблема убудавана�, а н� дадана� ўла�на Вамі."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "�емагчыма зьм�ніць назву �мблемы"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Зьм�ніць назву �мблемы"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Пазначце назву дл� адлю�траванае �мблемы:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Зьм�ніць назву"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Дадаць �мблемы..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Пазначце апі�альную назву дл� кожнай �мблемы. Г�та� назва будзе �кары�тана "
 "далей дл� ід�нтыфікацыі �мблемы."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,62 @@ msgstr ""
 "Пазначце апі�альную назву дл� �мблемы. Г�та� назва будзе �кары�тана далей "
 "дл� ід�нтыфікацыі �мблемы."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"П�ўны� файлы н� могуць быць даданы� �к �мблемы, таму �к н� зь�ўл�юцца "
-"дапушчальнымі відары�амі."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Выбачайце, але відары� %s н� можа быць у�тал�ваны �к �мблема."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Файл \"%s\" не зь�ўл�ецца р�чаі�ным відары�ам."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "�емагчыма дадаць �мблемы"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "�і�кі� файлы н� могуць быць даданы� �к �мблемы, таму �к не зь�ўл�юцца "
 "р�чаі�нымі відары�амі."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Перац�гнуць т�к�т быў нер�чаі�ным знаходжаньнем файла."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "�емагчыма дадаць �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Файл \"%s\" не зь�ўл�ецца р�чаі�ным відары�ам."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Перане�еные� файлы н� зь�ўл�юцца р�чаі�нымі відары�амі."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Сьцёрці"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Вытворча�ьць дл� прагл�ду аб�тал�ваньн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "�б�тал�ваньне"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Прагл�дальнік аб�тал�ваньн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Прагл�д аб�тал�ваньн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "�б�тал�ваньне"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "прагл�д аб�тал�ваньн�"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "назва значкі дл� прагл�ду аб�тал�ваньн�"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "агульны� зьве�ткі пра аб�тал�ваньне"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s ЦПУ\n"
-"%s MHz\n"
-"%s K памер к�ша"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Ча� працы  %d дзён, %d гадзін, %d хвілін"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "�гл�д аб�тал�ваньн�"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Г�та мей�ца дл� �тронкі ЦПУ."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Г�та мей�ца дл� �таронкі пам�ці."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Г�та мей�ца дл� �таронкі IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Гі�торы�"
@@ -909,6 +844,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "�б�тал�ваньне"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Міжнароднае"
@@ -1195,31 +1134,19 @@ msgid "Desktop trash icon name"
 msgstr "Подпі� пад значкай �ьметніцы"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"В�ліч�зны� т�чкі, большы� за г�ты памер, будуць абр�заны блізу �го. "
-"Прызнач�ньне г�тай магчыма�ьці пазьбегнуць нежаданага раздзьмуваньн� купы й "
-"забой�тва �аўтылю�а в�ліч�знымі т�чкамі. �дмоўнае знач�ньне выключае "
-"абмежаваньне. �бмежаваньне набліжана дз�куючы чытаньню кавалкам мудра�ьці "
-"(chunk-wise) т�чак."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Уключыць \"адмы�ловы�\" �ьц�гі у ды�лёге пераваг"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "�азва файла дл� дапомнага тла т�чкі. Выкары�тоўваецца толькі калі "
 "background_set і�ьціна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1227,6 +1154,20 @@ msgstr ""
 "�азва файла дл� дапомнага тла бакавое пан�лі. Выкары�тоўваецца толькі калі "
 "side_pane_background_set і�ьціна."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"В�ліч�зны� т�чкі, большы� за г�ты памер, будуць абр�заны блізу �го. "
+"Прызнач�ньне г�тай магчыма�ьці пазьбегнуць нежаданага раздзьмуваньн� купы й "
+"забой�тва �аўтылю�а в�ліч�знымі т�чкамі. �дмоўнае знач�ньне выключае "
+"абмежаваньне. �бмежаваньне набліжана дз�куючы чытаньню кавалкам мудра�ьці "
+"(chunk-wise) т�чак."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Схаваць дапомны� закладкі ў м�ню закладак."
@@ -1236,9 +1177,10 @@ msgid "Home icon visible on desktop"
 msgstr "Значка хатн�е т�чкі бачна на �тальцы"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Калі і�ьціна, �аўтылю� будзе паказываць толькі т�чкі на др�ве ў бакавое "
 "пан�лі. Інакш ён будзе паказываць і файлы й т�чкі."
@@ -1269,9 +1211,10 @@ msgstr ""
 "выбары ў ды�лёге пераваг файла."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Калі і�ьціна, тады �аўтылю� аддае перавагу паказу т�чак раней за файлы ў "
 "выгл�дах значак і �ьпі�а."
@@ -1316,8 +1259,9 @@ msgstr ""
 "м�ню закладак."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Калі і�ьціна, тады �аўтылю� будзе выкары�тоўваць хатнюю т�чку кары�тальніка "
@@ -1335,9 +1279,10 @@ msgstr ""
 "тыльду (~) зь�ўл�юцца файламі адкату."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Калі і�ьціна, тады �хаваны� файлы будуць бачны� ў кіраўніке файлаў. Схаваны� "
 "файлы - г�та ты� файлы, �кі� пачынаюцца з кропкі ці пры�утнічаюць у �ьпі�е "
@@ -1360,8 +1305,9 @@ msgstr ""
 "Калі і�ьціна, тады значка �па�ылкі на �ьметніцу будзе пакладзена на �талец."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Калі і�ьціна, тады значка �па�ылкі на хатнюю т�чку будзе пакладзена на "
@@ -1398,7 +1344,8 @@ msgstr ""
 "упарадкаваны ў парадку павеліч�ньн� памераў."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Калі і�ьціна, тады ў новых вокнах значкі будуць дапомна шчыльна "
 "разьмеркаваны."
@@ -1431,7 +1378,8 @@ msgid "List of possible captions on icons"
 msgstr "Сьпі� магчымых подпі�аў на значках"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "�айбольша� колька�ьць файлаў у т�чках, зь �кімі можна працаваць"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1451,11 +1399,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Мал�ваць �талец �родкамі �аўтылю�а"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "�аўтылю� выкарытоўвае хатнюю т�чку кары�тальніка ў �ка�ьці �тальца"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Паказываць толькі т�чкі ў др�ве бакавое пан�лі"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1475,7 +1425,8 @@ msgid "Reverse sort order in new windows"
 msgstr "�дваротнае ўпарадкаваньне ў новых вокнах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Паказываць у вокнах �пачатку т�чкі, а потым файлы"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1512,10 +1463,11 @@ msgstr ""
 "\"never\", тады прайграваньн� н�будзе ніколі."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1527,12 +1479,13 @@ msgstr ""
 "будзе �тварацца."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "�бм�жоўваць �твар�ньне міні�цюр файлаў зь відары�амі Калі ў�тал�вана \"always"
 "\", тады заў�ёды будуць �тварацца міні�цюры, нават калі файл знаходзіцца на "
@@ -1542,10 +1495,11 @@ msgstr ""
 "будуць выкары�тоўвацца звычайны� занчкі."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "�бм�жоўваць паказ колька�ьці �лем�нтаў т�чкі. Калі ў�тал�вана \"always\", "
@@ -1556,18 +1510,20 @@ msgstr ""
 "�лем�нтаў т�чкі ніколі н� будзе паказывацца."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Дапомны парадак упарадкаваньн� �лем�нтаў у выгл�дзе значак. Магчымы� "
 "знач�ньні: \"name\" (назва), \"size\" (памер), \"type\" (від), "
 "\"modification_date\" (ча� зьм�неньн�), \"emblems\" (�мблемы)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Дапомны парадак упарадкаваньн� �лем�нтаў у выгл�дзе �ьпі�у. Магчымы� "
 "знач�ньні: name (назва), size (памер), type (від), modification_date (ча� "
@@ -1615,7 +1571,8 @@ msgid "Use manual layout in new windows"
 msgstr "Выкары�тоўваць адмы�ловае разьмеркаваньне ў новых вокнах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Выкары�тоўваць шчыльнае разьмеркаваньне ў новых вокнах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1646,7 +1603,8 @@ msgstr ""
 "\" (прагл�дальнік �ьпі�у) і \"icon_view\" (прагл�дальнік значак)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Калі паказываць колька�ьць �лем�нтаў у т�чке"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1658,7 +1616,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Калі паказываць міні�цюры файлаў зь відары�амі"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Ці будзе ў�тал�вана адмы�ловае дапомнае тло т�чак."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1815,68 +1774,83 @@ msgstr "�кінуць"
 msgid "on the desktop"
 msgstr "на �тальце"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "�емагчыма выдаліць падзел"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "�емагчыма выдаліць падзел"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Пера_м��ьціць �юды"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Скапі�ваць �юды"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Спа�_лацца� �юды"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "У�тал�ваць �к _тло"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "�дм�ніць"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Выкары�тоўваць �к тло дл� _ў�іх т�чак"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Выбачайце, але т�ма \"%s\" н� можа быць у�тал�вана."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Выбачайце, але патр�бна пазначыць н�пу�тое ключавое �лова дл� новай �мблемы."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "�емагчыма ў�тал�ваць �мблему"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1887,20 +1861,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Выбачайце, але ўжо і�нуе �мблема з назвай \"%s\". Калі ла�ка, выб�рыце іншую "
 "назву."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�емагчыма ў�тал�ваць �мблему"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Выбачайце, немагчыма захаваць �мблему кары�тальніка."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Выбачайце, немагчыма захаваць назву �мблемы."
 
@@ -1919,22 +1899,28 @@ msgstr "З:"
 msgid "To:"
 msgstr "У:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Памылка пад ча� перано�у."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Памылка пад ча� перано�у.\n"
 "\n"
 "\"%s\" немагчыма перане�ьці покуль ды�к да�тупны толькі дл� чытаньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Памылка пад ча� выдаленьн�."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1943,22 +1929,17 @@ msgstr ""
 "\"%s\" немагчыма выдаліць покуль вы н� будзеце мець правы на до�туп да "
 "выш�йшай т�чкі."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Памылка пад ча� выдаленьн�.\n"
 "\n"
 "\"%s\" немагчыма выдаліць покуль ды�к да�тупны толькі дл� чытаньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1967,12 +1948,15 @@ msgstr ""
 "\"%s\" немагчыма выдаліць покуль вы н� будзеце мець правы на до�туп да "
 "выш�йшай т�чкі."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Памылка пад ча� перано�у."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Памылка пад ча� перано�у.\n"
@@ -1980,251 +1964,189 @@ msgstr ""
 "\"%s\" немагчыма перане�ьці покуль ён ці �го бацькоў�ка� т�чка утрымліваюцца "
 "ў мей�цы прызнач�ньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Памылка пад ча� перано�у.\n"
 "\"%s\" н� можа быць перане�ена ў �ьметніцу, таму �к вы н� маеце правоў дл� "
 "зьмены �е ці выш�йшай т�чкі."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Памылка пад ча� капі�ваньн�."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Памылка пад ча� капі�ваньн�.\n"
 "\n"
 "\"%s\" немагчыма �капі�ваць да таго ча�у �к вы атрымаеце правы на чытаньне "
 "г�тага."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Памылка пад ча� капі�ваньн� у \"%s\".\n"
-"\n"
-"�еда�таткова ды�кавае пра�торы на прыймальніку."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Памылка пад ча� капі�ваньн�."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Памылка пад ча� перано�у ў \"%s\".\n"
 "\n"
 "�еда�таткова ды�кавае пра�торы на прыймальніку."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Памылка пад ча� �твар�ньн� лучыва на \"%s\".\n"
-"\n"
-"�еда�таткова ды�кавае пра�торы на прыймальніку."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Памылка пад ча� перано�у."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Памылка пад ча� злуч�ньн�."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Памылка пад ча� капі�ваньн� ў \"%s\".\n"
 "\n"
 "Вы н� маеце правоў на запі� у г�тую т�чку."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Памылка пад ча� капі�ваньн� у \"%s\".\n"
 "\n"
 "Прыймальнік да�тупны толькі на чытаньне."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Памылка пад ча� перано�у запі�аў у \"%s\".\n"
-"\n"
-"Вы н� маеце правоў на запі� у г�тую т�чку."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Памылка пад ча� перано�у запі�аў у \"%s\".\n"
-"\n"
-"Прыймальнік да�тупны толькі на чытаньне."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Памылка пад ча� �твар�ньн� лучываў у \"%s\".\n"
-"\n"
-"Вы н� маеце правоў на запі� у г�тую т�чку."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Памылка пад ча� перано�у."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Памылка пад ча� �твар�ньн� лучываў у \"%s\".\n"
-"\n"
-"Прыймальнік да�тупны толькі на чытаньне."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылка \"%s\" пад ча� капі�ваньн� \"%s\".\n"
-"\n"
-"Жадаеце прац�гваць?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Памылка пад ча� злуч�ньн�."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Памылка пад ча� капі�ваньн�."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Памылка \"%s\" пад ча� перано�у \"%s\".\n"
+"Памылка \"%s\" пад ча� перано�у.\n"
 "\n"
 "Жадаеце прац�гваць?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылка \"%s\" пад ча� �твар�ньн� лучыва на \"%s\".\n"
-"\n"
-"Жадаеце прац�гваць?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Памылка пад ча� перано�у."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Памылка \"%s\" пад ча� выдаленьн� \"%s\".\n"
+"Памылка \"%s\" пад ча� �твар�ньн� лучыва на \"%s\".\n"
 "\n"
 "Жадаеце прац�гваць?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылка \"%s\" пад ча� капі�ваньн�.\n"
-"\n"
-"Жадаеце прац�гваць?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Памылка пад ча� выдаленьн�."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылка \"%s\" пад ча� перано�у.\n"
-"\n"
-"Жадаеце прац�гваць?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Памылка пад ча� капі�ваньн�."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылкаr \"%s\" пад ча� злуч�ньн�.\n"
-"\n"
-"Жадаеце прац�гваць?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Памылка пад ча� перано�у."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Памылка \"%s\" пад ча� выдаленьн�.\n"
-"\n"
-"Жадаеце прац�гваць?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Памылка пад ча� злуч�ньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Памылка пад ча� выдаленьн�."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Памылка пад ча� капі�ваньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Памылка пад ча� перано�у."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Памылка пад ча� злуч�ньн�."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Памылка пад ча� выдаленьн�."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Прапу�цiць"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Паўтарыць"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�� атрымала�� завершыць пазначанае дзе�ньне."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" н� можа быць перане�ены ў новае мей�ца, таму �к �го назва ўжо "
 "выкары�тоўваецца дл� а�аблівага �лем�нта, �кі н� можа быць выдалены ці "
@@ -2233,13 +2155,16 @@ msgstr ""
 "Калі Вы ў�ё �шч� жадаеце перане�ьці �лем�нт \"%s\", зьм�ніце �гоную назву й "
 "па�прабуйце �шч�."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�� атрымала�� завершыць пазначанае дзе�ньне."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" н� можа быць �капі�ваны ў новае мей�ца, таму �к �гона� назва ўжо "
 "выкары�тоўваецца дл� а�аблівага �лем�нта, �кі н� можа быть выдалены ці "
@@ -2248,44 +2173,50 @@ msgstr ""
 "Калі Вы ў�ё �шч� жадаеце перане�ьці �лем�нт \"%s\", зьм�ніце �гоную назву й "
 "па�прабуйце �шч�."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "�емагчыма зам�ніць файл."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Файл \"%s\" ужо і�нуе.\n"
 "\n"
 "Вы жадаеце �го зам�ніць?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Канфлікт пад ча� капі�ваньн�"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Замена"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Зам�ніць у�ё"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "лучыва да %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "іншае лучыва да %s"
@@ -2294,25 +2225,25 @@ msgstr "іншае лучыва да %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d-ае лучыва да %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d-ае лучыва да %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d-ае лучыва да %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d-ае лучыва да %s"
@@ -2322,561 +2253,600 @@ msgstr "%d-ае лучыва да %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (копі�)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (інша� копі�)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " -� копі�)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr " -� копі�)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr " -� копі�)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr " -� копі�)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (копі�)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (інша� копі�)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-� копі�)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d-� копі�)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d-� копі�)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�ев�домы GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Перано� файлаў ў �ьметніцу"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Перамешчана файлаў:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Перано�іцца"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Падрыхтоўка да перано�у ў �ьметніцу..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Перано� файлаў"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Файлы перано��цца:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Падрыхтоўка да перано�у..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Заканч�ньне перано�у..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Ствар�ньне лучываў да файлаў"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Файлаў злучана:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Злучаецца"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Падрыхтоўка да �твар�ньн� лучываў..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Заканч�ньне �твар�ньн� лучываў..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Капі�ваньне файлаў"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Файлаў �капі�вана:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Капуецца"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Падрыхтоўка да капі�ваньн�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Вы н� можаце �капі�ваць �лем�нты ў �ьметніцу."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�емагчыма капі�ваць у �ьметніцу"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Вы н� можаце перане�ьці т�чку �ьметніцы."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Вы н� можаце �капі�ваць т�чку �ьметніцы."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�емагчыма зьм�ніць разьм�шч�ньне �ьметніцы."
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�емачыма �капі�ваць �ьметніцу"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "�емагчыма перане�ьці т�чку �аму ў ��бе."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "�емагчыма капі�ваць т�чку �аму ў ��бе."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Стварыць новую пу�тую т�чку ў нутры г�тае т�чкі"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�емагчыма перане�ьці ў ��бе."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�емагчыма �капі�ваць у ��бе."
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "�емагчыма капі�ваць файл на �амога ��бе."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�емагчыма капі�ваць на ��бе"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Памылка �твар�ньн� новае т�чкі\n"
 "\n"
 "Вы н� маеце правы на запі� у прыймальнік."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Памылка �твар�ньн� новае т�чкі\n"
 "\n"
 "�д�утнічае ды�кава� пра�тора на прыймальніку."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Памылка \"%s\" �твар�ньн� новае т�чкі."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Памылка �твар�ньн� новае т�чкі"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Памылка �твар�ньн� новае т�чкі"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "т�чка б�з назвы"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Памылка \"%s\" �твар�ньн� новае т�чкі."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Памылка �твар�ньн� новае т�чкі"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Памылка �твар�ньн� новае т�чкі"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 файл"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Выдаленьне файлаў"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Файлаў выдалена:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Выдал�ецца"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Падрыхтоўка да выдаленьн� файлаў..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "�ча�тка �ьметніцы"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Падрыхтоўка да ачы�ткі �ьметніцы"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Вы ўп�ўнены�, што жадаеце выдаліць у�ё �а �ьметніцы?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "�_чы�ьціць"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (копі�).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (інша� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (інша� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (інша� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3-ц�� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-ц�� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (інша� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-ц�� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-а� копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124-а� копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124-а� копі�).txt"
 
@@ -2895,64 +2865,64 @@ msgstr "foo (124-а� копі�).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "�ёньн� ў 00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "�ёньн� ў %-H:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "�ёньн� ў 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "�ёньн� ў %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "�ёньн�, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "�ёньн�, %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "�ёньн�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "учора ў 00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "учора ў %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "учора ў 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "учора ў %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "учора, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "учора, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "учора"
 
@@ -2961,133 +2931,133 @@ msgstr "учора"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Серада, 00 вера�ьн� 0000 у 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Пан, 00 ка� 0000 у 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Пан, 00 Ка� 0000 у 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 ка� 0000 у 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 ка� 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 �лем�нтаў"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 т�чак"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 файлаў"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 �лем�нт"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 т�чка"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 файл"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u �лем�нтаў"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u т�чак"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u файлаў"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? �лем�нтаў"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? байтаў"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "нев�домы від"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "нев�дома"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "праграма"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3097,7 +3067,7 @@ msgstr ""
 "ваш файл gnome-vfs.keys знаходзіцца н� там дзе тр�ба ці н� быў адшуканы па "
 "�кіх�ьці іншых прычынах."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3106,11 +3076,11 @@ msgstr ""
 "�д�утнічае апі�аньне дл� віду MIME \"%s\" (файл \"%s\"). Паведаміце, калі "
 "ла�ка, у �ьпі� ра��ылкі gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "лучыва"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "лучыва (бітае)"
 
@@ -3231,11 +3201,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Пошук па назве файла й ула�ьціва�ьц�х"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "�длю�троўваць �к значкі"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "�длю�троўваць �к �ьпі�"
@@ -3379,148 +3351,153 @@ msgstr "Хатн�� т�чка дл� %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Контуры"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "значка файла"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "т�к�т �кі р�дагуецца"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "метка �ка� р�дагуецца"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "дадатковы т�к�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "�шч� болей т�к�та"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "пад�ьв�тленьне дл� вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "ці павінна пад�ьв�тл�цца вылуч�ньне"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "пад�ьв�тленьне за��роджаньн� кл�ві�туры"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "ці павінна пад�ьв�тл�цца за��роджаньне кл�ві�туры"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "пад�ьв�тленьне дл� ў�таўкі"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "ці павінны пад�ьв�тл�цца файлы дл� ў�таўкі пад ча� захопу-й-кіданьн�"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Вобла�ьць вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Т�к�т у фр�йме"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Ры�аваць рамку вакол н�вылучанага т�к�та"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Колер вобла�ьці вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Колер вобла�ьці вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Празры�та�ьць вобла�ьці вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Празры�та�ьць вобла�ьці вылуч�ньн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Празры�та�ьць пад�ьв�тленьн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Празры�та�ьць пад�ьв�тленьн� дл� вылучаных значак"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Сьветлы колер зьве�так"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Колер, �кі выкары�тоўваецца дл� т�к�та зьве�так на цёмным тле"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Цёмны колер зьве�так"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Колер, �кі выкары�тоўваецца дл� т�к�та зьве�так на �ьветлым тле"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Г�та� т�чка выкары�тоўвае аўтаматычнае разьмеркаваньне. Жадаеце пераключыцца "
 "ў ручное разьм�шч�ньне і пакінуць г�ты �лем�нт там дзе, Вы �го разьм��ьцілі?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Г�та� т�чка выкары�тоўвае аўтаматычнае разьмеркаваньне. Жадаеце пераключыцца "
 "ў ручное разьм�шч�ньне і пакінуць г�ты� �лем�нты там дзе, Вы іх разьм��ьцілі?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Пераключыць на ручное разьм�шч�ньне?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Пераключыць"
 
@@ -3630,72 +3607,72 @@ msgstr "Дапомна дл� �лем�нтаў \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Дапомна дл� ў�іх �лем�нтаў \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Зьм�ніць \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Уключыць у м�ню дл� �лем�нтаў \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Ужываць дапомна дл� �лем�нтаў \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Уключыць у м�ню толькі дл� \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Ужываць дапомна толькі дл� \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�� уключаць у м�ню дл� �лем�нтаў \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "�азва"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Стан"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Выбраць"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Выканана"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Зьм�ніць..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Віды файлаў і праграмы"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "�а_ладзіць..."
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3703,48 +3680,48 @@ msgstr ""
 "Вы можаце наладзіць адпаведна�ьць між праграмамі й тыпамі файлаў у ды�лёге "
 "\"Праграмы й віды файлаў\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "�дчыніць з дапамогай іншага да�та�аваньн�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Выб�рыце да�та�аваньне �кое будзе адкрываць \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "�дчыніць з дапамогай іншага прагл�дальніка"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Выб�рыце прагл�дальнік дл� \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "��ма да�тупных прагл�дальнікаў дл� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "��ма адпаведных прагл�дальнікаў"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "��ма да�та�аваньн�ў, �кі� а�ацы�ваны� з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "��ма а�ацы�ваных да�та�аваньн�ў"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "��ма дзе�ньн�ў, зьв�заных з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "��ма зьв�заных дзе�ньн�ў"
 
@@ -3752,11 +3729,9 @@ msgstr "��ма зьв�заных дзе�ньн�ў"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3765,42 +3740,41 @@ msgstr ""
 "Вы можаце наладзіць GNOME, каб зьв�заць да�та�аваньні зь відамі файлаў. Мо "
 "жадаеце зьв�заць зараз да�та�аваньне з г�тым відам файлаў?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Зьв�заны� да�та�аваньні"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "�ер�чаі�ны прагл�дальнік, �кі зьв�заны з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "�ер�чаі�ны зьв�заны прагл�дальнік"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "�ер�чаі�нае да�та�аваньне, �кое зьв�зана з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "�ер�чаі�нае зьв�занае да�та�аваньне"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "�ер�чаі�нае дзе�ньне, �кое зьв�зана з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "�ер�чаі�нае зьв�занае дзе�ньне"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3811,94 +3785,134 @@ msgstr ""
 "з г�тым відам файлаў. Мо жадаеце зьв�заць зараз да�та�аваньне ці "
 "прагл�дальнік з г�тым відам файлаў?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Зьв�занае дзе�ньне"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" немагчыма адчыніць \"%s\" таму што \"%s\" н� мае до�тупа да файлаў у "
+"\"%s\". Жадаеце выбраць іншае да�та�аваньне?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" немагчыма адчыніць \"%s\" таму што \"%s\" н� мае до�тупа да файлаў у "
 "\"%s\". Жадаеце выбраць іншае да�та�аваньне?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Дапомнае дзе�ньне н� можа адчыніць \"%s\" бо н�мае до�тупу да файлаў на "
 "знаходжаньні \"%s\".  Ці не жадаеце абраць іншае дзе�ньне?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�емагчыма ачыніць знаходжаньне"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" немагчыма адчыніць \"%s\" таму што \"%s\" н� мае до�тупа да файлаў у "
+"\"%s\". Жадаеце выбраць іншае да�та�аваньне?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" н� можа одкрыць \"%s\" таму што \"%s\" н� мае до�тупа да файлаў у \"%s"
 "\". Іншы� да�та�аваньні не да�тупны� дл� прагл�ду дадзенага файла. Калі вы "
 "�капуеце дадзены файл на �вой кампутар, магчыма, вы здолееце �го адкрыць."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Дапомнае дзе�ньне н� можа адчыніць \"%s\" бо н�мае до�тупу да файлаў на "
-"знаходжаньні \"%s\".  Іншым дзе�ньн�м неда�тупны прагл�д г�тага файла. Калі "
-"вы зробіце копію г�тага файла на ваш кампутар, вы магчыма здолееце адчыніць "
-"�го."
+"знаходжаньні \"%s\".  Ці не жадаеце абраць іншае дзе�ньне?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" н� можа одкрыць \"%s\" таму што \"%s\" н� мае до�тупа да файлаў у \"%s"
+"\". Іншы� да�та�аваньні не да�тупны� дл� прагл�ду дадзенага файла. Калі вы "
+"�капуеце дадзены файл на �вой кампутар, магчыма, вы здолееце �го адкрыць."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "�дчын�ецца %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Выбачайце, але вы н� можаце выконваць каманды з аддаленага боку з-за "
 "пагадненьн�ў б��ьпекі."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "�емагчыма запу�ьціць аддаленае лучыва"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "�дбыла�� памылка пад ча� запу�ку да�та�аваньн�.\n"
 "\n"
 "Падраб�зна�ьці:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Памылка запу�ку да�та�аваньн�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Мей�ца дл� перац�гнутых файлаў падтрымлівае толькі лакальны� файлы"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Г�та мей�ца дл� перац�гнутых файлаў падтрымлівае толькі м��цовы� файлы.\n"
@@ -3906,15 +3920,15 @@ msgstr ""
 "Дл� адкрыцьц� нелакальных файлаў �капуйце іх у лакальную т�чку й перац�гніце "
 "зноў."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Мей�ца дл� перац�гнутых файлаў падтрымлівае толькі лакальны� файлы"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4169,14 +4183,6 @@ msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 "Элем�нты, назвы �кіх утрымліваюць \"medusa\" �кі� зь�ўл�юцца каталёгамі."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Пошук на ды�ках"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "\"�аўтылю�\" шукае на ды�ках т�чку �ьметніцы."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Зьм�ніць"
@@ -4380,96 +4386,106 @@ msgstr "Тло"
 msgid "Empty Trash"
 msgstr "�чы�ьціць �ьметніцу"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Будзе адкрыта %d а�обных вокнаў. Вы �апраўды жадаеце зрабіць г�та?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "�дчыніць %d акно?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Вы �апраўды жадаеце канчаткова выдаліць \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Будзе адкрыта %d а�обных вокнаў. Вы �апраўды жадаеце зрабіць г�та?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Вы �апраўды жадаеце канчаткова выдаліць \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Вы �апраўды жадаеце канчаткова выдаліць %d вылучаны� �лем�нты?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Выдаліць у�ё вылучанае назаў�ёды"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Выдаліць?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Вылучыце кат�горыю:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Шпалеры"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" вылучаны�"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 т�чка вылучана"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d т�чак вылучана"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (утрымлівае 0 �лем�нтаў)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (утрымлівае 1 �лем�нт)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (утрымлівае %d �лем�нтаў)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (утрымлівае агулам 0 �лем�нтаў)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (утрымлівае агулам 1 �лем�нт)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (утрымлівае агулам %d �лем�нт)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" вылучаны (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d �лем�нтаў вылучана (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 іншы �лем�нт вылучаны (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d іншых �лем�нтаў вылучана (%s)"
@@ -4481,7 +4497,7 @@ msgstr "%d іншых �лем�нтаў вылучана (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4490,106 +4506,124 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Т�чка \"%s\" утрымлівае больш файлаў, чым можа апрацаваць \"�аўтылю�\". "
 "П�ўны� файлы н� будуць паказаны�."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Зашмат файлаў"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" немагчыма перане�ьці ў �ьметніцу. Жадаеце выдаліць г�та неадкладна?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"�емагчыма перане�ьці ў �ьметніцу %d вылучаных запі�аў. Жадаеце выдаліць іх "
-"неадкладна?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" немагчыма перане�ьці ў �ьметніцу. Жадаеце выдаліць г�та неадкладна?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"�емагчыма перане�ьці ў �ьметніцу %d вылучаных запі�аў. Жадаеце выдаліць %d "
-"г�тых �лем�нтаў неадкладна?"
+"\"%s\" немагчыма перане�ьці ў �ьметніцу. Жадаеце выдаліць г�та неадкладна?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Выдаліць неадкладна?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Вы �апраўды жадаеце канчаткова выдаліць \"%s\" �а �ьметніцы?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Вы �апраўды жадаеце канчаткова выдаліць %d вылучаных �лем�нтаў �а �ьметніцы?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Выдаліць �а �ьметніцы?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Кары�тайце�� \"%s\" каб ачыніць вылучаны �лем�нт"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Іншае да�та�аваньне..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Да�та�аваньне..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Іншы _прагл�дальнік..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Прагл�дальнік..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�� атрымала�� завершыць пазначанае дзе�ньне:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�� атрымала�� завершыць пазначанае дзе�ньне."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Выканаць \"%s\" дл� вылучаных �лем�нтаў"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"У�е файлы выкананьн� з г�тае т�чкі будуць адлю�траваны� ў м�ню \"Сц�нары\". "
+"Выбар �ц�нару з м�ню будзе запу�каць г�ты �ц�нар з вылучанымі �лем�нтамі ў "
+"�ка�ьці парам�траў."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4597,11 +4631,11 @@ msgstr ""
 "Выбар �ц�нару з м�ню будзе запу�каць г�ты �ц�нар з вылучанымі �лем�нтамі ў "
 "�ка�ьці парам�траў."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Пра �ц�нары"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4643,19 +4677,19 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: пазыцы� й памер б�гучага акна"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "Калі вы выб�рыце каманду \"У�тавіць файлы\", �лем�нт \"%s\" будзе перане�ены"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 "Калі вы выб�рыце каманду \"У�тавіць файлы\", �лем�нт \"%s\" будзе �капі�ваны"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4663,7 +4697,7 @@ msgstr ""
 "%d вылучаных �лем�нтаў будуць перане�ены�, калі вы выб�рыце каманду "
 "\"У�тавіць файлы\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4671,161 +4705,168 @@ msgstr ""
 "%d выбраных �лем�нты будуць �капі�ваны�, калі вы выб�рыце каманду \"У�тавіць "
 "файлы\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "У буф�ры абмену н�ма нічога дл� ў�таўкі."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Памылка мантаваньн�"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Памылка размантаваньн�"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Памылка мантаваньн�"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Вы_зваліць"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Размантаваць падзел"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "�дчыніць у _новым акне"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "�дчыніць _у %d новых вокнах"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Хатн�� т�чка"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Хатн�� т�чка"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Выдаліць �а �ьметніцы"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Выдаліць у�ё вылучанае назаў�ёды"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Пера_не�ьці ў �ьметніцу"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Перам��ьціць вылучаны� �лем�нты ў �ьметніцу"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Вы_даліць"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Стварыць _лучывы"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Стварыць _лучыва"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "�_чы�ьціць �ьметніцу"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Вы_разаць файл"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Вы_разаць файлы"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "С_капі�ваць файл"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "С_капі�ваць файлы"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Г�тае лучыва н� можа быць �кары�тана�, таму �к н� мае м�ты. Можа перане�ьці "
 "�го ў �ьметніцу?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Г�тае лучыва н� можа быць �кары�тана�, таму �к н� мае м�ты. Можа перане�ьці "
+"�го ў �ьметніцу?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Біты� �па�ылкі"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" зь�ўл�ецца т�к�тавым файлам выкананьн�. Жадаеце запу�ьціць �го ці "
 "прагледзіць �го зьме�т?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Запу�ьціць ці адлю�траваць?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "�д_лю�траваць"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Запу�ьціць у _т�рмінале"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "�д_лю�траваць"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "За_пу�ьціць"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "�дчын�ецца \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "�дм�ніць адчыненьне?"
 
@@ -4846,10 +4887,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Выбачайце, немагчыма паказаць уве�ь зьме�т �лем�нта \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Правы дл� \"%s\" н� могуць быць вызначаны�."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Памылка адлю�траваньн� т�чкі"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4857,19 +4903,19 @@ msgstr ""
 "�азва \"%s\" ужо выкары�тоўваецца у г�тае т�чцы. Калі ла�ка, выб�рыце іншую "
 "назву."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "��ма �лем�нта \"%s\" у г�тае т�чцы. Магчыма ён быў перане�ены ці выдалены?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "У ва� неда�таткова правоў дл� зьмены назвы �лем�нта \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4878,68 +4924,83 @@ msgstr ""
 "�азва \"%s\" нер�чаі�на�, бо �на ўтрымлівае знак \"/\".\n"
 "Калі ла�ка, выб�рыце іншую назву."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "�азва \"%s\" недапушчальна�.\n"
 "Калі ла�ка, выб�рыце іншую назву."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "�емагчыма зьм�ніць назву дл� �лем�нта \"%s\", таму �к г�та ды�к толькі дл� "
 "чытаньн�."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Выбачайце, немагчыма зьм�ніць назву �лем�нта \"%s\" у \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Выбачайце, т�ма н� можабыць выдалена!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Памылка зьмены назвы"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "У ва� неда�таткова правоў дл� зьмены групы �лем�нта \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "�емагчыма зьм�ніць групу дл� �лем�нта \"%s\", таму �к г�ты ды�к толькі дл� "
 "чытаньн�."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Выбачайце, немагчыма зьм�ніць групу дл� �лем�нта \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Правы дл� \"%s\" н� могуць быць вызначаны�."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Памылка ў�тал�ваньн� групы"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "�емагчыма зьм�ніць уладальніка дл� �лем�нта \"%s\", таму �к г�ты ды�к толькі "
 "дл� чытаньн�."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Выбачайце, немагчыма зьм�ніць уладальніка дл� �лем�нта \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Правы дл� \"%s\" н� могуць быць вызначаны�."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Памылка ў�талёўкі уладальніка"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4947,21 +5008,26 @@ msgstr ""
 "Выбачайце, нельга зьм�ніць правы дл� \"%s\", таму �к г�ты ды�к толькі дл� "
 "чытаньн�."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Выбачайце, немагчыма зьм�ніць правы дл� \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Правы дл� \"%s\" н� могуць быць вызначаны�."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Памылка ў�талёўкі правоў"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Зьмена назвы з \"%s\" на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "�дм�ніць зьмену назвы?"
 
@@ -5019,130 +5085,154 @@ msgstr "�днавіць зыходны� памеры значак"
 msgid "Restore Icon's Original Si_ze"
 msgstr "�днавіць арыгінальны памер значак"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "указывае на \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr ""
 "�п�рацыі захопу й кіданьн� падтрымліваюцца толькі на лакальных файлавых "
 "�ы�т�мах."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr ""
+"�п�рацыі захопу й кіданьн� падтрымліваюцца толькі на лакальных файлавых "
+"�ы�т�мах."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Памылка захопу й кіданьн�"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "�едапушчальны від захопу."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "�азва файла"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Памер"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Від"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Дата зьм�неньн�"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Вы н� можаце зьв�заць больш чым з адной значкай кары�тальніка аднача�ова! "
+"Калі ла�ка, перац�гніце толькі адзін відары�, каб у�тал�ваць значку."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Вы н� можаце зьв�заць больш чым з адной значкай кары�тальніка аднача�ова! "
 "Калі ла�ка, перац�гніце толькі адзін відары�, каб у�тал�ваць значку."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Больш за адзін відары�"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Файл, �кі вы кінулі, н� лакальны. Вы можаце выкары�тоўваць толькі лакальны� "
+"відары�ы ў �ка�ьці значак."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Файл, �кі вы кінулі, н� лакальны. Вы можаце выкары�тоўваць толькі лакальны� "
 "відары�ы ў �ка�ьці значак."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Толькі лакальны� відары�ы"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Файл, �кі вы кінулі, н� зь�ўл�ецца відары�ам. Вы можаце выкары�тоўваць "
-"толькі лакальны� відары�ы ў �ка�ьці значак."
+"Файл, �кі вы кінулі, н� лакальны. Вы можаце выкары�тоўваць толькі лакальны� "
+"відары�ы ў �ка�ьці значак."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Толькі відары�ы"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Ула�ьціва�ьці"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s ула�ьціва�ьці"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "�дм�ніць змену групы?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Зьмена групы"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "�дм�ніць зьмену ўладальніка?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Зьмена уладальніка"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "нічога"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "н� чытаецца"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 �лем�нт, памерам %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d �лем�нтаў, з агульным памерам %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(п�ўны зьме�т н� чытаецца)"
 
@@ -5152,192 +5242,192 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Зьме�т:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "��ноўны"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_�азвы:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_�азва:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Від:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Памер:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "�азва:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Падзел:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Вольна� пра�тора:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Лучыва да:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "МІМЕ від:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Зьменены:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "�пошні до�туп:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Зьм�н_іць значку..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Дап_омна� значка"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Чытаньне"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Запі�"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "В_ыкананьне"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "У�тал�ваць ID _кары�тальніка"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "��аблівы� �ьц�гі:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "У�тал�ваць ID _групы"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Ліпучы біт"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Правы до�тупу"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Вы н� зь�ўл�еце�� ўладальнікам, таму вы н� можаце зьм�ніць г�ты� правы."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Уладальнік файла:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Уладальнік файла:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Група _файла:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Група файла:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Уладальнік:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Група:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Іншы�:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Т�к�тавы выгл�д:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Лічбавы выгл�д:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "�пошні раз зьменены:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Правы дл� \"%s\" н� могуць быць вызначаны�."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Правы дл� вылучанага файла н� могуць быць вызначаны�."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"�дбыла�� памылка пад ча� адлю�траваньн� дапамогі: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Памылка пад ча� адлю�траваньн� дапамогі: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�емагчыма адлю�траваць дапамогу"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "�дм�ніць адлю�траваньне акна ўла�ьціва�ьц�ў?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Ствар�ньне акна ўла�ьціва�ьц�ў"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Вылучыце значку"
 
@@ -5355,70 +5445,108 @@ msgid "Search Results"
 msgstr "Вынікі пошуку"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Выбачайце, але па�луга пошуку \"Medusa\" неда�тупна�, таму што ён н� "
-"ў�тал�ваны."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Выбачайце, але па�луга пошуку \"Medusa\" неда�тупна�."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Па�луга пошуку неда�тупна�"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Інд�к� вашае �ы�т�мы �а�тар�ў. Пошук зараз н� верне вынікаў. �овы інд�к� "
 "можна �тварыць, запу�ьціўшы па�лугу \"medusa-indexd\" у р�жыме "
 "адміні�тратара з каманднага радка."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Праграма пошуку н� можа адкрыць інд�к� файлавай �ы�т�мы. Інд�к� можа "
+"ад�утнічаць ці быць пашкоджаны. Стварыць новы інд�к� можна, выканаўшы  "
+"па�лугу \"medusa-indexd\" у р�жыме адміні�тратара ў камандным радку."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Пошук файлаў, �кі� занадта новы�"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Кожны інд�к�аваны файл на кампутары трапл�е пад крыт�р пошуку. Можна "
+"праверыць напі�аньне крыт�раў ці дадаць дадатковы� крыт�ры."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Кожны інд�к�аваны файл на кампутары трапл�е пад крыт�р пошуку. Можна "
 "праверыць напі�аньне крыт�раў ці дадаць дадатковы� крыт�ры."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "�дбыла�ы памылка пад ча� пошуку"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Праграма пошуку н� можа адкрыць інд�к� файлавай �ы�т�мы. Інд�к� можа "
 "ад�утнічаць ці быць пашкоджаны. Стварыць новы інд�к� можна, выканаўшы  "
 "па�лугу \"medusa-indexd\" у р�жыме адміні�тратара ў камандным радку."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Памылка чытаньн� інд�к�а файла"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Пад ча� загрузкі зьме�та г�тага пошуку ўзьнікла памылка: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Дл� выкананьн� пошуку па зьме�ьце праграме пошуку патрабуецца інд�к� файлаў "
+"�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Дл� выкананьн� пошуку па зьме�ьце праграме пошуку патрабуецца інд�к� файлаў "
+"�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5426,25 +5554,23 @@ msgstr ""
 "Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а, таму �к будзе "
 "зьдзей�ьнены больш павольны пошук, �кі не выкары�тоўвае інд�к�."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Дл� выкананьн� пошуку па зьме�ьце праграме пошуку патрабуецца інд�к� файлаў "
-"�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Хуткі пошук неда�тупны"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Пошук па зьме�ьце неда�тупны"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5459,56 +5585,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Дл� выкананьн� хуткага пошуку праграме пошуку патрабуецца інд�к� файлаў у "
 "�ы�т�ме. У б�гучы момант г�ткі інд�к� �твараецца. Таму �к праграма пошуку "
 "�шч� н� можа выкары�тоўваць г�ты інд�к�, пошук можа зан�ць некалькі хвілін."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Дл� выкананьн� пошуку па зьме�ьце праграмы пошуку патрабуецца інд�к� файлаў "
 "у �ы�т�ме. У б�гучы момант г�ткі інд�к� �твараецца. Пошук па зьме�ьце будзе "
 "неда�тупны, калі інд�к� будзе �твораны."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Інд�к�ны пошук неда�тупны"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Дл� выкананьн� пошуку па зьме�ьце праграме пошуку патрабуецца інд�к� файлаў "
+"�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Дл� выкананьн� пошуку па зьме�ьце праграме пошуку патрабуецца інд�к� файлаў "
+"�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Дл� выкананьн� хуткага пошуку праграме пошуку патрабуецца інд�к� файлаў у "
 "�ы�т�ме. У б�гучы момант інд�к� неда�тупны. Інд�к� можна �тварыць праз "
 "запу�к па�лугі \"medisa-searcd\" у р�жыме адміні�тратара ў камандным радку. "
 "Да �твар�ньн� інд�к�а пошук будзе займаць некалькі хвілін."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Дл� выкананьн� пошуку па зьме�ьце праграме пошуку тр�ба інд�к� файлаў у "
 "�ы�т�ме. У б�гучы момант інд�к� неда�тупны. Інд�к� можна �тварыць шл�хам "
 "запу�ка па�лугі \"medisa-indexd\" у р�жыме адміні�тратара ў камандным радку. "
 "Да �твар�ньн� інд�к�а пошук па зьме�ьце н� можа быць выкананы."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Хуткі пошук н� ўключаны на вашым кампутары"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5518,11 +5676,12 @@ msgstr ""
 "�ы�т�мы. Праграма пошуку зараз н� можа зьв�рнуцца да інд�к�а, таму будзе "
 "зьдзей�ьнены больш павольны пошук, �кі не выкары�тоўвае інд�к�."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Хуткі пошук н� ўключаны на вашым кампутары"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Хуткі пошук неда�тупны"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Дзе"
 
@@ -5531,7 +5690,7 @@ msgstr "Дзе"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_�дчыніць у новым акне"
@@ -5542,7 +5701,7 @@ msgstr "_�дчыніць у новым акне"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "�дчыніць у %d _новых вокнах"
@@ -5551,15 +5710,21 @@ msgstr "�дчыніць у %d _новых вокнах"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "\"�аўтылю�\" адшукаў больш, чым можа адлю�траваць на �кране. Ча�тка "
 "�лем�нтаў н� будзет адлю�травана�."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"\"�аўтылю�\" адшукаў больш, чым можа адлю�траваць на �кране. Ча�тка "
+"�лем�нтаў н� будзет адлю�травана�."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Зашмат �упадзеньн�ў"
 
@@ -5573,12 +5738,12 @@ msgid "Create L_auncher"
 msgstr "Стварыць за_пу�кальнік"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Стварыць новы запу�кальнік"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Выдаліць у�е запі�ы ў �ьметніцу"
 
@@ -5599,7 +5764,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "У�тал�ваць дап_омнае тло"
@@ -5621,58 +5786,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Выбраць іншую праграму прагл�ду дл� адкрыцьц� вылучанага �лем�нта"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Стварыць _каталёг"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Стварыць _каталёг"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Стварыць новую пу�тую т�чку ў нутры г�тае т�чкі"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Стварыць новую пу�тую т�чку ў нутры г�тае т�чкі"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Стварыць знакавую �па�ылку дл� кожнага вылучанага �лем�нта"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Па_двоіць"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Выдаліць кожны вылучаны �лем�нт, абмінаючы �ьметніцу"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Падвоіць кожны вылучаны �лем�нт"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Р�дагаваць запу�кальнік"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Р�дагаваць зьве�ткі запу�кальніка"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Фарматаваць вылучаны падзел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Ула�ьціва�ьці _но�ьбіта"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "�дмантаваць вылучаны падзел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Перам��ьціць ці �капі�ваць файлы выбраны� раней камандай \"Выразаць файлы\" "
 "ці \"Скапі�ваць файлы\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5680,134 +5855,143 @@ msgstr ""
 "Перам��ьціць ці �капі�ваць файлы, вылучаны� раней загадам \"Выразаць файлы\" "
 "ці \"Скапі�ваць файлы\" у вылучаны каталёг"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "�дчыніць _у"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "�дчыніць кожны вылучаны �лем�нт у новым акне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "�дчыніць у _новым акне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "�дчыніць вылучаны �лем�нт у г�тым акне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Падрыхтаваць вылучаны� файлы да капі�ваньн� з дапамогай каманды \"У�тавіць "
 "файлы\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Падрыхтаваць вылучаны� файлы да перам�шч�ньн� з дапамогай каманды \"У�тавіць "
 "файлы\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "�_бараніць"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "�бараніць вылучаны падзел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Зьм�ніць назву вылучанага �лем�нта"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "У�тал�ваць _дапомны выгл�д"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "�бнавіць парадак упарадкаваньн� й маштаб дл� �упадзеньн� з наладкамі дл� "
 "г�тага прагл�ду"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Запу�к ці кіраваньне �ц�нарамі з ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Вылучыць _у�е файлы"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Шпалеры"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Вылучыць у�е �лем�нты ў г�тым акне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Вылучыць у�е �лем�нты ў г�тым акне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Прагледзіць ула�ьціва�ьці кожнага вылучанага падзела"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Паказаць т�чку �ка� ўтрымлівае �ц�нары, �кі� паказаны� ў г�тым м�ню"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "�дмантаваць вылучаны падзел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Выкары�тоўваць дапомнае тло дл� г�тага мей�ца"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Прагледзіць ці зьм�ніць ула�ьціва�ьць кожнага вылучанага �лем�нта"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "С_капі�ваць файл"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Фарматаваць"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Размантаваць падзел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_�дчыніць"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_�дчыніць т�чку �ц�нараў"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "У�_тавіць файлы"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "У�_тавіць файлы ў каталёг"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Ула�ьціва�ьці"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Зьм�ніць назву..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Сц�нары"
 
@@ -5894,7 +6078,12 @@ msgstr "_�д�утнічае"
 msgid "Indexing is %d%% complete."
 msgstr "Інд�к�ацы� выканана� на %d%%."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Вашы� файлы былі апошні раз інд�к�аваны� %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5902,25 +6091,29 @@ msgstr ""
 "Раз на дзень вашы� файлы й т�к�тавы зьме�т інд�к�уюцца дл� па�кар�ньн� "
 "пошуку."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Стан інд�к�ацыі"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Вашы� файлы былі апошні раз інд�к�аваны� %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Раз на дзень вашы� файлы й т�к�тавы зьме�т інд�к�уюцца дл� па�кар�ньн� "
-"пошуку. Вышы� файлу ўжо інд�к�аваны�."
+"пошуку."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "У б�гучы момант дл� вашых файлаў н�ма інд�к�а."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5930,15 +6123,19 @@ msgstr ""
 "Хуткі пошук неда�тупны на вашым кампутары, таму �к у Ва� зараз н�ма "
 "інд�к�нага файла."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "У б�гучы момант дл� вашых файлаў н�ма інд�к�а."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Выбачайце, але па�луга пошуку \"Medusa\" неда�тупна�."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5962,32 +6159,37 @@ msgstr "�длю�траваць �тан _інд�к�аваньн�"
 msgid "Show status of indexing used when searching"
 msgstr "Паказаць �тан інд�к�аваньн�, �кое выкары�тоўваецца дл� пошуку"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "�емагчыма �тварыць патр�бную т�чку"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�емагчыма �тварыць патр�бны� т�чкі"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "�� атрымала�� �тварыць неабходную т�чку \"%s\". Стварыце г�тую т�чку да "
 "запу�ку \"�аўтылю�а\" ці у�талюйце правы так, каб \"�аўтылю�\" мог �тварыць "
 "�е."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�емагчыма �тварыць патр�бны� т�чкі"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5998,22 +6200,27 @@ msgstr ""
 "Стварыце г�ты� т�чкі да запу�ку �аўтылю�а ці у�талюйце правы так, каб "
 "�аўтылю� мог �тварыць іх."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Стары �талец"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Знаходжаньне т�чкі �тальца было зьменена ў GNOME 2.4. Спа�ылка пад назвай "
 "\"Стары �талец\" была �творана на �талец�. Вы можаце адчыніць �е, каб "
 "перане�ьці адтуль файлы, �кі� вам патр�бы�, а потым выдаліць �е."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Пераехаўшы �тары �талец"
 
 #. Can't register myself due to trouble locating the
@@ -6026,7 +6233,7 @@ msgstr "Пераехаўшы �тары �талец"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6037,7 +6244,7 @@ msgstr ""
 "перазагрузіць кампутар ці перау�тал�ваць \"�аўтылю�\"."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6083,12 +6290,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "\"�аўтылю�\" н� можа быць �кары�таны зараз з-за нечаканае памылкі."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6096,7 +6303,7 @@ msgstr ""
 "\"�аўтылю�\" н� можа быць �кары�таны зараз з-за нечаканае памылкі ў �ы�т�ме "
 "Bonobo пад ча� �пробы зар�гі�траваць па�лужнік прагл�ду кіраўніка файлаў."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6107,7 +6314,7 @@ msgstr ""
 "activation-server і перазапу�к \"�аўтылю�а\" можа дапамагчы вырашыць "
 "праблему."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6118,6 +6325,17 @@ msgstr ""
 "activation-server і перазапу�к �аўтылю�а можа дапамагчы ў выраш�ньні г�тых "
 "ц�жка�ьц�ў."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"�дбыла�� памылка пад ча� адлю�траваньн� дапамогі: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Закладкі н� вызначаны�"
@@ -6151,36 +6369,46 @@ msgstr "Меней выбараў"
 msgid "Find Them!"
 msgstr "Шукаць іх!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�емагчыма перане�ьці ў ��бе."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Выбачайце, але \"%s\" н�правільна� назва файла."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" н� правільнае разьм�шч�ньне. Калі ла�ка, праверце правапі� і "
-"па�прабуйце �шч�."
+"�емагчыма адшукаць \"%s\". Калі ла�ка, праверце правапі� і па�прабуйце �шч�."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Сеткавы� па�лужнікі"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_�азва:"
+msgid "_Location:"
+msgstr "�азва:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Да_лучыцца"
@@ -6382,6 +6610,20 @@ msgstr ""
 "\n"
 "Вы можаце выдаліць г�ты файл а�абі�та, каб нанава запу�ьціць чараўніка.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Вы н� можаце зьв�заць больш чым з адной значкай кары�тальніка аднача�ова! "
+"Калі ла�ка, перац�гніце толькі адзін відары�, каб у�тал�ваць значку."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Файл, �кі вы кінулі, н� лакальны. Вы можаце выкары�тоўваць толькі лакальны� "
+"відары�ы ў �ка�ьці значак."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6392,26 +6634,25 @@ msgstr "�дычыніць у %s"
 msgid "Open with..."
 msgstr "�дчыніць у..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "�емагчыма запу�ьціць да�та�аваньне дл� запі�у аптычных ды�каў:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "�емагчыма запу�ьціць вып�калку ды�каў"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "�чы�ьціць �_ьметніцу"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "За_пі�аць зьме�т на CD"
 
@@ -6419,89 +6660,89 @@ msgstr "За_пі�аць зьме�т на CD"
 msgid "Go To:"
 msgstr "І�ьці да:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Вы жадаеце прагледзіць г�ты� %d мей�цаў у а�обных вокнах?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Прагледзіць у шматлікіх вокнах?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�емагчыма ачыніць знаходжаньне"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Выканаць хуткую �амаправерку."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Стварыць пачатковае акно з пазначанай геам�тры�й."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕ�МЭТРЫЯ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Толькі �твараць вокны дл� дакладна вызначаных URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "�е кіраваць �тальцом (ігнараваць наладкі ў ды�лёге перавагаў)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Вый�ьці з \"�аўтылю�а\"."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Перазапу�ьціць \"�аўтылю�\"."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Загадчык файлаў"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "\"�аўтылю�\""
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 "nautilus: парам�тар --check н� можа быць �кары�таны разам з ід�нтыфікатарамі "
 "(URI).\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: парам�тар --check н� можа быць �кары�таны разам з іншымі "
 "парам�трамі.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 "nautilus: парам�тар --quit н� можа быць �кары�таны разам з ід�нтыфікатарамі "
 "(URI).\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 "nautilus:  парам�тар --restart н� можа быць �кары�таны разам з "
 "ід�нтыфікатарамі (URI).\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus:  парам�тар --geometry н� можа быць �кары�таны разам з больш чым "
@@ -6510,36 +6751,49 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Вы �апраўды жадаеце канчаткова выдаліць \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Вы �апраўды жадаеце забыцца на гі�торыю? Калі так, вы здолееце паўтарыць "
 "г�та."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Вы ўп�ўнены�, што жадаеце ачы�ьціць �ьпі� наведаных знаходжаньн�ў?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "�чы�ьціць гі�торыю"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Знаходжаньне \"%s\" н� і�нуе. Вы жадаеце выдаліць у�е закладкі з вашага "
 "�ьпі�а, �кі� �па�ылаюцца туды?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Знаходжаньне \"%s\" больш н� і�нуе."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Закладка дл� мей�ца, �кое н� і�нуе"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Выдаліць"
 
@@ -6572,7 +6826,6 @@ msgid "Close _All Windows"
 msgstr "Зачыніць _у�е вокны"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Зачыніць у�е вокны \"�аўтылю�а\""
@@ -6595,107 +6848,119 @@ msgid "Forward"
 msgstr "�аперад"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "І�ьці да �ьметніцы"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "І�ьці да на�тупнага наведанага мей�ца"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "І�ьці да пап�р�дн�га наведанага мей�ца"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "І�ьці да �ьметніцы"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Да хаты"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Пан�ль разьм�ш_ч�ньн�"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Перазагрузіць"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Пошук файлаў на г�тым кампутары"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Радок _�тану"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Угору"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Запі�аць на CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Дадаць закладку"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "�а_зад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Закладкі"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_�чы�ьціць гі�торыю"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Р�дагаваць за_кладкі"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_�аперад"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Пераход"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Хатн�� т�чка"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Знаходжаньне..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Бакава� пан�л�"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Сьметніца"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "�а ўзровень _выш�й"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Выгл�д"
 
@@ -6713,34 +6978,39 @@ msgstr "�длю�троўваць �к..."
 msgid "File Browser: %s"
 msgstr "Уладальнік файла:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "�дна з бакавых пан�л�ў выклікала памылку й н� можа выкары�тоўвацца далей.\n"
 "Шкада, але немагчыма �казаць менавіта �ка�."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Кампан�нт прагл�ду \"%s\" адшукаў памылку пад ча� запу�ку."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Збой у бакавой пан�лі %s, прац�г немагчымы. Калі г�та будзе здарацца й "
 "далей, магчыма, тр�ба адключыць г�тую пан�лю."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Збой бакавой пан�лі"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Бакава� пан�л�"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Утрымлівае бакавую пан�лю"
 
@@ -6774,147 +7044,180 @@ msgstr "_Дадаць новае..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Выбачайце, але шпалеры %s н� могуць быць выдалены."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "�емагчыма выдаліць шпалеры"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Выбачайце, але �мблема %s н� можа быць выдалена."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "�емагчыма выдаліць �мблему"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Стварыць новую �мблему:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Ключавое �лова:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Відары�:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Выб�рыце відары� дл� новае �мблемы:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Стварыць новы колер:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_�азва колера:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Знач�ньне колера:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Выбачайце, але \"%s\" н�правільна� назва файла."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Выбачайце, але вы назвалі н�правільную назву файла."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "�емагчыма ў�тал�ваць шпалеры"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Выбачайце, але вы н� можаце зьм�ніць відары� �кіданьн�."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Г�та не відары�"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Выбачайце, але шпалеры %s н� могуць быць у�тал�ваны."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "�б�рыце файл з відары�ам, каб дадаць �го да шпалераў"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Выбачайце, але вы му�іце вызначыць назву дл� новага колера."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "�емагчыма ў�тал�ваць колер"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Выб�рыце колер каб дадаць �го"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Выбачайце, але '%s' відары� немагчыма выкары�таць �к вокладку."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Файл \"%s\" не зь�ўл�ецца р�чаі�ным відары�ам."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Вылучыце кат�горыю:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "�д_м�ніць выдаленьне"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Дадаць новы� шпалеры..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Дадаць новы колер..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Дадаць новую �мблему..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "�аці�ьніце на шпалеры, каб выдаліць іх"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "�аці�ьніце на колер, каб выдаліць �го"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "�аці�ьніце на �мблему, каб выдаліць �е"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Шпалеры:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Колеры:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Эмблемы:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Выдаліць шпалеры..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Выдаліць колер..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Выдаліць �мблему..."
 
@@ -7306,34 +7609,39 @@ msgstr "С_тваральнік CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Зачыніць _у�е вокны"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Зачыніць бакавую пан�лю"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "І�ьці да пу�той т�чкі CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "І�ьці да �ьметніцы"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Знаходжаньне..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]- т�чкі"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Шпалеры"
@@ -7363,10 +7671,13 @@ msgid "View Failed"
 msgstr "Збой прагл�ду"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Кампан�нт прагл�ду \"%s\" адшукаў памылку пад ча� запу�ку."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Узьнікла памылка прагл�ду \"%s\", прац�гваць немагчыма. Вы можаце выбраць "
 "іншую праграму прагл�ду ці перай�ьці ў іншае мей�ца."
@@ -7376,104 +7687,135 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Кампан�нт прагл�ду \"%s\" адшукаў памылку пад ча� запу�ку."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Да�та�аваньне \"�аўтылю�\" атае�омл�нае з г�тым акном."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Прагл�д зьме�та"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Прагл�д б�гучага файла ці пан�лі"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"�емагчыма адшукаць \"%s\". Калі ла�ка, праверце правапі� і па�прабуйце �шч�."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "�емагчыма дадаць �мблемы"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "�аўтылю� н� можа адлю�траваць \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "�емагчыма адлю�траваць \"%s\", пакуль \"�аўтылю�\" н� вызначыць тып файла."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "\"�аўтылю�\" н� мае у�тал�ванае праграмы прагл�ду, �ка� можа адлю�траваць \"%"
 "s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "�емагчыма адлю�траваць \"%s\", пакуль \"�аўтылю�\" н� можа кіраваць %s: "
 "разьм�шч�ньні."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "�емагчыма адлю�траваць \"%s\", пакуль �проба уваходу �канчаецца н�ўдачай."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�емагчыма адлю�траваць \"%s\", бо до�туп забаронены."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "�� атрымала�� адлю�траваць \"%s\", таму што вузел \"%s\" н� можа быць "
 "адшуканы. Зап�ўніце��, што ў ва� правільна наладжана па�луга прок�і і што вы "
 "ўв�лі адр��у правільна."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "�емагчыма адлю�траваць \"%s\". Праверце правільна�ьць ў�талёвак вашага "
 "паўнамоцнага па�лужніка."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"�емагчыма адлю�траваць \"%s\", пакуль \"�аўтылю�\" н� можа кіраваць %s: "
+"разьм�шч�ньні."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"�емагчыма адлю�траваць \"%s\", пакуль �аўтылю� н� зв�жацца з кіраўніком�еткі "
-"SAMBA.\n"
-"Праверце ці працуе па�лужнік SMB."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "У б�гучы момант пошук не да�тупны, альбо таму што у ва� н�ма інд�к�а, альбо "
 "таму што не выконваецца па�луга пошуку. Уп�ўніце��, што вы запу�ьцілі "
 "па�лугу пошуку Medusa і калі ў ва� н�ма інд�к�а, што выконваецца інд�к�атар "
 "Medusa."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"У б�гучы момант пошук не да�тупны, альбо таму што у ва� н�ма інд�к�а, альбо "
+"таму што не выконваецца па�луга пошуку. Уп�ўніце��, што вы запу�ьцілі "
+"па�лугу пошуку Medusa і калі ў ва� н�ма інд�к�а, што выконваецца інд�к�атар "
+"Medusa."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Пошук неда�тупны"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "�аўтылю� н� можа адлю�траваць \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�емагчыма адлю�траваць знаходжаньне"
 
@@ -7485,7 +7827,7 @@ msgstr "ІÑ�ьці да знаходжаньнÑ� на Ñ�кое Ñ�паÑ�ылаеÑ
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Правы �тваральнікаў © 1999-2001 Eazel, Inc."
 
@@ -7493,14 +7835,14 @@ msgstr "Правы �тваральнікаў © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Belarusian GNU/Linux Translation Team\n"
 "Home:   http://www.mova.linux.by\n"
 "Mail-to: i18n@mova.org"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7516,39 +7858,43 @@ msgstr "І�ьці назад на некалькі �таронак"
 msgid "Go forward a number of pages"
 msgstr "І�ьці наперад на колька�ьць �таронак"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "�длю�траваць г�тае знаходжаньне ў \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_Шрыфты"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Т�мы"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "С_тваральнік CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID да�та�аваньн�"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID акна да�та�аваньн�."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Да�та�аваньне"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Да�та�аваньне \"�аўтылю�\" атае�омл�нае з г�тым акном."
 
@@ -7584,6 +7930,257 @@ msgstr "Сеткавы� па�лужнікі"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Прагл�д вашых �еткавых па�лужнікаў у �аўтылю�е"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "П�ўны� файлы н� могуць быць даданы� �к �мблемы, таму �к н� зь�ўл�юцца "
+#~ "дапушчальнымі відары�амі."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Вытворча�ьць дл� прагл�ду аб�тал�ваньн�"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Прагл�дальнік аб�тал�ваньн�"
+
+#~ msgid "Hardware view"
+#~ msgstr "Прагл�д аб�тал�ваньн�"
+
+#~ msgid "View as Hardware"
+#~ msgstr "�б�тал�ваньне"
+
+#~ msgid "hardware view"
+#~ msgstr "прагл�д аб�тал�ваньн�"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "назва значкі дл� прагл�ду аб�тал�ваньн�"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "агульны� зьве�ткі пра аб�тал�ваньне"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s ЦПУ\n"
+#~ "%s MHz\n"
+#~ "%s K памер к�ша"
+
+#~ 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 "Ча� працы  %d дзён, %d гадзін, %d хвілін"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "�гл�д аб�тал�ваньн�"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Г�та мей�ца дл� �тронкі ЦПУ."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Г�та мей�ца дл� �таронкі пам�ці."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Г�та мей�ца дл� �таронкі IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Памылка пад ча� капі�ваньн� у \"%s\".\n"
+#~ "\n"
+#~ "�еда�таткова ды�кавае пра�торы на прыймальніку."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Памылка пад ча� �твар�ньн� лучыва на \"%s\".\n"
+#~ "\n"
+#~ "�еда�таткова ды�кавае пра�торы на прыймальніку."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Памылка пад ча� перано�у запі�аў у \"%s\".\n"
+#~ "\n"
+#~ "Вы н� маеце правоў на запі� у г�тую т�чку."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Памылка пад ча� перано�у запі�аў у \"%s\".\n"
+#~ "\n"
+#~ "Прыймальнік да�тупны толькі на чытаньне."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Памылка пад ча� �твар�ньн� лучываў у \"%s\".\n"
+#~ "\n"
+#~ "Вы н� маеце правоў на запі� у г�тую т�чку."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Памылка пад ча� �твар�ньн� лучываў у \"%s\".\n"
+#~ "\n"
+#~ "Прыймальнік да�тупны толькі на чытаньне."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылка \"%s\" пад ча� капі�ваньн� \"%s\".\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылка \"%s\" пад ча� перано�у \"%s\".\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылка \"%s\" пад ча� выдаленьн� \"%s\".\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылка \"%s\" пад ча� капі�ваньн�.\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылкаr \"%s\" пад ча� злуч�ньн�.\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Памылка \"%s\" пад ча� выдаленьн�.\n"
+#~ "\n"
+#~ "Жадаеце прац�гваць?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�емагчыма капі�ваць у �ьметніцу"
+
+#~ 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 ""
+#~ "Дапомнае дзе�ньне н� можа адчыніць \"%s\" бо н�мае до�тупу да файлаў на "
+#~ "знаходжаньні \"%s\".  Іншым дзе�ньн�м неда�тупны прагл�д г�тага файла. "
+#~ "Калі вы зробіце копію г�тага файла на ваш кампутар, вы магчыма здолееце "
+#~ "адчыніць �го."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Пошук на ды�ках"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "\"�аўтылю�\" шукае на ды�ках т�чку �ьметніцы."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "�емагчыма перане�ьці ў �ьметніцу %d вылучаных запі�аў. Жадаеце выдаліць "
+#~ "іх неадкладна?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "�емагчыма перане�ьці ў �ьметніцу %d вылучаных запі�аў. Жадаеце выдаліць %"
+#~ "d г�тых �лем�нтаў неадкладна?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Файл, �кі вы кінулі, н� зь�ўл�ецца відары�ам. Вы можаце выкары�тоўваць "
+#~ "толькі лакальны� відары�ы ў �ка�ьці значак."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Выбачайце, але па�луга пошуку \"Medusa\" неда�тупна�, таму што ён н� "
+#~ "ў�тал�ваны."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Раз на дзень вашы� файлы й т�к�тавы зьме�т інд�к�уюцца дл� па�кар�ньн� "
+#~ "пошуку. Вышы� файлу ўжо інд�к�аваны�."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" н� правільнае разьм�шч�ньне. Калі ла�ка, праверце правапі� і "
+#~ "па�прабуйце �шч�."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Выбачайце, але \"%s\" г�та н�прыдатны файл відары�а!"
+
+#~ 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 ""
+#~ "�емагчыма адлю�траваць \"%s\", пакуль �аўтылю� н� зв�жацца з "
+#~ "кіраўніком�еткі SAMBA.\n"
+#~ "Праверце ці працуе па�лужнік SMB."
+
+#~ msgid "file icon"
+#~ msgstr "значка файла"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_�азва:"
+
 #~ msgid "Unknown"
 #~ msgstr "�ев�дома�"
 
@@ -7678,9 +8275,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "_Toolbar"
 #~ msgstr "Панел� _�родкаў"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Знаходжаньне \"%s\" больш н� і�нуе."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "І�ьці да знаходжаньн�, �кое н� і�нуе"
 
@@ -7769,9 +8363,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "_Выконваць файлы, калі па іх клікнуць"
 
@@ -8285,9 +8876,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "Set Cover Image"
 #~ msgstr "У�тал�ваць вокладку"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Выбачайце, але '%s' відары� немагчыма выкары�таць �к вокладку."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Выб�рыце відары� дл� вокладкі:"
 
@@ -8345,9 +8933,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "Re_move Custom Icon"
 #~ msgstr "В_ыдаліць значку кары�тальніку"
 
-#~ msgid "Themes"
-#~ msgstr "Т�мы"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Паводзіны новага акна"
 
@@ -8438,9 +9023,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "Preferences"
 #~ msgstr "Ула�ьціва�ьці"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Выбачайце, але відары� %s н� можа быць у�тал�ваны �к �мблема."
-
 #~ msgid "Click on a theme to remove it."
 #~ msgstr "Клікніце па т�ме каб выдаліць �е."
 
@@ -8450,9 +9032,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "Выбачайце, але \"%s\" н� т�чка т�мы."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Выбачайце, але т�ма \"%s\" н� можа быць у�тал�вана."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "�емагчыма у�тал�ваць т�му"
 
@@ -8469,9 +9048,6 @@ msgstr "ПраглÑ�д вашых Ñ�еткавых паÑ�лужнікаў у Ð�Ð
 #~ "Выбачайце, але немагчыма выдаліць б�гучую т�му. Калі ла�ка, зьм�ніце �е "
 #~ "на іншую, і толькі потым выдал�йце г�ту."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Выбачайце, т�ма н� можабыць выдалена!"
-
 #~ msgid "_Add Theme..."
 #~ msgstr "_Дадаць т�му..."
 
diff --git a/po/bg.po b/po/bg.po
index 504888ee9..2faa6d113 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus.HEAD.bg\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2002-12-19 18:10+0200\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "неу�пешно bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Емблеми"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "Преглед на емблеми в Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�е мога да изтри� емблема"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "�е мога да изтри� емблема � име '%s'.  Това веро�тно е понеже емблемата е "
 "по�то�нна, и не �те �и � добавили вие."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "�е мога да изтри� емблема"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�е мога да преименувам емблема"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "�е мога да преименувам емблема � име '%s'.  Това веро�тно е понеже емблемата "
 "е по�то�нна, и не �те �и � добавили вие."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "�е мога да преименувам емблема"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Изтрива Емблема"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Въведете име на файл за показване на емблемата:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Преименува"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Добав� Емблеми..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Въведете име на опи�ателен тек�т за в��ка емблема. Това име ще бъде "
 "използвано на други ме�та за идентификаци� на емблемата."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,62 @@ msgstr ""
 "Въведете име на опи�ателен тек�т �лед емблемата. Това име ще бъде използвано "
 "на други ме�та за идентификаци� на емблемата."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"��кой от файловете не могат да бъдат добавени като емблеми понеже не �а "
-"валидни картинки."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Съжал�вам, но картинката %s не можа да бъде ин�талирана като емблема."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Файлът '%s' не изглежда да е валидна картинка."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "�е мога да добав� емблема"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "�ито един от файловете неможе да бъде добавен като емблеми понеже не �а "
 "валидни графични файлове."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Извлачени�т тек�т н�маше валидно ме�тоположение на файл."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "�е мога да добав� емблема"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Файлът '%s' не изглежда да е валидна картинка."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Извлачени�т файл не изглежда да е валидна картинка."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Изтрива"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Фабрика за хардуерен преглед"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Хардуер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Програма за Хардуерен преглед"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Хардуерен преглед"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Преглед като Хардуер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "хардуерен преглед"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "име на икона за хардуерен преглед"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "резюме на хардуерна информаци�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K размер на кеш"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Гб RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MБ RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Гб"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mб"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Работи %d дни, %d ча�а, %d минути"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Хардуерен Преглед"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Това е м��тото за информаци� на CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Това е м��тото за информаци�та на паметта."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Това е м��тото за информаци�та на IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "И�тори�"
@@ -909,6 +844,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Хардуер"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Международнен"
@@ -1197,30 +1136,30 @@ msgid "Desktop trash icon name"
 msgstr "Работно м��то & Кошче"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 #, fuzzy
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Показва �пециални флагове в _�а�тройка за прозорец"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1232,8 +1171,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1260,10 +1199,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Кошчето тр�бва да о�тане на работното м��то"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1296,10 +1236,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Кошчето тр�бва да о�тане на работното м��то"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1311,7 +1252,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1328,7 +1269,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1354,7 +1295,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1378,7 +1319,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1398,11 +1339,11 @@ msgstr "_Използва Nautilus за да Ñ�ъздаде работното Ð
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Използва вашата до_машна папка като работно м��то"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1422,7 +1363,7 @@ msgstr "_Отвар� в�еки файл или папка в нов прозо
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Опитва �е да го нагла�и към прозореца"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1462,7 +1403,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1470,30 +1411,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1539,7 +1480,7 @@ msgstr "Изпо_лзва ръчна подредба"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "_Отвар� избран елемент в нов прозорец"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1564,7 +1505,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 #, fuzzy
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Показва бро� обекти в Папка"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1579,7 +1520,7 @@ msgstr "Показва малки картинки за графични файÐ
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Използва подразбиращи�т �е фон на работното м��то"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1738,67 +1679,80 @@ msgstr "ре�етира"
 msgid "on the desktop"
 msgstr "на раб. м��то"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "�е мога да изтри� текущата тема"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "�е мога да изтри� текущата тема"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Кошче"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Преме�тва тук"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Копира тук"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Създава указател тук"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Задава като _Фон"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Прекъ�ва"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Задава като фон за _в�ички директории"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Съжалв�вам, но тема \"%s\" не може да бъде ин�талирана."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Съжал�вам, но вие тр�бва да зададете не празна ключова дума за нова емблема"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "�е мога да ин�талирам емблема"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1809,20 +1763,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Съжал�вам, вече �ъще�твуваща емблема \"%s\". Мол� изберете различно име за "
 "тне�."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�е мога да ин�талирам емблема"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Съжал�вам, но немога да запаз� потребител�ка емблема."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Съжал�вам, но немога да запаз� име на потребител�ка емблема."
 
@@ -1841,23 +1801,29 @@ msgstr "От:"
 msgid "To:"
 msgstr "За:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Грешка по време на преме�тване."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Грешка при преме�тване.\n"
 "\n"
 "\"%s\" не може да бъде преме�тен понеже той е на файлова �и�тема �амо за "
 "четене."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Грешка по време на изтриване."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1866,22 +1832,17 @@ msgstr ""
 "\"%s\" не може да бъде изтрит понеже вие н�мате права за модифициране на "
 "бащината папка."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Грешка по време на изтриване.\n"
 "\n"
 "\"%s\" не може да бъде изтрит понеже е на ди�к �амо за четене."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1890,24 +1851,25 @@ msgstr ""
 "\"%s\" не може да бъде преме�тен понеже вие н�мате права за модифициране на "
 "бащината папка."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Грешка по време на преме�тване."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Грешка при преме�тване.\n"
 "\n"
 "\"%s\" не може да бъде преме�тен понеже той или бащината папка �а отдалечени."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Грешка по време на преме�тване.\n"
@@ -1915,295 +1877,244 @@ msgstr ""
 "\"%s\" не може да бъде преме�тен понеже вие н�мате права за модифициране на "
 "бащината папка."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Грешка по време на копиране."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Грешка по време на копиране.\n"
 "\n"
 "\"%s\" не може да бъде копиран понеже н�мате права за четене на него."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка по време на копиране в \"%s\".\n"
-"\n"
-"��ма до�татъчно м��то."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Грешка по време на копиране."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Грешка по време на преме�тване в \"%s\".\n"
 "\n"
 "��ма до�татъчно м��то."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка при �ъздаване на указател в \"%s\".\n"
-"\n"
-"��ма до�татъчно м��то."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Грешка по време на преме�тване."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Грешка по време на �ъздаване на указател."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Грешка при копиране на обекти в \"%s\".\n"
 "\n"
 "Вие н�мате права за запи� в тази папка."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Грешка по време на копиране на обект в \"%s\".\n"
 "\n"
 "Ди�ка е �амо за четене."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при преме�тване на обекти в \"%s\".\n"
-"\n"
-"Вие н�мате права за запи� в тази папка."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка по време на преме�тване на обект в \"%s\".\n"
-"\n"
-"Ди�ка е �амо за четене."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при �ъздаване на указател в \"%s\".\n"
-"\n"
-"Вие н�мате права за запи� в тази папка."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Грешка по време на преме�тване."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при �ъздавне на връзка към \"%s\".\n"
-"\n"
-"Ди�ка е �амо за четене."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на копиране на \"%s\".\n"
-"\n"
-"И�кате ли да продължите?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Грешка по време на �ъздаване на указател."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Грешка по време на копиране."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Грешка \"%s\" по време на преме�тване на \"%s\".\n"
+"Грешка \"%s\" по време на преме�тване.\n"
 "\n"
 "И�кате ли да продължите?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на �ъздаване на указател към \"%s\".\n"
-"\n"
-"И�кате ли да продължите?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Грешка по време на преме�тване."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Грешка \"%s\" по време на изтриване на \"%s\".\n"
+"Грешка \"%s\" по време на �ъздаване на указател към \"%s\".\n"
 "\n"
 "И�кате ли да продължите?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на копиране.\n"
-"\n"
-"И�кате ли да продължите?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Грешка по време на изтриване."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на преме�тване.\n"
-"\n"
-"И�кате ли да продължите?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Грешка по време на копиране."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на �ъздаване на указател.\n"
-"\n"
-"И�кате ли да продължите?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Грешка по време на преме�тване."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" по време на изтриване.\n"
-"\n"
-"И�кате ли да продължите?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Грешка по време на �ъздаване на указател."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Грешка по време на изтриване."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Грешка по време на копиране."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Грешка по време на преме�тване."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Грешка по време на �ъздаване на указател."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Грешка по време на изтриване."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Пре�кача"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Опитва отново"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�е мога да завърша зададеното дей�твие."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" не можа да бъде преме�тен на нов адре� понеже името му �е използва за "
 "�пециален обект който не можа да бъде изтрит или заменен.\n"
 "\n"
 "�ко и�кате да преме�тите \"%s\", �менете му името и опитайте отново."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�е мога да завърша зададеното дей�твие."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" не можа да бъде копиран на нов адре� понеже името му �е използва за "
 "�пециален обект който не можа да бъде изтрит или заменен.\n"
 "\n"
 "�ко и�кате да копирате \"%s\", �менете му името и опитайте отново."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "�е мога да замен� файл"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Файла \"%s\" вече �ъще�твува.\n"
 "\n"
 "И�кате ли да го презапишете?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Конфликт по време на копиране"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Зам�на"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Зам�на на в�ички"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "указател към %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "друг указател към %s"
@@ -2212,25 +2123,25 @@ msgstr "друг указател към %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d указател към %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d указател към %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d указател към %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d указател към %s"
@@ -2240,562 +2151,601 @@ msgstr "%d указател към %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (копие)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (друго копие)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "то копие)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "во копие)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ро копие)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "то копие)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (копие)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (друго копие)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dто копие)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dто копие)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dто копие)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�еизве�тен GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Преме�твам файловете в Кошчето"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Изхвърлени файлове:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Преме�тва"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Подготовка за преме�тване в Кошчето..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Преме�тва файлове"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Преме�тени файлове:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Подготовка за преме�тване.."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Завърши преме�тване"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Създаване на указател към файлове"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Файлове � указатели:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Създавам указател"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Подготовка за �ъздаване на указатели"
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Завърши �ъздаването на указатели"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Копиране на файлове"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Копирани файлове:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Копира"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Подготовка за копиране"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Вие не може да копирате обектите в Кошчето"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�е мога да копирам в Кошчето"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Вие не може да преме�тите тази папка-Кошче."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Вие не може да копирате тази папка"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�е мога да �мен� ме�тоположението на Кошчето"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�е мога да копирам Кошчето"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Вие не може да преме�тите папката в �ебе �и"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Вие не може да копирате папката в �ебе �и"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Създава нова празна папка в тази папка"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�е мога да преме�т� в �ебе �и"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�е мога да копирам в �ебе �и"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Вие не може да копирате файл върху �ебе �и"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�е мога да копирам върху �ебе �и."
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Грешка при �ъздаване на нова папка.\n"
 "\n"
 "Вие н�мате права за запи�"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Грешка при �ъздаване на нова папка.\n"
 "\n"
 "Там н�ма м��то."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Грешка \"%s\" при �ъздаване на нова папка."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Грешка при �ъздаване на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Грешка при �ъздаване на нова папка."
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "папка без име"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Грешка \"%s\" при �ъздаване на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Грешка при �ъздаване на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Грешка при �ъздаване на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 файл"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Изтрива файлове"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Изтрити файлове:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Изтива"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Подготовка за изтриване на файлове..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Изпразва Кошчето"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Подготовка за изпразване на Кошчето"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Сигурни ли �те, че и�кате да изтриете за по�то�нно тези обекти от Кошчето?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Празно"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (копие).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (друго копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (друго копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (друго копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (друго копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21-во копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22-ро копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21-во копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-ро копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122-ро копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-ро копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-то копие).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124-то копие)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124то копие).txt"
 
@@ -2814,64 +2764,64 @@ msgstr "foo (124то копие).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "дне� в 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "дне� в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "дне� в 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "дне� в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "дне�, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "дне�, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "дне�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "вчера в 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "вчера в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "вчера в 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "вчера в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "вчера, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "вчера, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "вчера"
 
@@ -2880,133 +2830,133 @@ msgstr "вчера"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Вчера, Септември 00 0000 в 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Пон, Окт 00 0000 в 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Пон, Окт 00 0000 в 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Окт 00 0000 в 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Окт 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 обекта"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 папки"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 файлове"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 обект"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 папка"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 файл"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u обекти"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u папки"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u файлове"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? обекта"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? байта"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "неизве�тен тип"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "неизве�тен"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "програма"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3016,7 +2966,7 @@ msgstr ""
 "верочтно означава , че ваши�т gnome-vfs.keys файл е на грешно м��то или не е "
 "намерен по друга причина."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3025,11 +2975,11 @@ msgstr ""
 "�е е намерено опи�ание за mime тип \"%s\" (файла е \"%s\"). Мол� обадете �е "
 "в пощен�ки� �пи�ък на gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "указател"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "указател (повреден)"
 
@@ -3150,11 +3100,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Тър�и за файлове по име и ак�е�оари на файл"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Преглед в Икони"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Преглед в Спи�ък"
@@ -3298,148 +3250,153 @@ msgstr "%s Домашен"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Контури"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "икона на файл"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "редактируем тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "редактируем етикет"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "допълнително тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "мовече тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "под�ветнати за избор"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "дали да �а под�ветнати за ибор"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "под�ветва фоку�а на въвеждане"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "да под�ветва ли фоку�а на въвеждане"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "под�ветва за по�тав�не"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "да под�ветва ли при 'Извлачи и по�тави'"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Правоъгълник за избиране"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Рамка на тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Чертае рамка около избран тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Избор на цв�т за рамка"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Цв�т на избрана рамка"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Избор на рамка алфа"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "�епрозрачно�т на избрана рамка"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "�лфа под�ветване"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "�епрозрачно�т на под�ветване за избрани икони"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Светъл Цв�т на Информаци�"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Цв�т използван за информационен тек�т на тъмен фон"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Тъмен Информационен Цв�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Цв�т използван за информационен тек�т на �ветъл фон"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Тази папка използва автоматична подредба. И�кате ли да превключите на ръчна "
 "и да о�тавите този обект там където е пу�нат?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Тази папка използва автоматична подредба. И�кате ли да превключите на ръчна "
 "и да о�тавите тези обекти там където �а пу�нати?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Превключва на Ръчна Подредба"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Превключва"
 
@@ -3548,72 +3505,72 @@ msgstr "Е по подразбиране за \"%s\" обект"
 msgid "Is the default for all \"%s\" items."
 msgstr "Е по подразбиране за в�ички \"%s\" обекти."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Модифицира \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Включва в менюто за \"%s\" обект"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Използва като подразбиращ �е за \"%s\" обект"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Включва в менюто �амо за \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Използва като подразбиращ �е �амо за \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�е включва в меню за \"%s\" обекти"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Име"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Стату�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Избор"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Завърши"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Модифицира..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Типове Файлове и Програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Отиди Там"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3621,48 +3578,48 @@ msgstr ""
 "Вие може да конфигурирате кои програми �а предложени за определен тип в "
 "Типовете файлове и Диалог на програми."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Отвар� � друго приложение"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Изберете приложение � което да отвор� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Отвар� � друга програма"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Избор на преглед за \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "��ма налични програми за преглед на \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "��ма налични програми за преглед"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "��ма приложение �вързано � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "��ма приложение �вързано � този тип"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "��ма приложение �вързано � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "��ма приложение �вързано � този тип"
@@ -3671,11 +3628,9 @@ msgstr "��ма приложение �вързано � този тип"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3684,44 +3639,43 @@ msgstr ""
 "Вие може да конфигурирате GNOME да �върже приложени�та �ъ� �ъответни типове. "
 "И�кате ли �вързване на приложени�та �ъ� �ъответни типове файлове."
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Свързано Приложение"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "��ма приложение �вързано � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "��ма приложение �вързано � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "��ма приложение �вързано � този тип"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "��ма приложение �вързано � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "��ма приложение �вързано � този тип"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3731,94 +3685,134 @@ msgstr ""
 "Вие може да конфигурирате GNOME да �върже приложени�та �ъ� �ъответни типове. "
 "И�кате ли �вързване на приложени�та �ъ� �ъответни типове файлове."
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "Свързано Приложение"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" не мога да отвор� \"%s\" понеже \"%s\" нама до�тъп до файл \"%s\". "
+"И�кате ли да изберете друго приложение?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" не мога да отвор� \"%s\" понеже \"%s\" нама до�тъп до файл \"%s\". "
 "И�кате ли да изберете друго приложение?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "\"%s\" не мога да отвор� \"%s\" понеже \"%s\" нама до�тъп до файл \"%s\". "
 "И�кате ли да изберете друго приложение?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�е мога да отвор� адре�"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" не мога да отвор� \"%s\" понеже \"%s\" нама до�тъп до файл \"%s\". "
+"И�кате ли да изберете друго приложение?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" не може да отвори \"%s\" понеже \"%s\" н�ма до�тъп до файловете в \"%s"
 "\". ��ма други приложени� �по�обни да прегледат този файл. �ко го копирате "
 "на ваши�т компютър, вие може да у�пеете да го отворите."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" не мога да отвор� \"%s\" понеже \"%s\" нама до�тъп до файл \"%s\". "
+"И�кате ли да изберете друго приложение?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" не може да отвори \"%s\" понеже \"%s\" н�ма до�тъп до файловете в \"%s"
 "\". ��ма други приложени� �по�обни да прегледат този файл. �ко го копирате "
 "на ваши�т компютър, вие може да у�пеете да го отворите."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Отвар� \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Съжал�вам, но вие не може да изпълните команди на отдалечени� �айт поради "
 "причина за �игурно�т."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "�е мога да изпълн� отдалечен указател"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "По�ви грешка при �тартиране на приложение.\n"
 "\n"
 "Подробно�ти:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Грешка при �тартиране на приложение"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "М��то за извлачвани файлове подържа �амо локалните."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Това м��то за извлачване на файлове подържа �амо локалните.\n"
@@ -3826,15 +3820,15 @@ msgstr ""
 "За да отворите файлове които не �а локални копирайте ги в локална папка и "
 "�лед това ги извлачете отново."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "М��то за извлачвани файлове подържа �амо локалните."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4089,14 +4083,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Обекти �ъдържащи \"medusa\" в техните имена и �а папки"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Тър�и по ди�ковете"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus тър�и на ваши�т ди�к повредени папки."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Редактиране"
@@ -4303,97 +4289,107 @@ msgstr "Фон"
 msgid "Empty Trash"
 msgstr "Изпразва Кошчето"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Това ще отвори %d различни прозорци. Сигурен ли �те, че и�кате точно това?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Да отвор� %d прозорец?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Сигурен ли �те, че и�кате да изтриете за по�то�нно \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Това ще отвори %d различни прозорци. Сигурен ли �те, че и�кате точно това?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Сигурен ли �те, че и�кате да изтриете за по�то�нно \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Сигурен ли �те, че и�кате да изтриете за по�то�нно  %d избрани обекти?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Изтрива в�ички избрани елемент за по�то�нно"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Да изтри�?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Избор на Категори�:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Образци"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" избрани"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 избрана папка"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d избрани папки"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (�ъдържаща 0 обекта)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (�ъдържаща 1 обект)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (�ъдържаща %d обект)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (�ъдържаща общо 0 обекта)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (�ъдържаща общо 1 обект)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (�ъдържаща общо %d обекта)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" избрани (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d обекта избрани (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 друг избран елемент (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d други избрани елементи (%s)"
@@ -4405,7 +4401,7 @@ msgstr "%d други избрани елементи (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4414,119 +4410,138 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Папката \"%s\" �ъдържа повече файлове отколкото Nautilus може да поддържа. "
 "��кой файлове н�ма да бъдат показани."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Твърде много файлове"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" не може да бъде преме�тен в Кошчето. Изкате ли да го изтриете "
 "незабавно?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d избрани обекта не могат да бъдат преме�тени в Кошчето. Изкате ли да го "
-"изтриете незабавно?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" не може да бъде преме�тен в Кошчето. Изкате ли да го изтриете "
+"незабавно?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d от избраните обекти не могат да бъдат преме�тени в Кошчето. И�кате ли "
-"тези %d обекта да бъдат изтрити?"
+"\"%s\" не може да бъде преме�тен в Кошчето. Изкате ли да го изтриете "
+"незабавно?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Да изтри� незабавно?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Сигурен ли �те, че и�кате да изтриете за по�то�нно \"%s\" от Кошчето?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Сигурен ли �те, че и�кате да изтриете за по�то�нно %d избрани елементи от "
 "Кошчето?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Да изтри� от Кошчето?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Използва \"%s\" за отвар�не на избрани� елемент"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Друго _приложение..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Приложение.."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Друг _Преглед..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Преглед..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�е мога да завърша зададеното дей�твие:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�е мога да завърша зададеното дей�твие."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Изпълн�ва \"%s\" за в�еки избран елемент"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"В�ички изпълними файлове от тази папка ще �е по�ват в Скрипт менюто "
+"Избирането на �крипт от менюто ще го изпълни � избраните обекти като вход."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "В�ички изпълними файлове от тази папка ще �е по�ват в Скрипт менюто "
 "Избирането на �крипт от менюто ще го изпълни � избраните обекти като вход."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Отно�но Скриптовете"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4566,184 +4581,191 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY:м��то и размер на текущ прозорец"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" ще бъде преме�тен ако изберете командата По�тави файлове"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" ще бъде копиран ако изберете командата По�тави файлове"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "%d избрани обекта ще бъдат преме�тени, ако изберете командата По�тави файлове"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d избрани обекта ще бъдат копирани, ако изберете командата По�тави файлове"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "��ма нищо в буфера за обмен за по�тав�не."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Грешка при монтиране"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Грешка при демонтиране"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Грешка при монтиране"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Из_хвърли"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Демонтира у�трой�тво"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Отвар� в �ов Прозорец"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Отвар_� в %d �ов Прозорец"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Домашна Папка"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Домашна Папка"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Изтрива от _Кошчето"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Изтрива в�ички избрани елемент за по�то�нно"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "П_реме�тва в Кошчето"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Преме�тва в�еки избран елемент в Кошчето"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Из_трива"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Създава _Указатели"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Създав_а Указател"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Изпразва Кошчето"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Отр�зва Фа_йл"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Отр�зва Фа_йлове"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Копира Файл"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Копира Файлове"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Този указател не можа да бъде използван, понеже н�ма обект към който да "
 "�очи. И�кате ли да ппреме�тите този указател в Кошчето?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Този указател не можа да бъде използван, понеже н�ма обект към който да "
+"�очи. И�кате ли да ппреме�тите този указател в Кошчето?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Повреден Указател"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" е изпълним тек�тови файл. И�кате ли да го изпълните, или да покажа "
 "�ъдържанието му?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Изпълними тек�тови файлове"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Да изпълн� или да Покажа?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "По_казва"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Изпълн�ва в тер_минал"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "По_казва"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Изп_ълни"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Отвар� \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Да прекъ�на отвар�нето?"
 
@@ -4764,27 +4786,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Съжал�вам, но не мога да покажа ц�лото �ъдържание на \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Правата на \"%s\" не могат да бъдат определени"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Грешка при показване на папка."
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Името \"%s\" вече �е използва в тази папка. Мол�, изберете друго."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "��ма \"%s\" в тази папка. Може би той е преме�тен или изтрит?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Вие н�мате необходимите права за �м�на името на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4793,81 +4820,101 @@ msgstr ""
 "Името \"%s\" е невалидно понеже �ъдържа �имвола \"/\". Мол�, изберете друго "
 "име."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Името \"%s\" е невалидно. Мол�, изберете друго."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "�е мога да �мен� името на \"%s\" понеже той е на ди�к �амо за четене"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Съжал�вам, но не мога да �мен� името \"%s\" на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Съжал�вам, но този обект не може да бъде изтрит!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Грешка при преименуване"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Вие н�мате права необходими за �м�на на групата на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "�е мога да �мен� групата на \"%s\" понеже той е на ди�к �амо за четене"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Съжал�вам, но не мога да �мен� групата на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Правата на \"%s\" не могат да бъдат определени"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Грешка при у�танов�ване на група"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "�е мога да �мен� �об�твеника на \"%s\" понеже той е на ди�к �амо за четене"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Съжал�вам, но не мога да �мен� �об�твеника на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Правата на \"%s\" не могат да бъдат определени"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Грешка при у�танов�ване на Соб�твеник"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "�е мога да �мен� правата на \"%s\" понеже е на ди�к �амо за четене"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Съжал�вам, но не мога да �мен� правата на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Правата на \"%s\" не могат да бъдат определени"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Грешка при у�танов�ване на правата"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Преименувам \"%s\" на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Да прекъ�на преименуването?"
 
@@ -4925,128 +4972,150 @@ msgstr "ВъзÑ�тановÑ�ва и_кони в оригинален размеÑ
 msgid "Restore Icon's Original Si_ze"
 msgstr "Въз�танов�ва икона в оригинален размер"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "указва на \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "'Изтегли и пу�ни' �е използва �амо за локани файлове."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "'Изтегли и пу�ни' �е използва �амо за локани файлове."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Грешка в 'Изтегли и пу�ни'"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Използван е невалиден тип за извлачване."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Размер"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Тип"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Дата на Модифициране"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Вие не може да назначавате повече от една икона едновременно. Мол� извлачете "
 "�амо една картинка за у�танов�ване като потребител�ка икона."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Вие не може да назначавате повече от една икона едновременно. Мол� извлачете "
+"�амо една картинка за у�танов�ване като потребител�ка икона."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Повече от една картинка"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Файла който по�тавихте не е локален. Вие може да използвате �амо локални "
+"картинки като потребител�ки икони."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Файла който по�тавихте не е локален. Вие може да използвате �амо локални "
 "картинки като потребител�ки икони."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Само локални картинки"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Файла който вие по�тавихте не е графичен файл. Може да използвате �амо "
-"локални картинки като потребител�ки икони."
+"Файла който по�тавихте не е локален. Вие може да използвате �амо локални "
+"картинки като потребител�ки икони."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Само картинки"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "�а�тройки"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s �к�е�оари"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Да прекъ�на �м�на на група?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "См�на на група"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Да прекъ�на �м�на на �об�твеник?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "См�на на �об�твеник"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "нищо"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "нечетимо"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 обект � размер %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d обекта, общо %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(н�кой �ъдържани� �а нечетими)"
 
@@ -5056,195 +5125,195 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Съдържание:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Базов"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_Име:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Име:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "�дре�:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "DVD файлова �и�тема"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 #, fuzzy
 msgid "Free space:"
 msgstr "Свободен �тил"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Обект на указател:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME тип:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Модифициран:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "До�тъпван:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Избор на Потребител�ка Икона..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Премахва Потребител�ка Икона"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Четене"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Запи�"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Изпълнение"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Задава потребител�ко _ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Специални флагове:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Задава I_D на група"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Прил_епен"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Права"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Вие не �те �об�твеник, така че вие не може да промените правата."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Соб�твеник на файл:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Соб�твеник на файл:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Г_рупа на файл:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Група на файл:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Соб�твеник:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Група:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Други:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Тек�тови преглед:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Цифров преглед:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "По�ледна пром�на:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Правата на \"%s\" не могат да бъдат определени"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "Правата на \"%s\" не могат да бъдат определени"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"По�ви грешка при показване на помощ: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Има грешка при показване на помощ: %s."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�е мога да покажа помощ"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Да прекъ�на показването на на�тройки на прозорец?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Създаване на на�тойки на прозорец"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Избор на икона:"
@@ -5263,70 +5332,110 @@ msgid "Search Results"
 msgstr "Резултат от тър�ене"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Съжал�вам, но об�лужването Medusa не е налично понеже не е ин�талирано."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Съжал�вам, но об�лужването за тър�ене medusa не е налично."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Об�лужването за тър�ене не е налично"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Тър�енето което вие �те избрали е по-ново от индек�а на вашата �и�тема. "
 "Тър�енето н�ма да върне резултат. Вие може да �ъздадете нов индек� "
 "изпълн�вайки командата \"medusa-indexd\" като root от команден ред."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find не може да отвори ваши�т �и�темен индек�ен файл. Ваши� индек� може да "
+"лип�ва или да е повреден...Вие може да �ъздадете нов � командата \"medusa-"
+"indexd\" като root в команден ред."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Тър�ене за обекти които �а твърде нови"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"В�еки индек�ен файл на вашата �и�тема �е �равн�ва � критериите които �те "
+"избрали. Може да проверите правопи�а на ваши� избор или да добавите повече "
+"критерии за да �те�ните резултата от тър�енето."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "В�еки индек�ен файл на вашата �и�тема �е �равн�ва � критериите които �те "
 "избрали. Може да проверите правопи�а на ваши� избор или да добавите повече "
 "критерии за да �те�ните резултата от тър�енето."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Грешка по време на тър�ене"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find не може да отвори ваши�т �и�темен индек�ен файл. Ваши� индек� може да "
 "лип�ва или да е повреден...Вие може да �ъздадете нов � командата \"medusa-"
 "indexd\" като root в команден ред."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Грешка при четене на индек�ен файл"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "По�ви �е грешка при зареждане на това �ъдържание за тър�ене: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"За да извърши тър�ене по �ъдържание, Find изи�ква индек� на файловете на "
+"вашата �и�тема. Точно �ега Find н�ма до�тъп до индек�а."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"За да извърши тър�ене по �ъдържание, Find изи�ква индек� на файловете на "
+"вашата �и�тема. Точно �ега Find н�ма до�тъп до индек�а."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5334,25 +5443,23 @@ msgstr ""
 "�и�тема. Find н�ма до�тъп до него и затова ще бъде извършено бавно тър�ене "
 "което не изи�ква индек�."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"За да извърши тър�ене по �ъдържание, Find изи�ква индек� на файловете на "
-"вашата �и�тема. Точно �ега Find н�ма до�тъп до индек�а."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Бързото тър�ене не е налично"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Контек�тното тър�ене не е налично"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5366,55 +5473,87 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "За да извърши Бързо тър�ене, Find �е нуждае от индек� на файловете за вашата "
 "�и�тема. В момента �е изгражда този индек�.  Понеже Find не може да използва "
 "този индек�, това тър�ене ще отнеме н�колко минути."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "За да извърши тър�ене по �ъдържание, Find �е нуждае от индек� на "
 "�ъдържанието на вашата �и�тема.  Сега �е �ъздава този индек�. Тър�енето по "
 "�ъдържание ще бъде налично �лед по�тро�ване на индек�а."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Индек�ното тър�ене не е налично"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"За да извърши тър�ене по �ъдържание, Find изи�ква индек� на файловете на "
+"вашата �и�тема. Точно �ега Find н�ма до�тъп до индек�а."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"За да извърши тър�ене по �ъдържание, Find изи�ква индек� на файловете на "
+"вашата �и�тема. Точно �ега Find н�ма до�тъп до индек�а."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "За да направите бързо тър�ене, Find изи�ква индек� на файловете във вашата "
 "�и�темаЗа �ега н�ма наличен индек�. Вие тр�бва да �ъздадете такъв като "
 "изпълните като root \"medusa-indexd\" от команден ред."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "За да извърши контек�тно тър�ене, Find �е нуждае от индек� на �ъдържанието "
 "на вашата �и�тема. За �ега н�ма индек�. Вие може да �ъздадете такъв като "
 "изпълните програмата \"medusa-indexd\" � правата на root от команден ред. До "
 "завършването и бързото тър�ене не може да бъде използвано."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Бързото тър�ене не е налично във вашата �и�тема"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5424,11 +5563,12 @@ msgstr ""
 "вашата �и�тема. Ваши�т �итемен админи�тратор е забранил бързото тър�ене, "
 "така че н�ма наличен индек�."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Бързото тър�ене не е налично във вашата �и�тема"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Бързото тър�ене не е налично"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Къде"
 
@@ -5437,7 +5577,7 @@ msgstr "Къде"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Показва в �ов прозорец"
@@ -5448,7 +5588,7 @@ msgstr "_Показва в �ов прозорец"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Показва %d в _�ов прозорец"
@@ -5457,15 +5597,21 @@ msgstr "Показва %d в _�ов прозорец"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus намери повече �ъвпадени� в резултат от тър�енето които може да "
 "покаже. ��кой от т�х н�ма да могат да бъдат показани."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus намери повече �ъвпадени� в резултат от тър�енето които може да "
+"покаже. ��кой от т�х н�ма да могат да бъдат показани."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Твърде Много Съвпадени�"
 
@@ -5480,12 +5626,12 @@ msgid "Create L_auncher"
 msgstr "�ово Страрт_иране"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Създава нов �тартер"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Изтрива в�ички обекти от Кошчето"
 
@@ -5507,7 +5653,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Използва подразбиращ �е _фон"
@@ -5530,58 +5676,68 @@ msgstr "Избор на нова програма за преглед на изÐ
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "�е мога да Чета Папка"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "�е мога да Чета Папка"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Създава нова празна папка в тази папка"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Създава нова празна папка в тази папка"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Създава �имволен указател за в�еки избран обект"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Д_ублира"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Изтрива в�еки избран обект, без да го преме�тва в Кошчето"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Дублира в�еки избран обект"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Редактира Страртиране"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Редактиране информаци� за �тартирането"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Формат на избран д�л"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "�а�тройки на м_еди�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Демонтира избрани�т д�л"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Преме�тва или копира файловете предварително избрани от командите за "
 "Отр�зване или Копиране на файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5590,133 +5746,142 @@ msgstr ""
 "Преме�тва или копира файловете предварително избрани от командите за "
 "Отр�зване или Копиране на файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Отвар� _�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Отвар� в�еки избран елемент в нов прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Отвар� в �ов Прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Отвар� избраните обекти в нов прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Подготв� избраните файлове за копиране � командата за По�тав�не на файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Подготв� избраните файлове за преме�тване � командата за По�тав�не на файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "За_щита"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Защита на избрани�т д�л"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Преименува избран обект"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Въз�танов�ва _Преглед � Подразбиращи �е �тойно�ти"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Преподрежда �ортирани� ред и нивото на мащаб да �ъвпадне � предпочитани�та "
 "за този преглед"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Изпълн�ва или управл�ва �криптове от ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Избор на _В�ички Файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Образци"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Избор на в�ички обекти в този прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Избор на в�ички обекти в този прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Показва на�тройките на меди�та за избрани�т д�л"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Показва �ъдържанието на папка �ъ� �криптове които �е по�в�ват в менюто"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Демонтира избрани�т д�л"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Използва подразбиращ �е фон за това ме�тоположение"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Преглед или модификаци� на ак�е�оарите на в�еки избран обект"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Копира Файл"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Формат"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Демонтира у�трой�тво"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Отвар�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Отва_р� Папка �ъ� Скриптове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_По�тав� Файлове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "Файлове и Папки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_�а�тройки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Преименува..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Скриптове"
 
@@ -5804,7 +5969,12 @@ msgstr "_Ръчно"
 msgid "Indexing is %d%% complete."
 msgstr "Индек�ирането е %d%% завършено"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Вашите файлове �а за по�ледно индек�ирани на %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5812,25 +5982,29 @@ msgstr ""
 "Един път на ден вашите файлове и �ъдържанието на тек�та �е индек�ират за да "
 "у�кор�т тър�енето."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Стату� на индек�иране"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Вашите файлове �а за по�ледно индек�ирани на %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Един път на ден вашите файлове и �ъдържание на тек�та �е индек�ират за да "
-"�помогнат бързото тър�ене. Вашите файлове �ега �е индек�ират."
+"Един път на ден вашите файлове и �ъдържанието на тек�та �е индек�ират за да "
+"у�кор�т тър�енето."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "��ма индек� за вашите файлове точно �ега."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5840,15 +6014,19 @@ msgstr ""
 "на тър�ене. Бързото тър�ене не е налично за вашата �и�тема, така че н�мате "
 "индек� точно �ега."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "��ма индек� за вашите файлове точно �ега."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Съжал�вам, но об�лужването за тър�ене medusa не е налично."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5872,32 +6050,37 @@ msgstr "Показва _индек�иращи�т �тату�"
 msgid "Show status of indexing used when searching"
 msgstr "Показва �тату�а на индек�ирането използван при тър�ене"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "�е мога да �ъздам за�вената папка"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�е мога да �ъздам за�вените папки"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus не може да �ъздаде за�вената папка \"%s\" Преди да изпълните "
 "Nautilus, мол� �ъздайте тази папка, или задайте права � които Nautilus може "
 "да � �ъздаде."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�е мога да �ъздам за�вените папки"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5908,21 +6091,25 @@ msgstr ""
 "Преди да изпълните Nautilus, мол� �ъздайте тези папки, или задайте права � "
 "които Nautilus може да ги �ъздаде."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "на раб. м��то"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "на раб. м��то"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5934,7 +6121,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5945,7 +6132,7 @@ msgstr ""
 "�и�темата или ин�талирайте Nautilus отново."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5987,12 +6174,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus не може да бъде използван �ега поради неочаквана грешка."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6000,7 +6187,7 @@ msgstr ""
 "Nautilus неможе да бъде използван �ега, поради неочаквана грешка от Bonobo "
 "при опит за реги�траци� на файлов мениджър."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6010,7 +6197,7 @@ msgstr ""
 "при опит за откриване на фабрика. Убиването на bonobo и пре�тартиране на "
 "Nautilus може да реши проблема."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6020,6 +6207,17 @@ msgstr ""
 "при опит за откриване на обект на shell. Убиването на bonobo и пре�тартиране "
 "на Nautilus може да реши проблема."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"По�ви грешка при показване на помощ: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "�е е зададена отметка"
@@ -6055,35 +6253,45 @@ msgstr "По-малко опции"
 msgid "Find Them!"
 msgstr "�амери ги!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�е мога да преме�т� в �ебе �и"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Съжал�вам, но \"%s\" не е валидно име на файл."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" не е валиден адре�. Мол�, проверете името на адре�а и опитайте отново."
+"�е мога да намер� \"%s\". Мол� проверете �и правопи�а и опитайте отново."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Мрежови Сървъри"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Име:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Ме�тоположение:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6287,6 +6495,20 @@ msgstr ""
 "\n"
 "Вие може ръчно да го изтриете за да �тартирате конфигуратора отново.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Вие не може да назначавате повече от една икона едновременно. Мол� извлачете "
+"�амо една картинка за у�танов�ване като потребител�ка икона."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Файла който по�тавихте не е локален. Вие може да използвате �амо локални "
+"картинки като потребител�ки икони."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6297,24 +6519,22 @@ msgstr "Отвар� � %s"
 msgid "Open with..."
 msgstr "Отвори �.."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "�ово Страрт_иране"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Изпразва _Кошчето"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6322,83 +6542,83 @@ msgstr ""
 msgid "Go To:"
 msgstr "Отива:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "И�кате ли да видите тези %d адре�и в отделни прозорци?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Преглед в много прозорци?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�е мога да отвор� адре�"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Изпълн�ва бързо набор от те�тове."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Създава начален прозорец �ъ� зададената геометри�."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕОМЕТРИЯ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Само �ъздава прозорец за изрично указан URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "�е управл�ва работното м��то (игнорира на�тройките от диалога за на�тройки)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "�апу�кане на Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Пре�тартиране на Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "Управление на Файлове"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --проверката не може да бъде използвана � URL.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --проверката не може да бъде използвана � други опции.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --напу�кането не може да бъде използвано � URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: -- ре�тартирането не може да бъде използвано � URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --геометри�та не мога да бъде използвана � повече от един URI.\n"
@@ -6406,36 +6626,49 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Сигурен ли �те, че и�кате да изтриете за по�то�нно \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Сигурен ли �те, че и�кате да забравите и�тори�та? �ко е така вие �те обречен "
 "да � повторите."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Сигурен ли �те, че и�кате да изтриете адре�ите които �те по�ещавали?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Изчи�тва И�тори�"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "�дре� \"%s\" не �ъще�твува. И�кате ли да го изтриете отметки от ваши�т "
 "�пи�ък."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Ме�тоположение \"%s\" повече не �ъще�твува."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Отметка на не�ъще�твуващо ме�тоположение"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Изтрива"
 
@@ -6468,7 +6701,6 @@ msgid "Close _All Windows"
 msgstr "Затвар� _В�ички Прозорци"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Затвар� в�ички прозорци на Nautilus"
@@ -6491,107 +6723,119 @@ msgid "Forward"
 msgstr "�апред"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Отива на папка Кошче"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Отива на �ледващи� по�етен адре�"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Отива на предишни�т по�етен адре�"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Отива на папка Кошче"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Домашен"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Лентата за �_дре�"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Презарежда"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Тър�и в този компютър за файлове"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Лентата за �тату�"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "�агоре"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Добав� Отметка"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_�азад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Отметки"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Изчи�тва И�тори�"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Редактиране на Отметки"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_�апред"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Отиди"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Домашен"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_�дре�..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Страниче_н панел"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Кош_че"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_�агоре"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Преглед"
 
@@ -6609,34 +6853,39 @@ msgstr "Преглед като..."
 msgid "File Browser: %s"
 msgstr "Соб�твеник на файл:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "По�ви �е грешка в един от �траничните панели и не мога да продължа. За "
 "�ъжаление не мога да кажа в кой."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "В прегледа %s �е по�ви грешка при �тартирането му."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "По�ви �е грешка в �траничен панел %s и не мога да продължа. �ко това �е "
 "�лучва вие може да изключите този панел."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Грешка в Страничен Панел"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Страничен Панел"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Съдържа преглед на �траничен панел"
 
@@ -6670,148 +6919,181 @@ msgstr "_Добав� нов..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Съжал�вам, но шаблона %s не може да бъде изтрит."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "�е мога да изтри� шаблон"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Съжал�вам, но емблемата %s не може да бъде изтрита."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "�е мога да изтри� емблема"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Създаване на �ова Емблема:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Ключова дума:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Картинка:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Избор на графичен файл за нова емблема:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Създаване на нов цв�т:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Име _на Цв�т:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Стойно�т на Цв�т:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Съжал�вам, но \"%s\" не е валидно име на файл."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Съжал�вам, но вие не използвате валидно име на файл."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "�е мога да ин�талирам шаблон"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Съжал�вам, но вие неможе да �мените ре�етираната картинка."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "��ма картинка"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Съжал�вам, но шаблон  %s не може да бъде ин�талиран."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Избор на графичен файл за добав�не като шаблон"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Съжал�вам, но вие тр�бва да зададете не празно име за нов цв�т."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "�е мога да ин�талирам цв�т"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Избор на цв�т за добав�не"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Съжал�вам, но '%s' не е използваем графичен файл."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Файлът '%s' не изглежда да е валидна картинка."
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Избор на Категори�:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "П_рекъ�ва Изтриване"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Добав� �ов Шаблон"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Добав� �ов Цв�т..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Добав� �ова Емблема..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Кликнете на шаблона за да го изтриете"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Кликнете на цвета за да го изтриете"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Кликнете на емблемата за да � изтриете"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Шаблони:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Цветове:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Емблеми:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Изтрива Шаблон..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Изтрива Цв�т..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Изтрива Емблема..."
 
@@ -7202,34 +7484,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Затвар� _В�ички Прозорци"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Затвар� �транични�т панел"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Отива на папка Кошче"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Отива на папка Кошче"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_�дре�..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Обекти който �а ]папки"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Образци"
@@ -7259,10 +7546,13 @@ msgid "View Failed"
 msgstr "Прегледа е неу�пешен"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "В прегледа %s �е по�ви грешка при �тартирането му."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "В прегледа %s �е по�ви грешка при �тартирането му и не може да �е продължи. "
 "Вие може да изберете друг преглед или да отидете на друг адре�."
@@ -7272,97 +7562,126 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "В прегледа %s �е по�ви грешка при �тартирането му."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Приложение на Nautilus �вързано � този прозорец"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Преглед на �ъдържание"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Преглед на текущ файл или папка"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"�е мога да намер� \"%s\". Мол� проверете �и правопи�а и опитайте отново."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "�е мога да заред� %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "�е мога да заред� %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "�е мога да покажа \"%s\", понеже Nautilus не може да определи типа на файла."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "В Nautilus не е ин�талирана програма за преглед на \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "�е мога да покажа \"%s\", понеже Nautilus не поддържа %s: адре�и"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "�е мога да покажа \"%s\", понеже опита за влизане е неу�пешен."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�е мога да покажа \"%s\", понеже до�тъпа е забранен."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "�е мога да покажа \"%s\",понеже хо�т \"%s\" не може да бъде намерен. "
 "Проверете дали името му е правилно и вие имате коректна конфигураци� на "
 "прок�и."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "�е мога да покажа \"%s\", понеже името на хо�та е празно. Проверете дали "
 "вашите на�тройки за прок�и �а коректни."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "�е мога да покажа \"%s\", понеже Nautilus не поддържа %s: адре�и"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"�е мога да покажа \"%s\", понеже Nautilus не може да контактува � SMB.\n"
-"Проверете дали �ървъра на SMB работи в локалната мрежа"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Тър�ене на неналични точно �ега, понеже вие или н�мате индек�, или тър�ещото "
 "об�лужване не е �тартирано. Убедете �е, че имате �тартирано об�лужване "
 "Medusa."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Тър�ене на неналични точно �ега, понеже вие или н�мате индек�, или тър�ещото "
+"об�лужване не е �тартирано. Убедете �е, че имате �тартирано об�лужване "
+"Medusa."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Тър�� неналични"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus не може да покаже \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�е мога да покажа адре�а"
 
@@ -7374,7 +7693,7 @@ msgstr "Отива на меÑ�тоположението указано от Ñ‚Ð
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7382,11 +7701,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Translator Credits"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7402,39 +7721,44 @@ msgstr "�азад � н�колко �траници"
 msgid "Go forward a number of pages"
 msgstr "�апред � брой �траници"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Показва това ме�тоположение � \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_Шрифтове"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Отива на папка Кошче"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID на Приложение"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID на приложението на прозореца"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Приложение"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Приложение на Nautilus �вързано � този прозорец"
 
@@ -7470,6 +7794,255 @@ msgstr "Мрежови Сървъри"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Преглед на вашите мрежови �ървъри във файловиет мениджър Nautilus "
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "��кой от файловете не могат да бъдат добавени като емблеми понеже не �а "
+#~ "валидни картинки."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Фабрика за хардуерен преглед"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Програма за Хардуерен преглед"
+
+#~ msgid "Hardware view"
+#~ msgstr "Хардуерен преглед"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Преглед като Хардуер"
+
+#~ msgid "hardware view"
+#~ msgstr "хардуерен преглед"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "име на икона за хардуерен преглед"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "резюме на хардуерна информаци�"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K размер на кеш"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu Гб RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MБ RAM"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Гб"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu Mб"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Работи %d дни, %d ча�а, %d минути"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Хардуерен Преглед"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Това е м��тото за информаци� на CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Това е м��тото за информаци�та на паметта."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Това е м��тото за информаци�та на IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка по време на копиране в \"%s\".\n"
+#~ "\n"
+#~ "��ма до�татъчно м��то."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка при �ъздаване на указател в \"%s\".\n"
+#~ "\n"
+#~ "��ма до�татъчно м��то."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при преме�тване на обекти в \"%s\".\n"
+#~ "\n"
+#~ "Вие н�мате права за запи� в тази папка."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка по време на преме�тване на обект в \"%s\".\n"
+#~ "\n"
+#~ "Ди�ка е �амо за четене."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при �ъздаване на указател в \"%s\".\n"
+#~ "\n"
+#~ "Вие н�мате права за запи� в тази папка."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка при �ъздавне на връзка към \"%s\".\n"
+#~ "\n"
+#~ "Ди�ка е �амо за четене."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на копиране на \"%s\".\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на преме�тване на \"%s\".\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на изтриване на \"%s\".\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на копиране.\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на �ъздаване на указател.\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" по време на изтриване.\n"
+#~ "\n"
+#~ "И�кате ли да продължите?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�е мога да копирам в Кошчето"
+
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\" не може да отвори \"%s\" понеже \"%s\" н�ма до�тъп до файловете в "
+#~ "\"%s\". ��ма други приложени� �по�обни да прегледат този файл. �ко го "
+#~ "копирате на ваши�т компютър, вие може да у�пеете да го отворите."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Тър�и по ди�ковете"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus тър�и на ваши�т ди�к повредени папки."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d избрани обекта не могат да бъдат преме�тени в Кошчето. Изкате ли да го "
+#~ "изтриете незабавно?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d от избраните обекти не могат да бъдат преме�тени в Кошчето. И�кате ли "
+#~ "тези %d обекта да бъдат изтрити?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Файла който вие по�тавихте не е графичен файл. Може да използвате �амо "
+#~ "локални картинки като потребител�ки икони."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Съжал�вам, но об�лужването Medusa не е налично понеже не е ин�талирано."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Един път на ден вашите файлове и �ъдържание на тек�та �е индек�ират за да "
+#~ "�помогнат бързото тър�ене. Вашите файлове �ега �е индек�ират."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" не е валиден адре�. Мол�, проверете името на адре�а и опитайте "
+#~ "отново."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Съжалвам, но '%s' не е използваем графичен файл!"
+
+#~ 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 ""
+#~ "�е мога да покажа \"%s\", понеже Nautilus не може да контактува � SMB.\n"
+#~ "Проверете дали �ървъра на SMB работи в локалната мрежа"
+
+#~ msgid "file icon"
+#~ msgstr "икона на файл"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Име:"
+
 #~ msgid "Unknown"
 #~ msgstr "�еизве�тно"
 
@@ -7583,9 +8156,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "_Toolbar"
 #~ msgstr "Л_ентата � ин�трументи"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Ме�тоположение \"%s\" повече не �ъще�твува."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Отива на не�ъще�твуващо ме�тоположение"
 
@@ -7610,9 +8180,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "Authentication Required"
 #~ msgstr "Изи�ква Оторизаци�"
 
-#~ msgid "_Location:"
-#~ msgstr "_Ме�тоположение:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Кошчето тр�бва да о�тане на работното м��то"
 
@@ -7652,9 +8219,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "Изпълн�ва _файловете когато те �а кликнати"
 
@@ -7707,10 +8271,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgstr " (грешен уникод)"
 
 #, fuzzy
-#~ msgid "Themes"
-#~ msgstr "_Times"
-
-#, fuzzy
 #~ msgid "New Window Behavior"
 #~ msgstr "�ов Прозорец"
 
@@ -7743,9 +8303,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "Click Behavior"
 #~ msgstr "Поведение при кликване"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Изпълними тек�тови файлове"
-
 #, fuzzy
 #~ msgid "Show Options"
 #~ msgstr "Показва/Скрива Опции"
@@ -7898,9 +8455,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "Couldn't add theme"
 #~ msgstr "�е мога да добав� тема"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Съжалв�вам, но тема \"%s\" не може да бъде ин�талирана."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "�е мога да ин�талирам тема"
 
@@ -7917,9 +8471,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ "Съжал�вам, но вие не може да изтриете текущата тема. Мол� изберете друга "
 #~ "преди да изтриете тази."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Съжал�вам, но този обект не може да бъде изтрит!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "�е мога да изтри� обекта"
 
@@ -8232,9 +8783,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "Set Cover Image"
 #~ msgstr "Задава картинка на обложка"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Съжал�вам, но '%s' не е използваем графичен файл."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Избор на графичен файл за обложка на албум:"
 
@@ -8267,10 +8815,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "<span size=\"xx-large\">%s - %s</span>"
 #~ msgstr "<span size=\"xx-large\">%s - %s</span>"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr ""
-#~ "Съжал�вам, но картинката %s не можа да бъде ин�талирана като емблема."
-
 #~ msgid "Delete"
 #~ msgstr "Изтрива"
 
@@ -8315,9 +8859,6 @@ msgstr "Преглед на вашите мрежови �ървъри във ф
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "�е мога да заред� %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Зареждам %s"
 
diff --git a/po/bn.po b/po/bn.po
index 7795a0c52..0692ca0db 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 2.2 \n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-03-20 09:00+0600\n"
 "Last-Translator: Progga <abulfazl@juniv.edu>\n"
 "Language-Team: Bangla <gnome-translation@bengalinux.org>\n"
@@ -43,8 +43,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() ব�যর�থ হয়েছে।"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "প�রতীক"
 
@@ -57,48 +57,60 @@ msgid "Nautilus Emblem view"
 msgstr "নটিলাস প�রতীকের দৃশ�য"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "প�রতীক ম�ছে ফেলা যায়নি"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "'%s' নামের প�রতীকটিকে সরিয়ে ফেলা যায়নি না। সম�ভবত �টি �কটি স�থায়ী প�রতীকটি �বং "
 "আপনি নিজে �টিকে যোগ করেন নি।"
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "প�রতীক ম�ছে ফেলা যায়নি"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "প�রতীকের নাম পরিবর�তন করা যায়নি"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "'%s' নামের প�রতীকটির নাম পরিবর�তন করা যায়নি না। সম�ভবত �টি �কটি স�থায়ী প�রতীকটি "
 "�বং আপনি নিজে �টিকে যোগ করেন নি।"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "প�রতীকের নাম পরিবর�তন করা যায়নি"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "প�রতীকের নাম পরিবর�তন করা হোক"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "যে প�রতীকটি প�রদর�শন করা হচ�ছে তার জন�য �কটি নাম লিখ�ন:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "নাম পরিবর�তন"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "প�রতীক যোগ কর�ন..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -108,7 +120,7 @@ msgstr ""
 
 # "C"
 # "বর�ণনাসূচক" নাম আবার কি ?
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -116,142 +128,64 @@ msgstr ""
 "প�রতীকটির পাশে �কটি বর�ণনাসূচক নাম লিখ�ন। �ই নামটি অন�যান�য স�থানে প�রতীকটিকে চিহ�নিত "
 "করার কাজে ব�যবহৃত হবে।"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "কিছ� কিছ� ফাইলকে প�রতীক হিসেবে ব�যবহার করা যাচ�ছে না, কারণ মনে হচ�ছে যে �গ�লো আদৌ "
 "কোন ছবির ফাইল নয়।"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "'%s' নামের ফাইলটিকে কোন ছবির ফাইল বলে মনে হচ�ছে না।"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "প�রতীক যোগ করা যায়নি"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "কোন ফাইলকেই প�রতীক হিসেবে ব�যবহার করা যাচ�ছে না, কারণ মনে হচ�ছে যে �গ�লো আদৌ কোন "
 "ছবির ফাইল নয়।"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "যে টেক�সট টেনে আনা হয়েছে তা কোন ফাইলের সঠিক অবস�থান নির�দেশ করে না।"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "প�রতীক যোগ করা যায়নি"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'%s' নামের ফাইলটিকে কোন ছবির ফাইল বলে মনে হচ�ছে না।"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "যে ফাইলটিকে টেনে আনা হয়েছে তা কোন ছবির ফাইল বলে মনে হচ�ছে না।"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "ম�ছে ফেলো"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "হার�ডওয়ার চিত�রের ফ�যাক�টরি"
-
-# "C"
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "হার�ডওয়ার"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "হার�ডওয়ার প�রদর�শক"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "হার�ডওয়ার চিত�র"
-
-# "C"
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "হার�ডওয়ার হিসেবে দেখানো হোক"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "হার�ডওয়ার চিত�র"
-
-# "C"
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "হার�ডওয়ার চিত�র নির�দেশক আইকনের নাম"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "হার�ডওয়ার সংক�রান�ত তথ�যের সারসংক�ষেপ"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s সি.পি.ইউ\n"
-"%s মেগাহার�জ\n"
-"ক�যাশের আকার %s কিলোবাইট "
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu গিগাবাইট র�যাম"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu মেগাবাইট র�যাম"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu গিগাবাইট"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu মেগাবাইট"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "কম�পিউটারটি %d দিন, %d ঘন�টা, %d মিনিট যাবত�� চলছে"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "হার�ডওয়ার বিষয়ক সংক�ষিপ�ত বিবরণ"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "�টা সি-পি-ইউ সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "�টা র�যাম সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "�টা আই-ডি-ই সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "ব�রাউজকৃত স�থানসমূহের তালিকা"
@@ -937,6 +871,11 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+# "C"
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "হার�ডওয়ার"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "আন�তর�জাতিক"
@@ -1232,26 +1171,19 @@ msgid "Desktop trash icon name"
 msgstr "ডেস�কটপে প�রদর�শিত আবর�জনার আইকনের নাম"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "ফাইল সম�বন�ধীয় পছন�দ তালিকায় 'বিশেষ' ফ�ল�যাগ সক�রিয় করা হোক"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "ডিরেক�টরির ডিফল�ট পটভূমির জন�য ফাইল। �কমাত�র background_set  সত�য (true) হলে "
 "প�রযোজ�য।"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1259,6 +1191,14 @@ msgstr ""
 "ধারের পেন-�র ডিফল�ট  পটভূমির জন�য ফাইল। �কমাত�র side_pane_background_set  সত�য "
 "(true) হলে প�রযোজ�য।"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "ব�কমার�ক মেন�-তে ডিফল�ট ব�কমার�ক সমূহকে অদৃশ�য রাখো"
@@ -1268,9 +1208,10 @@ msgid "Home icon visible on desktop"
 msgstr "প�রথম (Home) ফোল�ডার ডেস�কটপে দৃশ�যমান"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "যদি সত�য (true) হয়, তাহলে নটিলাস শাখা-প�রশাখা সদৃশ�য ধারের পেন-�  শ�ধ�মাত�র "
 "ডিরেক�টরি সমূহ দেখাবে। অন�যথা নটিলাস ডিরেক�টরি ও ফাইল - দ�ইই দেখাবে।"
@@ -1299,9 +1240,10 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "যদি সত�য (true) হয়, তাহলে আইকন বা তালিকা হিসাবে দেখাবার সময় ফাইল-�র আগে সমস�ত "
 "ডিরেক�টরি সমূহকে দেখাবে।"
@@ -1345,8 +1287,9 @@ msgstr ""
 "দেখাবে।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "যদি সত�য (true) হয়, তাহলে নটিলাস ব�যবহারকারীর প�রথম ডিরেক�টরী-কে (home "
@@ -1364,9 +1307,10 @@ msgstr ""
 "ফাইল হিসাবে ধার�য করা হয়।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "যদি সত�য (true) হয়, তাহলে লোকানো ফাইলসমূহ ফাইল ম�যানেজারে প�রদর�শিত হবে। লোকানো "
 "ফাইলসমূহ হয় ডটফাইল, নয়তো কোন ডিরেক�টরীর .hidden ফাইলে তালিকাভ�ক�ত ফাইল।"
@@ -1389,8 +1333,9 @@ msgstr ""
 "�কটি আইকন প�রদর�শিত হবে।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "যদি সত�য (true) হয়, তাহলে ডেস�কটপের উপরে আপনার প�রথম ফোল�ডার-�র  (home) দিকে "
@@ -1427,7 +1372,8 @@ msgstr ""
 "নিয়মে সাজানো হবে।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "যদি সত�য (true) হয়, তাহলে নত�ন উইন�ডোতে আইকনসমূহ ঘনভাবে সাজানো হবে।"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1454,7 +1400,8 @@ msgid "List of possible captions on icons"
 msgstr "আইকনের উপর সম�ভাব�য শিরোনামের তালিকা"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "�কটা ডিরেক�টরি-তে  যত ফাইল সামলানো হবে - তার সর�বোচ�চ মান"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1474,11 +1421,12 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "ডেস�কটপের ভার নটিলাসের"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "নটিলাস ব�যবহারকারীর হোম (home) ডিরেক�টরি-কে ডেস�কটপ হিসাবে ব�যবহার করে"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1496,7 +1444,8 @@ msgid "Reverse sort order in new windows"
 msgstr "নত�ন উইন�ডোতে আইকনগ�লোকে উল�টোভাবে সাজিও"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "উইন�ডোতে প�রথমে ডিরেকটরি সমূহ দেখিও"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1531,7 +1480,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1539,30 +1488,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1608,7 +1557,8 @@ msgstr "নতà§�ন উইনà§�ডোতে নিজ হাতে সাজà¦
 
 # HACK msgstr "_শ�ধ�মাত�র �ই আকার অপেক�ষা ক�ষ�দ�রতর ফাইলের জন�য:"
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "নত�ন উইন�ডোতে আইকন ঘনভাবে সাজিও"
 
 # "C"
@@ -1632,7 +1582,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "কখন ডিরেক�টরিতে বস�ত�র সংখ�যা দেখানো হবে"
 
 # HACK msgstr "ল�ক�কায়িত ও _অতিরিক�ত (Backup) ফাইল প�রদর�শন করা হোক"
@@ -1646,7 +1597,8 @@ msgstr ""
 
 # HACK msgstr "_ডিফল�ট পটভূমি ব�যবহার করা হোক"
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "ব�যবহারকারীর পছন�দ মতো ডিরেক�টরির পটভূমি ঠিক করা হয়েছে কিনা"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1804,67 +1756,81 @@ msgstr "রিসেট"
 msgid "on the desktop"
 msgstr "ডেস�কটপে অবস�থিত"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+# HACK msgstr "ডি_স�ক"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "ভলিউমটিকে মোছা যাচ�ছে না"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 
 # HACK msgstr "ডি_স�ক"
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "ভলিউমটিকে মোছা যাচ�ছে না"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "আবর�জনার বাক�স"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "�খানে সরিয়ে আনো (_�)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "�খানে কপি করো (_ক)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "�খানে লিঙ�ক করো (_ল)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "পটভূমি হিসেবে ব�যবহার করা হোক"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "প�রতিটি ফোল�ডারের পটভূমি হিসেবে ব�যবহার করা হোক (_ব)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+msgid "The emblem cannot be installed."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "দ�ঃখিত, নত�ন প�রতীকটিকে নির�দেশ করে কোন ফা�কা শব�দ লেখা যাবে না।"
 
 # "C" 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "প�রতীকটি ইনস�টল করা যায়নি"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "দ�ঃখিত, প�রতীক নির�দেশক শব�দে শ�ধ�মাত�র অক�ষর, স�পেস আর নম�বর লেখা যায়।"
@@ -1874,19 +1840,26 @@ msgstr "দà§�ঃখিত, পà§�রতীক নিরà§�দেশক শবà§
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "দ�ঃখিত, \"%s\" নামে �কটি প�রতীক �খনই আছে। দয়া করে অন�য �কটি নাম বেছে নিন।"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+# "C" 
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "প�রতীকটি ইনস�টল করা যায়নি"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "দ�ঃখিত, ইচ�ছামাফিক তৈরি করা প�রতীকটিকে সংরক�ষণ করা গেল না।"
 
 # "C" 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "দ�ঃখিত, ইচ�ছামাফিক তৈরি করা প�রতীকটির নাম সংরক�ষণ (Save) করা গেল না।"
 
@@ -1905,22 +1878,28 @@ msgstr "হতে:"
 msgid "To:"
 msgstr "প�রতি:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "স�থানান�তরের সময় সমস�যা হয়েছে।\n"
 "\n"
 "\"%s\"'কে স�থানান�তর করা যাবে না কারণ �টি �কটি অপরিবর�তনীয় ডিস�কে অবস�থিত।"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1929,22 +1908,17 @@ msgstr ""
 "\"%s\"'কে আপনি ম�ছতে পারবেন না কারণ �টি যে ফোল�ডারে অবস�থিত, তা পরিবর�তনের অন�মতি "
 "আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "ম�ছে ফেলার সময় সমস�যা হয়েছে।\n"
 "\n"
 "\"%s\"'কে ম�ছে ফেলা যাবে না কারণ �টি �কটি অপরিবর�তনীয় ডিস�কে অবস�থিত।"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1953,12 +1927,15 @@ msgstr ""
 "\"%s\"'কে আপনি স�থানান�তর করতে পারবেন না কারণ �টি যে ফোল�ডারে অবস�থিত, তা "
 "পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "স�থানান�তরের সময় সমস�যা হয়েছে।\n"
@@ -1966,12 +1943,10 @@ msgstr ""
 "\"%s\"'কে স�থানান�তর করা যাবে না কারণ �টি বা �টি যে ফোল�ডারে অবস�থিত, তা গন�তব�য "
 "ফোল�ডারের ভেতরেই রয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "স�থানান�তরের সময় সমস�যা হয়েছে।\n"
@@ -1979,239 +1954,179 @@ msgstr ""
 "\"%s\"'কে আপনি আবর�জনার বাক�সে স�থানান�তর করতে পারবেন না, কারণ �টি অথবা �টি যে "
 "ফোল�ডারে অবস�থিত, তা পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "কপি করার সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "কপি করার সময় সমস�যা হয়েছে।\n"
 "\n"
 "পড়ার জন�য প�রয়োজনীয় অন�মতি না থাকায় \"%s\"'কে কপি করা সম�ভব নয়।"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"-� কপি করা সময় সমস�যা হয়েছে।\n"
-"\n"
-"গন�তব�যস�থলে যথেষ�ট স�থান অবশিষ�ট নেই।"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "কপি করার সময় সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "\"%s\"-� স�থানান�তরের সময় সমস�যা হয়েছে।\n"
 "\n"
 "গন�তব�যস�থলে যথেষ�ট স�থান অবশিষ�ট নেই।"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
-"\n"
-"গন�তব�যস�থলে যথেষ�ট স�থান অবশিষ�ট নেই।"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "\"%s\"-� কপি করার সময় সমস�যা হয়েছে।\n"
 "\n"
 "�ই ফোল�ডারের কোন কিছ� পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "\"%s\"-� কপি করার সময় সমস�যা হয়েছে।\n"
 "\n"
 "গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\"-� ফাইল সরিয়ে নেয়ার সময় সমস�যা হয়েছে।\n"
-"\n"
-"�ই ফোল�ডারে কোন কিছ� পরিবর�তনের অন�মতি আপনার নেই।"
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\"-� ফাইল সরিয়ে নেয়ার সময় সমস�যা হয়েছে।\n"
-"\n"
-"গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
-"\n"
-"�ই ফোল�ডারের কোন কিছ� পরিবর�তনের অধিকার আপনার নেই।"
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
-"\n"
-"গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%2$s\" কপি করার সময় \"%1$s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "কপি করার সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"\"%2$s\"'কে স�থানান�তরের সময় \"%1$s\" সমস�যা হয়েছে।\n"
+"স�থানান�তরের সময় \"%s\" সমস�যা হয়েছে।\n"
 "\n"
 "আপনি কি চালিয়ে যেতে চান?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%2$s\"'কে নির�দেশ করে লিঙ�ক তৈরির সময় \"%1$s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"\"%2$s\"'কে ম�ছে ফেলার সময় \"%1$s\" সমস�যা হয়েছে।\n"
+"\"%2$s\"'কে নির�দেশ করে লিঙ�ক তৈরির সময় \"%1$s\" সমস�যা হয়েছে।\n"
 "\n"
 "আপনি কি চালিয়ে যেতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"কপি করার সময় \"%s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"স�থানান�তরের সময় \"%s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "কপি করার সময় সমস�যা হয়েছে।"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"লিঙ�ক তৈরির সময় \"%s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"ম�ছে ফেলার সময় \"%s\" সমস�যা হয়েছে।\n"
-"\n"
-"আপনি কি চালিয়ে যেতে চান?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "কপি করার সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "স�থানান�তরের সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "লিঙ�ক তৈরির সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "ম�ছে ফেলার সময় সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "�ড়িয়ে যাওয়া"
 
 # "C"
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "প�নঃপ�রচেষ�টা"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "উল�লেখিত কাজটি সম�পন�ন করা যায়নি।"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\"'কে নত�ন অবস�থানে স�থানান�তর করা যায়নি, কারণ �টির নাম ইতিমধ�যেই স�থানান�তর "
 "নিষিদ�ধ �কটি বিশেষ ফাইলের জন�য ব�যবহৃত হয়েছে।\n"
@@ -2219,13 +2134,16 @@ msgstr ""
 "যদি তারপরও আপনি \"%s\"'কে স�থানান�তর করতে চান, তবে �টির নাম পরিবর�তন করে আবার "
 "চেষ�টা কর�ন।"
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "উল�লেখিত কাজটি সম�পন�ন করা যায়নি।"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\"'কে নত�ন অবস�থানে কপি করা যায়নি, কারণ �টির নাম ইতিমধ�যেই স�থানান�তর নিষিদ�ধ "
 "�কটি বিশেষ ফাইলের জন�য ব�যবহৃত হয়েছে।\n"
@@ -2233,45 +2151,51 @@ msgstr ""
 "যদি তারপরও আপনি \"%s\"'কে কপি করতে চান, তবে �টির নাম পরিবর�তন করে আবার চেষ�টা "
 "কর�ন।"
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "ফাইলটিকে বদল করা যায়নি।"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "\"%s\" নামে ইতিমধ�যেই �কটি ফাইল আছে।\n"
 "\n"
 "আপনি কি �টিকে বদল করতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "কপি করার সময় সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "বদল করা"
 
 # "C"
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "সকল ফাইলকে বদল করা হোক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s নির�দেশক লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s নির�দেশক আরেকটি লিঙ�ক"
@@ -2280,25 +2204,25 @@ msgstr "%s নির�দেশক আরেকটি লিঙ�ক"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s নির�দেশক %1$d নম�বর লিঙ�ক"
@@ -2308,563 +2232,602 @@ 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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (কপি)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (আরেকটি কপি)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr " নম�বর কপি) "
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr " নম�বর কপি)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (কপি)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (আরেকটি কপি)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d নম�বর কপি)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr "("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "অজ�ঞাত GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "আবর�জনার বাক�সে ফাইল সরিয়ে নেয়া হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "যেসব ফাইলকে ছ�ড়ে ফেলে দেয়া হয়েছে:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "স�থানান�তর করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "আবর�জনার বাক�সে ফেলে দেয়ার জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "ফাইল স�থানান�তর করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "যেসব ফাইলকে স�থানান�তর করা হয়েছে:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "স�থানান�তরের জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "স�থানান�তর প�রক�রিয়া শেষ হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "বিভিন�ন ফাইলকে নির�দেশ করে লিঙ�ক তৈরি করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "যেসব ফাইলের লিঙ�ক তৈরি করা হয়েছে:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "লিঙ�ক তৈরি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "লিঙ�ক তৈরির জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "লিঙ�ক তৈরির প�রক�রিয়া শেষ হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "ফাইল কপি করা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "কপিকৃত ফাইল:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "কপি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "কপি করার জন�য প�রস�ত�তি নেয়া হচ�ছে.."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "আবর�জনার বাক�সে কোনকিছ� কপি করতে পারবেন না"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "আবর�জনার বাক�সে কপি করা যাচ�ছে না"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "আবর�জনার বাক�স হিসেবে ব�যবহৃত �ই ফোল�ডারটিকে আপনি স�থানান�তর করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "আবর�জনার বাক�স হিসেবে ব�যবহৃত �ই ফোল�ডারটিকে আপনি কপি করতে পারবেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "আবর�জনার বাক�সের অবস�থান পরিবর�তন করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "আবর�জনার বাক�সকে কপি করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "কোন ফোল�ডারকে আপনি তার নিজের ভেতরেই স�থানান�তর করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "কোন ফোল�ডারকে আপনি তার নিজের ভেতরেই কপি করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "�ই ফোল�ডারের ভেতরে আরেকটি নত�ন ফা�কা ফোল�ডার তৈরি করা হোক"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "নিজের ভেতরে স�থানান�তর করা যাচ�ছে না।"
 
 # "C"
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "নিজের ভেতরে কপি করা যাচ�ছে না।"
 
 # "C"
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "আপনি কোন ফাইলকে তার নিজ ওপরই কপি করতে পারেন না।"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "নিজের ওপর কপি করা যাচ�ছে না"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "নত�ন ফোল�ডার তৈরি করায় সমস�যা হয়েছে।\n"
 "\n"
 "গন�তব�যস�থলে কোনকিছ� পরিবর�তনের অন�মতি আপনার নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "নত�ন ফোল�ডার তৈরির সময় সমস�যা হয়েছে।\n"
 "\n"
 "গন�তব�যস�থলে কোন স�থান অবশিষ�ট নেই।"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "নত�ন ফোল�ডার তৈরির সময় \"%s\" সমস�যা হয়েছে।"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "নামবিহীন ফোল�ডার"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "নত�ন ফোল�ডার তৈরির সময় \"%s\" সমস�যা হয়েছে।"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "নত�ন ফোল�ডার তৈরিতে সমস�যা"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "১টি ফাইল"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "ফাইল ম�ছে ফেলা হচ�ছে"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "যেসব ফাইল ম�ছে ফেলা হয়েছে:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "ম�ছে ফেলা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "ফাইল ম�ছে ফেলার জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "আবর�জনার বাক�স খালি করা হচ�ছে"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "আবর�জনার বাক�স খালি করার জন�য প�রস�ত�তি নেয়া হচ�ছে..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "আপনি কি নিশ�চিত যে আবর�জনার বাক�সের সবকিছ� আপনি স�থায়ীভাবে ম�ছে ফেলতে চান?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "ফা�কা করা হোক (_ক)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "ফ�ঊঊ"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "ফ�ঊঊ (কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "ফ�ঊঊ ফ�ঊঊ"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "ফ�ঊঊ ফ�ঊঊ (কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "ফ�ঊঊ foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "ফ�ঊঊ foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (কপি).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "ফ�ঊঊ...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "ফ�ঊঊ.. (কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "ফ�ঊঊ..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "ফ�ঊঊ... (কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "ফ�ঊঊ. (কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "ফ�ঊঊ. (আরেকটি কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "ফ�ঊঊ (আরেকটি কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "ফ�ঊঊ (আরেকটি কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "ফ�ঊঊ (৩য় কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "ফ�ঊঊ (৩য় কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (আরেকটি কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (৩য় কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "ফ�ঊঊ (১৩তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "ফ�ঊঊ (১৪তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "ফ�ঊঊ (১৩তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "ফ�ঊঊ (১৪তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "ফ�ঊঊ (২১তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "ফ�ঊঊ (২২তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "ফ�ঊঊ (২১তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "ফ�ঊঊ (২২তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "ফ�ঊঊ (২৩তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "ফ�ঊঊ (২৩তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "ফ�ঊঊ (২৪তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "ফ�ঊঊ (২৪তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "ফ�ঊঊ (২৫তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "ফ�ঊঊ (২৫তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "ফ�ঊঊ ফ�ঊঊ (২৪তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "ফ�ঊঊ ফ�ঊঊ(২৫তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (২৪তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (২৫তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "ফ�ঊঊ ফ�ঊঊ (১০০০০০০০০০০০০০০তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "ফ�ঊঊ (১০ম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "ফ�ঊঊ (১১তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "ফ�ঊঊ (১০ম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "ফ�ঊঊ (১১তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "ফ�ঊঊ (১২তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "ফ�ঊঊ (১২তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "ফ�ঊঊ (১১০তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "ফ�ঊঊ (১১১তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "ফ�ঊঊ (১১০তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "ফ�ঊঊ (১১১তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "ফ�ঊঊ (১২২তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "ফ�ঊঊ (১২৩তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "ফ�ঊঊ (১২২তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "ফ�ঊঊ (১২৩তম কপি).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "ফ�ঊঊ (১২৪তম কপি)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "ফ�ঊঊ (১২৪তম কপি).txt"
 
@@ -2883,66 +2846,66 @@ msgstr "ফ�ঊঊ (১২৪তম কপি).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "আজ সময় ০০:০০:০০ অপরাহ�ণ"
 
 # "C"
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "আজ সময় %-I:%M:%S %p"
 
 # "C"
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "আজ সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "আজ সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "আজ, সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "আজ, সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "আজ"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "গতকাল সময় ০০:০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "গতকাল সময় %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "গতকাল সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "গতকাল সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "গতকাল, সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "গতকাল, সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "গতকাল"
 
@@ -2951,134 +2914,134 @@ msgstr "গতকাল"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "ব�ধবার, সেপ�টেম�বর ০০ ০০০০ সময় ০০:০০:০০ অপরাহ�ণ"
 
 # "C"
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y সময় %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "সোমবার, অক�টোবর ০০ ০০০০ সময় ০০:০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y সময় %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "সোমবার, অক�টোবর ০০ ০০০০ সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "অক�টোবর ০০ ০০০০ সময় ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y সময় %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "অক�টোবর ০০ ০০০০, ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "০০/০০/০০, ০০:০০ অপরাহ�ণ"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "০০/০০/০০"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "০ সংখ�যক বস�ত�"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "০ সংখ�যক ফোল�ডার"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "০ সংখ�যক ফাইল"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "১টি বস�ত�"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "১টি ফোল�ডার"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%uটি বস�ত�"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%uটি ফোল�ডার"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%uটি ফাইল"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? বস�ত�"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? বাইট"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "অজ�ঞাত প�রকৃতি"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "অজ�ঞাত"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "প�রোগ�রাম"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3088,7 +3051,7 @@ msgstr ""
 "ব�যবহৃত gnome-vfs.keys ফাইলটি �কটি ভ�ল স�থানে অবস�থান করছে অথবা অন�য কোন কারণে তা "
 "খ��জে পাওয়া যাচ�ছে না।"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3097,11 +3060,11 @@ msgstr ""
 "মাইম প�রকৃতি \"%s\"-�র (ফাইল হল \"%s\") জন�য কোন বিবরণ পাওয়া যাচ�ছে না, দয়া করে "
 "gnome-vfs মেইলিং লিস�টে �ই সংবাদটি দিন।"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "লিঙ�ক"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "লিঙ�ক (অচল)"
 
@@ -3222,11 +3185,13 @@ msgid "Search for files by file name and file properties"
 msgstr "ফাইলের নাম ও বৈশিষ�ট�য ব�যবহার করে ফাইল খো�জা হোক"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "আইকনের সাহায�যে ফাইল প�রদর�শন"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "তালিকার সাহায�যে ফাইল প�রদর�শন"
@@ -3371,159 +3336,164 @@ msgstr "%s-�র প�রথম (Home) ডিরেক�টরি"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "কাউন�টারটপ"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ফাইলের আইকন"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "পরিবর�তনযোগ�য টেক�সট"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "পরিবর�তনযোগ�য লেবেল"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "অতিরিক�ত টেক�সট"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "আরো কিছ� টেক�সট"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "বাছাইয়ের উদ�দেশ�যে চিহ�নিত"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "আমরা বাছাইয়ের উদ�দেশ�যে চিহ�নিত হয়েছি কি হইনি"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "কীবোর�ড ইনপ�টের লক�ষ�য হিসেবে নির�ধারিত"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "কীবোর�ড ইনপ�টের লক�ষ�য হিসেবে আমরা নির�ধারিত হয়েছি কি হইনি"
 
 # "C"
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "স�থানান�তরের জন�য চিহ�নিত"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "টেনে �নে রেখে দেয়ার জন�য আমরা চিহ�নিত হয়েছি কি হইনি"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "চিহ�নিত করার সময় ব�যবহৃত চত�র�ভূজ"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "ফ�রেম টেক�সট"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "যেসব টেক�সট চিহ�নিত করা হয়নি তার চারদিকে �কটি ফ�রেম আ�ক�ন"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "বাছাই করার বাক�সের রং"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "বাছাই করার বাক�সের রং"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "বাছাই করার বাক�স আলফা"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "বাছাই করার বাক�সের অস�বচ�ছতা"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "আলফাকে চিহ�নিত করা হোক"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "আইকন চিহ�নিত করার ক�ষেত�রে অস�বচ�ছতা"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "হালকা রঙে প�রদর�শিত তথ�যের রং"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "গা� পটভূমির প�রেক�ষাপটে তথ�য প�রদর�শনে ব�যবহৃত রং"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "গা� রঙে প�রদর�শিত তথ�যের রং"
 
 # "C"
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "হালকা পটভূমির প�রেক�ষাপটে তথ�য প�রদর�শনে ব�যবহৃত রং"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
 # "C" - শেষ বাক�যে সমস�যা
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "�ই ফোল�ডারটি স�বয়ংক�রিয়ভাবে আইকন সাজায় করে। আপনি কি নিজ হাতে আইকন সাজাতে আগ�রহী "
 "�বং �ই আইকনটিকে যেখানে রেখেছেন সেখানেই রাখতে চান?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "�ই ফোল�ডারটি স�বয়ংক�রিয়ভাবে আইকন সাজায় করে। আপনি কি নিজ হাতে আইকন সাজাতে আগ�রহী "
 "�বং �ই আইকনগ�লোকে যেখানে রেখেছেন সেখানেই রাখতে চান?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "নিজ হাতে আইকন সাজাতে চান?"
 
 # "C"
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "পাল�টানো"
 
@@ -3632,72 +3602,72 @@ msgstr "\"%s\" �র জন�য ডিফল�ট।"
 msgid "Is the default for all \"%s\" items."
 msgstr "সকল \"%s\" �র জন�য ডিফল�ট"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\"'কে পরিবর�তন করা হোক"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" �র জন�য মেন�র অন�তর�ভ�ক�ত করা হোক"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" �র জন�য ডিফল�ট হিসেবে ব�যবহার করা হোক"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "শ�ধ�মাত�র \"%s\" �র জন�য মেন�র অন�তর�ভ�ক�ত করা হোক"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "শ�ধ�মাত�র \"%s\" �র জন�য ডিফল�ট হিসেবে ব�যবহার করা হোক"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" �র জন�য মেন�র অন�তর�ভ�ক�ত করা হবে না"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "নাম"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "অবস�থা"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "বেছে নিন (_ন)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "সম�পন�ন"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "পরিবর�তন করা... (_প)"
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "ফাইলের ধরন ও সংশ�লিষ�ট প�রোগ�রাম"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "ওখানে যাও (_য)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3705,48 +3675,48 @@ msgstr ""
 "ফাইলের ধরন ও সংশ�লিষ�ট প�রোগ�রাম শীর�ষক ডায়ালগ থেকে বিভিন�ন ধরনের ফাইল ব�যবহারের "
 "জন�য কোন প�রোগ�রামটি ব�যবহৃত হবে তা আপনি কনফিগার করতে পারেন।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "অন�য কোন অ�যাপলিকেশনের সাহায�যে ব�যবহার করা হোক"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\"'কে যে প�রোগ�রামের সাহায�যে ব�যবহার করা হবে তা বেছে নিন:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "অন�য �কটি প�রদর�শকের সাহায�যে দেখানো হোক"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\"'কে প�রদর�শনের জন�য �কটি প�রদর�শক বেছে নিন:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\"'কে প�রদর�শন করার মত কোন উপয�ক�ত প�রদর�শক নেই।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "কোন উপয�ক�ত প�রদর�শক নেই"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\"'কে ব�যবহারের জন�য কোন প�রোগ�রাম নির�দিষ�ট করা নেই।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "কোন প�রোগ�রাম নির�দিষ�ট করা নেই"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\"'কে ব�যবহারের জন�য কোন প�রোগ�রাম নির�দিষ�ট করা নেই।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "কোন প�রোগ�রাম নির�দিষ�ট করা নেই"
 
@@ -3754,11 +3724,9 @@ msgstr "কোন প�রোগ�রাম নির�দিষ�ট কর
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3768,42 +3736,41 @@ msgstr ""
 "প�রোগ�রাম নির�দিষ�ট করতে পারেন। �ই বিশেষ ধরনের ফাইলটির জন�য কি আপনি �খনই �কটি "
 "প�রোগ�রাম নির�দিষ�ট করবেন?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "অ�যাপলিকেশন নির�দিষ�ট করা হোক"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\"'কে দেখাবার জন�য কোন প�রদর�শকটি বেঠিক।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\"'কে ব�যবহারের জন�য কোন প�রোগ�রামটি বেঠিক।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "প�রোগ�রামটি বেঠিক"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\"-�র জন�য নির�দিষ�ট কার�যটি বেঠিক।"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "নির�দিষ�ট কার�যটি বেঠিক"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3814,96 +3781,144 @@ msgstr ""
 "প�রোগ�রাম নির�দিষ�ট করতে পারেন। �ই বিশেষ ধরনের ফাইলটির জন�য কি আপনি �খনই �কটি "
 "প�রোগ�রাম নির�দিষ�ট করবেন?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "কার�য় নির�দিষ�ট কর�ন"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা কারণ \"%s\" \"%s"
+"\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। আপনি কি অন�য কোন অ�যাপলিকেশন বেছে "
+"নেবেন?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা কারণ \"%s\" \"%s"
 "\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। আপনি কি অন�য কোন অ�যাপলিকেশন বেছে "
 "নেবেন?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
+"\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা কারণ \"%s\" \"%s"
+"\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। আপনি কি অন�য কোন অ�যাপলিকেশন বেছে "
+"নেবেন?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�ই অবস�থানের কিছ� পড়া যাচ�ছে না"
 
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা কারণ \"%s\" \"%s"
+"\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। আপনি কি অন�য কোন অ�যাপলিকেশন বেছে "
+"নেবেন?"
+
 # "C"
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"No other applications are available to view this file.  If you copy this "
+"file onto your computer, you may be able to open it."
 msgstr ""
 "\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা  কারণ \"%s\" \"%s"
 "\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। �ই ফাইলটিকে দেখার জন�য অন�য কোন উপয�ক�ত "
 "অ�যাপলিকেশন নেই। যদি আপনি ফাইলটিকে আপনার কম�পিউটারে কপি করেন, তবে তবে হয়তো "
 "দেখতে পারবেন।"
 
-# "C"
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা কারণ \"%s\" \"%s"
+"\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। আপনি কি অন�য কোন অ�যাপলিকেশন বেছে "
+"নেবেন?"
+
+# "C"
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা  কারণ \"%s\" \"%s"
 "\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। �ই ফাইলটিকে দেখার জন�য অন�য কোন উপয�ক�ত "
 "অ�যাপলিকেশন নেই। যদি আপনি ফাইলটিকে আপনার কম�পিউটারে কপি করেন, তবে তবে হয়তো "
 "দেখতে পারবেন।"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "\"%s\" খোলা হচ�ছে"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "দ�ঃখিত, নিরাপত�তাজনিত সতর�কতার কারণে আপনি দূরবর�তী কোন সাইটের প�রোগ�রাম চালাতে "
 "পারবেন না।"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "দূরবর�তী লিঙ�কসমূহের নির�দেশিত প�রোগ�রামগ�লোকে চালানো যাচ�ছে না"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "অ�যাপলিকেশনটি চালাতে সমস�যা হয়েছে।\n"
 "\n"
 "বিস�তারিত বিবরণ: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "অ�যাপলিকেশন চাল� করতে সমস�যা হয়েছে"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+# "C"
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইলের ক�ষেত�রে প�রযোজ�য"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "�ভাবে টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইলের ক�ষেত�রে প�রযোজ�য।\n"
@@ -3912,16 +3927,16 @@ msgstr ""
 "প�নরায় চেষ�টা কর�ন।"
 
 # "C"
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইলের ক�ষেত�রে প�রযোজ�য"
 
 # "C"
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4177,14 +4192,6 @@ msgstr "২০০০ বাইট অপেকà§�ষা ছোট আকারà§
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "যেসব ফোল�ডারের নামে \"medusa\" আছে"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "ডিস�কে অন�সন�ধান চালানো হচ�ছে"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "নটিলাস আপনার ব�যবহৃত ডিস�কে আবর�জনার বাক�স হিসেবে ব�যবহৃত ফোল�ডার খ��জছে।"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "�ডিট"
@@ -4388,96 +4395,106 @@ msgstr "পটভূমি"
 msgid "Empty Trash"
 msgstr "আবর�জনার বাক�স ফা�কা করা হোক"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "�টি %dটি পৃথক উইন�ডো চাল� করবে। আপনি কি �ই কাজটির ব�যাপারে নিশ�চিত?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%dটি উইন�ডো কি চাল� করা হবে?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "আপনি কি \"%s\"'কে স�থায়ীভাবে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "�টি %dটি পৃথক উইন�ডো চাল� করবে। আপনি কি �ই কাজটির ব�যাপারে নিশ�চিত?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "আপনি কি \"%s\"'কে স�থায়ীভাবে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "আপনি চিহ�নিত করা %dটি ফাইল/ফোল�ডারকে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "চিহ�নিত সবকিছ�কে স�থায়ীভাবে ম�ছে ফেলো"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "ম�ছে ফেলা হবে কি?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "কোন �কটি শ�রেণী বেছে নিন:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "প�যাটার�ন:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\"'কে চিহ�নিত করা হয়েছে"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "১টি ফোল�ডার চিহ�নিত করা হয়েছে"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%dটি ফোল�ডার চিহ�নিত করা হয়েছে"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (০ সংখ�যক ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (১টি ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d সংখ�যক ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (সর�বমোট শূন�যটি ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (সর�বমোট ১টি ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (সর�বমোট %dটি ফাইল/ফোল�ডার ধারণ করছে)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" চিহ�নিত করা হয়েছে (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d সংখ�যক ফাইল/ফোল�ডার চিহ�নিত করা হয়েছে (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "আরো �কটি ফাইল/ফোল�ডার চিহ�নিত করা হয়েছে (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "আরো %dটি  ফাইল/ফোল�ডার চিহ�নিত করা হয়েছে (%s)"
@@ -4489,7 +4506,7 @@ msgstr "আরো %dটি  ফাইল/ফোলà§�ডার চিহà§�নà¦
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4498,109 +4515,129 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "\"%s\" ফোল�ডারে যে সংখ�যক ফাইল আছে তা প�রদর�শন করা ননটিলাসর পক�ষে সম�ভব নয়। তাই "
 "কিছ� ফাইলকে প�রদর�শন করা হবে না। দ�ঃখিত।"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "ফাইলের সংখ�যা অত�যধিক"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\"'কে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �টিকে �খনই স�থায়ীভাবে "
 "ম�ছে ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%dটি চিহ�নিত ফাইল/ফোল�ডারকে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �গ�লোকে "
-"�খনই স�থায়ীভাবে ম�ছে ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\"'কে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �টিকে �খনই স�থায়ীভাবে "
+"ম�ছে ফেলতে চান?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"চিহ�নিত ফাইল/ফোল�ডারের %dটিকে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �ই %"
-"dটি ফাইল/ফোল�ডারকে �খনই স�থায়ীভাবে ম�ছে ফেলতে চান?"
+"\"%s\"'কে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �টিকে �খনই স�থায়ীভাবে "
+"ম�ছে ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "�খনই কি স�থায়ীভাবে ম�ছে ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "আপনি কি নিশ�চিতভাবে আবর�জনার বাক�স থেকে \"%s\"'কে স�থায়ীভাবে ম�ছে ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "আপনি কি নিশ�চিতভাবে আবর�জনার বাক�স থেকে %dটি চিহ�নিত ফাইল/ফোল�ডারকে স�থায়ীভাবে ম�ছে "
 "ফেলতে চান?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "আবর�জনার বাক�স থেকে কি ম�ছে ফেলা হবে?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "চিহ�নিত ফাইল ব�যবহারের জন�য \"%s\" ব�যবহার করা হোক"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "অন�যান�য অ�যাপলিকে_শন..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "�_কটি অ�যাপলিকেশন..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "অন�যান�য প�র_দর�শক..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_�কটি প�রদর�শক..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "উল�লেখিত কাজটি সম�পন�ন করা যায়নি:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "উল�লেখিত কাজটি সম�পন�ন করা যায়নি।"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "কোন �কটি চিহ�নিত ফাইলের জন�য \"%s\" চালানো হোক"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"স�ক�রিপ�ট মেন�তে �ই ফোল�ডারের সকল �ক�সিকিউটেবল ফাইলকে দেখানো হবে। মেন� থেকে কোন "
+"স�ক�রিপ�ট বেছে নিলে তা যে কোন চিহ�নিত ফাইলকে ইনপ�ট হিসেবে ব�যবহার করে চলতে আরম�ভ "
+"করবে।"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4608,11 +4645,11 @@ msgstr ""
 "স�ক�রিপ�ট বেছে নিলে তা যে কোন চিহ�নিত ফাইলকে ইনপ�ট হিসেবে ব�যবহার করে চলতে আরম�ভ "
 "করবে।"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "স�ক�রিপ�ট সম�পর�কিত"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4653,188 +4690,195 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: বর�তমান উইন�ডোর আকার ও অবস�থান"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "ফাইল পেস�ট (Paste) করার কমান�ড দিলে \"%s\"'কে স�থানান�তর করা হবে"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "ফাইল পেস�ট (Paste) করার কমান�ড দিলে \"%s\"'কে কপি করা হবে"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "ফাইল পেস�ট (Paste) করার কমান�ড দিলে চিহ�নিত %dটি ফাইল/ফোল�ডারকে স�থানান�তর করা হবে"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "ফাইল পেস�ট (Paste) করার কমান�ড দিলে চিহ�নিত %dটি ফাইল/ফোল�ডারকে কপি করা হবে"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "ক�লিপবোর�ডে পেস�ট (Paste) করার মত কিছ� নেই"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "মাউন�ট করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "আনমাউন�ট করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "মাউন�ট করায় সমস�যা"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "বে_র করে দেয়া হোক"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "ফাইল সিস�টেম _আনমাউন�ট করা হোক"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "নত�ন উইন�ডোতে চাল� করো"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "%dটি নত�ন উইন�ডোতে চাল� করো"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "প�রথম (Home) ফোল�ডার"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "প�রথম (Home) ফোল�ডার"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "আবর�জনার বাক�স থেকে _ম�ছে ফেলো"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "চিহ�নিত সবকিছ�কে স�থায়ীভাবে ম�ছে ফেলো"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "আবর�জনার বাক�সে স�থানান�তর করো (_স)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "প�রতিটি চিহ�নিত ফাইল/ফোল�ডারকে আবর�জনার বাক�সে স�থানান�তর করো"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "ম�ছে ফেলো (_ম)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "লিঙ�কসমূহ তৈরি করো (_র)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "লিঙ�ক তৈরি করো (_ল)"
 
 # HACK msgstr "লিঙ�ক তৈ_রি করা হোক"
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "আবর�জনার বাক�স খালি করো (_খ)"
 
 # HACK msgstr "আবর�জনার বাক�স _খালি করা হোক"
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "ফাইল কাট (Cut) করো (_ট)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "ফাইলগ�লো কাট (Cut) করো (_ট)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "ফাইল _কপি (Copy) করো (_ক)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "ফাইলগ�লো কপি (Copy) করা হোক (_ক)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "কিছ� নির�দেশ করে না বলে �ই লিঙ�কটি অকেজো। �ই লিঙ�কটিকে কি আবর�জনার বাক�সে ফেলে "
 "দেবেন?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"কিছ� নির�দেশ করে না বলে �ই লিঙ�কটি অকেজো। �ই লিঙ�কটিকে কি আবর�জনার বাক�সে ফেলে "
+"দেবেন?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "অকার�যকর লিঙ�ক"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" �কটি �ক�সিকিউটেবল (চালানো যায়, �মন) টেক�সট ফাইল। আপনি কি �টি চালাতে চান "
 "নাকি �র ভেতর যা লেখা আছে তা পড়তে চান?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "চালানো হবে নাকি লেখা প�রদর�শন করা হবে?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "প�রদর�শন (_প)"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "টার�মিনালে চালানো হোক (_ট)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "প�রদর�শন (_প)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "চালানো হোক (_চ)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" চাল� করা হচ�ছে"
 
 # "C"
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "পড়ার প�রচেষ�টা কি বাতিল করা হবে?"
 
@@ -4855,10 +4899,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "দ�ঃখিত, \"%s\"'কে সম�পূর�ণরূপে দেখানো সম�ভব হয়নি।"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "ফোল�ডার দেখাতে সমস�যা হয়েছে"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4866,7 +4915,7 @@ msgstr ""
 "�ই ফোল�ডারে ইতিমধ�যেই \"%s\" নামটি ব�যবহৃত হয়েছে। দয়া করে অন�য �কটি নাম ব�যবহার "
 "কর�ন।"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4874,12 +4923,12 @@ msgstr ""
 "\"%s\" নামে �ই ফোল�ডারে কিছ� নেই। সম�ভবত �টিকে কিছ�ক�ষণ পূর�বে সরিয়ে নেয়া অথবা ম�ছে "
 "ফেলা হয়েছে।"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\" �র নাম পরিবর�তনের জন�য প�রয়োজনীয় অন�মতি আপনার নেই।"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4888,63 +4937,78 @@ msgstr ""
 "\"%s\" নামটি সঠিক নয় কারণ �তে �কটি \"/\" রয়েছে। দয়া করে অন�য �কটি নাম ব�যবহার "
 "কর�ন।"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" নামটি সঠিক নয়। দয়া করে অন�য �কটি নাম ব�যবহার কর�ন।"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" �র নাম পরিবর�তন করা সম�ভব নয় কারণ �টি যে ডিস�কে আছে তা অপরিবর�তনীয়"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "দ�ঃখিত, \"%s\" �র নাম পরিবর�তন করে \"%s\" করা যায়নি।"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "নাম পরিবর�তন সংক�রান�ত সমস�যা"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "\"%s\" �র গ�র�প পরিবর�তনের জন�য আপনার প�রয়োজনীয় অন�মতি নেই।"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\" �র গ�র�প পরিবর�তন করা যায়নি কারণ �টি যে ডিস�কে আছে তা অপরিবর�তনীয়"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "দ�ঃখিত, \"%s\" �র গ�র�প পরিবর�তন করা সম�ভব হয়নি।"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "গ�র�প নির�ধারণে সমস�যা"
 
 # "C"
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "\"%s\" �র মালিকানা পরিবর�তন করা যায়নি কারণ �টি �কটি অপরিবর�তনীয় ডিস�কে অবস�থান "
 "করছে"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "দ�ঃখিত, \"%s\" �র মালিকানা পরিবর�তন করা সম�ভব হয়নি।"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "মালিকানা নির�ধারণে সমস�যা"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4952,21 +5016,26 @@ msgstr ""
 "\"%s\" �র মালিকানা পরিবর�তন করা যায়নি কারণ �টি যে ডিস�কে অবস�থান করছে তা "
 "অপরিবর�তনীয়"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "দ�ঃখিত, \"%s\" �র মালিকানা পরিবর�তন করা যায়নি।"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "মালিকানা নির�ধারণে সমস�যা"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" �র নাম পরিবর�তন করে \"%s\" করা হচ�ছে।"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "নাম পরিবর�তনের প�রচেষ�টা কি বাতিল করা হবে?"
 
@@ -5025,133 +5094,157 @@ msgid "Restore Icon's Original Si_ze"
 msgstr "আইকনের প�রকৃত আকার ব�যবহার করা হোক (_ক)"
 
 # HACK msgstr "আইকনের প�রকৃত আ_কার ব�যবহার করা হোক"
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" �র প�রতি নির�দেশ করা হচ�ছে"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমের ক�ষেত�রে প�রযোজ�য।"
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়া শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমের ক�ষেত�রে প�রযোজ�য।"
 
 # "C" - "টেনে �নে ফেলে দেয়া"র ব�যাপারটা খ�ব �কটা পছন�দ হচ�ছে না।
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "টেনে �নে ফেলে দেয়ার প�রক�রিয়ায় সমস�যা"
 
 # "C"
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "টেনে আনার সময় ভ�ল পদ�ধতি অবলম�বন করা হয়েছে।"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "ফাইলের নাম"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "আকার"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "ধরন"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "পরিবর�তনের তারিখ"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "�কই সময় ইচ�ছামাফিক তৈরি করা �কাধিক আইকন নির�ধারণ করা যাবে না! দয়া করে শ�ধ�মাত�র "
 "�কটি চিত�রকে আইকন হিসেবে ব�যবহার কর�ন।"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"�কই সময় ইচ�ছামাফিক তৈরি করা �কাধিক আইকন নির�ধারণ করা যাবে না! দয়া করে শ�ধ�মাত�র "
+"�কটি চিত�রকে আইকন হিসেবে ব�যবহার কর�ন।"
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "�কাধিক চিত�র"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা স�থানীয় ফাইল সিস�টেমে অবস�থিত নয়। "
 "ইচ�ছামাফিক আইকন তৈরির ক�ষেত�রে শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত চিত�রের "
 "ফাইলগ�লোই ব�যবহার করা যাবে।"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা স�থানীয় ফাইল সিস�টেমে অবস�থিত নয়। "
+"ইচ�ছামাফিক আইকন তৈরির ক�ষেত�রে শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত চিত�রের "
+"ফাইলগ�লোই ব�যবহার করা যাবে।"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত ফাইল"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"যে ফাইলটি ব�যবহার করতে চাচ�ছেন তা কোন ছবির ফাইল নয়। আপনি শ�ধ�মাত�র স�থানীয় ফাইল "
-"সিস�টেমে অবস�থিত ফাইলকেই ইচ�ছামাফিক তৈরি করা আইকন হিসেবে ব�যবহার করতে পারবেন।"
+"যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা স�থানীয় ফাইল সিস�টেমে অবস�থিত নয়। "
+"ইচ�ছামাফিক আইকন তৈরির ক�ষেত�রে শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত চিত�রের "
+"ফাইলগ�লোই ব�যবহার করা যাবে।"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "শ�ধ�মাত�র ছবি"
 
 # HACK msgstr "ফাইল _পেস�ট (Paste) করা হোক"
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "বৈশিষ�ট�যাবলি"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s �র বৈশিষ�ট�যাবলী"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "গ�র�প পরিবর�তনের প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "গ�রপ পরিবর�তন করা হচ�ছে"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "মালিকানা পরিবর�তনের প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "মালিকানা পরিবর�তন করা হচ�ছে"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "কিছ� না"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "পড়ার অযোগ�য"
 
 # msgstr "পড়া সম�ভব নয়"
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "%s আকারের �কটি বস�ত�"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d সংখ�যক বস�ত�, সর�বমোট সংখ�যা %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(কিছ� অংশ পড়ার অযোগ�য)"
 
@@ -5162,196 +5255,196 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "অভ�যন�তরস�থ বস�ত�:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "প�রাথমিক"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "নাম (_ন):"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "নাম (_ন):"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "ধরন:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "আকার:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "অবস�থান:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "শব�দমাত�রা"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "ফা�কা জায়গা"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "লিঙ�কের লক�ষ�য:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "মাইমের প�রকৃতি:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "পরিবর�তিত:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "ব�যবহৃত:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "ইচ�ছামাফিক আইকন বেছে নিন... (_ব)"
 
 # HACK msgstr "ইচ�ছামাফিক তৈরি করা আইকন _বেছে নিন..."
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "ইচ�ছামাফিক বেছে নেয়া আইকন ম�ছে ফেলা হোক (_ম)"
 
 # HACK msgstr "ইচ�ছামাফিক তৈরি করা আইকন _ম�ছে ফেলা হোক"
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "পড়া (_প)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "লেখা (_ল)"
 
 # HACK msgstr "_লেখা"
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "চালানো (_ল)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "ব�যবহারকারীর আই.ডি নির�ধারণ করা হোক (_ব)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "বিশেষ ফ�ল�যাগ:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "গ�র�প আই.ডি নির�ধারণ করা হোক (_প)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "স�টিকি (_স)"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "ব�যবহারের অন�মতি"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "যেহেত� আপনি মালিক না তাই আপনি �ই অন�মতিগ�লো পরিবর�তন করতে পারবেন না।"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "ফাইলের মালিক:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "ফাইলের মালিক:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "ফাইলের গ�র�প (_ফ):"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "ফাইলের গ�র�প:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "মালিক:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "গ�র�প:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "অন�যান�য:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "টেক�সট চিত�র:"
 
 # "C"
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "সংখ�যা চিত�র:"
 
 # "C"
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "সর�বশেষ পরিবর�তন:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" �র অন�মতি বো�া যাচ�ছে না।"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "নির�বাচিত ফাইলটির অন�মতি বো�া যাচ�ছে না।"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"সহায়িকা প�রদর�শনে সমস�যা হয়েছে: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "সহায়িকা প�রদর�শনে সমস�যা: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "সহায়িকা প�রদর�শন করা সম�ভব হয়নি"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "বৈশিষ�ট�যাবলী প�রদর�শনকারী উইন�ডো চাল� করার প�রচেষ�টা কি বাতিল করা হবে?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "বৈশিষ�ট�যাবলী প�রদর�শনকারী উইন�ডো তৈরী করা হচ�ছে"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "�কটি আইকন বেছে নিন:"
 
@@ -5369,96 +5462,135 @@ msgid "Search Results"
 msgstr "অন�সন�ধানের ফলাফল"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "দ�ঃখিত, ইনস�টল করা না থাকায় মেড�সা ফাইল অন�সন�ধান প�রক�রিয়াটি সচল নয়।"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "দ�ঃখিত, মেড�সা ফাইল সন�ধান প�রক�রিয়া সচল নেই।"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "ফাইল অন�সন�ধান প�রক�রিয়া অচল"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "যে অন�সন�ধান প�রক�রিয়াটি আপনি বেছে নিয়েছে তা অপেক�ষা আপনার সিস�টেমের ফাইলের "
 "তালিকাটি প�রনো। ফলে অন�সন�ধানের ফলাফল �খন জানানো হবে না। কমান�ড লাইন থেকে root "
 "হিসেবে \"medusa-indexd\" চালিয়ে �কটি নত�ন ফাইলের তালিকা তৈরী করতে পারেন।"
 
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find ফাইল সিস�টেমের তালিকা পড়তে পারছে না। সম�ভবত তালিকাটি হারিয়ে বা নষ�ট হয়ে "
+"গিয়েছে। নত�ন করে ফাইলের তালিকা তৈরি করতে চাইলে কমান�ড লাইন root হিসেবে থেকে "
+"\"medusa-indexd\" চালান।"
+
 # "C"
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "যেসব ফাইল/ফোল�ডার খ�বই নত�ন, সেগ�লো খ��জে বের করা হোক"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"আপনি যে ধরনের ফাইল খ��জতে চাচ�ছেন, প�রতিটি ফাইলই তার আওতায় পরে। তাই আরো নিখ��ত "
+"ফলাফল পেতে চাইলে অন�সন�ধানে ব�যবহৃত শব�দের বানান পরীক�ষা কর�ন অথবা আরো বেশি শব�দ "
+"ব�যবহার কর�ন।"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "আপনি যে ধরনের ফাইল খ��জতে চাচ�ছেন, প�রতিটি ফাইলই তার আওতায় পরে। তাই আরো নিখ��ত "
 "ফলাফল পেতে চাইলে অন�সন�ধানে ব�যবহৃত শব�দের বানান পরীক�ষা কর�ন অথবা আরো বেশি শব�দ "
 "ব�যবহার কর�ন।"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "ফাইল খো�জার সময় সমস�যা হয়েছে"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find ফাইল সিস�টেমের তালিকা পড়তে পারছে না। সম�ভবত তালিকাটি হারিয়ে বা নষ�ট হয়ে "
 "গিয়েছে। নত�ন করে ফাইলের তালিকা তৈরি করতে চাইলে কমান�ড লাইন root হিসেবে থেকে "
 "\"medusa-indexd\" চালান।"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "ফাইলের তালিকা পড়তে সমস�যা হয়েছে"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "�ই অন�সন�ধানের বিষয়বস�ত� পড়তে সমস�যা হয়েছেঃ %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"ফাইলের অভ�যন�তরস�থ বস�ত�র ওপর নির�ভর করে অন�সন�ধানের জন�য Find সিস�টেমের সকল ফাইলের "
+"�কটি তালিকা ব�যবহার করে। কিন�ত� �ম�হূর�তে সেরকম কোন তালিকা পাওয়া যাচ�ছে না। "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"ফাইলের অভ�যন�তরস�থ বস�ত�র ওপর নির�ভর করে অন�সন�ধানের জন�য Find সিস�টেমের সকল ফাইলের "
+"�কটি তালিকা ব�যবহার করে। কিন�ত� �ম�হূর�তে সেরকম কোন তালিকা পাওয়া যাচ�ছে না। "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
 "দ�র�ত ফাইল খো�জার জন�য Find সকল ফাইলের �কটি তালিকা ব�যবহার করে।  যেহেত� �ম�হূর�তে "
 "�রকম কোন তালিকা পাওয়া যাচ�ছে না, তাই অপেক�ষাকৃত ধীর গতিতেইফাইল খো�জা হবে।"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"ফাইলের অভ�যন�তরস�থ বস�ত�র ওপর নির�ভর করে অন�সন�ধানের জন�য Find সিস�টেমের সকল ফাইলের "
-"�কটি তালিকা ব�যবহার করে। কিন�ত� �ম�হূর�তে সেরকম কোন তালিকা পাওয়া যাচ�ছে না। "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "দ�র�ত ফাইল খো�জার ব�যবস�থা নেই"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "অভ�যন�তরস�থ বস�ত� ভিত�তিক অন�সন�ধানের ব�যবস�থা নেই"
 
 # "C"
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5472,56 +5604,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "দ�র�ত ফাইল খো�জার জন�য সিস�টেমের সকল ফাইলের �কটি তালিকা প�রয়োজন। �ম�হূর�তে �রকম �কটি "
 "তালিকা তৈরি করা হচ�ছে। যেহেত� �ম�হূর�তে Find তালিকাটি ব�যবহার করতে পারছে না, তাই "
 "অন�সন�ধান সম�পন�ন করতে কয়েক মিনিট সময় লাগতে পারে।"
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "অভ�যন�তরস�থ বস�ত�র পর ভিত�তি করে ফাইল খো�জার জন�য সিস�টেমের সকল ফাইলের �কটি তালিকা "
 "প�রয়োজন। �রকম �কটি তালিকা �ম�হূর�তে তৈরি করা হচ�ছে। তালিকাটি তৈরি হয়ে গেলে "
 "অভ�যন�তরস�থ বস�ত�র ওপর ভিত�তিক করে অন�সন�ধান চালানো যাবে।"
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "ফাইলের তালিকা ব�যবহার করে ফাইল খো�জার ব�যবস�থা নেই"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"ফাইলের অভ�যন�তরস�থ বস�ত�র ওপর নির�ভর করে অন�সন�ধানের জন�য Find সিস�টেমের সকল ফাইলের "
+"�কটি তালিকা ব�যবহার করে। কিন�ত� �ম�হূর�তে সেরকম কোন তালিকা পাওয়া যাচ�ছে না। "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"ফাইলের অভ�যন�তরস�থ বস�ত�র ওপর নির�ভর করে অন�সন�ধানের জন�য Find সিস�টেমের সকল ফাইলের "
+"�কটি তালিকা ব�যবহার করে। কিন�ত� �ম�হূর�তে সেরকম কোন তালিকা পাওয়া যাচ�ছে না। "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "দ�র�ত ফাইল খো�জার জন�য Find সিস�টেমের সকল ফাইলের �কটি তালিকা ব�যবহার করে। �ম�হূর�তে "
 "�রকম কোন তালিকা নেই। �ই তালিকা তৈরি করতে হলে root হিসেবে কমান�ড লাইন থেকে "
 "\"medusa-indexd\" চালান। সম�পূর�ণ তালিকাটি তৈরি না হওয়া পর�যন�ত ফাইল অন�সন�ধানের "
 "ক�ষেত�রে কয়েক মিনিট সময় লাগবে।"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "বিষয়বস�ত�র ওপর ভিত�তি করে ফাইল খো�জার জন�য Find সিস�টেমের সকল ফাইলের �কটি তালিকা "
 "ব�যবহার করে। �ম�হূর�তে �রকম কোন তালিকা নেই। �ই তালিকা তৈরি করতে হলে root হিসেবে "
 "কমান�ড লাইন থেকে \"medusa-indexd\" চালান। সম�পূর�ণ তালিকাটি তৈরি না হওয়া "
 "বিষয়বস�ত�ভিত�তিক ফাইল অন�সন�ধান সম�ভব নয়।"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "�ই কম�পিউটারে দ�র�ত ফাইল খো�জার ব�যবস�থা নেই"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5531,11 +5695,12 @@ msgstr ""
 "আপনার সিস�টেম অ�যাডমিনস�ট�রেটর �ই সিস�টেমে দ�র�ত ফাইল খো�জার ব�যবস�থা নিষ�ক�রিয় করে "
 "রেখেছেন, তাই �রকম কোন তালিকা নেই।"
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "�ই কম�পিউটারে দ�র�ত ফাইল খো�জার ব�যবস�থা নেই"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "দ�র�ত ফাইল খো�জার ব�যবস�থা নেই"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "কোথায়"
 
@@ -5544,7 +5709,7 @@ msgstr "কোথায়"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "নত�ন উইন�ডোতে প�রদর�শন করা হোক"
@@ -5556,7 +5721,7 @@ msgstr "নত�ন উইন�ডোতে প�রদর�শন করা
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d টি নত�ন উইন�ডোতে প�রদর�শন করা হোক"
@@ -5566,15 +5731,22 @@ msgstr "%d টি নত�ন উইন�ডোতে প�রদর�শন
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"নটিলাসের অন�সন�ধানের ফলাফলের সংখ�যা �ত বেশি যে সবগ�লো দেখানো সম�ভব নয়। তাই "
+"দেখানোর সময়কিছ� ফলাফল বাদ দেয়া হবে। "
+
+# HACK msgstr "%d টি _নত�ন উইন�ডোতে প�রদর�শন করা হোক"
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "নটিলাসের অন�সন�ধানের ফলাফলের সংখ�যা �ত বেশি যে সবগ�লো দেখানো সম�ভব নয়। তাই "
 "দেখানোর সময়কিছ� ফলাফল বাদ দেয়া হবে। "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "ফলাফলের সংখ�যা অত�যধিক বেশি"
 
@@ -5589,12 +5761,12 @@ msgstr "নত�ন লঞ�চার তৈরি করো (_ল)"
 
 # HACK msgstr "ডেস�কটপের _পটভূমি পরিবর�তন করা হোক"
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "�কটি নত�ন লঞ�চার তৈরি কর�ন"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "আবর�জনার বাক�সের সব কিছ� ম�ছে ফেলা হোক"
 
@@ -5615,7 +5787,7 @@ msgstr "ডেস�কটপের পটভূমির বিন�যাস
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "ডিফল�ট পটভূমি ব�যবহার করা হোক"
@@ -5639,62 +5811,72 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "চিহ�নিত ফাইলটিকে দেখার জন�য কোন �কটি প�রদর�শক প�রোগ�রাম বেছে নিন"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "নত�ন ফোল�ডার তৈরি করো (_ফ)"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "নত�ন ফোল�ডার তৈরি করো (_ফ)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "�ই ফোল�ডারের ভেতরে আরেকটি নত�ন ফা�কা ফোল�ডার তৈরি করা হোক"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "�ই ফোল�ডারের ভেতরে আরেকটি নত�ন ফা�কা ফোল�ডার তৈরি করা হোক"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "প�রতিটি চিহ�নিত ফাইল/ফোল�ডার-�র জন�য সিম�বলিক লিঙ�ক তৈরি করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "প�রতিরূপ (_র)"
 
 # HACK msgstr "প�র_তিরূপ"
 # "C"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 "আবর�জনার বাক�সে স�থানান�তর না করে সবগ�লো চিহ�নিত ফাইল/ফোল�ডারকে সরাসরি ম�ছে ফেলা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "প�রতিটি চিহ�নিত বস�ত�র প�রতিরূপ (Duplicate) তৈরি করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "লঞ�চার �ডিট করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "লঞ�চারের তথ�য �ডিট করা হোক"
 
 # HACK msgstr "ডি_স�ক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "চিহ�নিত ভলিউমটিকে ফরম�যাট করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "মিডিয়ার বৈশিষ�ট�যাবলি (_ম)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "চিহ�নিত ফাইল সিস�টেমকে আনমাউন�ট করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "কাট (Cut) বা কপি (Copy) কম�যান�ডের সাহায�যে পূর�বে চিহ�নিত ফাইলসমূহকে স�থানান�তর বা "
 "কপি করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5702,145 +5884,154 @@ msgstr ""
 "কাট (Cut) বা কপি (Copy) কম�যান�ডের সাহায�যে পূর�বে চিহ�নিত ফাইলসমূহকে স�থানান�তর বা "
 "কপি করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "যে প�রোগ�রামের সাহায�যে চালানো হবে (_হ)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "প�রতিটি চিহ�নিত ফাইল/ফোল�ডারকে পৃথক পৃথক উইন�ডোতে প�রদর�শন করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "নত�ন উইন�ডোতে চাল� করো"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "চিহ�নিত ফাইল/ফোল�ডারকে �ই উইন�ডোতে প�রদর�শন করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "চিহ�নিত ফাইলসমূহকে পেস�ট (Paste) কম�যান�ডের সাহায�যে কপি করার ব�যবস�থা করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "চিহ�নিত ফাইলসমূহকে পেস�ট (Paste) কম�যান�ডের সাহায�যে স�থানান�তর করার ব�যবস�থা করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "চিহ�নিত ফাইল/ফোল�ডারগ�লোর নাম পরিবর�তন করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "প�রদর�শনের জন�য ডিফল�ট ব�যবহার করা হোক"
 
 # HACK msgstr "প�রদর�শনের জন�য ডিফল�ট ব�যবহার করা হোক"
 # "C"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "সাজানোর ধারা ও বড় করে দেখার মাত�রা �মনভাবে পরিবর�তন করা হোক যেন তা �ই দৃশ�যের "
 "বৈশিষ�ট�যের সাথে মিলে যায়"
 
 # "C"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "~/Nautilus/scripts �র স�ক�রিপ�টসমূহকে চালানো বা ম�যানেজ করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "সকল ফাইলকে চিহ�নিত করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "প�যাটার�ন:"
 
 # HACK msgstr "_সকল ফাইলকে চিহ�নিত করা হোক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "�ই উইন�ডোর সকল ফাইল/ফোল�ডারকে চিহ�নিত করা হোক"
 
 # HACK msgstr "_সকল ফাইলকে চিহ�নিত করা হোক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "�ই উইন�ডোর সকল ফাইল/ফোল�ডারকে চিহ�নিত করা হোক"
 
 # "C" - "নির�ধারণী" বানান নিয়ে Confusion আছে
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "চিহ�নিত ফাইল সিস�টেম খন�ডের মিডিয়া বৈশিষ�ট�যাবলি প�রদর�শন করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "�ই মেন�তে প�রদর�শিত স�ক�রিপ�টসমূহ যে ফোল�ডারে আছে তা দেখানো হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "চিহ�নিত ফাইল সিস�টেমকে আনমাউন�ট করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "�খানে ডিফল�ট পটভূমি ব�যবহার করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "প�রতিটি চিহ�নিত ফাইল/ফোল�ডারের বৈশিষ�ট�য দেখানো বা পরিবর�তন করা হোক"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "ফাইল _কপি (Copy) করো (_ক)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "বিন�যাস (_ব)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "ফাইল সিস�টেম _আনমাউন�ট করা হোক"
 
 # HACK msgstr "_নত�ন ফোল�ডার"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "প�রদর�শন (_প)"
 
 # HACK msgstr "_পড়া"
 # msgstr "_ব�যবহার করা"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "যে ফোল�ডারে স�ক�রিপ�টসমূহ আছে তা দেখানো হোক (_খ)"
 
 # HACK msgstr "যে ফোল�ডারে স�ক�রিপ�টসমূহ আছে তা _দেখানো হোক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "ফাইল পেস�ট (Paste) করা হোক (_প)"
 
 # HACK msgstr "যে ফোল�ডারে স�ক�রিপ�টসমূহ আছে তা _দেখানো হোক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "ফোল�ডারের মধ�যে ফাইল পেস�ট (Paste) করা হোক (_প)"
 
 # HACK msgstr "ফাইল _পেস�ট (Paste) করা হোক"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "বৈশিষ�ট�যাবলি (_ব)"
 
 # HACK msgstr "_বৈশিষ�ট�যাবলি"
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "নাম পরিবর�তন (_র)..."
 
 # HACK msgstr "_নাম পরিবর�তন..."
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "স�ক�রিপ�ট (_ক)"
 
@@ -5938,7 +6129,12 @@ msgstr "নিজ হাতে (_হ)"
 msgid "Indexing is %d%% complete."
 msgstr "তালিকা তৈরির কাজ %d%% ভাগ সম�পন�ন হয়েছে।"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "শেষবার যে সময় ফাইলের তালিকা তৈরি করা হয়েছিল তা হল %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5946,25 +6142,29 @@ msgstr ""
 "দ�র�ত ফাইল অন�সন�ধানের জন�য প�রতিদিন �কবার সকল ফাইল ও অন�যান�য টেক�সটের তালিকা তৈরি "
 "করা হয়। "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "ফাইলের তালিকা তৈরির অবস�থা"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "শেষবার যে সময় ফাইলের তালিকা তৈরি করা হয়েছিল তা হল %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"দ�র�ত ফাইল অন�সন�ধানের জন�য প�রতিদিন �কবার সমস�ত ফাইল ও অন�যান�য টেক�সটের তালিকা তৈরি "
-"করা হয়। �ম�হূর�তে আজকের তালিকাটি তৈরি করা হচ�ছে।"
+"দ�র�ত ফাইল অন�সন�ধানের জন�য প�রতিদিন �কবার সকল ফাইল ও অন�যান�য টেক�সটের তালিকা তৈরি "
+"করা হয়। "
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "�ম�হূর�তে আপনার ব�যবহৃত ফাইলসমূহের কোন তালিকা নেই।"
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5974,15 +6174,19 @@ msgstr ""
 "যেহেত� আপনার কম�পিউটারে দ�রত ফাইল অন�সন�ধানের কোন ব�যবস�থা নেই তাই �রকম কোন তালিকাও "
 "�ম�হূর�তে নেই।"
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "�ম�হূর�তে আপনার ব�যবহৃত ফাইলসমূহের কোন তালিকা নেই।"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "দ�ঃখিত, মেড�সা ফাইল সন�ধান প�রক�রিয়া সচল নেই।"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -6007,32 +6211,37 @@ msgstr "ফাইলের তালিকা তৈরির বর�তমা
 msgid "Show status of indexing used when searching"
 msgstr "অন�সন�ধানের সময় ফাইলের তালিকা তৈরির বর�তমান অবস�থা জানানো হোক"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "প�রয়োজনীয় ফোল�ডারটি তৈরি করা যায়নি"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "প�রয়োজনীয় ফোল�ডারসমূহ তৈরি করা যায়নি"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "নটিলাস, প�রয়োজনীয় ফোল�ডার \"%s\"  তৈরি করতে পারেনি। পরবর�তিতে নটিলনটিলাসানোর "
 "পূর�বে দয়া করে ফোল�ডারটি তৈরি করে রাখ�ন অথবা �মন কিছ� কর�ন যেন নটনটিলাসিজেই "
 "ফোল�ডারটি তৈরি করতে পারে।"
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "প�রয়োজনীয় ফোল�ডারসমূহ তৈরি করা যায়নি"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6043,23 +6252,28 @@ msgstr ""
 "পরবর�তিতে নটিলাস চালানোর পূর�বে দয়া করে ফোল�ডারগ�লো তৈরি করে রাখ�ন অথবা ফোল�ডার "
 "ব�যবহারের অন�মতি পরিবর�তন করে �মন কর�ন যেন নটিলাস ফোল�ডারটি তৈরি করতে পারে।"
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "প�রোনো ডেক�সটপের অবস�থান"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "গ�হ�‌নোম ২.৪-� ডেস�কটপ ডিরেক�টরির অবস�থান বদলে গেছে। \"প�রোনো ডেক�সটপের অবস�থান\" বলে "
 "�কটি লিঙ�ক বর�তমান ডেস�কটপের উপরে তৈরি করা হয়েছে। চাইলে আপনি আপনার দরকারি "
 "ফাইলগ�লোকে ওখান থেকে সরিয়ে �নে লিঙ�কটিকে ম�ছে ফেলতে পারেন।"
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "প�রোনো ডেক�সটপের অবস�থান"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6071,7 +6285,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6082,7 +6296,7 @@ msgstr ""
 "করে নটিলাস ইনস�টল কর�ন।"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6128,12 +6342,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "�কটি অপ�রত�যাশিত সমস�যার কারণে �খন নটিলাস চালানো যাচ�ছে না।"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6141,7 +6355,7 @@ msgstr ""
 "বনোবো যখন ফাইল ম�যানেজার ভিউ সার�ভারকে নিবন�ধিত করার চেষ�টা করছিল তখন �কটি "
 "অপ�রত�যাশিত সমস�যা হয়েছে �বং �কারণে �খন ননটিলাসচালানো যাচ�ছে না।"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6151,7 +6365,7 @@ msgstr ""
 "নটিলাস চালানো যাবে না। বনোবো-অ�যাক�টিভেশন-সার�ভারকে বন�ধ করে প�নরায় নটিলনটিলাস� "
 "করলে হয়তো সমস�যার সমাধান হতে পারে।"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6161,6 +6375,17 @@ msgstr ""
 "নটিলাস চালানো যাবে না। বনোবো-অ�যাক�টিভেশন-সার�ভারকে বন�ধ করে প�নরায় নটিলনটিলাস� "
 "করলে হয়তো সমস�যার সমাধান হতে পারে।"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"সহায়িকা প�রদর�শনে সমস�যা হয়েছে: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "কোন ব�কমার�কের উল�লেখ নেই"
@@ -6196,36 +6421,48 @@ msgstr "অপেক�ষাকৃত কম অপশন"
 msgid "Find Them!"
 msgstr "তাদেরকে খ��জে বের কর!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "নিজের ভেতরে স�থানান�তর করা যাচ�ছে না।"
 
-#: src/nautilus-connect-server-dialog.c:100
+# "C"
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "দ�ঃখিত, \"%s\" কোন ফাইলের সঠিক নাম হতে পারেনা।"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" কোন সঠিক অবস�থান নয়। দয়া করে বানান ঠিক আছে কিনা তা পরীক�ষা কর�ন �বং আবার "
-"চেষ�টা কর�ন।"
+"\"%s\"'কে খ��জে পাওয়া যায়নি। দয়া করে বানান ঠিক আছে কিনা তা পরীক�ষা কর�ন �বং আবার "
+"চেষ�টা কর�ন। "
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "নেটওয়ার�ক সার�ভার"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "নাম (_ন):"
+msgid "_Location:"
+msgstr "অবস�থান:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "যোগাযোগ স�থাপন করো (_য)"
@@ -6443,6 +6680,21 @@ msgstr ""
 "\n"
 "ড�র�ইডটিকে নত�ন করে উপস�থাপন করতে চাইলে আপনি নিজ হাতে ফাইলটিকে ম�ছে ফেলতে পারেন।\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"�কই সময় ইচ�ছামাফিক তৈরি করা �কাধিক আইকন নির�ধারণ করা যাবে না! দয়া করে শ�ধ�মাত�র "
+"�কটি চিত�রকে আইকন হিসেবে ব�যবহার কর�ন।"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"যে ফাইলটি আপনি ব�যবহার করতে চাচ�ছেন তা স�থানীয় ফাইল সিস�টেমে অবস�থিত নয়। "
+"ইচ�ছামাফিক আইকন তৈরির ক�ষেত�রে শ�ধ�মাত�র স�থানীয় ফাইল সিস�টেমে অবস�থিত চিত�রের "
+"ফাইলগ�লোই ব�যবহার করা যাবে।"
+
 # "C"
 #: src/nautilus-information-panel.c:882
 #, c-format
@@ -6454,26 +6706,25 @@ msgstr "চালানোর জন�য ব�যবহৃত হবে %s"
 msgid "Open with..."
 msgstr "চালানোর জন�য ব�যবহৃত হবে..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "সিডি বার�নার অ�যাপ�লিকেশন চালানো গেল না।\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "সিডি বার�নার চালানো গেল না"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "আবর�জনার বাক�স খালি করা হোক (_আ)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6481,38 +6732,38 @@ msgstr ""
 msgid "Go To:"
 msgstr "গন�তব�য:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "আপনি কি �ই %dটি অবস�থানকে পৃথক পৃথক উইন�ডোতে দেখতে চান?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "পৃথক পৃথক উইন�ডোতে দেখানো হবে কি?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�ই অবস�থানের কিছ� পড়া যাচ�ছে না"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "সব কিছ� ঠিক আছে কিনা তা দেখার জন�য নিজের ওপর দ�র�ত কিছ� পরীক�ষা চালানো হোক।"
 
 # "C"
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "প�রদত�ত আকার অন�যায়ী প�রথম উইন�ডোটি তৈরি করা হোক।"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "আকার"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "শ�ধ�মাত�র বিশেষভাবে উল�লেখিত ইউ.আর.আই (URI) �র জন�য উইন�ডো তৈরি করা হোক।"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6520,87 +6771,100 @@ msgstr ""
 "উইন�ডো ম�যানেজ করা হবে না (বৈশিষ�ট�যাবলি নির�দেশক ডায়ালগে নির�ধারিত মানসমূহকে "
 "অগ�রাহ�য করা হোক)।"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "নটিলাস বন�ধ করে দেয়া হোক।"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "নটিলাস প�নরায় চাল� করা হোক।"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "ফাইল ব�যবস�থাপনা"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "নটিলাস"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "নটিলাস: --ইউ.আর.আই (URI) �র সাথে পরীক�ষা করা যাবে না।\n"
 
 # "C"
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "নটিলাসঃ --অন�যান�য অপশনের সাথে পরীক�ষা করা যাবে না।\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "নটিলাসঃ --ইউ.আর.আই (URI) �র সাথে বন�ধ করা যাবে না।\n"
 
 # "C"
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "নটিলাসঃ --ইউ.আর.আই (URI) �র সাথে রিস�টার�ট করা যাবে না।\n"
 
 # "C"
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "নটিলাসঃ --�কাধিক ইউ.আর.আই (URI) �র সাথে আকার ব�যবহার করা যাবে না।\n"
 
-# "C"
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "আপনি কি \"%s\"'কে স�থায়ীভাবে ম�ছে ফেলার ব�যাপারে নিশ�চিত?"
+
+# "C"
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "আপনি কি নিশ�চিত যে আপনি ব�রাউজের তালিকা ম�ছে ফেলতে চান? যদি আপনি সত�যিই রাজি "
 "থাকেন, তবে �জন�য আপনাকে ভবিষ�যতে অন�তপ�ত হতে হবে।"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "আপনি কি নিশ�চিত যে আপনি যে সব ডিরেক�টরির ভেতর প�রবেশ করেছেন তার তালিকা ম�ছে "
 "ফেলতে চান?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "ব�রাউজের তালিকা ম�ছে ফেলা হোক"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" নামে কোন অবস�থান নেই। �ই অবস�থান নির�দেশকারী কোন ব�কমার�ককে কি আপনি তালিকা "
 "থেকে ম�ছে ফেলতে চান?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "\"%s\" �র আর কোন অস�তিত�ব নেই।"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "অস�তিত�বহীন অবস�থান নির�দেশকারী ব�কমার�ক"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "ম�ছে ফেলা"
 
@@ -6634,7 +6898,6 @@ msgid "Close _All Windows"
 msgstr "সকল উইন�ডো বন�ধ করা হোক (_স)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "নটিলাসের সকল উইন�ডো বন�ধ করা হোক"
@@ -6657,111 +6920,123 @@ msgid "Forward"
 msgstr "পরবর�তি অবস�থান"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "গন�তব�য আবর�জনার ফোল�ডার"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "গন�তব�য পরবর�তি ডিরেক�টরি"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "গন�তব�য পূর�ববর�তি ডিরেক�টরি"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "গন�তব�য আবর�জনার ফোল�ডার"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "প�রথম ফোল�ডার (Home)"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "অবস�থানসূচক বার (_ব)"
 
 # HACK msgstr "বৈশিষ�ট�যা_বলি"
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "নত�ন করে পড়া"
 
 # "C"
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "�ই কম�পিউটারে ফাইল খো�জা হোক"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "স�ট�যাটা_সবার"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "বন�ধ"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "উপর"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "ব�কমার�কের তালিকায় যোগ করা হোক (_য)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "পূর�ববর�তি (_ব)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "ব�কমার�ক (_ব)"
 
 # HACK msgstr "_পটভূমি �বং প�রতীক"
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "ব�রাউজের তালিকা ম�ছে ফেলো (_ম)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_ক�রিয়ার"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "ব�কমার�কের তালিকার সম�পাদন করব (_ম)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "পরবর�তি (_র)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "গন�তব�য (_গ)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "প�রথম ফোল�ডার (Home) (_প)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "অবস�থান... (_অ)"
 
 # HACK msgstr "প�রোফাইলিং _রিসেট করা হোক"
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "ধারের পেন (_ধ)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_টাইম�‌স"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "আবর�জনা (_আ)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "উপর (_উ)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "দৃশ�য (_দ)"
 
@@ -6779,34 +7054,39 @@ msgstr "যেভাবে দেখানো হবে..."
 msgid "File Browser: %s"
 msgstr "ফাইলের মালিক:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "কোন �কটি সাইডবার পপেনল সমস�যার সম�ম�খিন হয়েছে �বং তা আর চালানো যাচ�ছে না। দ�র�ভাগ�য "
 "বশতঃ �টা বলা যাচ�ছে না যে কোন পপেনলটির �ই সমস�যা হয়েছে।"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "চাল� হওয়ার সময় %s হিসেবে প�রদর�শনের চেষ�টা সমস�যার সম�ম�খিন হয়েছে।"
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s নামক সাইডবার পেনেলটি সমস�যার সম�ম�খিন হয়েছে �বং �টি আর চালানো যাচ�ছে না। যদি "
 "�রকম চলতে থাকে, তবে আপনি পেনেলটি বন�ধ করে দিতে পারেন।"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "সাইডবার পেনেলটি চালানো যায়নি"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "সাইড পেন"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "সাইড পেনবিশিষ�ট চিত�র"
 
@@ -6841,149 +7121,182 @@ msgstr "নত�ন যোগ করা হোক... (_য)"
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "দ�ঃখিত, কোনভাবেই %s প�যাটার�নটিকে ম�ছে ফেলা যায়নি।"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "প�যাটার�ন ম�ছে ফেলা যায়নি"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "দ�ঃখিত, কোনভাবেই %s প�রতীকটিকে ম�ছে ফেলা যায়নি।"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "প�রতীক ম�ছে ফেলা যায়নি"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "নত�ন প�রতীক তৈরি করা হোক:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "মূলশব�দ (_ম):"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "ছবি (_ছ):"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "নত�ন প�রতীকের জন�য �কটি ছবির ফাইল বেছে নিন:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "নত�ন �কটি রং তৈরি করা হোক:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "রঙের নাম (_ন):"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "রঙের মান (_ম):"
 
 # "C"
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "দ�ঃখিত, \"%s\" কোন ফাইলের সঠিক নাম হতে পারেনা।"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "দ�ঃখিত, আপনি ফাইলের নাম হিসেবে যা লিখেছেন তা সঠিক নয়।"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "প�যাটার�ন ইনস�টল করা যায়নি"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "দ�ঃখিত, আপনি রিসেটের সময় ব�যবহৃত চিত�রটি পরিবর�তন করতে পারেন না।"
 
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
 # "C"
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�টি কোন ছবি নয়"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "দ�ঃখিত, প�যাটার�ন %s কে ইনস�টল করা যায় নি।"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "প�যাটার�ন হিসেবে ব�যবহারের জন�য �কটি ছবির ফাইল বেছে নিন"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "দ�ঃখিত, নত�ন রঙে নাম হিসেবে আপনাকে অবশ�যই কিছ� লিখতে হবে।"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "রং ইনস�টল করা যায় নি"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "তালিকায় যোগ করার জন�য �কটি রং বেছে নিন"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "দ�ঃখিত, চিত�রের ফাইল হিসেবে '%s' ব�যবহারযোগ�য নয়!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "'%s' নামের ফাইলটিকে কোন ছবির ফাইল বলে মনে হচ�ছে না।"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "কোন �কটি শ�রেণী বেছে নিন:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "সরিয়ে ফেলার প�রচেষ�টা বাতিল করা হোক (_ব)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "�কটি নত�ন প�যাটার�ন  যোগ করা হোক... (_য)"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "�কটি নত�ন রং যোগ করা হোক... (_য)"
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "�কটি নত�ন প�রতীক যোগ করা হোক... (_য)"
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "কোন প�যাটার�নকে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "কোন রংকে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "কোন প�রতীককে সরিয়ে ফেলতে চাইলে তার ওপর ক�লিক কর�ন"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "প�যাটার�ন:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "রং:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "প�রতীক:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "�কটি প�যাটার�ন সরিয়ে ফেলা হোক... (_স)"
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "�কটি রং সরিয়ে ফেলা হোক... (_স)"
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "�কটি প�রতীক সরিয়ে ফেলা হোক... (_স)"
 
@@ -7382,34 +7695,40 @@ msgstr "সিডি প�রস�ত�তকারক (_স)"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "সকল উইন�ডো বন�ধ করা হোক (_স)"
 
+# HACK msgstr "_যেভাবে দেখানো হবে..."
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "সাইড পেন বন�ধ করা হোক"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "গন�তব�য খালি সিডির ফোল�ডার"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "গন�তব�য আবর�জনার ফোল�ডার"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "অবস�থান... (_অ)"
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]ফোল�ডার"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "প�যাটার�ন:"
@@ -7439,10 +7758,13 @@ msgid "View Failed"
 msgstr "প�রদর�শন করার প�রচেষ�টা ব�যর�থ হয়েছে"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "চাল� হওয়ার সময় %s হিসেবে প�রদর�শনের চেষ�টা সমস�যার সম�ম�খিন হয়েছে।"
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s হিসেবে প�রদর�শনের চেষ�টা সমস�যার সম�ম�খিন হয়েছে �বং আর আগ�রসর হতে পারছে না। আপনি "
 "অন�য কোন পদ�ধতিতে অথবা অন�য কোন অবস�থান থেকে চেষ�টা করে দেখতে পারেন।"
@@ -7452,103 +7774,133 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "চাল� হওয়ার সময় %s হিসেবে প�রদর�শনের চেষ�টা সমস�যার সম�ম�খিন হয়েছে।"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "�ই উইন�ডোর সাথে সম�পর�কিত ননটিলাস�যাপলিকেশন (NautilusApplication)।"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "অভ�যন�তরস�থ বস�ত�র দৃশ�য"
 
 # "C"
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "বর�তমান ফাইল অথবা ফোল�ডারের দৃশ�য"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"\"%s\"'কে খ��জে পাওয়া যায়নি। দয়া করে বানান ঠিক আছে কিনা তা পরীক�ষা কর�ন �বং আবার "
-"চেষ�টা কর�ন। "
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "প�রতীক যোগ করা যায়নি"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "নটিলাস \"%s\"'কে প�রদর�শন করতে পারছে না।"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "\"%s\"'কে দেখানো যাচ�ছে না, কারণ ননটিলাসব��তে পারছে না যে �টি কি ধরনের ফাইল।"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "\"%s\"'কে প�রদর�শন করার মত কোন প�রদর�শক ননটিলাসর নেই।"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\"'কে প�রদর�শন করা যায়নি, কারণ %s: অবস�থানকে প�রদর�শন করার ক�ষমতা ননটিলাসর "
 "নেই। "
 
 # "C" - ইংরেজি Stringটা Confusing
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\"'কে প�রদর�শন করা যায়নি, কারণ লগ ইনের প�রচেষ�টা ব�যর�থ হয়েছে।"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "প�রয়োজনীয় অন�মতির অভাবে \"%s\"'কে প�রদর�শন করা যায়নি।"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\"'কে প�রদর�শন করা যায়নি, কারণ \"%s\" নামে কোন হোস�ট পাওয়া যায়নি। বানান �বং "
 "প�রক�সির বৈশিষ�ট�যাবলি ঠিক আছে কি না তা পরীক�ষা কর�ন।"
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "\"%s\"'কে প�রদর�শন করা যায়নি, কারণ হোস�টের নাম হিসেবে কিছ� লেখা হয়নি। প�রক�সির "
 "বৈশিষ�ট�যাবলি ঠিক আছে কি না তা পরীক�ষা কর�ন।"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"\"%s\"'কে প�রদর�শন করা যায়নি, কারণ ননটিলাস�স.�ম.বি'র (SMB) মূল ব�রাউজারের সাথে "
-"য�ক�ত হতে পারে নি।\n"
-"স�থানীয় নেটওয়ার�কে কোন �স.�ম.বি (SMB) সার�ভার চলছে কিনা তা পরীক�ষা কর�ন।"
+"\"%s\"'কে প�রদর�শন করা যায়নি, কারণ %s: অবস�থানকে প�রদর�শন করার ক�ষমতা ননটিলাসর "
+"নেই। "
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "�ম�হূর�তে ফাইল খো�জা সম�ভব নয়, কারণ হয় কোন ফাইলের তালিকা নেই, অথবা ফাইল খো�জার "
 "ব�যবস�থা নিষ�ক�রিয় রয়েছে। মেড�সা ফাইল অন�সন�ধান প�রক�রিয়া সচল আছে কি না �বং যদি কোন "
 "ফাইলের তালিকা না থাকে তবে মেড�সার ফাইল তালিকা তৈরির প�রক�রিয়াটি চলছে কি না তা "
 "নিশ�চিত হোন।"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"�ম�হূর�তে ফাইল খো�জা সম�ভব নয়, কারণ হয় কোন ফাইলের তালিকা নেই, অথবা ফাইল খো�জার "
+"ব�যবস�থা নিষ�ক�রিয় রয়েছে। মেড�সা ফাইল অন�সন�ধান প�রক�রিয়া সচল আছে কি না �বং যদি কোন "
+"ফাইলের তালিকা না থাকে তবে মেড�সার ফাইল তালিকা তৈরির প�রক�রিয়াটি চলছে কি না তা "
+"নিশ�চিত হোন।"
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "ফাইল অন�সন�ধানের প�রক�রিয়া সচল নেই"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "নটিলাস \"%s\"'কে প�রদর�শন করতে পারছে না।"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "অবস�থানটি দেখানো যাচ�ছে না"
 
@@ -7560,7 +7912,7 @@ msgstr "গন�তব�য ব�কমার�ক দ�বারা নি
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "কপিরাইট (কপিরাইট) ১৯৯৯-২০০১ ইজেল, ইঙ�ক।"
 
@@ -7568,11 +7920,11 @@ msgstr "কপিরাইট (কপিরাইট) ১৯৯৯-২০০১
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "গ�হ�‌নোম (GNOME) বাংলা অন�বাদ প�রকল�পের পক�ষে প�রজ�ঞা"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7588,39 +7940,44 @@ msgstr "গন�তব�য কয়েক পৃষ�ঠা পেছনে"
 msgid "Go forward a number of pages"
 msgstr "গন�তব�য কয়েক পৃষ�ঠা সামনে"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "\"%s\" �র সাহায�যে �ই অবস�থানটি প�রদর�শন করা হোক"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "রেড হ�যাট নেটওয়ার�ক"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "ফ_ন�ট"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_টাইম�‌স"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "সিডি প�রস�ত�তকারক (_স)"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "অ�যাপলিকেশন আই.ডি"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "�ই উইন�ডোর অ�যাপলিকেশন আই.ডি।"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "অ�যাপলিকেশন"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "�ই উইন�ডোর সাথে সম�পর�কিত ননটিলাস�যাপলিকেশন (NautilusApplication)।"
 
@@ -7656,6 +8013,249 @@ msgstr "নেটওয়ার�ক সার�ভার"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "ব�যবহৃত নেটওয়ার�ক সার�ভারগ�লোকে নটনটিলাসাইল ম�যানেজারে প�রদর�শন করা হোক"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "হার�ডওয়ার চিত�রের ফ�যাক�টরি"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "হার�ডওয়ার প�রদর�শক"
+
+#~ msgid "Hardware view"
+#~ msgstr "হার�ডওয়ার চিত�র"
+
+# "C"
+#~ msgid "View as Hardware"
+#~ msgstr "হার�ডওয়ার হিসেবে দেখানো হোক"
+
+#~ msgid "hardware view"
+#~ msgstr "হার�ডওয়ার চিত�র"
+
+# "C"
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "হার�ডওয়ার চিত�র নির�দেশক আইকনের নাম"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "হার�ডওয়ার সংক�রান�ত তথ�যের সারসংক�ষেপ"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s সি.পি.ইউ\n"
+#~ "%s মেগাহার�জ\n"
+#~ "ক�যাশের আকার %s কিলোবাইট "
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu গিগাবাইট র�যাম"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu মেগাবাইট র�যাম"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu গিগাবাইট"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu মেগাবাইট"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "কম�পিউটারটি %d দিন, %d ঘন�টা, %d মিনিট যাবত�� চলছে"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "হার�ডওয়ার বিষয়ক সংক�ষিপ�ত বিবরণ"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "�টা সি-পি-ইউ সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "�টা র�যাম সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "�টা আই-ডি-ই সম�বন�ধীয় পৃষ�ঠার জন�য নির�বাচিত জায়গা"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"-� কপি করা সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "গন�তব�যস�থলে যথেষ�ট স�থান অবশিষ�ট নেই।"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "গন�তব�যস�থলে যথেষ�ট স�থান অবশিষ�ট নেই।"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\"-� ফাইল সরিয়ে নেয়ার সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "�ই ফোল�ডারে কোন কিছ� পরিবর�তনের অন�মতি আপনার নেই।"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\"-� ফাইল সরিয়ে নেয়ার সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "�ই ফোল�ডারের কোন কিছ� পরিবর�তনের অধিকার আপনার নেই।"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\"-� লিঙ�ক তৈরির সময় সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "গন�তব�যের ডিস�কটি অপরিবর�তনীয়।"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\" কপি করার সময় \"%1$s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\"'কে স�থানান�তরের সময় \"%1$s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\"'কে ম�ছে ফেলার সময় \"%1$s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "কপি করার সময় \"%s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "লিঙ�ক তৈরির সময় \"%s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "ম�ছে ফেলার সময় \"%s\" সমস�যা হয়েছে।\n"
+#~ "\n"
+#~ "আপনি কি চালিয়ে যেতে চান?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "আবর�জনার বাক�সে কপি করা যাচ�ছে না"
+
+# "C"
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\" প�রোগ�রামটি \"%s\" নামের ফাইলটিকে ব�যবহার করতে পারছেনা  কারণ \"%s\" "
+#~ "\"%s\" অবস�থানে অবস�থিত ফাইলসমূহকে পড়তে পারেনা। �ই ফাইলটিকে দেখার জন�য অন�য "
+#~ "কোন উপয�ক�ত অ�যাপলিকেশন নেই। যদি আপনি ফাইলটিকে আপনার কম�পিউটারে কপি করেন, তবে "
+#~ "তবে হয়তো দেখতে পারবেন।"
+
+#~ msgid "Searching Disks"
+#~ msgstr "ডিস�কে অন�সন�ধান চালানো হচ�ছে"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "নটিলাস আপনার ব�যবহৃত ডিস�কে আবর�জনার বাক�স হিসেবে ব�যবহৃত ফোল�ডার খ��জছে।"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%dটি চিহ�নিত ফাইল/ফোল�ডারকে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি "
+#~ "�গ�লোকে �খনই স�থায়ীভাবে ম�ছে ফেলতে চান?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "চিহ�নিত ফাইল/ফোল�ডারের %dটিকে আবর�জনার বাক�সে সরিয়ে নেয়া যাচ�ছে না। আপনি কি �ই "
+#~ "%dটি ফাইল/ফোল�ডারকে �খনই স�থায়ীভাবে ম�ছে ফেলতে চান?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "যে ফাইলটি ব�যবহার করতে চাচ�ছেন তা কোন ছবির ফাইল নয়। আপনি শ�ধ�মাত�র স�থানীয় ফাইল "
+#~ "সিস�টেমে অবস�থিত ফাইলকেই ইচ�ছামাফিক তৈরি করা আইকন হিসেবে ব�যবহার করতে পারবেন।"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "দ�ঃখিত, ইনস�টল করা না থাকায় মেড�সা ফাইল অন�সন�ধান প�রক�রিয়াটি সচল নয়।"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "দ�র�ত ফাইল অন�সন�ধানের জন�য প�রতিদিন �কবার সমস�ত ফাইল ও অন�যান�য টেক�সটের তালিকা "
+#~ "তৈরি করা হয়। �ম�হূর�তে আজকের তালিকাটি তৈরি করা হচ�ছে।"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" কোন সঠিক অবস�থান নয়। দয়া করে বানান ঠিক আছে কিনা তা পরীক�ষা কর�ন �বং "
+#~ "আবার চেষ�টা কর�ন।"
+
+#~ 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 ""
+#~ "\"%s\"'কে প�রদর�শন করা যায়নি, কারণ ননটিলাস�স.�ম.বি'র (SMB) মূল ব�রাউজারের "
+#~ "সাথে য�ক�ত হতে পারে নি।\n"
+#~ "স�থানীয় নেটওয়ার�কে কোন �স.�ম.বি (SMB) সার�ভার চলছে কিনা তা পরীক�ষা কর�ন।"
+
+#~ msgid "file icon"
+#~ msgstr "ফাইলের আইকন"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "নাম (_ন):"
+
 #~ msgid "Unknown"
 #~ msgstr "অজ�ঞাত"
 
@@ -7753,9 +8353,6 @@ msgstr "বà§�যবহৃত নেটওয়ারà§�ক সারà§�ভারà
 #~ msgid "_Toolbar"
 #~ msgstr "ট�লবার (_ল)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "\"%s\" �র আর কোন অস�তিত�ব নেই।"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "গন�তব�য �কটি অস�তিত�বহীন অবস�থান"
 
@@ -7828,6 +8425,3 @@ msgstr "বà§�যবহৃত নেটওয়ারà§�ক সারà§�ভারà
 
 #~ msgid "_Helvetica"
 #~ msgstr "_হেলভেটিকা"
-
-#~ msgid "_Times"
-#~ msgstr "_টাইম�‌স"
diff --git a/po/ca.po b/po/ca.po
index 2ceb5d463..5f5267397 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,5 +1,5 @@
 # nautilus translation to Catalan.
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 # Softcatalà <info@softcatala.org>, 2000, 2001.
 # Valentín Trilles <vtrilles@yahoo.es>, 2002.
 # Sinner from the Prairy <sinner@escomposlinux.org>, 2002.
@@ -7,43 +7,43 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus 2.3.90\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-09-07 12:34+0200\n"
+"Project-Id-Version: nautilus 2.4.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-04 17:38+0100\n"
+"PO-Revision-Date: 2004-01-04 18:14+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
-msgstr "Original per als fabricants del component adaptador Nautilus"
+msgstr "Factoria per a les factories d'adaptadors de components del Nautilus"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:2
 msgid "Factory for Nautilus component adapter factories "
-msgstr "Original per als fabricants del component adaptador Nautilus"
+msgstr "Factoria per a les factories d'adaptadors de components del Nautilus "
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:3
 msgid ""
 "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
 "look like Nautilus Views"
 msgstr ""
-"Original per als objectes que ajusten els controls Bonobo ordinaris "
-"oincrustats per tenir un aspecte semblant a les vistes del Nautilus"
+"Factoria per als objectes que ajusten els controls Bonobo ordinaris o "
+"incrustats per tenir un aspecte semblant a les vistes del Nautilus"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:4
 msgid "Nautilus component adapter factory"
-msgstr "Fabricant del component adaptador Nautilus"
+msgstr "Factoria del component adaptador Nautilus"
 
 #: components/adapter/main.c:101
 msgid "bonobo_ui_init() failed."
 msgstr "Ha fallat bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Distintius"
 
@@ -57,48 +57,51 @@ msgstr "Vista de distintiu del Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
-msgstr ""
-"No s'ha pogut eliminar el distintiu amb nom «%s». Açò probablement és perque "
-"el distintiu és un dels permanents, i no un dels que heu afegit vosaltres."
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "No s'ha pogut suprimir el distintiu amb nom «%s»."
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr "Açò probablement és perque el distintiu és un dels permanents, i no un dels que heu afegit vosaltres."
+
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "No s'ha pogut suprimir el distintiu"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "No s'ha pogut reanomenar el distintiu amb nom «%s»"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
-msgstr ""
-"No s'ha pogut reanomenar el distintiu amb nom «%s». Açò probablement és "
-"perque el distintiu és un dels permanents, i no un dels que heu afegit "
-"vosaltres."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr "Açò probablement és perque el distintiu és un dels permanents, i no un dels que heu afegit vosaltres."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "No s'ha pogut reanomenar el distintiu"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Reanomena el distintiu"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Introduïu un nou nom per al distintiu mostrat:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Canvia el nom"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Afegeix distintius..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -106,7 +109,7 @@ msgstr ""
 "Introduïu un nom descriptiu al costat de cada distintiu. Aquest nom s'usarà "
 "en tots els altres llocs per a identificar el distintiu."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -114,139 +117,55 @@ msgstr ""
 "Introduïu un nom descriptiu al costat del distintiu. Aquest nom s'usarà en "
 "tots els altres llocs per a identificar el distintiu."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Alguns fitxers no s'han pogut afegir com a distintius perquè no pareixien "
-"ser imatges vàlides."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Algunes de les imatges n s'han pogut afegir com distintius."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Els distintius no semblen ser imatges vàlides."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "No s'ha pogut afegir distintius"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Cap dels fitxers s'ha pogut afegir com a distintiu perquè no pareixien ser "
-"imatges vàlides."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Cap dels fitxers s'ha pogut afegir com a distintius."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "No es pot afegir el distintiu."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "El text arrossegat no era una localització de fitxer vàlida."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "No s'ha pogut afegir un distintiu"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "El fitxer «%s» no pareix ser una imatge vàlida."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "El fitxer arrossegat no pareix ser una imatge vàlida."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Esborrar"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Original per a la vista del maquinari"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Maquinari"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visualitzador del maquinari"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vista del maquinari"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Visualitza com a maquinari"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vista del maquinari"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nom de la icona per a la vista del maquinari"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "resum d'informació sobre el maquinari"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K mida de la memòria cau"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Temps: % dies, %d hores, %d minuts"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Informació general del maquinari"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Aquest és un lloc destinat per a la pàgina de la CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Aquest és una lloc destinat a la pàgina de RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Aquest és un lloc destinat per a la pàgina IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historial"
@@ -272,31 +191,28 @@ msgid "Nautilus Image Properties view"
 msgstr "Vista de propietats d'imatge del Nautilus"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Càmera"
+msgstr "Marca de la càmera"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Càmera"
+msgstr "Model de la càmera"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Data de la captura"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Temps d'exposició"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "programa"
+msgstr "Programa d'exposició"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Valor d'obertura"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
@@ -304,10 +220,10 @@ msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Flash disparat"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
-msgid "Focal Lenght"
+msgid "Focal Length"
 msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:201
@@ -334,7 +250,7 @@ msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:235
 msgid "Failed to load image information"
-msgstr "No s'ha pogut carregar l'informació de la imatge"
+msgstr "No s'ha pogut carregar la informació de la imatge"
 
 #: components/image_properties/nautilus-image-properties-view.c:423
 msgid "loading..."
@@ -390,22 +306,6 @@ msgstr "Còpia el text seleccionat al porta-retalls"
 msgid "_Copy Text"
 msgstr "_Copia el text"
 
-#: components/text/services/google.xml.h:1
-msgid "Search Google for Selected Text"
-msgstr "Cerca amb el Google el text seleccionat"
-
-#: components/text/services/google.xml.h:2
-msgid "Use Google to search the web for the selected text"
-msgstr "Utilitza el Google per cercar al web el text seleccionat"
-
-#: components/text/services/webster.xml.h:1
-msgid "Look Up Selected Text in Dictionary"
-msgstr "Cerca el text seleccionat en el diccionari"
-
-#: components/text/services/webster.xml.h:2
-msgid "Look up the selected text in the Merriam-Webster dictionary"
-msgstr "Cerca el text seleccionat en el diccionari Merriam-Webster"
-
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
 msgstr "animació per indicar activitat en procés"
@@ -912,6 +812,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Maquinari"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacional"
@@ -1198,30 +1102,19 @@ msgid "Desktop trash icon name"
 msgstr "Nom de la icona de la paperera de l'escriptori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Es truncaran els directoris gegants, per damunt d'aquesta mida. El propòsit "
-"d'açò és evitar que el sobrepasse el límit de memòria i que es mate nautilus "
-"en obrir directoris massius. Un valor negatiu vol dir que no hi ha cap "
-"límit. El límit és aproximat ja que es lligen els directoris troç a troç."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Habilita els senyaladors especials al diàleg de preferències de fitxer"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Nom de fitxer per al fons del directori predeterminat. Només s'utilitza si "
 "background_set és vertader."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1229,6 +1122,19 @@ msgstr ""
 "Nom del fitxer per al fons predeterminat de la barra lateral. Només "
 "s'utilitza si side_pane_background_set és vertader."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Es truncaran els directoris gegants, per damunt d'aquesta mida. El propòsit "
+"d'açò és evitar que el sobrepasse el límit de memòria i que es mate nautilus "
+"en obrir directoris massius. Un valor negatiu vol dir que no hi ha cap "
+"límit. El límit és aproximat ja que es lligen els directoris troç a troç."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr ""
@@ -1239,9 +1145,10 @@ msgid "Home icon visible on desktop"
 msgstr "La icona de carpeta personal és visible a l'escriptori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Si és vertader, Nautilus només mostrarà directoris a la barra lateral de "
 "l'arbre. Si no, mostrarà tant els directoris com els fitxers."
@@ -1274,9 +1181,10 @@ msgstr ""
 "esotèriques d'un fitxer al diàleg de preferències del fitxer."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Si és vertader, Nautilus mostrarà directoris abans de mostrar els fitxers a "
 "la vista d'icones i llista."
@@ -1320,8 +1228,9 @@ msgstr ""
 "menú d'adreces d'interés."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Si és vertader, Nautilus utilitzarà el directori personal de l'usuari com a "
@@ -1338,9 +1247,10 @@ msgstr ""
 "aquells que acaben amb tilde (~)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Si és vertader, els fitxers ocults es mostraran al gestor de fitxers. Els "
 "fitxers ocults comencen o estan llistats al fitxer .hidden del directori."
@@ -1363,8 +1273,9 @@ msgstr ""
 "paperera."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Si açò és vertader, s'afegirà a l'escriptori una icona que enllaçe amb el "
@@ -1401,7 +1312,8 @@ msgstr ""
 "comptes de ser incremental s'ordenara decrementalment."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Si és vertader, les icones es dispondran més rígidament per defecte en les "
 "noves finestres."
@@ -1434,7 +1346,8 @@ msgid "List of possible captions on icons"
 msgstr "Llista dels títols possibles a les icones"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Màxim número de fitxers gestionats a un directori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1454,11 +1367,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus gestiona la visualització de l'escriptori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus utilitza el directori personal de l'usuari com l'escriptori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Només mostra directoris a la barra lateral d'arbre"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1478,7 +1393,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Inverteix el criteri d'ordenació a les finestres noves"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Mostra primer els directoris a les finestres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1516,10 +1432,11 @@ msgstr ""
 "mai previsualitza sons."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1531,12 +1448,13 @@ msgstr ""
 "llegir les dades de previsualització."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Penalització de velocitat per a quan es mostra un fitxer d'imatge com a "
 "miniatura. Si s'estableix a «always», sempre es miniaturitza, encara que el "
@@ -1546,10 +1464,11 @@ msgstr ""
 "genèrica."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Penalització de velocitat per a quan es mostra el número d'elements a un "
@@ -1560,17 +1479,19 @@ msgstr ""
 "d'elements."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "El criteri d'ordenació per defecte per als elements a la vista d'icones. Els "
 "valors possibles són «name», «size», «type», «modification_date», «emblems»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "El criteri d'ordenació predeterminat per als elements a la vista de llista. "
 "Els valors possibles són «name», «size», «type» i «modification_date»."
@@ -1618,7 +1539,8 @@ msgid "Use manual layout in new windows"
 msgstr "Utilitza la disposició manual a les noves finestres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Utilitza una disposició més rígida a les noves finestres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1648,7 +1570,8 @@ msgstr ""
 "possibles són «list_view» i «icon_view»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Quan es mostra el número d'elements d'un directori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1660,7 +1583,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Quan mostrar miniatures de fitxers d'imatge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Si s'ha establert un fons de directori predeterminat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1818,67 +1742,82 @@ msgstr "reinicia"
 msgid "on the desktop"
 msgstr "a l'escriptori"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "No es pot suprimir el volum"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "No podeu suprimir una icona de volum. Si voleu expulsar el volum, si us "
 "plau, utilitzeu «Expulsa» al menú del botó dret del volum."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "No es pot suprimir el volum"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Paperera"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Moure aquí"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copiar aquí"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Enllaça aquí"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Estableix com el _fons"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Estableix com el fons per a _totes les carpetes"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Estableix com el fons per a _aquesta carpeta"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "El tema \"%s\" no s'ha pogut instal·lar."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Heu d'especificar una paraula clau per al nou distintiu."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "No s'ha pogut instal·lar el distintiu"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1889,22 +1828,28 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr "Ja existeix un distintiu amb el nom «%s». Trieu un nom diferent."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Ja existeix un distintiu amb el nom «%s»."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Trieu un nom de distintiu diferent."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "No s'ha pogut instal·lar el distintiu"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "No s'ha pogut desar el distintiu personalitzat."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "No s'ha pogut desar el nom del distintiu personalitzat."
 
-#: libnautilus-private/nautilus-file-operations-progress.c:456
+#: libnautilus-private/nautilus-file-operations-progress.c:457
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld de %ld"
@@ -1919,22 +1864,28 @@ msgstr "Des de:"
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:551
+#: libnautilus-private/nautilus-file-operations.c:599
+#: libnautilus-private/nautilus-file-operations.c:614
+msgid "Error while moving."
+msgstr "S'ha produït un error en moure"
+
+#: libnautilus-private/nautilus-file-operations.c:552
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "S'ha produït un error en moure.\n"
 "\n"
 "\"%s\" no es pot moure perquè és un disc de només lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:568
+msgid "Error while deleting."
+msgstr "S'ha produït un error en suprimir."
+
+#: libnautilus-private/nautilus-file-operations.c:563
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1943,22 +1894,17 @@ msgstr ""
 "\"%s\" no es pot suprimir perquè no teniu permís per modificar la seva "
 "carpeta pare."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:569
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "S'ha produït un error en suprimir.\n"
 "\n"
 "\"%s\" no es pot suprimir perquè és un disc de només lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:600
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1967,12 +1913,14 @@ msgstr ""
 "\"%s\" no es pot moure perquè no teniu permís per canviar-lo a la seva "
 "carpeta pare."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:604
+msgid "Error while moving. "
+msgstr "S'ha produït un error en moure."
+
+#: libnautilus-private/nautilus-file-operations.c:605
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "S'ha produït un error en moure.\n"
@@ -1980,12 +1928,10 @@ msgstr ""
 "\"%s\" no es pot moure perquè ell o la seua carpeta pare estan continguts en "
 "la destinació."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:615
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "S'ha produït un error en moure.\n"
@@ -1993,295 +1939,245 @@ msgstr ""
 "\"%s\" no es pot moure a la paperera perquè no teniu permís per canviar-lo a "
 "la seva carpeta pare."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:637
+msgid "Error while copying."
+msgstr "S'ha produït un error en copiar"
+
+#: libnautilus-private/nautilus-file-operations.c:638
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "S'ha produït un error en copiar.\n"
 "\n"
 "\"%s\" no es pot copiar perquè no teniu permisos per llegir-lo."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"S'ha produït un error en copiar-lo a \"%s\".\n"
-"\n"
-"No hi ha prou espai en la destinació."
+#: libnautilus-private/nautilus-file-operations.c:658
+#: libnautilus-private/nautilus-file-operations.c:679
+#: libnautilus-private/nautilus-file-operations.c:683
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "S'ha produït un error en copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:659
+#: libnautilus-private/nautilus-file-operations.c:664
+#: libnautilus-private/nautilus-file-operations.c:668
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "S'ha produït un error en moure a \"%s\".\n"
 "\n"
 "No hi ha prou espai en la destinació."
 
-#: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"S'ha produït un error en crear l'enllaç en \"%s\".\n"
-"\n"
-"No hi ha prou espai en la destinació."
+#: libnautilus-private/nautilus-file-operations.c:663
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "S'ha produït un error en moure"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:667
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "S'ha produït un error en enllaçar"
+
+#: libnautilus-private/nautilus-file-operations.c:680
+#: libnautilus-private/nautilus-file-operations.c:691
+#: libnautilus-private/nautilus-file-operations.c:702
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "S'ha produït un error en copiar a \"%s\".\n"
 "\n"
 "No teniu permisos per escriure en aquesta carpeta."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:684
+#: libnautilus-private/nautilus-file-operations.c:695
+#: libnautilus-private/nautilus-file-operations.c:706
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "S'ha produït un error en copiar a \"%s\".\n"
 "\n"
 "El disc de destí és de només lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"S'ha produït un error en moure els elements a \"%s\".\n"
-"\n"
-"No teniu permisos per escriure en aquesta carpeta."
-
-#: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"S'ha produït un error en moure els elements a \"%s\".\n"
-"\n"
-"El disc de destinació és de només lectura."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"S'ha produït un error en crear els enllaços en \"%s\".\n"
-"\n"
-"No teniu permisos per escriure en aquesta carpeta."
+#: libnautilus-private/nautilus-file-operations.c:690
+#: libnautilus-private/nautilus-file-operations.c:694
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "S'ha produït un error en moure"
 
-#: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"S'ha produït un error en crear els enllaços en \"%s\".\n"
-"\n"
-"El disc de destinació és de només lectura."
+#: libnautilus-private/nautilus-file-operations.c:701
+#: libnautilus-private/nautilus-file-operations.c:705
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "S'ha produït un error en enllaçar"
 
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en copiar \"%s\".\n"
-"\n"
-"Voleu continuar?"
+#: libnautilus-private/nautilus-file-operations.c:733
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "S'ha produït un error en copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:738
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:748
+#: 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
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"S'ha produït un error \"%s\" en moure \"%s\".\n"
+"S'ha produït un error \"%s\" en moure.\n"
 "\n"
 "Voleu continuar?"
 
-#: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en crear l'enllaç a \"%s\".\n"
-"\n"
-"Voleu continuar?"
+#: libnautilus-private/nautilus-file-operations.c:737
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "S'ha produït un error en moure"
 
 #: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"S'ha produït un error \"%s\" en suprimir \"%s\".\n"
+"S'ha produït un error \"%s\" en crear l'enllaç a \"%s\".\n"
 "\n"
 "Voleu continuar?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en copiar\n"
-"\n"
-"Voleu continuar?"
+#: libnautilus-private/nautilus-file-operations.c:747
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "S'ha produït un error en suprimir."
 
-#: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en moure.\n"
-"\n"
-"Voleu continuar?"
+#: libnautilus-private/nautilus-file-operations.c:762
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "S'ha produït un error en copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en enllaçar.\n"
-"\n"
-"Voleu continuar?"
+#: libnautilus-private/nautilus-file-operations.c:766
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "S'ha produït un error en moure"
 
 #: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"S'ha produït un error \"%s\" en suprimir.\n"
-"\n"
-"Voleu continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "S'ha produït un error en enllaçar"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:776
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "S'ha produït un error en suprimir."
+
+#: libnautilus-private/nautilus-file-operations.c:902
+#, fuzzy
+msgid "Error While Copying"
 msgstr "S'ha produït un error en copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:905
+#, fuzzy
+msgid "Error While Moving"
 msgstr "S'ha produït un error en moure"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:908
+#, fuzzy
+msgid "Error While Linking"
 msgstr "S'ha produït un error en enllaçar"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:913
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "S'ha produït un error en suprimir."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:940
+#: libnautilus-private/nautilus-file-operations.c:961
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+#, fuzzy
+msgid "_Skip"
 msgstr "Omet"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:961
+#, fuzzy
+msgid "_Retry"
 msgstr "Reintenta"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1027
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "No s'ha pogut completar l'acció especificada."
+
+#: libnautilus-private/nautilus-file-operations.c:1030
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" no es pot moure a la nova ubicació, perquè el seu nom ja està usat "
 "per un element especial que no es pot moure o reemplaçar.\n"
 "\n"
 "Si encara voleu moure \"%s\" canvieu-li el nom i torneu a provar."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1034
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "No s'ha pogut completar l'acció especificada."
+
+#: libnautilus-private/nautilus-file-operations.c:1037
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" no es pot copiar a la nova ubicació, perquè el seu nom ja està usat "
 "per un element especial que no es pot moure o reemplaçar.\n"
 "\n"
 "Si encara voleu copiar \"%s\" canvieu-li el nom i torneu a provar."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1043
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "No s'ha pogut reemplaçar el fitxer."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1056
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "El fitxer %s ja existeix.\n"
 "\n"
 "Voleu reemplaçar-lo?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Si reemplaceu un fitxer existent, es sobreescriurà el seu contingut."
+
+#: libnautilus-private/nautilus-file-operations.c:1070
+#: libnautilus-private/nautilus-file-operations.c:1089
+msgid "Conflict While Copying"
 msgstr "S'ha produït un conflicte en copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Reemplaça"
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Replace"
+msgstr "_Reemplaça"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Reemplaça-ho tot"
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "Replace _All"
+msgstr "Reempl_aça-ho tot"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#. Note to localizers: convert file type string for file
+#. * (e.g. "folder", "plain text") to file type for symbolic link
+#. * to that kind of file (e.g. "link to folder").
+#.
+#: libnautilus-private/nautilus-file-operations.c:1148
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "enllaç a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1152
 #, c-format
 msgid "another link to %s"
 msgstr "Un altre enllaç a %s"
@@ -2290,25 +2186,25 @@ msgstr "Un altre enllaç a %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1168
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d enllaç a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d enllaç a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1176
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d enllaç a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1180
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d enllaç a %s"
@@ -2318,563 +2214,605 @@ msgstr "%d enllaç a %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#. test the next duplicate name generator
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (copy)"
 msgstr " (còpia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1203
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (another copy)"
 msgstr " (un altra còpia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
-#: libnautilus-private/nautilus-file-operations.c:1204
+#. 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:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1210
+#: libnautilus-private/nautilus-file-operations.c:1220
 msgid "th copy)"
 msgstr "a còpia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "st copy)"
 msgstr "a còpia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "nd copy)"
 msgstr "a còpia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1217
 msgid "rd copy)"
 msgstr "a còpia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (còpia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1236
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (un altra còpia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#. localizers: appended to x12th file copy
+#. localizers: appended to x13th file copy
+#. localizers: appended to xxth file copy
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1243
+#: libnautilus-private/nautilus-file-operations.c:1252
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d còpia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d còpia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d còpia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d còpia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1350
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1358
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1543
+#: libnautilus-private/nautilus-file-operations.c:2125
+#: libnautilus-private/nautilus-file-operations.c:2286
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d desconegut"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Moving files to the Trash"
 msgstr "S'estan movent els fitxers a la paperera"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1872
 msgid "Files thrown out:"
 msgstr "Fitxers llançats:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1874
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Moving"
 msgstr "S'està movent"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1875
 msgid "Preparing to Move to Trash..."
 msgstr "S'està preparant per a moure a la paperera..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Moving files"
 msgstr "S'estan movent els fitxers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Files moved:"
 msgstr "Fitxers moguts:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1886
 msgid "Preparing To Move..."
 msgstr "S'està preparant per a moure..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1887
 msgid "Finishing Move..."
 msgstr "S'està acabant de moure..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Creating links to files"
 msgstr "Creant els enllaços a fitxers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Files linked:"
 msgstr "Fitxers enllaçats:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Linking"
 msgstr "Enllaçant"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1900
 msgid "Preparing to Create Links..."
 msgstr "S'està preparant per a crear els enllaços..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1901
 msgid "Finishing Creating Links..."
 msgstr "S'està finalitzant la creació dels enllaços..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Copying files"
 msgstr "S'estan copiant els fitxers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Files copied:"
 msgstr "Fitxers copiats:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1911
 msgid "Copying"
 msgstr "S'està copiant"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1912
 msgid "Preparing To Copy..."
 msgstr "S'està preparant per copiar..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "No podeu copiar elements a la paperera"
+#: libnautilus-private/nautilus-file-operations.c:1929
+msgid "You cannot copy items into the trash."
+msgstr "No podeu copiar elements a la paperera."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "No podeu copiar la paperera."
+#: libnautilus-private/nautilus-file-operations.c:1930
+msgid "Files and folders can only be moved into the trash."
+msgstr "Els fitxers i carpetes només es poden moure a la paperera."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1954
 msgid "You cannot move this trash folder."
 msgstr "No podeu moure la paperera."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1955
 msgid "You cannot copy this trash folder."
 msgstr "No podeu copiar la paperera."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1958
 msgid "Can't Change Trash Location"
 msgstr "No podeu canviar la ubicació de la paperera"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1959
 msgid "Can't Copy Trash"
 msgstr "No podeu copiar la paperera."
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1983
 msgid "You cannot move a folder into itself."
 msgstr "No podeu moure una carpeta dins ella mateixa."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1984
 msgid "You cannot copy a folder into itself."
 msgstr "No podeu copiar una carpeta dins ella mateixa."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Crea una nova carpeta buida dins d'aquesta carpeta"
+
+#: libnautilus-private/nautilus-file-operations.c:1987
 msgid "Can't Move Into Self"
 msgstr "No podeu moure dins ella mateixa."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1988
 msgid "Can't Copy Into Self"
 msgstr "No podeu copiar dins ella mateixa."
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "You cannot copy a file over itself."
 msgstr "No podeu copiar un fitxer sobre ell mateix."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2002
+msgid "The destination and source are the same file."
+msgstr "El destí i orígen són el mateix fitxer."
+
+#: libnautilus-private/nautilus-file-operations.c:2003
 msgid "Can't Copy Over Self"
 msgstr "No podeu copiar sobre ell mateix"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "S'ha produït un error en crear una nova carpeta.\n"
 "\n"
 "no teniu els permisos per escriure a la destinació."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2057
+#: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "S'ha produït un error en crear una nova carpeta.\n"
 "\n"
 "No hi ha espai a la destinació."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2059
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "S'ha produït l'error \"%s\" en crear una nova carpeta."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2064
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "S'ha produït un error en crear una nova carpeta"
+
+#: libnautilus-private/nautilus-file-operations.c:2064
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "S'ha produït un error en crear una nova carpeta"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2153
 msgid "untitled folder"
 msgstr "Carpeta sense títol"
 
+#: libnautilus-private/nautilus-file-operations.c:2193
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "S'ha produït l'error \"%s\" en crear una nova carpeta."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+#, fuzzy
+msgid "Error creating new document."
+msgstr "S'ha produït un error en crear una nova carpeta"
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "S'ha produït un error en crear una nova carpeta"
+
+#: libnautilus-private/nautilus-file-operations.c:2344
+#, fuzzy
+msgid "new file"
+msgstr "1 fitxer"
+
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2416
 msgid "Deleting files"
 msgstr "S'estan suprimint els fitxers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Files deleted:"
 msgstr "Fitxers suprimits:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2420
+#: libnautilus-private/nautilus-file-operations.c:2455
 msgid "Deleting"
 msgstr "S'està suprimint"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2421
 msgid "Preparing to Delete files..."
 msgstr "S'està preparant per a suprimir els fitxers..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Emptying the Trash"
 msgstr "S'està buidant la paperera"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2456
 msgid "Preparing to Empty the Trash..."
 msgstr "S'està preparant per a buidar la paperera..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2519
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr ""
-"Esteu segurs que voleu eliminar permanentment tots els elements de la "
-"paperera?"
+msgstr "Esteu segur que voleu eliminar permanentment tots els elements de la paperera?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2533
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Si buideu la paperera, els elements es suprimiran permanentment."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2545
 msgid "_Empty"
 msgstr "_Buida"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2592
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (copy)"
 msgstr "foo (còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc (copy)"
 msgstr ".bashrc (còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo (copy).txt"
 msgstr ".foo (còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo (copy)"
 msgstr "foo foo (còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2596
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (copy).txt"
 msgstr "foo (còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2597
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (copy).txt"
 msgstr "foo foo (còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (còpia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo.. (copy).txt"
 msgstr "foo.. (còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo... (copy)"
 msgstr "foo... (còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (copy)"
 msgstr "foo. (còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (another copy)"
 msgstr "foo. (un altra còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (another copy)"
 msgstr "foo (un altra còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (another copy).txt"
 msgstr "foo (un altra còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (3rd copy)"
 msgstr "foo (3a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (3rd copy).txt"
 msgstr "foo (3a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (un altra còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (13th copy)"
 msgstr "foo (13a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (14th copy)"
 msgstr "foo (14a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (13th copy).txt"
 msgstr "foo (13a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (14th copy).txt"
 msgstr "foo (14a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (21st copy)"
 msgstr "foo (21a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (22nd copy)"
 msgstr "foo (22a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (21st copy).txt"
 msgstr "foo (21a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (22nd copy).txt"
 msgstr "foo (22a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (23rd copy)"
 msgstr "foo (23a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (23rd copy).txt"
 msgstr "foo (23a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (24th copy)"
 msgstr "foo (24a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (24th copy).txt"
 msgstr "foo (24a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (25th copy)"
 msgstr "foo (25a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (25th copy).txt"
 msgstr "foo (25a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (25th copy)"
 msgstr "foo foo(25a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo(25a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (10th copy)"
 msgstr "foo (10a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (11th copy)"
 msgstr "foo (11a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (10th copy).txt"
 msgstr "foo (10a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (11th copy).txt"
 msgstr "foo (11a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2622
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (12th copy)"
 msgstr "foo (12a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2623
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (12th copy).txt"
 msgstr "foo (12a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (110th copy)"
 msgstr "foo (110a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (111th copy)"
 msgstr "foo (111a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (110th copy).txt"
 msgstr "foo (110a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (111th copy).txt"
 msgstr "foo (111a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (122nd copy)"
 msgstr "foo (122a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (123rd copy)"
 msgstr "foo (123a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (122nd copy).txt"
 msgstr "foo (122a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (123rd copy).txt"
 msgstr "foo (123a còpia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (124th copy)"
 msgstr "foo (124a còpia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (124th copy).txt"
 msgstr "foo (124a còpia).txt"
 
@@ -2893,64 +2831,64 @@ msgstr "foo (124a còpia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
-msgstr "avuí a les 00:00:00 PM"
+msgstr "avui a les 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
-msgstr "avuí a les %-I:%M:%S %p"
+msgstr "avui a les %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
-msgstr "avuí a les %-I:%M %p"
+msgstr "avui a les %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
-msgstr "avuí a les %-I:%M %p"
+msgstr "avui a les %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
-msgstr "avuí, 00:00 PM"
+msgstr "avui, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
-msgstr "avuí, %-I:%M %p"
+msgstr "avui, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
-msgstr "avuí"
+msgstr "avui"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ahir a les 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ahir a les %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ahir a les 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ahir a les %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ahir, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ahir, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ahir"
 
@@ -2959,133 +2897,133 @@ msgstr "ahir"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Dimecres, 00 de Setembre del 0000 a les 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %d de %B del %Y a les %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Dl, 00 d'Oct del 0000 a les 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y a les %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Dl, 00 d'Oct del 0000 a les 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y a les %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 d'Oct del 0000 a les 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y a les %I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 d'Oct del 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y %I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elements"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 carpetes"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fitxers"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elements"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u carpetes"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fitxers"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elements"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tipus de MIME desconegut"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "desconegut"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3095,7 +3033,7 @@ msgstr ""
 "probablement significa que el fitxer gnome-vfs.keys no està en el lloc "
 "correcte o no es troba per alguna altra raó."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3104,11 +3042,11 @@ msgstr ""
 "No s'ha trobat la descripció del tipus mime \"%s\" (el fitxer és \"%s\"), "
 "informeu-ne si us plau a la llista de correu del gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "enllaç"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "enllaç (trencat)"
 
@@ -3229,11 +3167,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Cerca els fitxers pel nom i les propietats"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Visualitza les icones"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Visualitza la llista"
@@ -3377,147 +3317,138 @@ msgstr "Directori de l'usuari %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1175
 msgid "Computer"
 msgstr "Ordinador"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "icona d'arxiu"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "text editable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "la etiqueta editable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "text addicional"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "una mica més de text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "ressaltat per sel·lecció"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "si estem o no remarcats per una sel·lecció"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "ressaltats per focus de teclat"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "si estem o no remarcats per tenir el focus tel teclat"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "remarcat per soltar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "si estem o no remarcats per un Arrastrar &i Soltar"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "El rectangle de la sel·lecció"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Enmarca el text"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Dibuixa un marc al voltant del text no seleccionat"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Color de la caixa de selecció"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Color de la caixa de selecció"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa de la caixa de selecció"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacitat de la caixa de selecció"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
-msgstr "Alfa resaltat"
+msgstr "Alfa ressaltat"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
-msgstr "Opacitat del resaltat per a les icones seleccionades"
+msgstr "Opacitat del ressaltat per a les icones seleccionades"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Color d'informació clar"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "El color que s'usa per a text informatiu amb un fons fosc"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Color d'informació fosc"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "El color que s'usa per a text informatiu amb un fons clar"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
-msgstr ""
-"Aquest directori empra un format automàtic. Voleu canviar a format manual i "
-"deixar aquest element on l'heu deixat anar? Això canviarà el format manual "
-"emmagatzemat."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
+msgstr "Voleu canviar a format manual i deixar aquest element on l'heu deixat anar? Això canviarà el format manual emmagatzemat."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Aquest directori empra un format automàtic."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
-msgstr ""
-"Aquest directori empra un format automàtic. Voleu canviar a format manual i "
-"deixar aquests elements on els heu deixat anar? Això canviarà el format "
-"manual emmagatzemat."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
+msgstr "Voleu canviar a format manual i deixar aquests elements on els heu deixat anar? Això canviarà el format manual emmagatzemat."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
-msgstr ""
-"Aquest directori empra un format automàtic. Voleu canviar a format manual i "
-"deixar aquest element on l'heu deixat anar?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr "Voleu canviar a format manual i deixar aquest element on l'heu deixat anar?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
-msgstr ""
-"Aquest directori empra un format automàtic. Voleu canviar a format manual i "
-"deixar aquests elements on els heu deixat anar?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
+msgstr "Voleu canviar a format manual i deixar aquests elements on els heu deixat anar?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
-msgstr "Canviar a format automàtic?"
+msgstr "Voleu canviar al format automàtic?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Canvia"
 
@@ -3627,72 +3558,72 @@ msgstr "És predeterminat per als elements \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "És predeterminat per a tots els elements \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifica \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Inclou al menú per als elements \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Empra com predeterminat per als elements \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Inclou al menú només per a \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Empra com predeterminat només per a \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "No incloure al menú per als elements \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "T_rieu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Fet"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modifica..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipus de fitxers i programes"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Vés allí"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3700,104 +3631,91 @@ msgstr ""
 "Podeu configurar quins programes s'ofereixen per a cada tipus de fitxer al "
 "diàleg Tipus de fitxers i programes"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Obre amb una altra aplicació"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Trieu una aplicació amb la qual obrir \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Obre amb un altre visualitzador"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Trieu una vista per a \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Trieu una vista per a \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "No hi ha visualitzadors disponibles"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "No hi ha cap aplicació associada amb «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "No hi ha aplicacions associades"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "No hi ha cap acció associada amb «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "No hi ha accions associades"
 
-#. Note: This might be misleading in the components case, since the
-#. * user can't add components to the complete list even from the capplet.
-#. * (They can add applications though.)
-#.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
-msgstr ""
-"%s\n"
-"\n"
-"Podeu configurar el GNOME per a que associe aplicacions amb tipus de "
-"fitxers. Voleu associar una aplicació amb aquest tipus de fitxer ara?"
+msgstr "Podeu configurar el GNOME per a que associe aplicacions amb tipus de fitxers. Voleu associar una aplicació amb aquest tipus de fitxer ara?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Aplicació associada"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Associa una aplicació"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "El visor associat amb «%s» és invàlid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Visor associat invàlid"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "L'aplicació associada amb «%s» és invàlida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplicació associada invàlida"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "L'acció associada amb «%s» és invàlida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Acció associada invàlida"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3808,92 +3726,119 @@ msgstr ""
 "amb aquest tipus de fitxer. Voleu associar una aplicació o visor amb aquest "
 "tipus de fitxer ara?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Associa una acció"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Associa una acció"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"«%s» no pot obrir «%s» perquè «%s» no pot accedir als fitxers a les "
+"ubicacions «%s». Voleu escollir un altra aplicació?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "«%s» no pot obrir «%s» perquè «%s» no pot accedir als fitxers a les "
 "ubicacions «%s». Voleu escollir un altra aplicació?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "No s'ha pogut obrir, voleu escollir una altra acció?"
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
-msgstr ""
-"L'acció predeterminada no pot obrir «%s» perquè no pot accedir als fitxers a "
-"les ubicacions «%s». Voleu escollir un altra acció?"
+"locations."
+msgstr "L'acció predeterminada no pot obrir «%s» perquè no pot accedir als fitxers a les ubicacions «%s»."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "No es pot obrir la ubicació"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr "«%s» no pot obrir «%s» perquè «%s» no pot accedir als fitxers a les ubicacions «%s»."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" no pot obrir \"%s\" perquè \"%s\" no pot accedir als fitxers a les "
 "ubicacions \"%s\". No hi ha cap aplicació disponible per visualitzar aquest "
 "fitxer. Si copieu aquest fitxer al vostre ordinador, potser podreu obrir-lo."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"L'acció predeterminada no pot obrir «%s» perque no pot accedir als fitxers a "
-"les ubicacions «%s». No hi ha altres accions disponibles per visualitzar "
-"aquest fitxer. Si copieu aquest fitxer al vostre ordinador, potser podreu "
-"obrir-lo."
+"L'acció predeterminada no pot obrir «%s» perquè no pot accedir als fitxers a "
+"les ubicacions «%s». Voleu escollir un altra acció?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" no pot obrir \"%s\" perquè \"%s\" no pot accedir als fitxers a les "
+"ubicacions \"%s\". No hi ha cap aplicació disponible per visualitzar aquest "
+"fitxer. Si copieu aquest fitxer al vostre ordinador, potser podreu obrir-lo."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr "No podeu executar ordres des d'un lloc remot per motius de seguretat."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "No podeu executar ordres des d'un lloc remot."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Això està inhabilitat per raons de seguretat."
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "No es poden executar el enllaços remots"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"S'ha produït un error en llançar l'aplicació.\n"
-"\n"
-"Detalls: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detalls:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "S'ha produït un error en llançar l'aplicació."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "S'ha produït un error en llançar l'aplicació"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Aquest lloc de deixada només suporta fitxers locals."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Aquest lloc de de deixada només suporta fitxers locals.\n"
@@ -3901,15 +3846,15 @@ msgstr ""
 "Per a obrir fitxers no locals, copieu-los a una carpeta local i després "
 "deixeu-los de nou."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Aquest lloc de deixada només suporta fitxers locals"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4164,14 +4109,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elements que contenen \"medusa\" en els seus noms i que són carpetes"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "S'estan cercant discs"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus està cercants carpetes de paperera en els vostres discs."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Edició"
@@ -4255,13 +4192,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Veure el teu directori d'inici amb el gestor de fitxers Nautilus"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Sistema de fitxers"
+msgstr "Navega el sistema de fitxers"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Navega el sistema de fitxers amb el gestor de fitxers"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4377,96 +4313,104 @@ msgstr "Segon pla"
 msgid "Empty Trash"
 msgstr "Buida la paperera"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Això obrirà %d finestres separades. Esteu segur que voleu això?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Obre en %d finestres"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Esteu segur que voleu eliminar permanentment l'element \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:156
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Això obrirà %d finestres separades. Esteu segur que voleu això?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Esteu segur que voleu eliminar permanentment l'element \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Segur que voleu eliminar permanentment els %d elements seleccionats?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Suprimeix tots els elements seleccionats permanentment"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Voleu suprimir?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Seleccioneu una categoria:"
+msgstr "Seleccioneu un patró"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Patrons"
+msgstr "_Patró:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionat"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 directori seleccionat"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d directoris seleccionats"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (contenint 0 elements)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contenint 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contenint %d elements)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contenint un total de 0 elements)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contenint un total d'1 element)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contenint un total de %d elements)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elements seleccionats (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 altre element seleccionat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "altres %d elements seleccionats (%s)"
@@ -4478,115 +4422,127 @@ msgstr "altres %d elements seleccionats (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
-#. Note that the number of items actually displayed varies somewhat due
-#. * to the way files are collected in batches. So you can't assume that
-#. * no more than the constant limit are displayed.
-#.
-#: src/file-manager/fm-directory-view.c:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "La carpeta \"%s\" conté més fitxers dels que el Nautilus pot manegar. Alguns "
 "fitxers no es visualitzaran."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Alguns fitxers no es mostraran."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Massa fitxers"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" no es pot moure a la paperera. Voleu suprimir-lo immediatament?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Els %d elements seleccionats no es poden moure a la paperera. Voleu suprimir-"
-"los immediatament?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" no es pot moure a la paperera. Voleu suprimir-lo immediatament?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d dels elements seleccionats no es poden moure a la paperera. Voleu "
-"suprimir aquests %d elements immediatament?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" no es pot moure a la paperera. Voleu suprimir-lo immediatament?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Voleu suprimir immediatament?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Esteu segur de que voleu suprimir permanentment \"%s\" de la paperera?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Esteu segur de que voleu suprimir permanentment els %d elements seleccionats "
 "de la paperera?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Si suprimiu un element, es perdrà permanentment."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
-msgstr "Suprimeixo des de la paperera?"
+msgstr "Voleu suprimir des de la paperera?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Utilitza \"%s\" per obrir l'element seleccionat"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Una altra _aplicació...."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Una _aplicació...."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Un altre _visualitzador..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Un _visualitzador..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "No s'ha pogut completar l'acció especificada: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "No s'ha pogut completar l'acció especificada."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Executa \"%s\" sobre qualsevol element seleccionat"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Tots els fitxers executables d'aquesta carpeta apareixeran en el menú de "
+"seqüències. La seqüència escollida des del menú s'executarà amb cada un dels "
+"elements escollits com a entrada."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4594,11 +4550,11 @@ msgstr ""
 "seqüències. La seqüència escollida des del menú s'executarà amb cada un dels "
 "elements escollits com a entrada."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Quant a seqüències"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4640,17 +4596,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posició i mida de la finestra actual"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" es mourà si seleccioneu l'ordre enganxar fitxers"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" es copiarà si seleccioneu l'ordre enganxar fitxers"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4658,7 +4614,7 @@ msgstr ""
 "Els %d elements seleccionats es mouran si seleccioneu l'ordre enganxar "
 "fitxers"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4666,161 +4622,168 @@ msgstr ""
 "Els %d elements seleccionats es copiaran si seleccioneu l'ordre enganxar "
 "fitxers"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "No hi ha res al porta-retalls per enganxar."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "S'ha produït un error de muntatge"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "S'ha produït un error de desmuntatge"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Error del servei"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_xpulsa"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Desm_unta el volum"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Obre en una nova f_inestra"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Obre en %d noves f_inestres"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Carpeta Inici"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Carpeta Inici"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Suprimeix de la paperera"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Suprimeix tots els elements seleccionats permanentment"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mo_u a la paperera"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mou cada element seleccionat a la Paperera"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Crea _enllaços"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Crea un _enllaç"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Buida la paperera"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Re_talla el fitxer"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Re_talla els fitxer"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Còpia el fitxer"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Còpia els fitxers"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Aquest enllaç no es pot usar, perquè no té cap destinació. Voleu moure "
 "aquest enllaç a la paperera?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Aquest enllaç no es pot usar, perquè no té cap destinació. Voleu moure "
+"aquest enllaç a la paperera?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Aquest enllaç no es pot utilitzar, perquè el seu objectiu «%s» no existeix. "
 "Voleu moure aquest enllaç a la paperera?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Enllaç trencat"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" és un fitxer de text executable. Voleu executar-lo o visualitzar-ne "
 "el contingut?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Fitxers de text executables"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Voleu executar-lo o visualitzar-lo?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Mostra"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Executa en un _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Mostra"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "E_xecuta"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "S'està obrint \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Cancel·lar obrir?"
 
@@ -4841,10 +4804,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "No s'ha pogut visualitzar tot el contingut de \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "No s'han pogut determinar els permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "S'ha produït un error en visualitzar la carpeta"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4852,19 +4820,19 @@ msgstr ""
 "El nom \"%s\" ja està utilitzat en aquest directori. Utilitzeu un nom "
 "diferent."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 ""
 "No existeix \"%s\" en aquesta carpeta. Potser s'acaba de moure o suprimir."
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "No teniu els permisos necessaris per a reanomenar \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4873,86 +4841,106 @@ msgstr ""
 "El nom \"%s\" no és vàlid perquè conté el caràcter \"/\". Utilitzeu un nom "
 "diferent."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "El nom \"%s\" no és vàlid. Utilitzeu un nom diferent."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "No podeu canviar el nom de \"%s\" perquè està en un disc de només lectura"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "No s'ha pogut reanomenar \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "El tema no s'ha pogut suprimir!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "S'ha produït un error en reanomenar"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "No teniu els permissos necessaris per a canviar el grup de \"%s\"."
+msgstr "No teniu els permisos necessaris per a canviar el grup de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "No podeu canviar el grup de \"%s\" perquè està en un disc de només lectura"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "No s'ha pogut canviar el grup de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "No s'han pogut determinar els permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "S'ha produït un error especificant el grup"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "No es pot canviar el propietari de \"%s\" perquè està en un disc de només "
 "lectura"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "No s'ha pogut canviar el propietari de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "No s'han pogut determinar els permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "S'ha produït un error en especificar el propietari"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
-"No s'han pogut canviar els permissos de \"%s\" perquè està en un disc de "
+"No s'han pogut canviar els permisos de \"%s\" perquè està en un disc de "
 "només lectura"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
-msgstr "No s'han pogut canviar els permissos de \"%s\"."
+msgstr "No s'han pogut canviar els permisos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "No s'han pogut determinar els permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
-msgstr "S'ha produït un error en especificar els permissos"
+msgstr "S'ha produït un error en especificar els permisos"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "S'està reanomenant \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Cancel·lo reanomenar?"
 
@@ -5010,128 +4998,150 @@ msgstr "Restaura les icones a la _mida original"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Restaura la icona a la _mida original"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "s'està apuntant a \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Només es pot arrossegar i deixar en sistemes de fitxers locals."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Només es pot arrossegar i deixar en sistemes de fitxers locals."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Error d'arrossegar i deixar"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "S'ha utilitzat un tipus d'arrossegament no vàlid."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Mida"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipus"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data de modificació"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "No podeu assignar més d'una icona personalitzada a la vegada! Arrossega "
 "només una imatge per especificar una icona personalitzada."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"No podeu assignar més d'una icona personalitzada a la vegada! Arrossega "
+"només una imatge per especificar una icona personalitzada."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Més d'una imatge"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"El fitxer que heu deixat anar no és local. Només podeu utilitzar imatges "
+"locals com a icones personalitzades"
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "El fitxer que heu deixat anar no és local. Només podeu utilitzar imatges "
 "locals com a icones personalitzades"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Només imatges locals"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"El fitxer que heu deixat anar no és una imatge. Només podeu utilitzar "
-"imatges locals com a icones personalitzades."
+"El fitxer que heu deixat anar no és local. Només podeu utilitzar imatges "
+"locals com a icones personalitzades"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Només imatges"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propietats de %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Voleu cancel·lar el canvi de grup?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "S'està canviant el grup"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Voleu cancel·lar el canvi de propietari?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "S'està canviant el propietari"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "res"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "il·legible"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element, amb mida %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elements, totalitzant %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(alguns continguts són il·legibles)"
 
@@ -5141,191 +5151,190 @@ msgstr "(alguns continguts són il·legibles)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Continguts:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Bàsic"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Noms:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:190
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Mida:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volum:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Espai lliure:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Objectiu de l'enllaç:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "tipus MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificat:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Accedit:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Selecciona icona personalitzada..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Elimina la icona pe_rsonalitzada"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lectura"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Escriptura"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xecució"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Defineix l'ID d'_usuari"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Senyaladors especials:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Defineix l'ID de gr_up"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "En_ganxós"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permisos"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "No sou el propietari, però podeu canviar aquests permisos."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Propietari del fitxer:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Propietari del fitxer:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Grup del _fitxer:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grup del fitxer:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Propietari:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grup:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Altres:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Vista de text:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Vista de nombre:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Últim canvi:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "No s'han pogut determinar els permisos de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "No s'han pogut determinar els permisos del fitxer seleccionat."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"S'ha produït un error en mostrar l'ajuda: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "S'ha produït un error en mostrar l'ajuda: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "No s'ha pogut mostrar l'ajuda"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Cancel·lo l'exhibició de la finestra de propietats?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Creant la finestra de propietats"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Seleccioneu una icona"
 
@@ -5343,72 +5352,111 @@ msgid "Search Results"
 msgstr "Resultats de la cerca"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"El servei de cerca Medusa no està disponible perquè no està instal·lat."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "El servei de cerca medusa no està disponible."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+#, fuzzy
+msgid "Medusa is not installed."
+msgstr "%s no està instal·lat"
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Servei de cerca no disponible"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "La cerca que heu escollit és més nova que l'índex del vostre sistema. La "
 "cerca no retornarà cap resultat, per ara. Podeu crear un nou índex si "
 "executeu \"medusa-indexd\" com a superusuari a la línia d'ordres."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"'Find' no pot obrir l'índex del sistema de fitxers; pot faltar o estar "
+"malmés. Podeu crear un nou índex executant \"medusa-indexd\" com a "
+"superusuari a la línia d'ordres."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Cerca els elements que també són nous"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Cada fitxer indexat del vostre ordinador coincideix amb el criteri que "
+"heuseleccionat. Podeu comprovar l'ortografia de les vostres seleccions i "
+"afegir més criteris per limitar els resultats."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Cada fitxer indexat del vostre ordinador coincideix amb el criteri que "
 "heuseleccionat. Podeu comprovar l'ortografia de les vostres seleccions i "
 "afegir més criteris per limitar els resultats."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "S'ha produït un error en cercar"
 
-#. FIXME: This dialog does not get shown because a slow search
-#. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "'Find' no pot obrir l'índex del sistema de fitxers; pot faltar o estar "
 "malmés. Podeu crear un nou índex executant \"medusa-indexd\" com a "
 "superusuari a la línia d'ordres."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "S'ha produït un error en llegir l'índex de fitxers"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 "S'ha produït un error mentre s'estaven carregant els continguts d'aquesta "
 "cerca: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Per fer una cerca amb contingut, Buscar requereix un índex dels fitxers del "
+"vostre sistema. Buscar no pot accedir al vostre índex ara mateix. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Per fer una cerca amb contingut, Buscar requereix un índex dels fitxers del "
+"vostre sistema. Buscar no pot accedir al vostre índex ara mateix. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5416,25 +5464,23 @@ msgstr ""
 "vostresistema. Buscar no pot accedir al vostre índex ara mateix i es "
 "realitzarà una cerca més lenta que no utilitza l'índex."
 
-#: src/file-manager/fm-search-list-view.c:249
-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 ""
-"Per fer una cerca amb contingut, Buscar requereix un índex dels fitxers del "
-"vostre sistema. Buscar no pot accedir al vostre índex ara mateix. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "No es pot accedir al vostre índex ara mateix."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Les cerques ràpides no estan disponibles"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Les cerques amb contingut no estan disponibles"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5448,37 +5494,64 @@ msgstr ""
 "d'ordres:\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Per fer una cerca ràpida, Buscar requereix un índex dels fitxers del vostre "
 "sistema. L'ordinador està creant l'índex actualment. Com Buscar no pot "
 "utilitzar un índex, la cerca pot tardar uns quants minuts."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Per cercar un contingut, Buscar requereix un índex del contingut en el "
 "vostre sistema. L'ordinador està creant l'índex actualment. Les cerques de "
 "contingut estaran disponibles quan s'hagi completat l'índex."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Les cerques indexades no estan disponibles"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Per fer una cerca amb contingut, Buscar requereix un índex dels fitxers del "
+"vostre sistema. Buscar no pot accedir al vostre índex ara mateix. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Per fer una cerca amb contingut, Buscar requereix un índex dels fitxers del "
+"vostre sistema. Buscar no pot accedir al vostre índex ara mateix. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Per fer una cerca ràpida, Buscar requereix un índex dels fitxers en el "
 "vostre sistema. Cap índex està disponible ara mateix. Podeu crear un índex "
@@ -5486,12 +5559,12 @@ msgstr ""
 "que un índex complet estigui disponible, les cerques poden tardar uns quants "
 "minuts."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Per fer una cerca ràpida, Buscar requereix un índex del contingut en vostre "
 "sistema. Cap índex està disponible ara mateix. Podeu crear un índex "
@@ -5499,7 +5572,12 @@ msgstr ""
 "que un índex complet estigui disponible, les cerques de contingut no es "
 "podran realitzar."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Les cerques ràpides no estan habilitades en el vostre ordinador"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5509,11 +5587,12 @@ msgstr ""
 "vostre sistema. L'administrador del vostre sistema ha inhabilitat la cerca "
 "ràpida en el vostre ordinador, de manera que no hi ha cap índex disponible."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Les cerques ràpides no estan habilitades en el vostre ordinador"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Les cerques ràpides no estan disponibles"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "On"
 
@@ -5522,7 +5601,7 @@ msgstr "On"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Mostra en una nova finestra"
@@ -5533,7 +5612,7 @@ msgstr "_Mostra en una nova finestra"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Mostra en %d _noves finestres"
@@ -5542,15 +5621,21 @@ msgstr "Mostra en %d _noves finestres"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus ha trobat més resultats en la cerca dels que pot mostrar. Alguns "
 "elements coincidents no es mostraran."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus ha trobat més resultats en la cerca dels que pot mostrar. Alguns "
+"elements coincidents no es mostraran."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Massa coincidències"
 
@@ -5564,12 +5649,12 @@ msgid "Create L_auncher"
 msgstr "Crea una nova llenç_adora"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Crea una nova llençadora"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Suprimeix tots els elements de la paperera"
 
@@ -5590,7 +5675,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Utilitza el fons per _defecte"
@@ -5612,58 +5697,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Trieu un altre visualitzador amb el què veure l'element seleccionat"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Crea una _carpeta"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Crea una _carpeta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Crea una nova carpeta buida dins d'aquesta carpeta"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Crea una nova carpeta buida dins d'aquesta carpeta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Crea un enllaç simbòlic per a cada element seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplica"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Suprimeix cada element seleccionat, sense moure'ls a la paperera"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplica cada element seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Edita la llençadora"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Edita la informació de la llençadora"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formata el volum seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Propietats del med_i"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Desmunta el volum seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Mou o còpia els fitxers prèviament seleccionats mitjançant l'ordre Retalla "
 "fitxers o Còpia fitxers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5671,132 +5766,141 @@ msgstr ""
 "Mou o còpia els fitxers prèviament seleccionats mitjançant l'ordre Retalla "
 "fitxers o Còpia fitxers a la carpeta seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "No hi ha plantilles instal·lades"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Obre am_b"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Obre cada element seleccionat en una nova finestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Obre en una nova f_inestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
-msgstr "Obre l'element seleccionat en aquest finestra"
+msgstr "Obre l'element seleccionat en aquesta finestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Prepara els fitxers seleccionats per ser copiats amb una ordre Enganxa "
 "fitxers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Prepara els fitxers seleccionats per ser moguts amb una ordre Enganxa fitxers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_egeix"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Protegeix el volum seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Reanomena l'element seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Reinicia la vista al valor pre_determinat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Reinicia l'ordenació i el nivell de zoom  "
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Executa o gestiona les seqüències des de ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Selecciona _tots els fitxers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
-msgstr "_Patrons"
+msgstr "Seleccioneu una categoria:"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Selecciona tots els elements d'aquesta finestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Selecciona tots els elements d'aquesta finestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Mostra les propietats del medi per al volum seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 "Mostra la carpeta que conté les seqüències que apareixen en aquest menú"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Desmunta el volum seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Utilitza el fons per defecte per a aquesta ubicació"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Visualitza o modifica les propietats de cada element seleccionat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Còpia el fitxer"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Format"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Desm_unta el volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Obre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Obre la carpeta de seqüències"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Enganxa els fitxers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Enganxa els fitxers a la carpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Reanomena..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Seqüències"
 
@@ -5838,7 +5942,7 @@ msgstr "Mostra les icones en l'ordre oposat"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:10
 msgid "Keep icons lined up on a grid"
-msgstr "Mantingues les icones aliniades en una graella"
+msgstr "Mantingues les icones alineades en una graella"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Leave icons wherever they are dropped"
@@ -5870,7 +5974,7 @@ msgstr "Commuta utilitzant un esquema de format ajustat"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "_Keep Aligned"
-msgstr "_Mantingues aliniat"
+msgstr "_Mantingues alineat"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "_Manually"
@@ -5881,7 +5985,12 @@ msgstr "_Manualment"
 msgid "Indexing is %d%% complete."
 msgstr "La indexació està un %d%% completada."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Els vostres fitxers han estat indexats per última vegada a les %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5889,26 +5998,29 @@ msgstr ""
 "Una vegada al dia els vostres fitxers i el contingut del text és reindexat "
 "de manera que les cerques són ràpides."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Estat de la indexació"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Els vostres fitxers han estat indexats per última vegada a les %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Una vegada al dia els vostres fitxers i el contingut del text és reindexat "
-"de manera que les cerques són ràpides. Els fitxers s'estan reindexant "
-"actualment."
+"de manera que les cerques són ràpides."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "No hi ha cap índex dels vostres fitxers ara mateix."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5918,15 +6030,19 @@ msgstr ""
 "ràpides les cerques. La cerca ràpida no està habilitada al vostre ordinador, "
 "de manera que no teniu un índex ara mateix."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "No hi ha cap índex dels vostres fitxers ara mateix."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "No hi ha un índex de fitxers"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "El servei de cerca medusa no està disponible."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Assegureu-vos que medusa ha estat configurat correctament."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5950,32 +6066,37 @@ msgstr "Mostra l'estat de la _indexació"
 msgid "Show status of indexing used when searching"
 msgstr "Mostra l'estat de la indexació utilitzat mentre s'està cercant"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "No s'ha pogut crear la carpeta requerida"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus no ha pogut crear la carpeta necessària «%s»."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "El Nautilus no ha pogut crear la carpeta necessària \"%s\". Abans d'executar "
 "el Nautilus, creeu aquesta carpeta, o especifiqueu els permisos per a que el "
 "Nautilus pugui crear-la."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "No s'han pogut crear les carpetes necessàries"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus no ha pogut crear el directori %s."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5986,35 +6107,30 @@ msgstr ""
 "Abans d'executar el Nautilus, creeu aquesta carpeta, o especifiqueu els "
 "permisos per a que el Nautilus pugui crear-les."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Enllaç a l'escriptori vell"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "La ubicació del directori de l'escriptori ha canviat en GNOME 2.4. S'ha "
 "creat un enllaç anomenat «Enllaç a l'escriptori vell» a l'escriptori. Podeu "
 "obrir-lo per a moure els fitxers que voleu i després eliminar l'enllaç."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "S'ha migrat l'escriptori vell"
 
-#. Can't register myself due to trouble locating the
-#. * Nautilus_Shell.server file. This has happened when you
-#. * launch Nautilus with an LD_LIBRARY_PATH that
-#. * doesn't include the directory containing the oaf
-#. * library. It could also happen if the
-#. * Nautilus_Shell.server file was not present for some
-#. * reason. Sometimes killing oafd and gconfd fixes
-#. * this problem but we don't exactly understand why,
-#. * since neither of the above causes explain it.
-#.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6024,8 +6140,7 @@ msgstr ""
 "l'ordre \"nautilus-clean.sh -x\" des de la consola. Si no, podeu provar "
 "d'arrencar de nou l'ordinador o instal·lar de nou el Nautilus."
 
-#. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6072,14 +6187,15 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#. FIXME bugzilla.gnome.org 42538: When can this happen?
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "A causa d'un error inesperat, en aquest moment el Nautilus no es pot "
 "utilitzar."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6088,7 +6204,7 @@ msgstr ""
 "vistes del gestor de fitxers, en aquest moment no es pot utilitzar el "
 "Nautilus.\""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6099,7 +6215,7 @@ msgstr ""
 "activation-server i reiniciant el Nautilus potser ajudarà a arreglar el "
 "problema."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6110,6 +6226,17 @@ msgstr ""
 "al bonobo-activation-server i reiniciant el Nautilus potser ajudarà a "
 "arreglar el problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"S'ha produït un error en mostrar l'ajuda: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "No hi ha adreces d'interes definides"
@@ -6143,39 +6270,47 @@ msgstr "Poques opcions"
 msgid "Find Them!"
 msgstr "Busca'ls!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Heu d'introduir un nom per al servidor."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "No podeu moure dins ella mateixa."
+msgid "Please enter a name and try again."
+msgstr "Si us plau, introduïu un nom i proveu de nou."
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "No es pot connectar al servidor"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "no és un dispositiu de bloc vàlid"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"«%s» no és una ubicació vàlida. Si us plau comproveu l'ortografia i torneu a "
+"No s'ha pogut trobar «%s». Si us plau comproveu l'ortografia i torneu a "
 "provar."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Servidors de xarxa"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nom:"
+#: src/nautilus-connect-server-dialog.c:209 src/nautilus-location-dialog.c:147
+msgid "_Location:"
+msgstr "_Ubicació:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
-msgid "Connect"
-msgstr "_Connecta"
+#: src/nautilus-connect-server-dialog.c:235
+msgid "C_onnect"
+msgstr "C_onnecta"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6376,6 +6511,20 @@ msgstr ""
 "\n"
 "Podeu suprimir manualment aquest fitxer per tornar a executar l'assistent.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"No podeu assignar més d'una icona personalitzada a la vegada! Arrossega "
+"només una imatge per especificar una icona personalitzada."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"El fitxer que heu deixat anar no és local. Només podeu utilitzar imatges "
+"locals com a icones personalitzades"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6386,64 +6535,63 @@ msgstr "Obre amb %s"
 msgid "Open with..."
 msgstr "Obre amb..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:484
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "No es pot llançar l'aplicació de gravació de cd:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "No es pot llançar el gravador de cd"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Buida la _paperera"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Escriu els continguts al CD"
 
-#: src/nautilus-location-bar.c:62
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "Vés a:"
 
 #: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Voleu veure aquestes %d ubicacions en finestres separades?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:166
 msgid "View in Multiple Windows?"
 msgstr "Visualitza en multiples finestres?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "No es pot obrir la ubicació"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Realitza un conjunt de proves ràpides d'auto comprovació."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Crea una finestra inicial amb la geometria donada."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Només crea finestres per a les URI especificades explícitament."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6451,82 +6599,100 @@ msgstr ""
 "No gestionis l'escriptori (ignora el conjunt la preferència especificada en "
 "el diàleg de preferències),"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "obre una finestra del navegador."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Surt del Nautilus"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reinicia el Nautilus"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Gestor de fitxers"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:271
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:173
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
+#, c-format
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --la comprovació no es pot utilitzar amb les URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
+#, c-format
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --la comprovació no es pot utilitzar amb altres opcions.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
+#, c-format
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --sortir no es pot utilitzar amb les URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
+#, c-format
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --reiniciar no es pot utilitzar amb les URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
+#, c-format
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --la geometria no es pot utilitzar amb més d'una 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Esteu segur que voleu eliminar permanentment l'element \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Esteu segurs que voleu oblidar l'historial? Si ho feu, esteu comdemnats a "
 "repetir-lo."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Esteu segur que voleu que el Nautilus s'oblidi dels llocs que heu visitat?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Oblidar l'historial"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "La ubicació \"%s\" no existeix. Voleu eliminar tots els preferits amb "
 "aquesta ubicació de la llista?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "La ubicació \"%s\" ja no existeix."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Adreça d'interès d'una ubicació inexistent"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Elimina"
 
@@ -6559,7 +6725,6 @@ msgid "Close _All Windows"
 msgstr "Ta_nca totes les finestres"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Tanca totes les finestres del Nautilus"
@@ -6567,7 +6732,7 @@ msgstr "Tanca totes les finestres del Nautilus"
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Connecta al _servidor..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6583,152 +6748,166 @@ msgid "Forward"
 msgstr "Endavant"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Vés a la carpeta de les plantilles"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Vés a la ubicació visitada anteriorment"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Vés a la ubicació visitada anteriorment"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Vés a la carpeta de la paperera"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Inici"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Barra d'ubicació"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Actualitza"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Cerca fitxers en aquest ordinador"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Barra d'est_at"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Atura"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Amunt"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Escriu a un CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Afegeix l'adreça d'interès"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Endarrere"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Adreces d'interès"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Obl_ida't de l'historial"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Ordinador"
+msgstr "_Ordinador"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Edita les adreces d'interès"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Endavant"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Vés"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Inici"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Ubicació..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Barres lateral_s"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "Plan_tilles"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Paperera"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Amunt"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "Vi_sualitza"
 
-#: src/nautilus-navigation-window.c:338
+#: src/nautilus-navigation-window.c:337
 msgid "Information"
 msgstr "Informació"
 
 #. Add "View as..." extra bonus choice.
-#: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-navigation-window.c:701 src/nautilus-shell-ui.xml.h:27
 msgid "View as..."
 msgstr "Visualitza com a..."
 
-#: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#: src/nautilus-navigation-window.c:733
+#, c-format
 msgid "File Browser: %s"
-msgstr "Propietari del fitxer:"
+msgstr "Navegador de fitxers: %s"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1104
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Una de les barres laterals ha trobat un error i no pot continuar. "
 "Desgraciadament no puc dir quina."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1105
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1108
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "La vista %s ha trobat un error mentre s'estava iniciant."
+
+#: src/nautilus-navigation-window.c:1109
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "El pannell de la barra lateral %s ha trobat un error i no pot continuar. Si "
 "això continua mantenint-se, haureu de desactivar aquest pannell."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1112
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "El pannell de la barra lateral ha fallat"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1243
 msgid "Side Pane"
 msgstr "Barra lateral"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1245
 msgid "Contains a side pane view"
 msgstr "Conté una vista de barra lateral"
 
@@ -6762,147 +6941,184 @@ msgstr "_Afegeix una nova..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "El patró %s no s'ha pogut eliminar."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Comproveu que teniu permisos per suprimir el patró."
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "No s'ha pogut eliminar el patró"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "El distintiu %s no s'ha pogut eliminar"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "No s'ha pogut reanomenar el distintiu"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Crea un distintiu nou:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Paraula _clau:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imatge:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Seleccioneu un fitxer d'imatge per al nou distintiu:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Crea un color nou:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nom del color:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valor del color:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" no és un nom de fitxer vàlid."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "No heu donat un nom de fitxer vàlid."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+#, fuzzy
+msgid "Please try again."
+msgstr "Si us plau, espereu..."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "No s'ha pogut instal·lar el patró"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "No podeu reemplaçar la imatge restaurada"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "No és una imatge"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "El patró %s no s'ha pogut instal·lar."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Seleccioneu un fitxer d'imatge per a afegir com a patró"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+#, fuzzy
+msgid "The color cannot be installed."
+msgstr ""
+"Aquests paquets s'estan preparant per ser desinstal·lats:\n"
+"\n"
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Heu d'especificar un nom per al nou color."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "No s'ha pogut instal·lar el color"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Seleccioneu un color per a afegir"
 
-#: 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' no és un fitxer d'imatge utilitzable!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "'%s' no és un fitxer d'imatge vàlid!"
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "El fitxer «%s» no pareix ser una imatge vàlida."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Seleccioneu una categoria:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_ancel·la eliminar"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Afegeix un nou patró..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Afegeix un nou color..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Afegeix un nou distintiu..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Feu clic en un patró per a eliminar-lo"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Feu clic sobre un color per a eliminar-lo"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Feu clic sobre un distintiu per a eliminar-lo"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patrons:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Colors:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Distintius:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Elimina un patró..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Elimina un color..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Elimina un distintiu..."
 
@@ -7297,37 +7513,39 @@ msgstr "Creador de C_D"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
-msgstr "Ta_nca totes les finestres"
+msgid "Close P_arent Folders"
+msgstr "Crea una _carpeta"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Tanca la barra lateral"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "en aquest ordinador"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Vés a la carpeta de la paperera"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "_Ubicació..."
+msgstr "Obre una _ubicació..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "Obre el _pare"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Elements que són ]carpetes"
+msgstr "Obre la carpeta pare"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Patrons"
+msgstr "_Llocs"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7354,10 +7572,13 @@ msgid "View Failed"
 msgstr "La vista ha fallat"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "La vista %s ha trobat un error mentre s'estava iniciant."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "La vista %s ha trobat un error i no pot continuar. Trieu un altra vista o "
 "aneu a una ubicació diferent."
@@ -7367,103 +7588,133 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "La vista %s ha trobat un error mentre s'estava iniciant."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "La NautilusApplication  associada amb aquesta finestra"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Vista del contingut"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Vista del fitxer o carpeta actual"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"No s'ha pogut trobar «%s». Si us plau comproveu l'ortografia i torneu a "
-"provar."
+msgid "Couldn't find \"%s\"."
+msgstr "No s'ha trobat «%s»."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
+msgstr "No s'ha pogut mostrar «%s»"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "No s'ha pogut mostrar «%s» perquè el Nautilus no pot determinar quin tipus "
 "de fitxer és."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "El Nautilus no té instal·lat cap visualitzador capaç de mostrar «%s»."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "No s'ha pogut mostrar «%s», perquè el Nautilus no pot gestionar les "
 "ubicacions %s."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "No s'ha pogut mostrar «%s», perquè ha fallat l'intent d'entrada."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "S'ha denegat l'accés."
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "No s'ha pogut mostrar «%s», perquè s'ha denegat l'accés."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "No es pot mostrar «%s», perquè l'ordinador central \"%s\" no s'ha trobat. "
 "Comproveu que l'ortografia és correcta i que els paràmetres del vostre "
 "servidor intermedi són correctes."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "No s'ha pogut mostrar «%s». Comproveu que els paràmetres del servidor "
 "intermedi són correctes."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"No s'ha pogut mostrar «%s» perquè el Nautilus no pot connectar amb el "
-"navegador principal de SMB.\n"
-"Revisa que tinguis un servidor de SMB a la xarxa local."
+"No s'ha pogut mostrar «%s», perquè el Nautilus no pot gestionar les "
+"ubicacions %s."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Cercant no està disponible ara mateix, perquè no teniu cap índex o el  "
 "servei de cerca no s'està executant. Assegureu-vos que heu iniciat el servei "
 "de cerca Medusa, i si no teniu cap índex, que l'indexador Medusa s'està "
 "executant."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Cercant no està disponible ara mateix, perquè no teniu cap índex o el  "
+"servei de cerca no s'està executant. Assegureu-vos que heu iniciat el servei "
+"de cerca Medusa, i si no teniu cap índex, que l'indexador Medusa s'està "
+"executant."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Cercant no està disponible"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "El Nautilus no pot mostrar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "No es pot mostrar la ubicació"
 
@@ -7475,22 +7726,22 @@ msgstr "Vés a la ubicació especificada per aquesta adreça d'interès"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
-msgstr "Copyright (C) 1999-2001 Eazel, Inc."
+msgstr "Copyright © 1999-2001 Eazel, Inc."
 
 #. Translators should localize the following string
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Valentín Trilles <vtrilles@yahoo.es>\n"
 "Sinner from the Prairy <sinner@escomposlinux.org>\n"
 "Jordi Mallach <jordi@sindominio.net>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7506,38 +7757,40 @@ msgstr "Anar enrere algunes pàgines"
 msgid "Go forward a number of pages"
 msgstr "Anar endavant un nombre de pàgines"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:906
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Mostra aquesta ubicació amb \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1177
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Xarxa"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1179
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1181
+msgid "Themes"
+msgstr "Temes"
+
+#: src/nautilus-window.c:1183
 msgid "CD Creator"
-msgstr "Creador de C_D"
+msgstr "Creador de CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1623
 msgid "Application ID"
 msgstr "ID de l'aplicació"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1624
 msgid "The application ID of the window."
-msgstr "El ID de l'aplicació de la finestra"
+msgstr "L'ID de l'aplicació de la finestra"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1630
 msgid "Application"
 msgstr "Aplicació"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1631
 msgid "The NautilusApplication associated with this window."
 msgstr "La NautilusApplication  associada amb aquesta finestra"
 
@@ -7574,6 +7827,212 @@ msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 "Visualitza els vostres servidors de xarxa en el gestor de fitxers Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Alguns fitxers no s'han pogut afegir com a distintius perquè no pareixien "
+#~ "ser imatges vàlides."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Original per a la vista del maquinari"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visualitzador del maquinari"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vista del maquinari"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Visualitza com a maquinari"
+
+#~ msgid "hardware view"
+#~ msgstr "vista del maquinari"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nom de la icona per a la vista del maquinari"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "resum d'informació sobre el maquinari"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K mida de la memòria cau"
+
+#~ 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 "Temps: % dies, %d hores, %d minuts"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Informació general del maquinari"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Aquest és un lloc destinat per a la pàgina de la CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Aquest és un lloc destinat a la pàgina de RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Aquest és un lloc destinat per a la pàgina IDE."
+
+#~ msgid "Search Google for Selected Text"
+#~ msgstr "Cerca amb el Google el text seleccionat"
+
+#~ msgid "Use Google to search the web for the selected text"
+#~ msgstr "Utilitza el Google per cercar al web el text seleccionat"
+
+#~ msgid "Look Up Selected Text in Dictionary"
+#~ msgstr "Cerca el text seleccionat en el diccionari"
+
+#~ msgid "Look up the selected text in the Merriam-Webster dictionary"
+#~ msgstr "Cerca el text seleccionat en el diccionari Merriam-Webster"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "S'ha produït un error en copiar-lo a \"%s\".\n"
+#~ "\n"
+#~ "No hi ha prou espai en la destinació."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "S'ha produït un error en crear l'enllaç en \"%s\".\n"
+#~ "\n"
+#~ "No hi ha prou espai en la destinació."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "S'ha produït un error en moure els elements a \"%s\".\n"
+#~ "\n"
+#~ "No teniu permisos per escriure en aquesta carpeta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "S'ha produït un error en moure els elements a \"%s\".\n"
+#~ "\n"
+#~ "El disc de destinació és de només lectura."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "S'ha produït un error en crear els enllaços en \"%s\".\n"
+#~ "\n"
+#~ "No teniu permisos per escriure en aquesta carpeta."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "S'ha produït un error en crear els enllaços en \"%s\".\n"
+#~ "\n"
+#~ "El disc de destinació és de només lectura."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en copiar \"%s\".\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en moure \"%s\".\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en suprimir \"%s\".\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en copiar\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en enllaçar.\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "S'ha produït un error \"%s\" en suprimir.\n"
+#~ "\n"
+#~ "Voleu continuar?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "No podeu copiar la paperera."
+
+#~ msgid "file icon"
+#~ msgstr "icona d'arxiu"
+
+#~ 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 ""
+#~ "L'acció predeterminada no pot obrir «%s» perque no pot accedir als "
+#~ "fitxers a les ubicacions «%s». No hi ha altres accions disponibles per "
+#~ "visualitzar aquest fitxer. Si copieu aquest fitxer al vostre ordinador, "
+#~ "potser podreu obrir-lo."
+
+#~ msgid "Searching Disks"
+#~ msgstr "S'estan cercant discs"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus està cercants carpetes de paperera en els vostres discs."
+
 #~ msgid "Unknown"
 #~ msgstr "Desconegut"
 
@@ -7635,18 +8094,56 @@ msgstr ""
 #~ msgid "Error executing utility program '%s': %s"
 #~ msgstr "Error a l'executar el programa d'utilitat «%s»: %s"
 
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Els %d elements seleccionats no es poden moure a la paperera. Voleu "
+#~ "suprimir-los immediatament?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d dels elements seleccionats no es poden moure a la paperera. Voleu "
+#~ "suprimir aquests %d elements immediatament?"
+
+#~ msgid "Open _in This Window"
+#~ msgstr "Obre _en aquesta Finestra"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "El fitxer que heu deixat anar no és una imatge. Només podeu utilitzar "
+#~ "imatges locals com a icones personalitzades."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "El servei de cerca Medusa no està disponible perquè no està instal·lat."
+
 #~ msgid "Dis_ks"
 #~ msgstr "Dis_cs"
 
 #~ msgid "Mount or unmount disks"
 #~ msgstr "Munta o desmunta discs"
 
-#~ msgid "Open _in This Window"
-#~ msgstr "Obre _en aquesta Finestra"
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Una vegada al dia els vostres fitxers i el contingut del text és "
+#~ "reindexat de manera que les cerques són ràpides. Els fitxers s'estan "
+#~ "reindexant actualment."
 
 #~ msgid "_Open activated item in a new window"
 #~ msgstr "_Obre cada element activat en una nova finestra"
 
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' no és un fitxer d'imatge utilitzable!"
+
 #~ msgid "Change the visibility of this window's toolbar"
 #~ msgstr "Canvia la visibilitat de la barra d'eines d'aquesta finestra"
 
@@ -7668,8 +8165,20 @@ msgstr ""
 #~ msgid "_Toolbar"
 #~ msgstr "Barra d'_eines"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "La ubicació \"%s\" ja no existeix."
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "«%s» no és una ubicació vàlida. Si us plau comproveu l'ortografia i "
+#~ "torneu a provar."
+
+#~ 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 ""
+#~ "No s'ha pogut mostrar «%s» perquè el Nautilus no pot connectar amb el "
+#~ "navegador principal de SMB.\n"
+#~ "Revisa que tinguis un servidor de SMB a la xarxa local."
 
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Vés a la ubicació inexistent"
@@ -7726,9 +8235,6 @@ msgstr ""
 #~ msgid "You cannot copy the Trash."
 #~ msgstr "No podeu copiar la paperera."
 
-#~ msgid "_Location:"
-#~ msgstr "_Ubicació:"
-
 #~ msgid "F_onts"
 #~ msgstr "T_ipus de lletra"
 
@@ -7768,18 +8274,12 @@ msgstr ""
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Clear Text"
 #~ msgstr "Neteja el text"
 
 #~ msgid "Copy Text"
 #~ msgstr "Còpia el text"
 
-#~ msgid "Paste Text"
-#~ msgstr "Enganxa el text"
-
 #~ msgid "Select All"
 #~ msgstr "Selecciona-ho Tot"
 
@@ -7927,9 +8427,6 @@ msgstr ""
 #~ msgid " (invalid Unicode)"
 #~ msgstr " (Unicode incorrecte)"
 
-#~ msgid "Themes"
-#~ msgstr "Temes"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Nou comportament de finestra"
 
@@ -7957,9 +8454,6 @@ msgstr ""
 #~ msgid "Click Behavior"
 #~ msgstr "Comportament en fer clic"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Fitxers de text executables"
-
 #~ msgid "Show Options"
 #~ msgstr "Mostra les opcions"
 
@@ -8076,9 +8570,6 @@ msgstr ""
 #~ msgid "Couldn't add theme"
 #~ msgstr "No s'ha pogut afegir un tema"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "El tema \"%s\" no s'ha pogut instal·lar."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "No s'ha pogut instal3lar el tema"
 
@@ -8094,9 +8585,6 @@ msgstr ""
 #~ msgstr ""
 #~ "No podeu suprimir el tema actual. Trieu un altre tema abans de suprimir-lo"
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "El tema no s'ha pogut suprimir!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "No s'ha pogut suprimir el tema"
 
@@ -8583,9 +9071,6 @@ msgstr ""
 #~ msgid "Set Cover Image"
 #~ msgstr "Defineix la imatge de la coberta"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "'%s' no és un fitxer d'imatge vàlid!"
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Seleccioneu un fitxer d'imatge per a la coberta de l'àlbum:"
 
@@ -8645,9 +9130,6 @@ msgstr ""
 #~ msgid "<span size=\"xx-large\">%s - %s</span>"
 #~ msgstr "<span size=\"xx-large\">%s - %s</span>"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "La imatge %s no s'ha pogut instal·lar com un distintiu."
-
 #~ msgid "Delete"
 #~ msgstr "Suprimeix"
 
@@ -8719,9 +9201,6 @@ msgstr ""
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "No s'ha pogut carregar %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "S'està carregant %s"
 
@@ -9465,7 +9944,7 @@ msgstr ""
 #~ msgstr "Xinès simplificat (HZ)"
 
 #~ msgid "Chinese Traditional (Big5)"
-#~ msgstr "Xinès tradicionsl (Big5)"
+#~ msgstr "Xinès tradicional (Big5)"
 
 #~ msgid "Chinese Traditional (EUC-TW)"
 #~ msgstr "Xinès tradicional (EUC-TW)"
@@ -9931,9 +10410,6 @@ msgstr ""
 #~ msgstr ""
 #~ "està protegit contra escriptura, s'està muntant com només de lectura"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "no és un dispositiu de bloc vàlid"
-
 #~ msgid "No medium found"
 #~ msgstr "No s'ha trobat cap medi"
 
@@ -9964,9 +10440,6 @@ msgstr ""
 #~ msgid "scripts"
 #~ msgstr "seqüències"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus no ha pogut crear el directori %s."
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "No hi ha carpeta de seqüències"
 
@@ -10359,9 +10832,6 @@ msgstr ""
 #~ msgid "%s requires %s"
 #~ msgstr "%s requereix %s"
 
-#~ msgid "%s is not installed"
-#~ msgstr "%s no està instal·lat"
-
 #~ msgid "Check for a new version of %s"
 #~ msgstr "Comprova per una nova versió de %s"
 
@@ -10574,13 +11044,6 @@ msgstr ""
 #~ "\n"
 
 #~ msgid ""
-#~ "These packages are about to be uninstalled:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aquests paquets s'estan preparant per ser desinstal·lats:\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "These packages are about to be reverted:\n"
 #~ "\n"
 #~ msgstr ""
@@ -11070,9 +11533,6 @@ msgstr ""
 #~ msgid "Can't open remote file"
 #~ msgstr "No es pot obrir el fitxer remot"
 
-#~ msgid "Details"
-#~ msgstr "Detalls"
-
 #~ msgid "Question"
 #~ msgstr "Descripció"
 
@@ -11633,9 +12093,6 @@ msgstr ""
 #~ msgid "Interrupted!"
 #~ msgstr "Interromput!"
 
-#~ msgid "Please wait..."
-#~ msgstr "Si us plau, espereu..."
-
 #~ msgid "Request timeout!"
 #~ msgstr "El temps de sol·licitud s'ha excedit!"
 
diff --git a/po/cs.po b/po/cs.po
index 79766c2b0..3ed4f6580 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,20 +1,21 @@
 # Czech translation of Nautilus
 # Copyright (C) 2001,2003 Free Software Foundation, Inc.
+# Copyright (C) 2004 Miloslav Trmac <mitr@volny.cz>
 # George Lebl <jirka@5z.com>, 2001.
-# Miloslav Trmac <mitr@volny.cz>, 2002, 2003.
+# Miloslav Trmac <mitr@volny.cz>, 2002, 2003, 2004.
 # Minor fixes by Michal Bukovjan <bukm@centrum.cz>, 2002,2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus VERSION\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-08-09 18:44+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-06 15:59+0100\n"
+"PO-Revision-Date: 2004-01-06 17:19+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -41,8 +42,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() selhalo."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblémy"
 
@@ -56,47 +57,51 @@ msgstr "Pohled Emblém Nautilu"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
-msgstr ""
-"Nemohu odstranit emblém se s názvem '%s'. Pravděpodobně je emblém "
-"permanentní, který jste nepřidali sami."
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Nemohu odstranit emblém s názvem '%s'."
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr "Pravděpodobně je emblém permanentní, který jste nepřidali sami."
+
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "Nemohu odstranit emblém"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Nemohu přejmenovat emblém s názvem '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
-msgstr ""
-"Nemohu přejmenovat emblém s názvem '%s'. Pravděpodobně je emblém "
-"permanentní, který jste nepřidali sami."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr "Pravděpodobně je emblém permanentní, který jste nepřidali sami."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "Nemohu přejmenovat emblém"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Přejmenovat emblém"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Zadejte nový název pro zobrazený emblém:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Přidat emblémy..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -104,7 +109,7 @@ msgstr ""
 "Zadejte vedle každého emblému popisný název. Tento název bude na jiných "
 "místech použit pro identifikaci emblému."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -112,139 +117,55 @@ msgstr ""
 "Zadejte vedle emblému popisný název. Tento název bude na jiných místech "
 "použit pro identifikaci emblému."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Některé soubory nemohly být přidány jako emblémy, protože zřejmě nejsou "
-"platné obrázky."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Některé soubory nemohly být přidány jako emblémy."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Emblémy zřejmě nejsou platné obrázky."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "Nemohu přidat emblémy"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Žádný soubor nemohl být přidán jako emblém, protože to zřejmě nejsou platné "
-"obrázky."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Žádný soubor nemohl být přidán jako emblém."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Emblém nelze přidat."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Tažený text nebylo platné umístění souboru."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Nemohu přidat emblém"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Soubor '%s' zřejmě není platný obrázek."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Tažený soubor zřejmě není platný obrázek."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Smazat"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Generátor pro hardware pohled"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Prohlíže� hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardware pohled"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Zobrazit jako hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardware pohled"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "název ikony pro hardware pohled"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "shrnutí informací o hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K velikost cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Čas běhu je %d dní, %d hodin, %d minut"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Přehled hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Sem patří stránka o CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Sem patří stránka o paměti."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Sem patří stránka o IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historie"
@@ -270,51 +191,48 @@ msgid "Nautilus Image Properties view"
 msgstr "Pohled Nautilu Vlastnosti obrázku"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Kamera"
+msgstr "Zna�ka fotoaparátu"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Kamera"
+msgstr "Model fotoaparátu"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Datum focení"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Doba expozice"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "program"
+msgstr "Program expozice"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Hodnota clony"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Režim měření"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Použit blesk"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
-msgid "Focal Lenght"
-msgstr ""
+msgid "Focal Length"
+msgstr "Ohnisková délka"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Rychlost závěrky"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "Ozna�ení rychlosti ISO"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -388,22 +306,6 @@ msgstr "Kopírovat vybraný text do schránky"
 msgid "_Copy Text"
 msgstr "_Kopírovat text"
 
-#: components/text/services/google.xml.h:1
-msgid "Search Google for Selected Text"
-msgstr "Hledat vybraný text na Google"
-
-#: components/text/services/google.xml.h:2
-msgid "Use Google to search the web for the selected text"
-msgstr "Hledat vybraný text na WWW pomocí Google"
-
-#: components/text/services/webster.xml.h:1
-msgid "Look Up Selected Text in Dictionary"
-msgstr "Vyhledat vybraný text ve slovníku"
-
-#: components/text/services/webster.xml.h:2
-msgid "Look up the selected text in the Merriam-Webster dictionary"
-msgstr "Vyhledat vybraný text ve slovníku Merriam-Webster"
-
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
 msgstr "animace pro indikaci aktivity"
@@ -910,6 +812,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Mezinárodní"
@@ -1109,9 +1015,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Otevřít nové okno pro každý otevřený soubor"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "Ikona domova zobrazena na pracovní ploše"
+msgstr "Ikona po�íta�e viditelná na pracovní ploše"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1194,30 +1099,18 @@ msgid "Desktop trash icon name"
 msgstr "Název ikony koše"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Adresáře nad tuto velikost budou zkráceny na zhruba tuto velikost. Ú�el "
-"tohoto je vyhnout se neúmyslnému nafouknutí haldy a zabití Nautilu na "
-"masivních adresářích. Záporná hodnota znamená žádný limit. Limit je "
-"přibližný díky �tení adresářů po soustech."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Povolit 'speciální' příznaky v dialogu vlastností souboru"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Název souboru implicitního pozadí adresáře. Používá se, jen je-li "
 "background_set true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1225,6 +1118,18 @@ msgstr ""
 "Název souboru implicitního pozadí bo�ního panelu. Používá se, jen je-li "
 "side_pane_background_set true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Adresáře nad tuto velikost budou zkráceny na zhruba tuto velikost. Ú�el "
+"tohoto je vyhnout se neúmyslnému nafouknutí haldy a zabití Nautilu na "
+"masivních adresářích. Záporná hodnota znamená žádný limit. Limit je "
+"přibližný díky �tení adresářů po soustech."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Skrýt implicitní záložky v menu záložek"
@@ -1235,8 +1140,8 @@ msgstr "Ikona domova zobrazena na pracovní ploše"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Je-li nastaveno na true, bude Nautilus zobrazovat v bo�ním panelu strom jen "
 "adresáře. V opa�ném případě bude zobrazovat adresáře i soubory."
@@ -1275,8 +1180,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Je-li nastaveno na true, zobrazuje Nautilus v ikonovém a seznamovém pohledu "
 "adresáře před zobrazováním souborů."
@@ -1321,7 +1226,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Je-li nastaveno na true, bude Nautilus používat jako pracovní plochu "
@@ -1340,7 +1245,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Je-li nastaveno na true, jsou ve správci souborů zobrazovány skryté soubory. "
 "Skryté soubory jsou soubory se jménem za�ínajícím te�kou nebo soubory "
@@ -1355,17 +1260,16 @@ msgstr ""
 "To znamená, že bude spuštěn, až se příště přihlásíte."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
-"Je-li nastaveno na true, bude na pracovní ploše zobrazena ikona ukazující na "
-"koš."
+"Je-li nastaveno na true, bude na pracovní ploše zobrazena ikona ukazující "
+"umístění po�íta�e."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Je-li nastaveno na true, bude na pracovní ploše umístěna ikona ukazující na "
@@ -1402,9 +1306,9 @@ msgstr ""
 "vzestupného třídění tříděny sestupně."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
-"Je-li true, budou ikony v nových oknech implicitně rozloženy kompaktněji."
+"Je-li true, budou jmenovky v nových oknech implicitně rozloženy kompaktněji."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1430,7 +1334,7 @@ msgid "List of possible captions on icons"
 msgstr "Seznam možných titulků ikon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr "Maximum obsloužených souborů v adresáři"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1450,11 +1354,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus obsluhuje kreslení pracovní plochy"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilu používá domovský adresář uživatele jako pracovní plochu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr "Zobrazovat v bo�ním panelu strom jen adresáře"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1474,7 +1378,7 @@ msgid "Reverse sort order in new windows"
 msgstr "Obrátit pořadí třídění v nových oknech"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Zobrazovat v oknech nejdříve adresáře"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1514,7 +1418,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1527,10 +1431,10 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Rozhodnutí, kdy zobrazovat soubory obrázků jako náhled. Je-li nastaveno na "
 "\"always\", tak pokaždé tvořit náhledy, i když je adresář na vzdáleném "
@@ -1540,9 +1444,9 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Rozhodnutí, kdy zobrazovat po�et položek v adresáři. Je-li nastaveno na "
@@ -1554,18 +1458,18 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
-"Implicitní pořadí třídění pro položku v ikonovém pohledu. Možné hodnoty jsou "
-"\"name\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"Implicitní pořadí třídění položek v ikonovém pohledu. Možné hodnoty jsou "
+"\"name\", \"size\", \"type\", \"modification_date\" a \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"Implicitní pořadí třídění pro položku v seznamovém pohledu. Možné hodnoty "
-"jsou name, size, type, modification_date, emblems."
+"Implicitní pořadí třídění položek v seznamovém pohledu. Možné hodnoty jsou "
+"\"name\", \"size\", \"type\" a \"modification_date\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
@@ -1608,7 +1512,7 @@ msgid "Use manual layout in new windows"
 msgstr "Používat v nových oknech ru�ní rozložení"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Používat v nových oknech kompaktnější rozložení"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1638,7 +1542,7 @@ msgstr ""
 "\"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Kdy zobrazovat po�et položek v adresáři"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1650,7 +1554,7 @@ msgid "When to show thumbnails of image files"
 msgstr "Kdy zobrazovat náhledy souborů obrázků"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Jestli bylo nastaveno vlastní implicitní pozadí adresáře."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1807,67 +1711,77 @@ msgstr "vymazat"
 msgid "on the desktop"
 msgstr "na ploše"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Nemůžete odstranit ikonu svazku."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Nemůžete odstranit ikonu svazku. Pokud chcete svazek vysunout, použijte "
-"prosím Vysunout v menu svazku po kliknutí pravým tla�ítkem."
+"Pokud chcete svazek vysunout, použijte prosím Vysunout v menu svazku po "
+"kliknutí pravým tla�ítkem."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "Nemohu odstranit svazek"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Koš"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Přesunout sem"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopírovat sem"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Odkaz sem"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "_Nastavit jako pozadí"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Nastavit jako pozadí pro _všechny adresáře"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Nastavit jako pozadí pro _tento adresář"
 
 #: 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 "Emblém nelze nainstalovat."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Lituji, ale musíte zadat neprázdné klí�ové slovo pro nový emblém."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "Nemohu nainstalovat emblém"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1878,24 +1792,28 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Lituji, ale emblém pojmenovaný \"%s\" již existuje. Zvolte pro něj prosím "
-"jiný název."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Lituji, ale emblém pojmenovaný \"%s\" již existuje."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Zvolte prosím jiný název emblému."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Nemohu nainstalovat emblém"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Lituji, nemohu uložit vlastní emblém."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Lituji, nemohu uložit název vlastního emblému."
 
-#: libnautilus-private/nautilus-file-operations-progress.c:456
+#: libnautilus-private/nautilus-file-operations-progress.c:457
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld z %ld"
@@ -1910,369 +1828,266 @@ msgstr "Z:"
 msgid "To:"
 msgstr "Do:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:551
+#: libnautilus-private/nautilus-file-operations.c:599
+#: libnautilus-private/nautilus-file-operations.c:614
+msgid "Error while moving."
+msgstr "Chyba při přesunu."
+
+#: libnautilus-private/nautilus-file-operations.c:552
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Chyba při přesunu.\n"
-"\n"
-"\"%s\" nelze přesunout, protože je na disku, který je pouze ke �tení."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "\"%s\" nelze přesunout, protože je na disku, který je pouze ke �tení."
+
+#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:568
+msgid "Error while deleting."
+msgstr "Chyba při odstraňování."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:563
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Chyba při odstraňování.\n"
-"\n"
 "\"%s\" nelze odstranit, protože nemáte oprávnění měnit adresář, kde je "
 "umístěn."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:569
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Chyba při odstraňování.\n"
-"\n"
-"\"%s\" nelze odstranit, protože je na disku, který je pouze pro �tení."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "\"%s\" nelze odstranit, protože je na disku, který je pouze pro �tení."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:600
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Chyba při přesunu.\n"
-"\n"
 "\"%s\" nelze přesunout, protože nemáte oprávnění změnit jej nebo jeho "
 "rodi�ovský adresář."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:604
+msgid "Error while moving. "
+msgstr "Chyba při přesunu. "
+
+#: libnautilus-private/nautilus-file-operations.c:605
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Chyba při přesunu.\n"
-"\n"
-"\"%s\" nelze přesunout, protože tento objekt nebo jeho rodi�ovský adresář je "
-"obsažen v cíli."
+"Nemohu přesunout \"%s\", protože tento objekt nebo jeho rodi�ovský adresář "
+"je obsažen v cíli."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:615
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Chyba při přesunu.\n"
-"\n"
-"\"%s\" nelze přesunout do koše, protože nemáte oprávnění změnit jej nebo "
+"Nemohu přesunout \"%s\" do koše, protože nemáte oprávnění změnit jej nebo "
 "jeho rodi�ovský adresář."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"Chyba při kopírování.\n"
-"\n"
-"\"%s\" nelze kopírovat, protože nemáte oprávnění na jeho �tení."
+#: libnautilus-private/nautilus-file-operations.c:637
+msgid "Error while copying."
+msgstr "Chyba při kopírování."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:638
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Chyba při kopírování do \"%s\".\n"
-"\n"
-"V cíli není dost místa."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr "\"%s\" nelze kopírovat, protože nemáte oprávnění na jeho �tení."
 
-#: libnautilus-private/nautilus-file-operations.c:657
+#: libnautilus-private/nautilus-file-operations.c:658
+#: libnautilus-private/nautilus-file-operations.c:679
+#: libnautilus-private/nautilus-file-operations.c:683
 #, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Chyba při přesunu do \"%s\".\n"
-"\n"
-"V cíli není dost místa."
+msgid "Error while copying to \"%s\"."
+msgstr "Chyba při kopírování do \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Chyba při vytváření odkazu v \"%s\".\n"
-"\n"
-"V cíli není dost místa."
+#: libnautilus-private/nautilus-file-operations.c:659
+#: libnautilus-private/nautilus-file-operations.c:664
+#: libnautilus-private/nautilus-file-operations.c:668
+msgid "There is not enough space on the destination."
+msgstr "V cíli není dost místa."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:663
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Chyba při kopírování do \"%s\".\n"
-"\n"
-"Nemáte oprávnění zapisovat do tohoto adresáře."
+msgid "Error while moving to \"%s\"."
+msgstr "Chyba při přesunu do \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:667
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Chyba při kopírování do \"%s\".\n"
-"\n"
-"Cílový disk je jen pro �tení."
+msgid "Error while creating link in \"%s\"."
+msgstr "Chyba při vytváření odkazu v \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Chyba při přesunu položek do \"%s\".\n"
-"\n"
-"Nemáte oprávnění zapisovat do tohoto adresáře."
-
-#: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Chyba při přesunu položek do \"%s\".\n"
-"\n"
-"Cílový disk je jen pro �tení."
+#: libnautilus-private/nautilus-file-operations.c:680
+#: libnautilus-private/nautilus-file-operations.c:691
+#: libnautilus-private/nautilus-file-operations.c:702
+msgid "You do not have permissions to write to this folder."
+msgstr "Nemáte oprávnění zapisovat do tohoto adresáře."
 
+#: libnautilus-private/nautilus-file-operations.c:684
 #: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Chyba při vytváření odkazů v \"%s\".\n"
-"\n"
-"Nemáte oprávnění zapisovat do tohoto adresáře."
+#: libnautilus-private/nautilus-file-operations.c:706
+msgid "The destination disk is read-only."
+msgstr "Cílový disk je jen pro �tení."
 
-#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:690
+#: libnautilus-private/nautilus-file-operations.c:694
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Chyba při vytváření odkazů v \"%s\".\n"
-"\n"
-"Cílový disk je jen pro �tení."
+msgid "Error while moving items to \"%s\"."
+msgstr "Chyba při přesunu položek do \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:701
+#: libnautilus-private/nautilus-file-operations.c:705
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při kopírování \"%s\".\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Chyba při vytváření odkazů v \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:733
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při přesunu \"%s\".\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Chyba \"%s\" při kopírování \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:738
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:748
+#: 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
+msgid "Would you like to continue?"
+msgstr "Chcete pokra�ovat?"
 
-#: libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:737
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při vytváření odkazu na \"%s\".\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Chyba \"%s\" při přesunu \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při odstraňování \"%s\".\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Chyba \"%s\" při vytváření odkazu na \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:747
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při kopírování.\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Chyba \"%s\" při odstraňování \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:760
+#: libnautilus-private/nautilus-file-operations.c:762
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při přesunu.\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while copying."
+msgstr "Chyba \"%s\" při kopírování."
 
-#: libnautilus-private/nautilus-file-operations.c:764
+#: libnautilus-private/nautilus-file-operations.c:766
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při vytváření odkazu.\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while moving."
+msgstr "Chyba \"%s\" při přesunu."
 
 #: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" při odstraňování.\n"
-"\n"
-"Chcete pokra�ovat?"
+msgid "Error \"%s\" while linking."
+msgstr "Chyba \"%s\" při vytváření odkazu."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Chyba při kopírování."
+#: libnautilus-private/nautilus-file-operations.c:776
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Chyba \"%s\" při odstraňování."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Chyba při přesunu."
+#: libnautilus-private/nautilus-file-operations.c:902
+msgid "Error While Copying"
+msgstr "Chyba při kopírování"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Chyba při vytváření odkazu."
+#: libnautilus-private/nautilus-file-operations.c:905
+msgid "Error While Moving"
+msgstr "Chyba při přesunu"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Chyba při odstraňování."
+#: libnautilus-private/nautilus-file-operations.c:908
+msgid "Error While Linking"
+msgstr "Chyba při vytváření odkazu"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Přesko�it"
+#: libnautilus-private/nautilus-file-operations.c:913
+msgid "Error While Deleting"
+msgstr "Chyba při odstraňování"
+
+#: libnautilus-private/nautilus-file-operations.c:940
+#: libnautilus-private/nautilus-file-operations.c:961
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Skip"
+msgstr "Pře_sko�it"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Znovu"
+#: libnautilus-private/nautilus-file-operations.c:961
+msgid "_Retry"
+msgstr "Z_novu"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1027
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nemohu přesunout \"%s\" do nového umístění."
+
+#: libnautilus-private/nautilus-file-operations.c:1030
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" nemohl být přesunut na nové umístění, protože jeho název se již "
-"používá pro zvláštní položku, která nemůže být odstraněna nebo přepsána.\n"
-"\n"
-"Pokud stále chcete přesunout \"%s\", přejmenujte jej a zkuste to znovu."
+"Název se již používá pro zvláštní položku, která nemůže být odstraněna nebo "
+"přepsána. Pokud stále chcete položku přesunout, přejmenujte ji a zkuste to "
+"znovu."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1034
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nemohu zkopírovat \"%s\" do nového umístění."
+
+#: libnautilus-private/nautilus-file-operations.c:1037
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" nemohl být zkopírován na nové umístění, protože jeho název se již "
-"používá pro zvláštní položku, která nemůže být odstraněna nebo přepsána.\n"
-"\n"
-"Pokud stále chcete zkopírovat \"%s\", přejmenujte jej a zkuste to znovu."
+"Název se již používá pro zvláštní položku, která nemůže být odstraněna nebo "
+"přepsána. Pokud stále chcete položku zkopírovat, přejmenujte ji a zkuste to "
+"znovu."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Nemohu přepsat soubor."
+#: libnautilus-private/nautilus-file-operations.c:1043
+msgid "Unable to Replace File"
+msgstr "Nemohu nahradit soubor"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1056
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"Soubor \"%s\" již existuje.\n"
-"\n"
-"Chcete ho přepsat?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Soubor \"%s\" již existuje. Chcete jej nahradit?"
+
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Pokud nahradíte existující soubor, jeho obsah bude přepsán."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1070
+#: libnautilus-private/nautilus-file-operations.c:1089
+msgid "Conflict While Copying"
 msgstr "Konflikt při kopírování"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Přepsat"
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Replace"
+msgstr "_Nahradit"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Přepsat vše"
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "Replace _All"
+msgstr "Nahradit _vše"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1148
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1152
 #, c-format
 msgid "another link to %s"
 msgstr "další odkaz na %s"
@@ -2281,25 +2096,25 @@ msgstr "další odkaz na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1168
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1176
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1180
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. odkaz na %s"
@@ -2309,564 +2124,322 @@ msgstr "%d. odkaz na %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
 msgid " (copy)"
 msgstr " (kopie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1203
 msgid " (another copy)"
 msgstr " (další kopie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
-#: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1210
+#: libnautilus-private/nautilus-file-operations.c:1220
 msgid "th copy)"
 msgstr ". kopie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "st copy)"
 msgstr ". kopie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "nd copy)"
 msgstr ". kopie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1217
 msgid "rd copy)"
 msgstr ". kopie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1236
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (další kopie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1243
+#: libnautilus-private/nautilus-file-operations.c:1252
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1350
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1358
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1543
+#: libnautilus-private/nautilus-file-operations.c:2125
+#: libnautilus-private/nautilus-file-operations.c:2286
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neznámý GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Moving files to the Trash"
 msgstr "Přesouvám soubory do koše"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1872
 msgid "Files thrown out:"
 msgstr "Vyhozené soubory:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1874
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Moving"
 msgstr "Přesouvám"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1875
 msgid "Preparing to Move to Trash..."
 msgstr "Připravuji přesun do koše..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Moving files"
 msgstr "Přesouvám soubory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Files moved:"
 msgstr "Přesunuté soubory:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1886
 msgid "Preparing To Move..."
 msgstr "Připravuji přesun..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1887
 msgid "Finishing Move..."
 msgstr "Ukon�uji přesun..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Creating links to files"
 msgstr "Vytvářím odkazy k souborům"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Files linked:"
 msgstr "Vytvořené odkazy:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Linking"
 msgstr "Vytvářím odkaz k"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1900
 msgid "Preparing to Create Links..."
 msgstr "Připravuji vytváření odkazů..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1901
 msgid "Finishing Creating Links..."
 msgstr "Ukon�uji vytváření odkazů..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Copying files"
 msgstr "Kopíruji soubory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Files copied:"
 msgstr "Zkopírované soubory:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1911
 msgid "Copying"
 msgstr "Kopíruji"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1912
 msgid "Preparing To Copy..."
 msgstr "Připravuji kopírování..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Nemůžete kopírovat položky do koše"
+#: libnautilus-private/nautilus-file-operations.c:1929
+msgid "You cannot copy items into the trash."
+msgstr "Nemůžete kopírovat položky do koše."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nemohu kopírovat do koše"
+#: libnautilus-private/nautilus-file-operations.c:1930
+msgid "Files and folders can only be moved into the trash."
+msgstr "Soubory a adresáře mohou být přesunuty jen do koše."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1954
 msgid "You cannot move this trash folder."
 msgstr "Tento adresář koše nemůžete přesunout."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1955
 msgid "You cannot copy this trash folder."
 msgstr "Nemůžete kopírovat tento adresář koše."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr "Adresář koše se používá pro ukládání položek přesunutých do koše."
+
+#: libnautilus-private/nautilus-file-operations.c:1958
 msgid "Can't Change Trash Location"
 msgstr "Nemohu změnit umístění koše"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1959
 msgid "Can't Copy Trash"
 msgstr "Nemohu kopírovat koš"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1983
 msgid "You cannot move a folder into itself."
 msgstr "Nemůžete přesunout adresář do sebe."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1984
 msgid "You cannot copy a folder into itself."
 msgstr "Nemůžete zkopírovat adresář do sebe."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
+msgid "The destination folder is inside the source folder."
+msgstr "Cílový adresář je uvnitř zdrojového adresáře."
+
+#: libnautilus-private/nautilus-file-operations.c:1987
 msgid "Can't Move Into Self"
 msgstr "Nemohu přesunout do sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1988
 msgid "Can't Copy Into Self"
 msgstr "Nemohu zkopírovat do sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "You cannot copy a file over itself."
 msgstr "Nemůžete zkopírovat soubor přes sebe."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2002
+msgid "The destination and source are the same file."
+msgstr "Cíl a zdroj jsou tentýž soubor."
+
+#: libnautilus-private/nautilus-file-operations.c:2003
 msgid "Can't Copy Over Self"
 msgstr "Nemohu kopírovat přes sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Chyba při vytváření nového adresáře.\n"
-"\n"
-"Nemáte oprávnění zapisovat do cíle."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "You do not have permissions to write to the destination."
+msgstr "Nemáte oprávnění zapisovat do cíle."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Chyba při vytváření nového adresáře.\n"
-"\n"
-"V cíli již není místo."
+#: libnautilus-private/nautilus-file-operations.c:2057
+#: libnautilus-private/nautilus-file-operations.c:2191
+msgid "There is no space on the destination."
+msgstr "V cíli není místo."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2059
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Chyba \"%s\" při vytváření nového adresáře."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error creating new folder."
+msgstr "Chyba při vytváření nového adresáře."
+
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error Creating New Folder"
 msgstr "Chyba při vytváření nového adresáře"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2153
 msgid "untitled folder"
 msgstr "nepojmenovaný adresář"
 
+#: libnautilus-private/nautilus-file-operations.c:2193
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Chyba \"%s\" při vytváření nového dokumentu."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error creating new document."
+msgstr "Chyba při vytváření nového dokumentu."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error Creating New Document"
+msgstr "Chyba při vytváření nového dokumenntu"
+
+#: libnautilus-private/nautilus-file-operations.c:2344
+msgid "new file"
+msgstr "nový soubor"
+
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2416
 msgid "Deleting files"
 msgstr "Odstraňuji soubory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Files deleted:"
 msgstr "Odstraněné soubory:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2420
+#: libnautilus-private/nautilus-file-operations.c:2455
 msgid "Deleting"
 msgstr "Odstraňuji"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2421
 msgid "Preparing to Delete files..."
 msgstr "Příprava k odstranění souborů..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Emptying the Trash"
 msgstr "Vyprazdňuji koš"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2456
 msgid "Preparing to Empty the Trash..."
 msgstr "Připravuji vyprázdnění koše..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2519
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr "Jste si jisti, že chcete natrvalo odstranit všechny položky v koši?"
+msgstr "Jste si jisti, že chcete odstranit všechny položky z koše?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2533
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Pokud vyprázdníte koš, budou položky natrvalo odstraněny."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2545
 msgid "_Empty"
 msgstr "_Vyprázdnit"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-msgid "foo"
-msgstr "foo"
-
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
-msgid "foo (copy)"
-msgstr "foo (kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2367
-msgid ".bashrc"
-msgstr ".bashrc"
-
-#: libnautilus-private/nautilus-file-operations.c:2367
-msgid ".bashrc (copy)"
-msgstr ".bashrc (kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2368
-msgid ".foo.txt"
-msgstr ".foo.txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2368
-msgid ".foo (copy).txt"
-msgstr ".foo (kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2369
-msgid "foo foo"
-msgstr "foo foo"
-
-#: libnautilus-private/nautilus-file-operations.c:2369
-msgid "foo foo (copy)"
-msgstr "foo foo (kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2370
-msgid "foo.txt"
-msgstr "foo.txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
-msgid "foo (copy).txt"
-msgstr "foo (kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2371
-msgid "foo foo.txt"
-msgstr "foo foo.txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
-msgid "foo foo (copy).txt"
-msgstr "foo foo (kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2372
-msgid "foo foo.txt txt"
-msgstr "foo foo.txt txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2372
-msgid "foo foo (copy).txt txt"
-msgstr "foo foo (kopie).txt txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2373
-msgid "foo...txt"
-msgstr "foo...txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2373
-msgid "foo.. (copy).txt"
-msgstr "foo.. (kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2374
-msgid "foo..."
-msgstr "foo..."
-
-#: libnautilus-private/nautilus-file-operations.c:2374
-msgid "foo... (copy)"
-msgstr "foo... (kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2375
-msgid "foo. (copy)"
-msgstr "foo. (kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2375
-msgid "foo. (another copy)"
-msgstr "foo. (další kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
-msgid "foo (another copy)"
-msgstr "foo (další kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
-msgid "foo (another copy).txt"
-msgstr "foo (další kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2378
-msgid "foo (3rd copy)"
-msgstr "foo (3. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2379
-msgid "foo (3rd copy).txt"
-msgstr "foo (3. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2380
-msgid "foo foo (another copy).txt"
-msgstr "foo foo (další kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2380
-msgid "foo foo (3rd copy).txt"
-msgstr "foo foo (3. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
-msgid "foo (13th copy)"
-msgstr "foo (13. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2381
-msgid "foo (14th copy)"
-msgstr "foo (14. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
-msgid "foo (13th copy).txt"
-msgstr "foo (13. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2382
-msgid "foo (14th copy).txt"
-msgstr "foo (14. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2383
-msgid "foo (21st copy)"
-msgstr "foo (21. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
-msgid "foo (22nd copy)"
-msgstr "foo (22. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2384
-msgid "foo (21st copy).txt"
-msgstr "foo (21. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
-msgid "foo (22nd copy).txt"
-msgstr "foo (22. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
-msgid "foo (23rd copy)"
-msgstr "foo (23. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
-msgid "foo (23rd copy).txt"
-msgstr "foo (23. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
-msgid "foo (24th copy)"
-msgstr "foo (24. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
-msgid "foo (24th copy).txt"
-msgstr "foo (24. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2389
-msgid "foo (25th copy)"
-msgstr "foo (25. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2390
-msgid "foo (25th copy).txt"
-msgstr "foo (25. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2391
-msgid "foo foo (24th copy)"
-msgstr "foo foo (24. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2391
-msgid "foo foo (25th copy)"
-msgstr "foo foo (25. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2392
-msgid "foo foo (24th copy).txt"
-msgstr "foo foo (24. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2392
-msgid "foo foo (25th copy).txt"
-msgstr "foo foo (25. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2393
-msgid "foo foo (100000000000000th copy).txt"
-msgstr "foo foo (100000000000000. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2394
-msgid "foo (10th copy)"
-msgstr "foo (10. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
-msgid "foo (11th copy)"
-msgstr "foo (11. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2395
-msgid "foo (10th copy).txt"
-msgstr "foo (10. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
-msgid "foo (11th copy).txt"
-msgstr "foo (11. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
-msgid "foo (12th copy)"
-msgstr "foo (12. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
-msgid "foo (12th copy).txt"
-msgstr "foo (12. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2400
-msgid "foo (110th copy)"
-msgstr "foo (110. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2400
-msgid "foo (111th copy)"
-msgstr "foo (111. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2401
-msgid "foo (110th copy).txt"
-msgstr "foo (110. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2401
-msgid "foo (111th copy).txt"
-msgstr "foo (111. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2402
-msgid "foo (122nd copy)"
-msgstr "foo (122. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
-msgid "foo (123rd copy)"
-msgstr "foo (123. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2403
-msgid "foo (122nd copy).txt"
-msgstr "foo (122. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
-msgid "foo (123rd copy).txt"
-msgstr "foo (123. kopie).txt"
-
-#: libnautilus-private/nautilus-file-operations.c:2404
-msgid "foo (124th copy)"
-msgstr "foo (124. kopie)"
-
-#: libnautilus-private/nautilus-file-operations.c:2405
-msgid "foo (124th copy).txt"
-msgstr "foo (124. kopie).txt"
-
 #. Today, use special word.
 #. * strftime patterns preceeded with the widest
 #. * possible resulting string for that pattern.
@@ -2882,64 +2455,64 @@ msgstr "foo (124. kopie).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "dnes v 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "dnes v %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "dnes v 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "dnes v %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "dnes, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "dnes, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "dnes"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "v�era v 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "v�era v %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "v�era v 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "v�era v %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "v�era, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "v�era, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "v�era"
 
@@ -2948,143 +2521,143 @@ msgstr "v�era"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Pondělí, 00. �ervenec 0000 v 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y v %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pá, 00. kvě 0000 v 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y v %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pá, 00. kvě 0000 v 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y v %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00. kvÄ› 0000 v 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y v %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00. kvÄ› 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 položek"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 adresářů"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 souborů"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 položka"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 adresář"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 soubor"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u položek"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u adresářů"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u souborů"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? položek"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bajtů"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "neznámý typ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "neznámý typ MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "neznámý"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
-"Nemohu najít popis ano pro \"x-directory/normal\". To pravděpodobně znamená, "
+"Nemohu najít popis ani pro \"x-directory/normal\". To pravděpodobně znamená, "
 "že váš soubor gnome-vfs.keys je na špatném místě nebo z nějakého jiného "
 "důvodu nejde najít."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3093,11 +2666,11 @@ msgstr ""
 "Nebyl nalezen popis typu mime \"%s\" (soubor je \"%s\"), oznamte prosím v "
 "poštovní konferenci gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "odkaz"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "odkaz (neplatný)"
 
@@ -3218,11 +2791,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Hledat soubory podle názvu a vlastností"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonový pohled"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Seznamový pohled"
@@ -3366,148 +2941,146 @@ msgstr "Domov %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1175
 msgid "Computer"
-msgstr "Kuchyňský stůl"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikona souboru"
+msgstr "Po�íta�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "měnitelný text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "měnitelná jmenovka"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "přídavný text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ještě další text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "zvýrazněno pro výběr"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "jestli jsme zvýrazněni pro výběr"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "zvýrazněni jako zaměření klávesnice"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "jestli jsme zvýrazněni pro znázornění zaměření klávesnice"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "zvýrazněno pro puštění"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "jestli jsme zvýrazněni pro D&D puštění"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Výběrový obdélník"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Rámec textu"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Kreslit rámec kolem nevybraného textu"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Barva výběrového ráme�ku"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Barva výběrového ráme�ku"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa výběrového ráme�ku"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Průhlednost výběrového ráme�ku"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alfa zvýraznění"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Průhlednost zvýraznění vybraných ikon"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Světlá barva informací"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Barva používaná pro informa�ní text na tmavém pozadí"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tmavá barva informací"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Barva používaná pro informa�ní text na světlém pozadí"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"Tento adresář používá automatické rozložení. Chcete přepnout na ru�ní "
-"rozložení a nechat tuto položku tam, kde jste ji pustili? Tím změníte "
-"uložené ru�ní rozložení."
+"Chcete přepnout na ru�ní rozložení a nechat tuto položku tam, kde jste ji "
+"pustili? Tím změníte uložené ru�ní rozložení."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Tento adresář používá automatické rozložení."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Tento adresář používá automatické rozložení. Chcete přepnout na ru�ní "
-"rozložení a nechat tyto položky tam, kde jste je pustili? Tím změníte "
-"uložené ru�ní rozložení."
+"Chcete přepnout na ru�ní rozložení a nechat tyto položky tam, kde jste je "
+"pustili? Tím změníte uložené ru�ní rozložení."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Tento adresář používá automatické rozložení. Chcete přepnout na ru�ní "
-"rozložení a nechat tuto položku tam, kde jste ji pustili?"
+"Chcete přepnout na ru�ní rozložení a nechat tuto položku tam, kde jste ji "
+"pustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Tento adresář používá automatické rozložení. Chcete přepnout na ru�ní "
-"rozložení a nechat tyto položky tam, kde jste je pustili?"
+"Chcete přepnout na ru�ní rozložení a nechat tyto položky tam, kde jste je "
+"pustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Přepnout do manuálního rozložení"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Přepnout"
 
@@ -3615,72 +3188,72 @@ msgstr "Je implicitní pro položky \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Je implicitní pro všechny položky \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Změnit \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Nabízet v menu pro položky \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
-msgstr "Použít jako implicitní pro položky \"%s\""
+msgstr "Používat jako implicitní pro položky \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Nabízet v menu jen pro \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
-msgstr "Použít jako implicitní jen pro \"%s\"."
+msgstr "Používat jako implicitní jen pro \"%s\"."
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nenabízet v menu pro položky \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Název"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stav"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Vybrat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Hotovo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
-msgstr "_Modifikovat..."
+msgstr "_Upravit..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Typy souborů a programy"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Jít tam"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3688,48 +3261,48 @@ msgstr ""
 "Můžete nastavit, které programy se nabízejí pro které typy souborů v dialogu "
 "Typy souborů a programy."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Otevřít jinou aplikací"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Vyberte aplikaci, se kterou otevřít \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Otevřít jiným prohlíže�em"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Vyberte pohled pro \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Žádné prohlíže�e nejsou k dispozici pro \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Žádné prohlíže�e nejsou k dispozici"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "S \"%s\" není asociovaná žádná aplikace."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Žádná asociovaná aplikace"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "S \"%s\" není asociovaná žádná akce."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Žádná asociovaná akce"
 
@@ -3737,177 +3310,181 @@ msgstr "Žádná asociovaná akce"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
 "Můžete nastavit GNOME pro asociaci aplikací s typy souborů. Chcete te� "
 "asociovat aplikaci s tímto typem souboru?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Asociovat aplikaci"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Asociovat aplikaci"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Prohlíže� asociovaný s \"%s\" je neplatný."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Asociován neplatný prohlíže�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplikace asociovaná s \"%s\" je neplatná."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Asociována neplatná aplikace"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Akce asociovaná s \"%s\" je neplatná."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Asociována neplatná akce"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"Můžete nastavit GNOME pro asociaci různé aplikace nebo prohlíže�e s tímto "
+"Můžete nastavit GNOME pro asociaci různých aplikací nebo prohlíže�ů s tímto "
 "typem souboru. Chcete te� asociovat aplikaci nebo prohlíže� s tímto typem "
 "souboru?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Asociovat akci"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Asociovat akci"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Otevření selhalo, chcete vybrat jinou aplikaci?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nemůže otevřít \"%s\", protože \"%s\" nemůže přistupovat k souborům v "
-"umístění \"%s\".  Chcete vybrat jinou aplikaci?"
+"umístění \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Otevření selhalo, chcete vybrat jinou akci?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Implicitní akce nemůže otevřít \"%s\", protože nemůže přistupovat k souborům "
-"v umístěních \"%s\". Chcete vybrat jinou akci?"
+"v umístěních \"%s\"."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nemohu otevřít umístění"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "\"%s\" nemůže otevřít \"%s\", protože \"%s\" nemůže přistupovat k souborům v "
-"umístění \"%s\". Žádné jiné aplikace pro prohlížení tohoto souboru nejsou k "
-"dispozici. Pokud zkopírujete tento soubor na váš po�íta�, budete ho možná "
-"moci otevřít."
+"umístění \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"Žádné jiné aplikace pro zobrazení tohoto souboru nejsou k dispozici. Pokud "
+"zkopírujete tento soubor na váš po�íta�, budete ho možná moci otevřít."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Implicitní akce nemůže otevřít \"%s\", protože nemůže přistupovat k souborům "
-"v umístěních \"%s\". Žádné jiné aplikace pro prohlížení tohoto souboru "
-"nejsou k dispozici. Pokud zkopírujete tento soubor na svůj po�íta�, budete "
-"ho možná moci otevřít."
+"v umístěních \"%s\"."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Žádné jiné akce pro zobrazení tohoto souboru nejsou k dispozici. Pokud "
+"zkopírujete tento soubor na váš po�íta�, budete ho možná moci otevřít."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Otevírám %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Lituji, z bezpe�nostních důvodů nemůžete spouštět příkazy ze vzdáleného "
-"po�íta�e."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Lituji, ale nemůžete spouštět příkazy ze vzdáleného po�íta�e."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Toto je zakázáno z důvodů zabezpe�ení."
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "Nemohu spustit vzdálené odkazy"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Vyskytla se chyba při spouštění aplikace.\n"
-"\n"
-"Detaily: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detaily: "
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Při spouštění aplikace došlo k chybě."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Chyba při spouštění aplikace"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Tento cíl upuštění podporuje jen místní soubory."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Tento cíl upuštění podporuje jen místní soubory.\n"
-"\n"
 "Vzdálené soubory můžete otevřít po jejich zkopírování do místního adresáře a "
 "jejich opětovném upuštění."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "Cíl upuštění podporuje jen místní soubory"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Tento cíl upuštění podporuje jen místní soubory.\n"
-"\n"
 "Vzdálené soubory můžete otevřít po jejich zkopírování do místního adresáře a "
-"jejich opětovném upuštění. Místní soubory, které jste upustily, byly již "
+"jejich opětovném upuštění. Místní soubory, které jste upustili, byly již "
 "otevřeny."
 
 #. Human readable description for a criterion in a search for
@@ -4155,14 +3732,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Položky, které v názvu obsahují \"medusa\" a jsou adresáře"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Prohledávám disky"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus hledá na vašich discích adresáře koše."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Upravit"
@@ -4231,7 +3800,7 @@ msgstr "Vl_ožit text"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Zobrazit úložný prostor vašeho po�íta�e"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4246,13 +3815,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Zobrazit váš domovský adresář ve správci souborů Nautilus"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Systém souborů"
+msgstr "Procházet systém souborů"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Procházet systém souborů správcem souborů"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4364,96 +3932,102 @@ msgstr "Pozadí"
 msgid "Empty Trash"
 msgstr "Vyprázdnit koš"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Toto otevře %d samostatných oken. Jste si jisti, že to chcete provést?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Otevřít %d oken?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Jste si jisti, že chcete otevřít všechny soubory?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:156
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Toto otevře %d samostatných oken."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Jste si jisti, že chcete natrvalo odstranit \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Jste si jisti, že chcete natrvalo odstranit vybraných %d položek?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "fPokud odstraníte položku, bude natrvalo ztracena."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Odstranit?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Vyberte kategorii:"
+msgstr "Zvolte vzorek"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Vzorky"
+msgstr "_Vzorek:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" vybrán"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 adresář vybrán"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d adresářů vybráno"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (obsahuje 0 položek)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (obsahuje 1 položku)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (obsahuje %d položek)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (obsahuje celkem 0 položek)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (obsahuje celkem 1 položku)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (obsahuje celkem %d položek)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" vybrán (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d položek vybráno (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 jiná položka vybrána (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d jiných položek vybráno (%s)"
@@ -4465,7 +4039,7 @@ msgstr "%d jiných položek vybráno (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4474,116 +4048,122 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
-msgstr ""
-"Adresář \"%s\" obsahuje více souborů, než může Nautilus zvládnout. Některé "
-"soubory nebudou zobrazeny"
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
+msgstr "Adresář \"%s\" obsahuje více souborů, než může Nautilus zvládnout."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Některé soubory nebudou zobrazeny."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Příliš mnoho souborů"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr "Nemohu přesunout \"%s\" do koše. Chcete jej odstranit ihned?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "Nemohu přesunout soubor do koše, chcete jej odstranit ihned?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr ""
-"%d vybraných položek nelze přesunout do koše. Chcete je odstranit ihned?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Soubor \"%s\" nemůže být přesunut do koše."
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Nemohu přesunout položky do koše, Chcete je odstranit ihned?"
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d z vybraných položek nelze přesunout do koše. Chcete těchto %d položek "
-"odstranit ihned?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Nemohu přesunout některé položky do koše, chcete je odstranit ihned?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Odstranit ihned?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Jste si jisti, že chcete z koše natrvalo odstranit \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Jste si jisti, že chcete z koše natrvalo odstranit %d vybraných položek?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Pokud odstraníte položku, bude natrvalo ztracena."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Odstranit z koše?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Použít \"%s\" k otevření vybrané položky"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Jiná _aplikace..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Aplikace..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Jiný _prohlíže�..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Prohlíže�..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nemohu dokon�it zadanou akci: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nemohu dokon�it zadanou akci."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Spustit \"%s\" na vybraných souborech"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Vytvořit dokument ze šablony \"%s\""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Všechny spustitelné soubory z tohoto adresáře se objeví v menu skriptů."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Všechny spustitelné soubory z tohoto adresáře se objeví v menu skriptů. "
-"Výběr skriptu z tohoto menu tento skript spustí s vybranými položkami jako "
-"vstup."
+"Výběr skriptu z tohoto menu skript spustí s vybranými položkami jako vstup."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "O skriptech"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4623,185 +4203,178 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: pozice a velikost aktuálního okna"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" bude přesunut, pokud vyberete příkaz Vložit soubory"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" bude zkopírován, pokud vyberete příkaz Vložit soubory"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "%d vybraných položek bude přesunuto, pokud vyberete příkaz Vložit soubory"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d vybraných položek bude zkopírováno, pokud vyberete příkaz Vložit soubory"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Ve schránce není nic ke vložení"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Chyba při připojení"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Chyba při odpojení"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Chyba při připojení"
+msgstr "Chyba při vysouvání"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "V_ysunout"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Odpojit svazek"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "Ot_evřít v novém okně"
+msgstr "Otevřít v novém okně"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Ot_evřít v %d nových oknech"
+msgstr "Otevřít v %d nových oknech"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Domovský adresář"
+msgstr "Procházet adresář"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Domovský adresář"
+msgstr "Procházet adresáře"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Odstranit z _koše"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Natrvalo odstranit všechny vybrané položky"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Pře_sunout do koše"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Přesunout všechny vybrané položky do koše"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Odstranit"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "V_ytvořit odkazy"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "V_ytvořit odkaz"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Vyprázdnit koš"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Vyjmout soubor"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Vyjmout soubory"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopírovat soubor"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopírovat soubory"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Tento odkaz nelze použít, protože nemá cíl. Chcete tento odkaz přesunout do "
-"koše?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Tento odkaz je přerušen, Chcete jej přesunout do koše?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Tento odkaz nelze použít, protože nemá cíl."
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Tento odkaz nelze použít, protože jeho cíl \"%s\" neexistuje. Chcete tento "
-"odkaz přesunout do koše?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Tento odkaz nelze použít, protože jeho cíl \"%s\" neexistuje."
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Neplatný odkaz"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"\"%s\" je spustitelný textový soubor. Chcete jej spustit nebo zobrazit jeho "
-"obsah?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Chcete spustit \"%s\" nebo zobrazit jeho obsah?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "\"%s\" je spustitelný textový soubor."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Spustit nebo zobrazit?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Zobrazit"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Spustit v _terminálu"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Zobrazit"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Spustit"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Otevírám \"%s\""
+msgid "Opening \"%s\"."
+msgstr "Otevírám \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Zrušit otevření?"
 
@@ -4822,29 +4395,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Lituji, nemohu zobrazit celý obsah \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "Obsah adresáře nebylo možné zobrazit."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Chyba při zobrazování adresáře"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
 "Název \"%s\" je v tomto adresáři již použit. Použijte prosím jiný název."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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\" v tomto adresáři neexistuje. Možná byl právě přesunut �i odstraněn?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nemáte oprávnění potřebná k přejmenování \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4853,83 +4430,99 @@ msgstr ""
 "Název \"%s\" není platný, protože obsahuje znak \"/\". Použijte prosím jiný "
 "název."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Název \"%s\" není platný. Použijte prosím jiný název."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 "Nemohu přejmenovat \"%s\", protože je na disku připojeném jen ke �tení"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Lituji, nemohu přejmenovat \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Položka nemohla být přejmenována."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Chyba při přejmenování"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nemáte oprávnění potřebná ke změně skupiny \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nemohu změnit skupinu \"%s\", protože je na disku připojeném jen ke �tení"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Lituji, nemohu změnit skupinu \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Skupina nemohla být změněna."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Chyba při změně skupiny"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nemohu změnit vlastníka \"%s\", protože je na disku připojeném jen ke �tení"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Lituji, nemohu změnit vlastníka \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Vlastník nemohl být změněn."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Chyba při změně vlastníka"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Nemohu změnit oprávnění \"%s\", protože je na disku připojeném jen ke �tení"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Lituji, nemohu změnit práva \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Oprávnění nemohla být změněna."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Chyba při změně práv"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Přejmenovávám \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Zrušit přejmenování?"
 
@@ -4987,128 +4580,130 @@ msgstr "Obnovit původní _velikosti ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Obnovit původní _velikost ikony"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ukazující na \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Přetažení objektů není podporováno."
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Přetažení objektů je podporováno jen na místních systémech souborů."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Chyba přetažení objektů"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Byl použit neplatný typ přetažení."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Velikost"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Datum změny"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
-"Nemůžete přiřadit více než jednu vlastní ikonu! Přetáhněte a pusťte prosím "
-"jen jeden obrázek pro nastavení vlastní ikony."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "Nemůžete najednou přiřadit více než jednu vlastní ikonu!"
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Nastavte prosím vlastní ikonu přetažením jen jednoho obrázku."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Více než jeden obrázek"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Soubor který, jste pustili, není místní. Jako vlastní ikony můžete použít "
-"jen místní obrázky."
+msgid "The file that you dropped is not local."
+msgstr "Soubor který, jste pustili, není místní."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Jako vlastní ikony můžete použít jen místní obrázky."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Jen místní obrázky"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Soubor, který jste pustili, není obrázek. Jako vlastní ikony můžete použít "
-"jen místní obrázky."
+msgid "The file that you dropped is not an image."
+msgstr "Soubor který, jste pustili, není obrázek."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Jen obrázky"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Vlastnosti %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Zrušit změnu skupiny?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "Měním skupinu"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Měním skupinu."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Zrušit změnu vlastníka?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "Měním vlastníka"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Měním vlastníka."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nic"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ne�itelné"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 položka s velikostí %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d položek, celkem %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(některý obsah ne�itelný)"
 
@@ -5118,191 +4713,186 @@ msgstr "(některý obsah ne�itelný)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Obsah:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Základní"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Názvy:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:190
 msgid "_Name:"
 msgstr "_Název:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Umístění:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Svazek:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Volné místo:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Cíl odkazu:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Změněný:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Použitý:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Vybrat vlastní ikonu..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Odstranit vlastní ikonu"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Čtení"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Zápis"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Spouštění"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Nastavit ID _uživatele"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Speciální příznaky:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Nastavit ID _skupiny"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nejste vlastník, a proto nemůžete měnit tato oprávnění."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "_Vlastník souboru:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Vlastník souboru:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Skupina souboru:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Skupina souboru:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Skupina:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Ostatní:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Textový pohled:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Číselný pohled:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Poslední změna:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Oprávnění \"%s\" nebylo možné zjistit."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Oprávnění vybraného souboru nebylo možné zjistit."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Při zobrazování nápovědy se vyskytla chyba: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Došlo k chybě při zobrazování nápovědy."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr "Nemohu zobrazit nápovědu"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Zrušit zobrazování okna vlastností?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "Vytvářím okno vlastností"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Vytvářím okno vlastností."
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Vyberte ikonu"
 
@@ -5320,97 +4910,109 @@ msgid "Search Results"
 msgstr "Výsledky hledání"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Lituji, ale služba hledání Medusa není k dispozici, protože není "
-"nainstalovaná."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Lituji, ale vyhledávací služba Medusa není k dispozici."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa není nainstalována."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Služba hledání není k dispozici"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "Hledání, které jste vybrali, je novější, než index vašeho systému. Hledání "
-"te� nevrátí žádné výsledky. Nový index můžete vytvořit spuštěním \"medusa-"
-"indexd\" na příkazovém řádku jako root."
+"te� nevrátí žádné výsledky."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Nový index můžete vytvořit spuštěním \"medusa-indexd\" na příkazovém řádku "
+"jako root."
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr "Hledání položek, které jsou příliš nové"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Každý indexovaný soubor na vašem po�íta�i vyhovuje vámi vybraným kritériím."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Každý indexovaný soubor na vašem po�íta�i vyhovuje vámi vybraným kritériím. "
 "Zkontrolujte překlepy ve vašem výběru nebo zužte výsledky přidáním dalších "
 "kritérií."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Chyba při hledání"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Hledání nemohlo najít váš index systému souborů. Váš index může chybět nebo "
-"být poškozen. Nový index můžete vytvořit spuštěním \"medusa-indexd\" na "
-"příkazovém řádku jako root."
+"Hledání nemohlo otevřít váš index systému souborů. Váš index může chybět "
+"nebo být poškozen."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr "Chyba při �tení indexu souborů"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Při na�ítání obsahu tohoto hledání se vyskytla chyba: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Při na�ítání obsahu tohoto hledání došlo k chybě."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr "Pro rychlé hledání je potřeba index souborů ve vašem systému."
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Aby bylo možné hledat v obsahu, je potřeba index souborů ve vašem systému."
+
+#: src/file-manager/fm-search-list-view.c:245
 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 ""
-"Aby bylo možné hledat rychle, je potřeba index souborů ve vašem systému. "
 "Hledání momentálně nemůže přistupovat k indexu, takže bude provedeno "
 "pomalejší hledání, které index nepoužívá."
 
-#: src/file-manager/fm-search-list-view.c:249
-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 ""
-"Aby bylo možné hledat v obsahu, je potřeba index souborů ve vašem systému. "
-"Hledání momentálně nemůže přistupovat k indexu."
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Hledání momentálně nemůže přistupovat k vašemu indexu."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr "Rychlé hledání není k dispozici"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
-msgstr "Hledání obsahu není k dispozici"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Hledání v obsahu není k dispozici"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5424,56 +5026,75 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Aby bylo možné hledat rychle, je potřeba index souborů ve vašem systému. "
-"Tento index se právě vytváří. Protože Hledání nemůže použít index, může "
-"hledání trvat několik minut."
+"Aby bylo možné hledat rychle, je potřeba index souborů ve vašem systému. Váš "
+"po�íta� tento index právě vytváří."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Aby bylo možné hledat v obsahu, je potřeba index souborů ve vašem systému. "
-"Tento index se právě vytváří. Hledání v obsahu bude k dispozici, až bude "
-"index hotov."
+"Váš po�íta� tento index právě vytváří."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"Protože hledání nemůže použít index, toto hledání může trvat nekolik minut."
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Hledání v obsahu budou k dispozici, až bude index dokon�en."
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr "Hledání v indexu není k dispozici"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 "Aby bylo možné hledat rychle, je potřeba index souborů ve vašem systému. "
-"Tento index není momentálně k dispozici. Index můžete vytvořit spuštěním "
-"\"medusa-indexd\" na příkazovém řádku jako root. Dokud nebude k dispozici "
-"index, může hledání trvat několik minu."
+"Momentálně není žádný index k dispozici."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 "Aby bylo možné hledat v obsahu, je potřeba index souborů ve vašem systému. "
-"Tento index není momentálně k dispozici. Index můžete vytvořit spuštěním "
-"\"medusa-indexd\" na příkazovém řádku jako root. Dokud nebude k dispozici "
-"index, nelze hledat v obsahu."
+"Momentálně není žádný index k dispozici."
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Index můžete vytvořit spuštěním \"medusa-indexd\" na příkazovém řádku jako "
+"root. Dokud nebude k dispozici úplný index, může hledání trvat několik minut."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Index můžete vytvořit spuštěním \"medusa-indexd\" na příkazovém řádku jako "
+"root. Dokud nebude k dispozici úplný index, nelze hledat v obsahu."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Rychlé hledání na vašem po�íta�i není povoleno."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5482,11 +5103,11 @@ msgstr ""
 "Aby bylo možné hledat rychle, je potřeba index souborů ve vašem systému. Váš "
 "správce systému zakázal rychlé hledání, takže index není k dispozici."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Rychlé hledání na vašem po�íta�i povoleno"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Rychlé hledání není povoleno"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Kde"
 
@@ -5495,7 +5116,7 @@ msgstr "Kde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Ukázat v novém okně"
@@ -5506,7 +5127,7 @@ msgstr "_Ukázat v novém okně"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Ukázat v %d _nových oknech"
@@ -5515,15 +5136,15 @@ msgstr "Ukázat v %d _nových oknech"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"Nautilus našel více výsledků hledání, než může zobrazit. Některé "
-"odpovídající položky nebudou zobrazeny. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus našel více výsledků hledání, než může zobrazit."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Některé odpovídající položky nebudou zobrazeny. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Příliš mnoho výsledků"
 
@@ -5537,12 +5158,12 @@ msgid "Create L_auncher"
 msgstr "Vytvořit s_pouště�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Vytvořit nový spouště�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Odstranit všechny položky z koše"
 
@@ -5563,7 +5184,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Použít _implicitní pozadí"
@@ -5585,58 +5206,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Vyberte jiný prohlíže�, se kterým prohlížet vybranou položku"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "Vytvořit _dokument"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "Vytvořit _adresář"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Vytvořit nový prázdný soubor uvnitř tohoto adresáře"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Vytvořit nový prázdný adresář uvnitř tohoto adresáře"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Vytvořit symbolický odkaz na každou vybranou položku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplikovat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Odstranit každou vybranou položku bez přesunu do koše"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplikovat každou vybranou položku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Upravit spouště�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Změnit parametry spouště�e"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formátovat vybraný svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Vlastnosti médi_a"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Odpojit vybraný svazek"
+msgstr "Připojit vybraný svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Přesunout nebo zkopírovat soubory dříve vybrané příkazem Vyjmout soubory "
 "nebo Kopírovat soubory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5644,129 +5272,132 @@ msgstr ""
 "Přesunout nebo zkopírovat soubory dříve vybrané příkazem Vyjmout soubory "
 "nebo Kopírovat soubory do vybraného adresáře"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Nenainstalovány žádné šablony"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "O_tevřít s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Otevřít vybranou položku v novém okně"
+msgstr "Otevřít každou vybranou položku v naviga�ním okně"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "Ot_evřít v novém okně"
+msgstr "Otevřít v naviga�ním okně"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otevřít vybranou položku v tomto okně"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Připravit vybrané soubory ke kopírování příkazem Vložit soubory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Připravit vybrané soubory k přesunutí příkazem Vložit soubory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Och_ránit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Ochránit vybraný svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Přejmenovat vybranou položku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Obnovit pohled na _implicitní"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Obnovit pořadí třídění a úroveň zvětšení podle nastavení pro tento pohled"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Spustit nebo upravit skripty z ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Vybr_at všechny soubory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "_Vzorky"
+msgstr "Zvolte _vzorek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Vybrat všechny položky v tomto okně"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Vybrat všechny položky v tomto okně"
+msgstr "Vybrat položky v tomto okně odpovídající zadanému vzorku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Zobrazit vlastnosti média pro vybraný svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Zobrazit adresář, ve kterém jsou skripty z tohoto menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Odpojit vybraný svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Použít implicitní pozadí pro toto umístění"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Prohlížet nebo modifikovat vlastnosti každé vybrané položky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "_Prázdný soubor"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formátovat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "_Odpojit svazek"
+msgstr "_Připojit svazek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Otevřít adresář skriptů"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Vl_ožit soubory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Vl_ožit soubory do adresáře"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Přejmenovat..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skripty"
 
@@ -5851,7 +5482,12 @@ msgstr "_Ru�ně"
 msgid "Indexing is %d%% complete."
 msgstr "Indexování je z %d%% hotové."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Vaše soubory byly naposled indexovány v %s."
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5859,25 +5495,27 @@ msgstr ""
 "Jednou za den jsou vaše soubory a textový obsah indexovány, aby bylo vaše "
 "hledání rychlé. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Stav indexování"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Vaše soubory byly naposled indexovány v %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Vaše soubory se právě indexují."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Jednou za den jsou vaše soubory a textový obsah indexovány, aby bylo vaše "
-"hledání rychlé. Vaše soubory se právě indexují."
+"hledání rychlé. "
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Momentálně neexistuje index vašich souborů."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5887,15 +5525,19 @@ msgstr ""
 "vyhledávání. Rychlé hledání není na vašem po�íta�i povoleno, takže "
 "momentálně nemáte index."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Momentálně neexistuje index vašich souborů."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Chybí index souborů"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Lituji, ale vyhledávací služba medusa není k dispozici."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Zkontrolujte prosím, že medusa byla správně nastavena."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5919,59 +5561,58 @@ msgstr "Zobrazovat stav _indexování"
 msgid "Show status of indexing used when searching"
 msgstr "Zobrazovat stav indexování používaného při hledání"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nemohu vytvořit potřebný adresář"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nemohu vytvořit potřebný adresář \"%s\"."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus nemohl vytvořit potřebný adresář \"%s\". Před spuštěním aplikace "
-"Nautilus vytvořte prosím tento adresář nebo nastavte oprávnění tak, aby ho "
-"Nautilus mohl vytvořit."
+"Před spuštěním Nautilu prosím vytvořte tento adresář nebo nastavte oprávnění "
+"tak, aby ho Nautilus mohl vytvořit."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nemohu vytvořit potřebné adresáře"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus nemohl vytvořit následující vyžadované adresáře: %s"
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus nemohl vytvořit následující potřebné adresáře:\n"
-"\n"
-"%s\n"
-"\n"
 "Před spuštěním Nautilu prosím vytvořte tyto adresáře nebo nastavte oprávnění "
 "tak, aby je Nautilus mohl vytvořit."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Odkaz na starou plochu"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr "Na pracovní ploše byl vytvořen odkaz \"Odkaz na starou plochu\"."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Umístění adresáře pracovní plochy se v GNOME 2.4 změnilo. Na vaší pracovní "
-"ploše byl vytvořen odkaz pojmenovaný \"Odkaz na starou plochu\". Můžete "
-"otevřít tento odkaz a přemístit soubory, které chcete, a poté tento odkaz "
-"smazat."
+"Umístění adresáře pracovní plochy se v GNOME 2.4 změnilo. Můžete otevřít "
+"tento odkaz a přemístit soubory, které chcete, a poté tento odkaz smazat."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr "Přestěhovaná stará pracovní plocha"
 
 #. Can't register myself due to trouble locating the
@@ -5984,7 +5625,7 @@ msgstr "Přestěhovaná stará pracovní plocha"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5995,7 +5636,7 @@ msgstr ""
 "znovu nainstalovat Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6041,12 +5682,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nyní nelze Nautilus použít kvůli neo�ekávané chybě."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6054,7 +5695,7 @@ msgstr ""
 "Nyní nelze Nautilus použít kvůli neo�ekávané chybě z Bonobo při pokusu "
 "registrovat server pohledu správce souborů."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6064,7 +5705,7 @@ msgstr ""
 "nalézt továrnu. Problém možná vyřešíte zabitím bonobo-activation-server a "
 "restartováním Nautilu."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6074,13 +5715,24 @@ msgstr ""
 "nalézt objekt shellu. Problém možná vyřešíte zabitím bonobo-activation-"
 "server a restartováním Nautilu."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Při zobrazování nápovědy se vyskytla chyba: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nedefinovány žádné záložky"
 
 #: src/nautilus-bookmarks-window.glade.h:1
 msgid "<b>_Bookmarks</b>"
-msgstr "<b>_Záložky</b>"
+msgstr "<b>Zá_ložky</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:2
 msgid "<b>_Location</b>"
@@ -6105,39 +5757,44 @@ msgstr "Méně možností"
 #. Create button first so we can use it for auto_click
 #: src/nautilus-complex-search-bar.c:227 src/nautilus-simple-search-bar.c:125
 msgid "Find Them!"
-msgstr "Najdi je!"
+msgstr "Hledat je!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Musíte zadat název serveru."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Nemohu přesunout do sebe"
+msgid "Please enter a name and try again."
+msgstr "Zadejte prosím název a zkuste to znovu."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Nemohu se připojit k serveru"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" není platné umístění. Zkontrolujte prosím překlepy a zkuste to znovu."
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" není platné umístění."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Zkontrolujte prosím překlepy a zkuste to znovu."
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Síťové servery"
+msgstr "Připojit se k serveru"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Název:"
+#: src/nautilus-connect-server-dialog.c:209 src/nautilus-location-dialog.c:147
+msgid "_Location:"
+msgstr "_Umístění:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
-msgid "Connect"
+#: src/nautilus-connect-server-dialog.c:235
+msgid "C_onnect"
 msgstr "_Připojit"
 
 #: src/nautilus-desktop-window.c:356
@@ -6234,7 +5891,7 @@ msgstr "Po�ítat _po�et položek:"
 
 #: src/nautilus-file-management-properties.glade.h:46
 msgid "Default _zoom level:"
-msgstr "Implicitní úroveň _zvětšení:"
+msgstr "Implicitní úroveň z_většení:"
 
 #: src/nautilus-file-management-properties.glade.h:47
 msgid "File Management Preferences"
@@ -6242,7 +5899,7 @@ msgstr "Nastavení správy souborů"
 
 #: src/nautilus-file-management-properties.glade.h:48
 msgid "I_nclude a Delete command that bypasses Trash"
-msgstr "_Nabídnout příkaz Odstranit, který nepoužívá koš"
+msgstr "_Nabízet příkaz Odstranit, který nepoužívá koš"
 
 #: src/nautilus-file-management-properties.glade.h:49
 msgid "Icon Captions"
@@ -6258,7 +5915,7 @@ msgstr "Nikdy"
 
 #: src/nautilus-file-management-properties.glade.h:56
 msgid "Preview _sound files:"
-msgstr "Ukázky _zvukových souborů"
+msgstr "_Ukázky zvukových souborů:"
 
 #: src/nautilus-file-management-properties.glade.h:57
 msgid "Show _only folders"
@@ -6270,11 +5927,11 @@ msgstr "Zobrazovat _náhledy:"
 
 #: src/nautilus-file-management-properties.glade.h:59
 msgid "Show hidden and _backup files"
-msgstr "Zobrazovat skryté a _záložní soubory"
+msgstr "Zobrazovat _skryté a záložní soubory"
 
 #: src/nautilus-file-management-properties.glade.h:60
 msgid "Show te_xt in icons:"
-msgstr "Zobrazovat te_xt v ikonách:"
+msgstr "Zobrazovat _text v ikonách:"
 
 #: src/nautilus-file-management-properties.glade.h:61
 msgid "Sort _folders before files"
@@ -6306,7 +5963,7 @@ msgstr "_Jen pro soubory menší než:"
 
 #: src/nautilus-file-management-properties.glade.h:69
 msgid "_Run executable text files when they are clicked"
-msgstr "S_pustit spustitelné textové soubory, když je na ně kliknuto"
+msgstr "_Spustit spustitelné textové soubory, když je na ně kliknuto"
 
 #: src/nautilus-file-management-properties.glade.h:70
 msgid "_Single click to activate items"
@@ -6318,7 +5975,7 @@ msgstr "_Text vedle ikon"
 
 #: src/nautilus-file-management-properties.glade.h:72
 msgid "_Use compact layout"
-msgstr "Použít ko_mpaktní rozložení"
+msgstr "Používat _kompaktní rozložení"
 
 #: src/nautilus-file-management-properties.glade.h:73
 msgid "_View executable text files when they are clicked"
@@ -6336,6 +5993,14 @@ msgstr ""
 "\n"
 "Druida můžete znovu zobrazit ru�ním smazáním tohoto souboru.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "Nemůžete najednou přiřadit více než jednu vlastní ikonu!"
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Jako vlastní ikony můžete použít jen obrázky."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6346,144 +6011,144 @@ msgstr "Otevřít s %s"
 msgid "Open with..."
 msgstr "Otevřít s..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Nemohu spustit aplikaci vypalova�e cd:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:484
+msgid "Unable to launch the cd burner application."
+msgstr "Nemohu spustit aplikaci vypalova�e cd."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "Nemohu spustit vypalova� cd"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
+msgid "Can't Launch CD Burner"
+msgstr "Nemohu spustit vypalova� CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Vyprázdnit _koš"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Zapsat obsah na CD"
 
-#: src/nautilus-location-bar.c:62
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "Jdi na:"
 
 #: src/nautilus-location-bar.c:154
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Chcete prohlédnout těchto %d umístění v samostatných oknech?"
+msgid "Do you want to view %d locations?"
+msgstr "Chcete zobrazit těchto %d umístění?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:166
 msgid "View in Multiple Windows?"
 msgstr "Otevřít ve více oknech?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Nemohu otevřít umístění"
+msgstr "Otevřít umístění"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Provést rychlou sadu kontrol sebe sama."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Vytvořit první okno se zadanou geometrií"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Vytvořit jen okna pro výslovně zadaná URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Nespravovat pracovní plochy (ignorovat volbu v dialogu Nastavení)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "otevřít okno prohlíže�e."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Skon�it Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Restartovat Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Správce souborů"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:271
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:173
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nemůže být použito s URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nemůže být použito s jinými volbami.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nemůže být použito s URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nemůže být použito s URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nemůže být použito s více než jedním 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Jste si jisti, že chcete zapomenout historii? Pokud ano, je váš osud ji "
-"zopakovat."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Jste si jisti, že chcete zapomenout historii?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Pokud ano, je váš osud ji zopakovat."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Jste si jisti, že chcete vymazat seznam navštívených umístění?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Pokud vyprázdníte seznam umístění, budou položky natrvalo odstraněny."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Vymazat historii"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
-msgstr ""
-"Umístění \"%s\" neexistuje. Chcete z vašeho seznamu odstranit všechny "
-"záložky s tímto umístěním?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr "Chcete ze seznamu ostranit záložky s neexistujícím umístěním?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Umístění \"%s\" neexistuje."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Záložka pro neexistující umístění"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -6516,15 +6181,13 @@ msgid "Close _All Windows"
 msgstr "Z_avřít všechna okna"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Zavřít všechna okna Nautilu"
+msgstr "Zavřít všechna naviga�ní okna"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Připojit se k _serveru..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6532,159 +6195,166 @@ msgstr "Zobrazit okno, které umožňuje upravit záložky v tomto menu"
 
 #: src/nautilus-navigation-window-ui.xml.h:12 src/nautilus-shell-ui.xml.h:10
 msgid "Find"
-msgstr "Najít"
+msgstr "Hledat"
 
 #: src/nautilus-navigation-window-ui.xml.h:13
 msgid "Forward"
 msgstr "Vpřed"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Jít do adresáře šablon"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Jít na následující navštívené umístění"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Jít na předchozí navštívené umístění"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Jít do adresáře koše"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Domů"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Lišta _umístění"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Obnovit"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Hledat soubory na tomto po�íta�i"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_avová lišta"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Zapsat na CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Přidat záložku"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Zpět"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Záložky"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Vymazat historii"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Kuchyňský stůl"
+msgstr "_Po�íta�"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Upravit záložky"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Vpřed"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Jdi"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Domů"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Umístění..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Bo�ní panel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Å ablony"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Koš"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Nahoru"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: src/nautilus-navigation-window.c:338
+#: src/nautilus-navigation-window.c:337
 msgid "Information"
 msgstr "Informace"
 
 #. Add "View as..." extra bonus choice.
-#: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-navigation-window.c:701 src/nautilus-shell-ui.xml.h:27
 msgid "View as..."
 msgstr "Zobrazit jako..."
 
-#: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#: src/nautilus-navigation-window.c:733
+#, c-format
 msgid "File Browser: %s"
-msgstr "Vlastník souboru:"
+msgstr "Prohlíže� souborů: %s"
 
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"V jednom z panelů bo�ního panelu došlo k chybě a on nemůže pokra�ovat. "
-"Bohužel nevím, který."
+#: src/nautilus-navigation-window.c:1104
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "V jednom z bo�ních panelů došlo k chybě a on nemůže pokra�ovat."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"V panelu bo�ního panelu %s došlo k chybě a on nemůže pokra�ovat. Pokud se to "
-"bude opakovat, možná byste měli tento panel vypnout."
+#: src/nautilus-navigation-window.c:1105
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Bohužel jsem nepoznal, ve kterém."
 
 #: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "V bo�ním panelu %s došlo k chybě a on nemůže pokra�ovat."
+
+#: src/nautilus-navigation-window.c:1109
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Pokud se to bude opakovat, možná byste měli tento panel vypnout."
+
+#: src/nautilus-navigation-window.c:1112
 msgid "Side Panel Failed"
 msgstr "Bo�ní panel selhal"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1243
 msgid "Side Pane"
 msgstr "Bo�ní panel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1245
 msgid "Contains a side pane view"
 msgstr "Obsahuje pohled bo�ního panelu"
 
@@ -6718,147 +6388,175 @@ msgstr "_Přidat nové..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Lituji, ale vzorek %s nelze odstranit."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Zkontrolujte, že máte oprávnění odstranit vzorek."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Nemohu odstranit vzorek"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Lituji, ale emblém %s nelze odstranit."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Zkontrolujte, že máte oprávnění odstranit embl0m."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Nemohu ostranit emblém"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Vytvořit nový emblém:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Klí�ové slovo:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Obrázek:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Vyberte obrázek pro nový emblém:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Vytvořit novou barvu:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Název barvy:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Hodnota barvy:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Lituji, ale \"%s\" není platný název souboru."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Lituji, ale nezadali jste platný název souboru."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Zkuste to prosím znovu."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Nemohu nainstalovat vzorek"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Lituji, ale nemůžete nahradit obrázek Vymazat"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Vymazat je speciální obrázek, který nemůže být odstraněn."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Není obrázek"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Lituji, ale vzorek %s nelze nainstalovat."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Vyberte soubor s obrázkem pro přidání jako vzorek"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Barva nemohla být nainstalována."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Lituji, ale musíte zadat neprázdný název pro novou barvu."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Nemohu nainstalovat barvu"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Vyberte barvu pro přidání"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Lituji, ale '%s' není použitelný soubor obrázku!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Lituji, ale \"%s\" není použitelný soubor obrázku."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Soubor není obrázek."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Vyberte kategorii:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Z_rušit odstranění"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Přidat nový vzorek..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Přidat novou barvu..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Přidat nový emblém..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Vzorek odstraníte kliknutím na něj"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Barvu odstraníte kliknutím na ni"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Emblém odstraníte kliknutím na něj"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Vzorky:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Barvy:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblémy:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Odstranit vzorek..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Odstranit barvu..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Odstranit emblém..."
 
@@ -7155,7 +6853,7 @@ msgstr "Zapsat obsah na CD"
 
 #: src/nautilus-shell-ui.xml.h:29
 msgid "Zoom _In"
-msgstr "Zvětš_it"
+msgstr "Z_většit"
 
 #: src/nautilus-shell-ui.xml.h:30
 msgid "Zoom _Out"
@@ -7243,47 +6941,44 @@ msgid "Show %s"
 msgstr "Zobrazit %s"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "Tvůrce _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "Z_avřít všechna okna"
+msgid "Close P_arent Folders"
+msgstr "Zavřít ro_di�ovské adresáře"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Zavřít rodi�e tohoto adresáře"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Jít do adresáře prázdného CD"
+msgstr "Jít do po�íta�e"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "Jít do adresáře koše"
+msgstr "Jít do tvůrce CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "_Umístění..."
+msgstr "Otevřít _umístění..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "Otevřít _rodi�e"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Items that are ]adresáře"
+msgstr "Otevřít rodi�ovský adresář"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Vzorky"
+msgstr "_Místa"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
-msgstr "Najít:"
+msgstr "Hledat:"
 
 #: src/nautilus-view-frame.c:595
 msgid "a title"
@@ -7299,7 +6994,7 @@ msgstr "aktuální výběr"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "typ okna, ve kterém je pohled vložen"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
@@ -7307,108 +7002,125 @@ msgstr "Pohled selhal"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"V pohledu %s nastala chyba a on nemůže pokra�ovat. Můžete zvolit jiný pohled "
-"nebo přejít na jiné umístění."
+msgid "The %s view encountered an error and can't continue."
+msgstr "V pohledu %s došlo k chybě a on nemůže pokra�ovat."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Můžete zvolit jiný pohled nebo přejít na jiné umístění."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Pohled %s měl problém při startu."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Toto umístění nemůže být zobrazeno tímto prohlíže�em."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Pohled obsahu"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Pohled na aktuální soubor nebo adresář"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Nemohu najít \"%s\". Zkontrolujte prosím překlepy a zkuste to znovu."
+msgid "Couldn't find \"%s\"."
+msgstr "Nemohu najít \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Nemohu zobrazit \"%s\", protože Nautilus nemůže zjistit, jaký je to typ "
-"souboru."
+msgid "Couldn't display \"%s\"."
+msgstr "Nemohu zobrazit \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus nemá nainstalován žádný prohlíže� schopný zobrazit \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus nemůže zjistit, jaký je to typ souboru."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
-"Nemohu zobrazit \"%s\", protože Nautilus nemůže obsloužit umístění %s:."
+"Nautilus nemá nainstalován žádný prohlíže� schopný zobrazit tento soubor."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "Nemohu zobrazit \"%s\", protože selhal pokus přihlásit se."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus neumí obsloužit umístění %s:."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Nemohu zobrazit \"%s\", protože přístup byl odmítnut."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Pokus přihlásit se selhal."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Přístup byl odepřen."
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Nemohu zobrazit \"%s\", protože nebyl nalezen po�íta� \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
-"Nemohu zobrazit \"%s\", protože nemohl být nalezen žádný po�íta� \"%s\". "
-"Zkontrolujte překlepy a vaše nastavení proxy."
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr " Zkontrolujte překlepy a vaše nastavení proxy."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr "Nemohu zobrazit \"%s\". Zkontrolujte vaše nastavení proxy."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Zkontrolujte vaše nastavení proxy."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 "Nemohu zobrazit \"%s\", protože Nautilus nemůže kontaktovat hlavní "
-"vyhledáva� SMB.\n"
-"Zkontrolujte, že na místní síti běží server SMB."
+"vyhledáva� SMB."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Zkontrolujte, že na místní síti běží SMB server."
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Hledání momentálně není k dispozici, protože bu� nemáte index, nebo neběží "
-"vyhledávací služba. Zkontrolujte, že jste spustili vyhledávací službu "
-"Medusa, a pokud nemáte index, že běží indexovací služba Medusy."
+"vyhledávací služba."
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Zkontrolujte, že jste spustili vyhledávací službu Medusa, a pokud nemáte "
+"index, že běží indexovací služba Medusy."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Hledání není k dispozici"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nemůže zobrazit \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Vyberte prosím jiný prohlíže� a zkuste to znovu."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Nemohu zobrazit umístění"
 
@@ -7420,7 +7132,7 @@ msgstr "Jdi na umístění definované touto záložkou"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright ©1999-2001 Eazel, Inc."
 
@@ -7428,14 +7140,14 @@ msgstr "Copyright ©1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Do �eštiny Nautilus přeložil Jirka\n"
 "Michal Bukovjan <bukm@centrum.cz>\n"
 "Miloslav Trma� <mitr@volny.cz>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7451,39 +7163,40 @@ msgstr "Jít o několik stránek zpět"
 msgid "Go forward a number of pages"
 msgstr "Jít o několik stránek vpřed"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:906
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Zobrazit toto umístění s \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1177
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Síť"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1179
 msgid "Fonts"
-msgstr "Te�ky"
+msgstr "Písma"
+
+#: src/nautilus-window.c:1181
+msgid "Themes"
+msgstr "Témata"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1183
 msgid "CD Creator"
-msgstr "Tvůrce _CD"
+msgstr "Tvůrce CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1623
 msgid "Application ID"
 msgstr "ID aplikace"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1624
 msgid "The application ID of the window."
 msgstr "ID aplikace daného okna"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1630
 msgid "Application"
 msgstr "Aplikace"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1631
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication asociovaná s oknem"
 
@@ -7519,18 +7232,213 @@ msgstr "Síťové servery"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Zobrazit vaše síťové servery ve správci souborů Nautilus"
 
+#~ msgid "Search Google for Selected Text"
+#~ msgstr "Hledat vybraný text na Google"
+
+#~ msgid "Use Google to search the web for the selected text"
+#~ msgstr "Hledat vybraný text na WWW pomocí Google"
+
+#~ msgid "Look Up Selected Text in Dictionary"
+#~ msgstr "Vyhledat vybraný text ve slovníku"
+
+#~ msgid "Look up the selected text in the Merriam-Webster dictionary"
+#~ msgstr "Vyhledat vybraný text ve slovníku Merriam-Webster"
+
+#~ msgid "foo (copy)"
+#~ msgstr "foo (kopie)"
+
+#~ msgid ".bashrc (copy)"
+#~ msgstr ".bashrc (kopie)"
+
+#~ msgid ".foo (copy).txt"
+#~ msgstr ".foo (kopie).txt"
+
+#~ msgid "foo foo (copy)"
+#~ msgstr "foo foo (kopie)"
+
+#~ msgid "foo (copy).txt"
+#~ msgstr "foo (kopie).txt"
+
+#~ msgid "foo foo (copy).txt"
+#~ msgstr "foo foo (kopie).txt"
+
+#~ msgid "foo foo (copy).txt txt"
+#~ msgstr "foo foo (kopie).txt txt"
+
+#~ msgid "foo.. (copy).txt"
+#~ msgstr "foo.. (kopie).txt"
+
+#~ msgid "foo... (copy)"
+#~ msgstr "foo... (kopie)"
+
+#~ msgid "foo. (copy)"
+#~ msgstr "foo. (kopie)"
+
+#~ msgid "foo. (another copy)"
+#~ msgstr "foo. (další kopie)"
+
+#~ msgid "foo (another copy)"
+#~ msgstr "foo (další kopie)"
+
+#~ msgid "foo (another copy).txt"
+#~ msgstr "foo (další kopie).txt"
+
+#~ msgid "foo (3rd copy)"
+#~ msgstr "foo (3. kopie)"
+
+#~ msgid "foo (3rd copy).txt"
+#~ msgstr "foo (3. kopie).txt"
+
+#~ msgid "foo foo (another copy).txt"
+#~ msgstr "foo foo (další kopie).txt"
+
+#~ msgid "foo foo (3rd copy).txt"
+#~ msgstr "foo foo (3. kopie).txt"
+
+#~ msgid "foo (13th copy)"
+#~ msgstr "foo (13. kopie)"
+
+#~ msgid "foo (14th copy)"
+#~ msgstr "foo (14. kopie)"
+
+#~ msgid "foo (13th copy).txt"
+#~ msgstr "foo (13. kopie).txt"
+
+#~ msgid "foo (14th copy).txt"
+#~ msgstr "foo (14. kopie).txt"
+
+#~ msgid "foo (21st copy)"
+#~ msgstr "foo (21. kopie)"
+
+#~ msgid "foo (22nd copy)"
+#~ msgstr "foo (22. kopie)"
+
+#~ msgid "foo (21st copy).txt"
+#~ msgstr "foo (21. kopie).txt"
+
+#~ msgid "foo (22nd copy).txt"
+#~ msgstr "foo (22. kopie).txt"
+
+#~ msgid "foo (23rd copy)"
+#~ msgstr "foo (23. kopie)"
+
+#~ msgid "foo (23rd copy).txt"
+#~ msgstr "foo (23. kopie).txt"
+
+#~ msgid "foo (24th copy)"
+#~ msgstr "foo (24. kopie)"
+
+#~ msgid "foo (24th copy).txt"
+#~ msgstr "foo (24. kopie).txt"
+
+#~ msgid "foo (25th copy)"
+#~ msgstr "foo (25. kopie)"
+
+#~ msgid "foo (25th copy).txt"
+#~ msgstr "foo (25. kopie).txt"
+
+#~ msgid "foo foo (24th copy)"
+#~ msgstr "foo foo (24. kopie)"
+
+#~ msgid "foo foo (25th copy)"
+#~ msgstr "foo foo (25. kopie)"
+
+#~ msgid "foo foo (24th copy).txt"
+#~ msgstr "foo foo (24. kopie).txt"
+
+#~ msgid "foo foo (25th copy).txt"
+#~ msgstr "foo foo (25. kopie).txt"
+
+#~ msgid "foo foo (100000000000000th copy).txt"
+#~ msgstr "foo foo (100000000000000. kopie).txt"
+
+#~ msgid "foo (10th copy)"
+#~ msgstr "foo (10. kopie)"
+
+#~ msgid "foo (11th copy)"
+#~ msgstr "foo (11. kopie)"
+
+#~ msgid "foo (10th copy).txt"
+#~ msgstr "foo (10. kopie).txt"
+
+#~ msgid "foo (11th copy).txt"
+#~ msgstr "foo (11. kopie).txt"
+
+#~ msgid "foo (12th copy)"
+#~ msgstr "foo (12. kopie)"
+
+#~ msgid "foo (12th copy).txt"
+#~ msgstr "foo (12. kopie).txt"
+
+#~ msgid "foo (110th copy)"
+#~ msgstr "foo (110. kopie)"
+
+#~ msgid "foo (111th copy)"
+#~ msgstr "foo (111. kopie)"
+
+#~ msgid "foo (110th copy).txt"
+#~ msgstr "foo (110. kopie).txt"
+
+#~ msgid "foo (111th copy).txt"
+#~ msgstr "foo (111. kopie).txt"
+
+#~ msgid "foo (122nd copy)"
+#~ msgstr "foo (122. kopie)"
+
+#~ msgid "foo (123rd copy)"
+#~ msgstr "foo (123. kopie)"
+
+#~ msgid "foo (122nd copy).txt"
+#~ msgstr "foo (122. kopie).txt"
+
+#~ msgid "foo (123rd copy).txt"
+#~ msgstr "foo (123. kopie).txt"
+
+#~ msgid "foo (124th copy)"
+#~ msgstr "foo (124. kopie)"
+
+#~ msgid "foo (124th copy).txt"
+#~ msgstr "foo (124. kopie).txt"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Prohlíže� hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Zobrazit jako hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "shrnutí informací o hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K velikost cache"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Přehled hardware"
+
+#~ msgid "Searching Disks"
+#~ msgstr "Prohledávám disky"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus hledá na vašich discích adresáře koše."
+
+#~ msgid "file icon"
+#~ msgstr "ikona souboru"
+
+#~ msgid "Name:"
+#~ msgstr "Název:"
+
 #~ msgid "Unknown"
 #~ msgstr "Neznámé"
 
 #~ msgid "Floppy"
 #~ msgstr "Disketa"
 
-#~ msgid "CD-ROM"
-#~ msgstr "CD-ROM"
-
-#~ msgid "Zip Drive"
-#~ msgstr "Zip disk"
-
 #~ msgid "Audio CD"
 #~ msgstr "Zvukové CD"
 
@@ -7573,18 +7481,12 @@ msgstr "Zobrazit vaše síťové servery ve správci souborů Nautilus"
 #~ msgid "Nautilus was unable to unmount the selected volume."
 #~ msgstr "Nautilus nemohl odpojit vybraný svazek."
 
-#~ msgid "ISO 9660 Volume"
-#~ msgstr "Disk ISO 9660"
-
 #~ msgid "Error executing utility program '%s': %s"
 #~ msgstr "Chyba při spouštění pomocného programu '%s': %s"
 
 #~ msgid "Dis_ks"
 #~ msgstr "Dis_ky"
 
-#~ msgid "Mount or unmount disks"
-#~ msgstr "Připojit �i odpojit disky"
-
 #~ msgid "Open _in This Window"
 #~ msgstr "Ot_evřít v tomto okně"
 
@@ -7603,18 +7505,12 @@ msgstr "Zobrazit vaše síťové servery ve správci souborů Nautilus"
 #~ msgid "Open another Nautilus window for the displayed location"
 #~ msgstr "Otevřít další okno Nautilu pro zobrazované umístění"
 
-#~ msgid "_Find"
-#~ msgstr "N_ajít"
-
 #~ msgid "_Start Here"
 #~ msgstr "_Za�něte zde"
 
 #~ msgid "_Toolbar"
 #~ msgstr "_Nástrojová lišta"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Umístění \"%s\" již neexistuje"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Jdi na neexistující umístění"
 
@@ -7622,4 +7518,4 @@ msgstr "Zobrazit vaše síťové servery ve správci souborů Nautilus"
 #~ msgstr "Seřadit _obráceně"
 
 #~ msgid "Use _manual layout"
-#~ msgstr "Použít _ru�ní rozložení"
+#~ msgstr "Používat _ru�ní rozložení"
diff --git a/po/cy.po b/po/cy.po
index c7215e4ee..cad02f9e7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-19 00:17+0100\n"
 "Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -48,8 +48,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Methodd bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Bathodynau"
 
@@ -62,48 +62,60 @@ msgid "Nautilus Emblem view"
 msgstr "Golwg Bathodynnau Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Methwyd tynnu'r bathodyn"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Wedi methu gwaredu'r bathodyn hefo'r enw '%s'. Mae hyn mwy na tebyg achos "
 "bod y bathodynyn un sefydlog, a ddim yn un gwanethoch ychwanegu."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Methwyd tynnu'r bathodyn"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Methu ailenwi bathodyn"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Wedi methu ailenwi bathodyn hefo'r enw '%s'. Mae hyn mwy na tebyg achos bod "
 "y bathodynyn un sefydlog, a ddim yn un gwanethoch ychwanegu."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Methu ailenwi bathodyn"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Ailenwi bathodyn"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Bwydwch enw newydd i'r bathodyn a ddangosir"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Ychwanegu Bathodyn"
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,7 +123,7 @@ msgstr ""
 "Bwydwch enw disgrifiadol nesaf i pob bathodyn. Bydd yr enw yma yn cael ei "
 "defnyddio mewn llefydd eraill i adnabod y bathodyn."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -119,139 +131,64 @@ msgstr ""
 "Bwydwch enw disgrifiadol nesaf i pob bathodyn. Bydd yr enw yma yn cael ei "
 "defnyddio mewn llefydd eraill i adnabod y bathodyn."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Nid oedd rhai o'r ffeiliau yn gallu cael ei ychwanegu fel bathodynnau "
 "oherwydd nid ydynt i weld i fod yn delweddau ddilys."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Tydi'r ffeil '%s' ddim yn delwedd gwir"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Methu ychwanegu bathodynnau"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Nid oedd dim un or ffeiliau yn gallu cael ei ychwanegu fel bathodynnau "
 "oherwydd nid ydynt i weld i fod yn delweddau ddilys."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Nid oedd y testun a llusgwyd ddim yn lleoliad ffeil dilys:"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Methu ychwanegu bathodyn"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Tydi'r ffeil '%s' ddim yn delwedd gwir"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Nid yw'r ffeil a llysgwyd i weld i fod yn delwedd ddllys."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Dileu"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Ffatri ar gyfer gwelydd caledwedd"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Caledwedd"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Edrychydd Caledwedd"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Golygfa Caledwedd"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Gweld fel Caledwedd"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "golygfa caledwedd"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "enw yr eicon ar gyfer gwelydd caledwedd"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "crynodeb o'r gwybodaeth caledwedd"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K maint cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Amser rhedeg: %d dydd, %d awr, %d munud"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Trosolwg Caledwedd"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Hanes"
@@ -924,6 +861,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Caledwedd"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Rhyngwladol"
@@ -1209,30 +1150,19 @@ msgid "Desktop trash icon name"
 msgstr "Enw eicon sbwriel y penbwrdd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Cyfeiriaduron dros y maint yma yn cael ei torri lawr i'r maint yma.pwrpas "
-"hyn yw i atal chwythu y tomen a lladdNautilus ar cyfeiriaduron enfawr. Bydd "
-"gwerth negyddol yn meddwl does ddim terfynMae y terfyn yn weddol oherwydd "
-"darllen y Cyfeiriaduron yn ôl darn."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Galluogi baneri 'arbennig' yn y deialog hoffterau ffeil"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Enw ffeil y delwedd cefndir cyfeiriadur rhagosodedig. Defnyddir ond os mae "
 "background_set yn wir."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1240,6 +1170,19 @@ msgstr ""
 "Enw ffeil ar gyfer y Cefndir rhagosod y panel ochr. Defnyddir ond os mae "
 "side_pane_background_set yn wir."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Cyfeiriaduron dros y maint yma yn cael ei torri lawr i'r maint yma.pwrpas "
+"hyn yw i atal chwythu y tomen a lladdNautilus ar cyfeiriaduron enfawr. Bydd "
+"gwerth negyddol yn meddwl does ddim terfynMae y terfyn yn weddol oherwydd "
+"darllen y Cyfeiriaduron yn ôl darn."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Cuddio llyfrnodau rhagosodedig yn y dewislen llyfnodau"
@@ -1249,9 +1192,10 @@ msgid "Home icon visible on desktop"
 msgstr "Eicon cartref yn weladwy ar y penbwrdd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Os wedi gosod i gwir, bydd Nautilus ond yn dangos cyfeiriaduron yn y panel "
 "ochr coeden. Fel arall gwnaiff dangos cyfeiriaduron a ffeiliau."
@@ -1287,9 +1231,10 @@ msgstr ""
 "opsiynnau esoterig y ffeil yn y ymgom hoffterau ffeil."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Os wedi gosod i gwir, bydd Nautilus yn dangos y cyfeiriaduron cyn dangos y "
 "ffeiliau yn yr golygon Eicon a Rhestrau."
@@ -1335,8 +1280,9 @@ msgstr ""
 "y dewislen llyfyrnodau."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Os wedi gosod i gwir, bydd Nautilus yn defnyddio cyfeiriadur cartref y "
@@ -1354,9 +1300,10 @@ msgstr ""
 "dilde (~) sydd yn cael ei hystyried fel ffeiliau cadw wrth gefn."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Os wedi gosod i gwir, bydd ffeiliau cudd yn cael ei dangos yn y trefnydd "
 "ffeiliau. Ffeiliau cudd yn unai ffeiliau dot neu rhai wedi ei rhestru yn "
@@ -1381,8 +1328,9 @@ msgstr ""
 "cysylltu hefo'r spwriel"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Os wedi gosod i gwir, bydd eicon yn cael ei gosod ar y penbwrdd sydd yn "
@@ -1419,7 +1367,8 @@ msgstr ""
 "trefnu yn ôl maint, yn lle bod yn gynyddol canet eu terfnu yn lleihaol."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Os yn wir, bydd eiconau yn cael eu gosod allan yn dynnach gan rhagosod mewn "
 "ffenestri newydd."
@@ -1450,7 +1399,8 @@ msgid "List of possible captions on icons"
 msgstr "Rhestr o pennawdau posib ar gyfer eiconnau"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Uchafrif y ffeiliau a ymddelir a hwy mewn cyfeiriadur"
 
 # EFALLAI
@@ -1471,12 +1421,14 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Mae Nautilus yn cymeryd gofal o ddarlunio'r penbwrdd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 "Mae Nautilus yn defnyddio cyfeiriadur cartref y defnyddiwr fel y penbwrdd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Dim ond dangos cyfeiriaduron yn y panel ochr coeden"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1496,7 +1448,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Gwrthdroi'r drefn mewn ffenestri newydd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Dangos cyfeiriaduron yn gyntaf mewn ffenestri"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1533,10 +1486,11 @@ msgstr ""
 "ni fydd rhagolygon sain."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1547,12 +1501,13 @@ msgstr ""
 "\" ni ddarllenir data rhagolwg."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Bydd amnewid cyflymdra pan bu rhagweld ffeil delwedd fel rhagolwg cryno. Os "
 "gosodwyd i \"always\" bydd pob tro'n dangos rhagolwg cryno, hyd yn oed os "
@@ -1561,10 +1516,11 @@ msgstr ""
 "\" ni fydd yn dangos rhagolwg cryno ac yn dangos eicon cyffredinol."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Bydd amnewid cyflymdra pan bu nifer o eitemau mewn cyfeiriadur. Os gosodwyd "
@@ -1574,17 +1530,19 @@ msgstr ""
 "yn trafferthu cyfru eitemau."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Y trefn rhagosod i eitemau yn y gwelydd eicon. Gwerthoedd posib yw \"name\", "
 "\"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Y trefn rhagosod i eitemau yn y gwelydd rhestr. Gwerthoedd posib yw \"name"
 "\", \"size\", \"type\", \"modification_date\", \"emblems\"."
@@ -1630,7 +1588,8 @@ msgid "Use manual layout in new windows"
 msgstr "Defnyddio llunwedd llaw mewn ffenestri newydd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Defnyddio llunwedd closiach mewn ffenestri newydd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1660,7 +1619,8 @@ msgstr ""
 "yw \"list_view\" ac \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Pryd dylid dangos y nifer o eitemau mewn cyfeiriadur"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1672,7 +1632,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Pryd i dangos ragolwg cryno o ffeiliau delwedd"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Os bod cyfeiriadur rhagosod addasiedig wedi ei gosod."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1829,69 +1790,83 @@ msgstr "ailosod"
 msgid "on the desktop"
 msgstr "ar y penbwrdd"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Methu dileu y cyfrol"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Rydych ddim yn gallu dileu eicon cyfrol. Os ydych eisiau allfwrw y cyfrol, "
 "Os gwelwch yn dda defnyddiwch yr opsiwn allfwrw yn y dewislen glic-dde."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Methu dileu y cyfrol"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Sbwriel"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Symyd Yma"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copio Yma"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Cysylltwch Yma"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Gosodwch fel _Cefndir"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Gosod fel cefndir ar gyfer _pob plygell"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Gosod fel cefndir ar gyfer y plygell _yma"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Ymddiheuriad, ond bydd rhaid iddoch penodi allweddeiriau di-wag ar gyfer "
 "bathodyn newydd"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Methu gosod bathodyn"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1902,20 +1877,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Ymdduheuriad, ond mae enw yn barod ar gyfer y bathodyn \"%s\". Os gwelwch yn "
 "dda dewisiwch enw arall iddo."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Methu gosod bathodyn"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Ymdduheuriad, methu arbed bathodyn addasiedig"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Ymdduheuriad, methu arbed enw bathodyn addasiedig"
 
@@ -1934,22 +1915,28 @@ msgstr "O:"
 msgid "To:"
 msgstr "I:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Gwall tra'n symyd"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Gwall tra'n symyd.\n"
 "\n"
 "\"%s\" methu symyd achos bod y disg yn darllen yn unig."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Gwall tra'n dileu"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1958,22 +1945,17 @@ msgstr ""
 "\"%s\" methu dileu achos nid oes gannoch caniatad i addasu ei cyfeiriadur "
 "rhiant."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Gwall tra'n dileu.\n"
 "\n"
 "\"%s\" methu dileu achos bod y disg yn darllen yn unig."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1982,12 +1964,15 @@ msgstr ""
 "\"%s\" methu cael ei symyd achos nid oes gannoch caniatad i addasu ef na ei "
 "cyfeiriadur rhiant."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Gwall tra'n symyd"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Gwall tra'n symyd.\n"
@@ -1995,12 +1980,10 @@ msgstr ""
 "\"%s\" methu symyd achos bod ynai 'e neu ei cyfeiriadur rhiant yn cael ei "
 "cynnwys yn y cyrchfan"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Gwall tra'n symyd.\n"
@@ -2008,238 +1991,178 @@ msgstr ""
 "\"%s\" methu cael ei symyd i'r spwriel achos nid oes gannoch caniatad i "
 "addasu ef na ei cyfeiriadur rhiant."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Gwall tra'n copïo"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Gwall tra'n Copïo.\n"
 "\n"
 "\"%s\" methu copïo achos nad oes ganoch caniatad i'w ddarllen ef."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Gwall tra'n copïo i \"%s\".\n"
-"\n"
-"Nid oes digon o lle yn y cyrchfan."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Gwall tra'n copïo"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Gwall tra'n symyd i \"%s\".\n"
 "\n"
 "Nid oes digon o lle yn y cyrchfan."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Gwall tra'n creu cyswllt yn \"%s\".\n"
-"\n"
-"Nid oes digon o lle yn y cyrchfan."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Gwall tra'n symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Gwall tra'n cysylltu"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Gwall tra'n copïo i \"%s\".\n"
 "\n"
 "Nid oes gannoch caniatad i ysgrifennu i'r cyfeiriadur."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Gwall tra'n copïo i \"%s\".\n"
 "\n"
 "Mae'r disg cyrchfan yn darllen yn unig."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Gwall tra'n symyd eitemau i \"%s\".\n"
-"\n"
-"Nid oes gannoch caniatad i ysgrifennu i'r cyfeiriadur."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Gwall tra'n symyd eitemau i \"%s\".\n"
-"\n"
-"Mae'r disg cyrchfan yn darllen yn unig."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Gwall tra'n creu cysylltiadau yn \"%s\".\n"
-"\n"
-"Nid oes gannoch caniatad i ysgrifennu i'r cyfeiriadur."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Gwall tra'n symyd"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Gwall tra'n creu cysylltiadau yn \"%s\".\n"
-"\n"
-"Mae'r disg cyrchfan yn darllen yn unig."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n copïo \"%s\".\n"
-"\n"
-"A hoffech chi parhau?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Gwall tra'n cysylltu"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Gwall tra'n copïo"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Gwall \"%s\" tra'n symyd \"%s\".\n"
+"Gwall \"%s\" tra'n symyd.\n"
 "\n"
 "A hoffech chi parhau?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n creu cyswllt i \"%s\".\n"
-"\n"
-"A hoffech chi parhau?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Gwall tra'n symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Gwall \"%s\" tra'n dileu \"%s\".\n"
+"Gwall \"%s\" tra'n creu cyswllt i \"%s\".\n"
 "\n"
 "A hoffech chi parhau?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n copïo.\n"
-"\n"
-"A hoffech chi parhau?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Gwall tra'n dileu"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n symyd.\n"
-"\n"
-"A hoffech chi parhau?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Gwall tra'n copïo"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n symyd.\n"
-"\n"
-"A hoffech chi parhau?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Gwall tra'n symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gwall \"%s\" tra'n dileu.\n"
-"\n"
-"A hoffech chi parhau?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Gwall tra'n cysylltu"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Gwall tra'n dileu"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Gwall tra'n copïo"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Gwall tra'n symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Gwall tra'n cysylltu"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Gwall tra'n dileu"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Hepgor"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Ailgeisio"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Methwyd cyflawnu y weithred a benodwyd."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" methu cael ei symyd i'r lleoliad newydd, achos mae ei enw yno yn "
 "barod yn cael ei defnyddio am eitem arbennig sydd methu cael ei waredu neu "
@@ -2247,13 +2170,16 @@ msgstr ""
 "\n"
 "Os ydych dal eisiau symyd \"%s\", ailenwch 'e a ceisiwch eto."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Methwyd cyflawnu y weithred a benodwyd."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" methu cael ei gopïo i'r lleoliad newydd, achos mae ei enw yno yn "
 "barod yn cael ei defnyddio am eitem arbennig sydd methu cael ei waredu neu "
@@ -2261,45 +2187,51 @@ msgstr ""
 "\n"
 "Os ydych dal eisiau copïo \"%s\", ailenwch 'e a ceisiwch eto."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Methu amnewid ffeil"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Ffeil \"%s\" yn bodoli yn barod.\n"
 "\n"
 "A ydych eisiau ei amnewid e?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Croestyniad tra'n copïo"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Amnewid"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Amnewid y Cwbl"
 
 # TRWSIO: camdreiglad, e.e. "cyswllt i Plygell"
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "cyswllt i %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "cyswllt arall i %s"
@@ -2308,25 +2240,25 @@ msgstr "cyswllt arall i %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "Cyswllt %d i %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "Cyswllt %d i %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "Cyswllt %d i %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "Cyswllt %d i %s"
@@ -2336,561 +2268,600 @@ msgstr "Cyswllt %d i %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (copi arall)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "fed copi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "copi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "copi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "copi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (copi arall)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (copi %d)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (copi %d)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (copi %d)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (copi %d)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus anhysbys %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Symyd ffeiliau i'r spwriel"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Ffeiliau i taflu allan"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Paratoi i symyd i'r spwriel..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Symyd Ffeiliau"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Symudir ffeiliau"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Paratoi I Symyd"
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Gorffen Symyd..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Creu cysylltiad i'r ffeiliau"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Ffeiliau wedi Cysylltu:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Cysylltu"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Paratoi i Creu Cyswllt..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Gorfen Creu Cyswllt..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copïo ffeiliau"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Ffeiliau wedi copïo"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copïo"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Paratoi i Copïo"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Rydych methu copïo eitemau i'r spwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Methu Copïo i'r Spwriel"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Rydych methu symyd y blygell spwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Rydych methu copïo y blygell spwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Methu newid lleoliad Spwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Methu Copïo Spwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Rydych methu symyd blygell i mewn iddo i hun"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Rydych methu copïo blygell i mewn iddo i hun "
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Creu plygell wag newydd o fewn y blygell hon"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Methu symyd mewn iddo i hun"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Methu copïo mewn iddo i hun"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Rydych methu copïo ffeil dros ei hun"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Methu copïo dros ei hun"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Gwall tra'n creu blygell newydd.\n"
 "\n"
 "Nid oes gannoch caniatad i ysgrifennu i'r cyrchfan."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Gwall tra'n creu blygell newydd.\n"
 "\n"
 "Nid oes digon o lle ar y cyrchfan."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Gwall \"%s\" creu blygell newydd."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Gwall creu blygell newydd"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Gwall creu blygell newydd"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "blygell di-deitl"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Gwall \"%s\" creu blygell newydd."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Gwall creu blygell newydd"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Gwall creu blygell newydd"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 ffeil"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Dileu ffeil"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Ffeil wedi ei dileu"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Dileu"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Paratoi i dileu ffeiliau..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Wrthi'n Gwagu'r Sbwriel"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Paratoi i Wagu'r Sbwriel..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Ydych yn siwr bod chi eisiau dileu pob eitem o'r spwriel am byth?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Gwagu"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copi).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (copi arall)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (copi arall)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (copi arall).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ydd copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ydd copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (copi arall).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ydd copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13eg copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14eg copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13eg copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14eg copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ain copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ain copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11eg copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11eg copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123fed copi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124fed copi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124fed copi).txt"
 
@@ -2909,64 +2880,64 @@ msgstr "foo (124fed copi).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "heddiw am 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "heddiw am %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "heddiw am 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "heddiw am %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "heddiw, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "heddiw, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "heddiw"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ddoe am 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ddoe am %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ddoe am 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ddoe am %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ddoe, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ddoe, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ddoe"
 
@@ -2975,133 +2946,133 @@ msgstr "ddoe"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Mercher, Medi 00 0000 am 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y am %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Llu, Hyd 00 0000 am 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y am %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Llu, Hyd 00 0000 am 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y am %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Hyd 00 0000 am 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y am %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Hyd 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 eitem"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 plygell"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 ffeil"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 eitem"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 plygell"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 ffeil"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u eitem"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u plygell"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u ffeil"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? eitem"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? beit"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "math anhysbys"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "math MIME anhysbys"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "anhysbys"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "rhaglen"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3111,7 +3082,7 @@ msgstr ""
 "hyn efallai yn meddwl bod eich ffeil gnome-vfs.keys yn y lle anghywir neu "
 "ddim yn gallu cael ei darganfod am rheswm."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3120,11 +3091,11 @@ msgstr ""
 "Dim disgrifiad ar gyfer y math mime \"%s\" (ffeil ydi \"%s\"), dwedwch wrth "
 "y rhestr e-bost gnome-vfs os gwelwch yn dda."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "cyswllt"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "cyswllt (torredig)"
 
@@ -3245,11 +3216,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Chwilio am ffeiliau wrth enw ac priodweddau ffeiliau"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Golwg Eicon"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Golwg Rhestr"
@@ -3393,148 +3366,153 @@ msgstr "Cartref %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Pen Cownter"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "eicon ffeil"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "testun golygadwy"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "Y label golygadwy"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "testun ychwanegol"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "mwy o destun"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "amlygir i ddewis"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "os ydym wedi amlygir i ddewis"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "amlygir fel canolbwyntio bysellfwrdd"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "os ydym wedi amlygir i llunio canolbwyntio bysellfwrdd"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "amlygir i gollwng"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "Os ydym wedi amlygir am gollwng D&D"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Y petryal dewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Testun Ffrâm"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Arlunio ffrâm o amgylch testun heb ei ddewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Lliw Blwch Dewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Lliw y blwch dewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha'r Blwch Dewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Didreiddedd y blwch dewis"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alffa Amlygu"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Didreiddedd yr amlygu ar gyfer eiconau a ddewiswyd"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Lliw Gwyboadaeth Golau"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Y lliw a ddefnyddir ar gyfer testun gwybodaeth yn erbyn cefndir tywyll"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Lliw Gwybodaeth Tywyll"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Y lliw a ddefnyddir ar gyfer testun gwybodaeth yn erbyn cefndir golau"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Mae y blygell yma yn defynyddio cynllun ymysgogol. Ydych eisiau newid i "
 "cynllun â llaw ac adael yr eitem yma yn lle gollynwyd? Bydd hyn yn "
 "trosysgrifo y cynllun â llaw cadwyd"
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Mae y blygell yma yn defynyddio cynllun ymysgogol. Ydych eisiau newid i "
 "cynllun â llaw ac adael yr eitemau yma yn lle gollynwyd? Bydd hyn yn "
 "trosysgrifo y cynllun â llaw cadwyd"
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Mae y blygell yma yn defynyddio cynllun ymysgogol. Ydych eisiau newid i "
 "cynllun â llaw ac adael yr eitem yma yn lle gollynwyd?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Mae y blygell yma yn defynyddio cynllun ymysgogol. Ydych eisiau newid i "
 "cynllun â llaw ac adael yr eitemau yma yn lle gollynwyd?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Newid i Cynllun â Llaw?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Newid"
 
@@ -3644,72 +3622,72 @@ msgstr "Y rhagosodiad ar gyfer eitemau \"%s\" ydyw."
 msgid "Is the default for all \"%s\" items."
 msgstr "Y rhagosodiad ar gyfer pob eitem \"%s\" ydyw."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Newid \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Cynnwys yn y dewislen ar gyfer eitemau \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Defnyddio fel rhagosodiad ar gyfer eitemau \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Cynnwys yn y dewislen ar gyfer \"%s\" yn unig"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Defnyddio fel rhagosodiad ar gyfer \"%s\" yn unig"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Peidio cynnwys yn y dewislen ar gyfer eitemau \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Enw"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Cyflwr"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Dewis"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Addasu..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Mathau o Ffeiliau a Rhaglenni"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Mynd 'Na"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3717,48 +3695,48 @@ msgstr ""
 "Fe allwch gyflunio pa rhaglenni sydd yn cael ei cynnig i pa math ffeiliau yn "
 "y blwch ymgom Math Ffeiliau a Rhaglenni."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Agor efo Rhaglen Arall"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Dewiswch rhaglen i agor \"%s\" efo:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Agor gyda Syllwr Arall"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Dewiswch olwg ar gyfer \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Does dim syllwyr ar gael ar gyfer \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Dim Syllwyr ar Gael"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Does dim rhaglen wedi ei gysylltu efo \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Dim Rhaglen wedi ei Gysylltu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Does dim gweithred wedi ei gysylltu gyda \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Dim Gweithred wedi ei Gysylltu"
 
@@ -3766,11 +3744,9 @@ msgstr "Dim Gweithred wedi ei Gysylltu"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3779,42 +3755,41 @@ msgstr ""
 "Fe allwch gyflunio GNOME i cysylltu cymhwysiadau hefo math ffeilau. Ydych "
 "eisiau cysylltu cymhwysiad hefo'r math ffeil yma nawr?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Cysylltu Rhaglen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Mae'r syllwr a chysylltir a \"%s\" yn annilys."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Syllwr Annilys wedi ei Gysylltu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Mae'r rhaglen syddd wedi ei gysylltu a \"%s\" yn annilys."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Rhaglen Annilys wedi ei Gysylltu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Mae'r weithred wedi ei gysylltu gyda \"%s\" yn annilys."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Gweithred Annilys wedi ei Gysylltu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3825,94 +3800,134 @@ msgstr ""
 "math ffeil yma. Ydych eisiau cysylltu cymhwysiad neu gwelydd hefo'r math "
 "ffeil yma nawr?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Cysylltu Gweithred"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" methu agor \"%s\" achos \"%s\" methu cyrchu ffeiliau yn lleoliad \"%s"
+"\". Ydych eisiau dewis cymhwysiad arall?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" methu agor \"%s\" achos \"%s\" methu cyrchu ffeiliau yn lleoliad \"%s"
 "\". Ydych eisiau dewis cymhwysiad arall?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Nid ydy yr gweithred rhagosod yn gallu agor \"%s\" achos nad yw yn gallu "
 "cyrchu y ffeiliau yn lleoliad \"%s\". Ydych eisiau dewis gweithred arall?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Methu Agor Lleoliad"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" methu agor \"%s\" achos \"%s\" methu cyrchu ffeiliau yn lleoliad \"%s"
+"\". Ydych eisiau dewis cymhwysiad arall?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" yn methu agor \"%s\" achos bod \"%s\" methu cyrchu y ffeiliau yn "
 "lleoliad \"%s\". Does dim cymhwysiad arall ar gael i olygu y ffeil. Os "
 "gwnewch copïo'r ffeil i'ch cyfrifiadur, bydych efallai yn gallu ei hagor."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Nid ydy yr gweithred rhagosod yn gallu agor \"%s\" achos nad yw yn gallu "
+"cyrchu y ffeiliau yn lleoliad \"%s\". Ydych eisiau dewis gweithred arall?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
-"Nid ydy y gweithred rhagosod yn gallu agor \"%s\" achos bod o methu cyrchu y "
-"ffeiliau yn lleoliad \"%s\". Does dim gweithred arall ar gael i olygu y "
-"ffeil. Os gwnewch copïo'r ffeil i'ch cyfrifiadur, bydych efallai yn galu ei "
-"hagor."
+"\"%s\" yn methu agor \"%s\" achos bod \"%s\" methu cyrchu y ffeiliau yn "
+"lleoliad \"%s\". Does dim cymhwysiad arall ar gael i olygu y ffeil. Os "
+"gwnewch copïo'r ffeil i'ch cyfrifiadur, bydych efallai yn gallu ei hagor."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Ymddiheuriad, ni allwch gweithredu gorchmynion o safle pell oherwydd "
 "ystyriedaethau diogelwch,"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Ni ellir gweithredu cysylltion pell"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Roedd gwall wrth lansio'r rhaglen.\n"
 "\n"
 "Manylion: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Gwall wrth lansio'r rhaglen"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Mae'r targed gollwng ond yn cynnal ffeiliau lleol"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Mae'r targed gollwng ond yn cynnal ffeiliau lleol.\n"
@@ -3920,15 +3935,15 @@ msgstr ""
 "I agor ffeilau di-lleol copïwch nhw i cyfeiriadur lleol a ceisiwch gollwng "
 "nhw eto."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Mae'r targed gollwng ond yn cynnal ffeiliau lleol"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4181,14 +4196,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Eitemau sy'n cynnwys \"medusa\" yn eu henwau a sy'n blygellau"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Yn Chwilio Disgiau"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Mae Nautilus yn chwilio eich disgiau ar gyfer plygellau sbwriel."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Golygu"
@@ -4391,97 +4398,107 @@ msgstr "Cefndir"
 msgid "Empty Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Gwneith hyn agor %d ffenest ar-wahan. Ydych yn siwr bod chi eisiau hyn?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Agor %d ffenest?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ydych yn siwr bod chi eisiau dileu \"%s\" am byth?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Gwneith hyn agor %d ffenest ar-wahan. Ydych yn siwr bod chi eisiau hyn?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ydych yn siwr bod chi eisiau dileu \"%s\" am byth?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ydych yn siwr bod chi eisiau dileu y %d eitem a dewisied am byth?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Dileu yr itemau dewisiedig am byth"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Dileu?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Dewiswch Gategori:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Patrymmau"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "dewiswyd \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "dewiswyd 1 plygell"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "dewiswyd %d plygell"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (yn cynnwys 0 eitem)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (yn cynnwys 1 eitem)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (yn cynnwys %d eitem)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (yn cynnwys cyfanswm o 0 eitem)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (yn cynnwys cyfanswm o 1 eitem)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (yn cynnwys cyfanswm o %d eitem)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "dewiswyd \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "dewiswyd %d eitem (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "dewiswyd 1 eitem arall (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "dewiswyd %d eitem arall (%s)"
@@ -4493,7 +4510,7 @@ msgstr "dewiswyd %d eitem arall (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4502,106 +4519,124 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mae y plygelli \"%s\" yn dal mwy o ffeiliau na mae Nautilus yn gallu trin. "
 "Bydd rhai ffeiliau ddim yn cael ei dangos."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Gormod o Ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "Ddim yn gallu symyd \"%s\" i'r spwriel. Ydych eisiau ei dileu ar unwaith?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Nid yw'r %d eitem dewisiedig yn gallu cael ei symyd i'r spwriel. Ydych "
-"eisiau ei dileu ar unwaith?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"Ddim yn gallu symyd \"%s\" i'r spwriel. Ydych eisiau ei dileu ar unwaith?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"Nid yw'r %d eitem dewisiedig yn gallu cael ei symyd i'r spwriel. Ydych "
-"eisiau dileu y %d eitem ar unwaith?"
+"Ddim yn gallu symyd \"%s\" i'r spwriel. Ydych eisiau ei dileu ar unwaith?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Dileu ar Unwaith?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ydych yn siwr bod chi eisiau dileu \"%s\" o'r spwriel?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Ydych yn siwr bod chi eisiau dileu y %d eitem a dewiswyd o'r spwriel am byth?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Dileu O'r Sbwriel?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Defnyddio \"%s\" i agor yr eitem a ddewiswyd"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Rhaglen _Arall..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Rhaglen..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "_Syllwr Arall..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Syllwr..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Methwyd cyflawnu y weithed a benodwyd: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Methwyd cyflawnu y weithred a benodwyd."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Rhedeg \"%s\" ar unrhyw eitemau dewisiedig"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Bydd pob ffeil gweithredadwy yn y plygell yma yn ymddangos yn y dewislen "
+"Sgriptiau. Bydd dewis sgribt o'r dewislen yn rhedeg y sgript hefo unrhyw "
+"eitem dewisiedig fel mewnbwn."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4609,11 +4644,11 @@ msgstr ""
 "Sgriptiau. Bydd dewis sgribt o'r dewislen yn rhedeg y sgript hefo unrhyw "
 "eitem dewisiedig fel mewnbwn."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Ynghylch Sgriptiau"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4655,18 +4690,18 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: safle a maint y ffenest cyfredol"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "Bydd \"%s\" yn cael ei symud os dewiswch chi'r gorchymyn Gludo Ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "Caiff \"%s\" ei gopïo os dewiswch chi'r gorchymyn Gludo Ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4674,7 +4709,7 @@ msgstr ""
 "Bydd y %d eitemau dewisiedig yn cael ei symyd os dewisiwch y gorchymyn Gludo "
 "ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4682,161 +4717,168 @@ msgstr ""
 "Bydd y %d eitemau dewisiedig yn cael ei copïo os dewisiwch y gorchymyn Gludo "
 "ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Does dim byd ar y clipfwrdd i'w ludo."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Gwall Gosod"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Gwall Datosod"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Gwall Gosod"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Bwrw _Allan"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Datosod Cyfrol"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Agor mewn %d _Ffenestr Newydd"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Plygell Cartref"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Plygell Cartref"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Dileu o'r Sb_wriel"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Dileu yr itemau dewisiedig am byth"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Symud i'r _Sbwriel"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Symud pob eitem â ddetholwyd i'r Sbwriel"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Creu _Cysylltion"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Creu _Cyswllt"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Taflu'r Sbwriel"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Torri Ffeil"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Torri Ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copio Ffeil"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copio Ffeiliau"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Nid yw y cysylltiad yma yn gallu cael ei defnyddio, oherwydd nad oes ganddo "
 "cyrchfan. Ycych eisiau symyd y cysylltiad i'r spwriel?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Nid yw y cysylltiad yma yn gallu cael ei defnyddio, oherwydd nad oes ganddo "
+"cyrchfan. Ycych eisiau symyd y cysylltiad i'r spwriel?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Nid yw y cysylltiad yma yn gallu cael ei defnyddio, oherwydd nad yw ei "
 "cyrchfan \"%s\" yn bodoli. Ycych eisiau symyd y cysylltiad i'r spwriel?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Cyswllt Torredig"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "Ffeil testun gweithredadwy yw \"%s\". A ydych am ei gweithredu, neu ddangos "
 "ei gynnwys?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Rhedeg neu arddangos?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Arddangos"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Gweithredu mewn _Derfynnell"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Arddangos"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Gweithredu"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Agor \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Diddymu Agor?"
 
@@ -4857,10 +4899,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Ymddiheuriad, methu arddangos y holl cynnwys o \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Ni ellir pennu caniatadau \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Gwall yn Arddangos Blygell"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4868,7 +4915,7 @@ msgstr ""
 "Mae'r enw \"%s\" yn cael ei defnyddio yn barod yn y plygell yma. Dewisiwch "
 "un arall os gwelwch yn dda."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4876,12 +4923,12 @@ msgstr ""
 "Nid oes \"%s\" yn y blygell yma. Efallai mae newydd cael ei symyd neu ei "
 "dileu?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nid oes ganoch y caniatad priodol i ailenwi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4890,81 +4937,101 @@ msgstr ""
 "Nid yw'r enw \"%s\" yn ddilys oherwydd mae'n cynnwys y cymeriad \"/\". "
 "Dewisiwch enw gwahanol os gwelwch yn dda."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "Nid yw'r enw \"%s\" yn ddilys. Dewisiwch enw gwahanol os gwelwch yn dda."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 "Methu newid enw \"%s\" oherwydd bod mae ar disg darllen yn unig"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Ymddiheuriad, methu ailenwi \"%s\" i \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Ni ellir pennu caniatadau \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Nam Ailenwi"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nid oes genych y caniatad angenrheidol i newid y grŵp o \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "Methu newid y grŵp o \"%s\" oherwydd mae ar disg darllen yn unig"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Ymddiheuriad, methu newid grŵp o \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Ni ellir pennu caniatadau \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Nam tra'n Gosod Grŵp"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Methu newid perchenog o \"%s\" oherwydd mae ar disg darllen yn unig"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Ymddiheuriad, methu newid perchenog o \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Ni ellir pennu caniatadau \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Nam tra'n gosod Perchenog"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "Methu newid y caniatadau o \"%s\" oherwydd mae ar disg darllen yn unig"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Ymddiheuriad, methu newid caniatadau o \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Ni ellir pennu caniatadau \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Nam tra'n Gosod Caniatadau"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Ailenwi \"%s\" i \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Diddymu Ailenwi?"
 
@@ -5022,128 +5089,150 @@ msgstr "Adfer Maint _Gwreiddiol Eiconau"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Adfer Maint _Gwreiddiol yr Eicon"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pwyntio at \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Ond yn y gysawd ffeiliau lleol cynhelir llusgo ac ollwng."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Ond yn y gysawd ffeiliau lleol cynhelir llusgo ac ollwng."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Nam Llusgo a Gollwng"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Llusgo annilys wedi ei defnyddio"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Enw ffeil"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Maint"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Math"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Dyddiad Addaswyd"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Ni allwch neilltuo mwy na un eicon addasiedig ar y tro! Llusgwch dim on un "
+"delwedd i osod fel eicon addasiedig."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Ni allwch neilltuo mwy na un eicon addasiedig ar y tro! Llusgwch dim on un "
 "delwedd i osod fel eicon addasiedig."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mwy na Un Delwedd"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Nid yw y ffeil a ollynir yn un lleol. Fe allwch ond defnyddio delweddau "
+"lleol fel eiconau addasiedig."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Nid yw y ffeil a ollynir yn un lleol. Fe allwch ond defnyddio delweddau "
 "lleol fel eiconau addasiedig."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Delweddau Lleol yn Unig"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Nid yw y ffeil a ollynir ganddoch yn delwedd. Fe allwch ond defnyddio "
-"delweddau lleol fel eiconau addasiedig."
+"Nid yw y ffeil a ollynir yn un lleol. Fe allwch ond defnyddio delweddau "
+"lleol fel eiconau addasiedig."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Delweddau yn Unig"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Priodweddau"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Priodweddau %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Diddymu Newid Grŵp?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Newid Grŵp"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Diddymu Newid Perchenog?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Newid Perchenog"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "dim"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "annarllenadwy"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 eitem, hefo maint %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d eitemau, Cyfansymmu %s:"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(rhai o'r cynnwys yn annarllenadwy)"
 
@@ -5153,191 +5242,191 @@ msgstr "(rhai o'r cynnwys yn annarllenadwy)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Sylfaenol"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Enwau:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Enw:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Math:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Maint:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Atseinedd:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Gofod rhydd:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Targed y cyswllt:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Math MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Addaswyd:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Hygyrchwyd:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Dewis Ei_con Addasiedig..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Gwaredu Eic_on Addasiedig..."
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Dar_llen"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Ysgrifennu"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Gweit_hredu"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Gosod ID de_fnyddiwr"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Baneri Arbennig:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Gosod ID Grŵ_p"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Lud_iog"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Caniatadau"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nid y chithau di'r perchenog, fellu ni allwch newid y caniatadau."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Perchenog ffeil:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Perchenog ffeil:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Grŵp _ffeil"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grŵp ffeil"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Perchenog:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grŵp"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Eraill"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Golwg Testun:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Golwg Rhifol"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Newidwyd Dwethaf:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Ni ellir pennu caniatadau \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ni ellir pennu caniatadau y ffeil a sydd wedi'i ddewis."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Roedd gwall wrth ddangos cymorth: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Roedd gwall wrth ddangos cymorth: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Methu dangos cymorth"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Diddymu Dangos Ffenestr Priodweddau?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Creu Ffenestr Priodweddau"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Dewiswch eicon"
 
@@ -5355,71 +5444,110 @@ msgid "Search Results"
 msgstr "Canlyniadau Chwilio"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Ymddiheuriad, on nid yw y gwasanaeth chwilio Medusa ar gael achos nad yw "
-"wedi ei sefydlu."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Ymddiheuriad, ond nid ydi y gwasanaeth chwilio medusa ar gael."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Gwasanaeth Chwilio ddim ar Gael"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Mae y chwilio fe ddewisoch yn fwy newydd na'r mynegai ar eich system. "
 "Gwneith y chwilio dangos dim canlyniad ar jyn o bryd. Fe allwch greu mynegai "
 "newydd trwy rhedeg \"medusa-indexd\" fel root ar y llinell gorchymyn."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Ni ellith Chwilio agor mynegai y system ffeiliau. Efallai bod eich mynegai "
+"ar goll neu wedi eu llygru. Fe allwch creu mynegai newydd trwy rhedeg "
+"\"medusa-indexd\" fel root yn y llinell gorchmynion."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Chwilio am eitemau sydd yn rhy newydd"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Mae pob ffeil nynegeiedig ar eich cyfrifiadur yn cyfateb y meini dewisiedig. "
+"Fe allwch gwirio y sillafu yn o eich dewis neu ychwanegu meini i lleihau "
+"eich canlynidau."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Mae pob ffeil nynegeiedig ar eich cyfrifiadur yn cyfateb y meini dewisiedig. "
 "Fe allwch gwirio y sillafu yn o eich dewis neu ychwanegu meini i lleihau "
 "eich canlynidau."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Nam tra'n chwilio"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Ni ellith Chwilio agor mynegai y system ffeiliau. Efallai bod eich mynegai "
 "ar goll neu wedi eu llygru. Fe allwch creu mynegai newydd trwy rhedeg "
 "\"medusa-indexd\" fel root yn y llinell gorchmynion."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Nam tra'n darllen y mynegai ffeil"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Bu nam tra'n llwytho cynnwys chwilio: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r ffeiliau ar eich "
+"system. Nid yw Chwilio yn gallu cyrchu eich mynegai ar y fynyd yma."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r ffeiliau ar eich "
+"system. Nid yw Chwilio yn gallu cyrchu eich mynegai ar y fynyd yma."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5427,25 +5555,23 @@ msgstr ""
 "Nid ydi chwilio yn gallu cyrchu eich mynegai ar y fynyd yma fellu bydd "
 "chwilio arafach yn cael ei gweithredu sydd ddim yn defnyddio y mynegai."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r ffeiliau ar eich "
-"system. Nid yw Chwilio yn gallu cyrchu eich mynegai ar y fynyd yma."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Chwilio sydyn ddim ar gael"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Chwilio cynnwys ddim ar gael"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5459,56 +5585,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "I gwneud chwilio sydyn, mae Chwilio angen mynegai o'r ffeiliau ar eich "
 "system. Mae eich cyfrifiadur yn creu mynegai ar y fynyd yma. Oherwydd ni "
 "ellir Chwilio ddefynyddio'r system, fe ellir y chwilio gymryd rhai munudau."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r cynnwys ar eich "
 "system. Mae eich cyfrifiadur yn creu yr mynegai nawr. Bydd Chwilio cynnwys "
 "ar gael pan fydd yr mynegai yn gyflawn."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Chwilio mynegrifol ddim ar gael"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r ffeiliau ar eich "
+"system. Nid yw Chwilio yn gallu cyrchu eich mynegai ar y fynyd yma."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"I gwneud chwilio cynnwys, mae Chwilio angen mynegai o'r ffeiliau ar eich "
+"system. Nid yw Chwilio yn gallu cyrchu eich mynegai ar y fynyd yma."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "I gwneud chwilio sydyn, mae Chwilio angen mynegai o'r ffeiliau ar eich "
 "system. Nid oes mynegai ar gael nawr. Fe ellwch creu mynegai trwy rhedeg "
 "\"medusa-indexd\" fel root yn y llinell gorchymyn. Bydd chwilio yn cymeryd "
 "rhai mynydau, nes bod mynegai cyflawn ar gael."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "I wneud chwilio cynnwys, mae Chwilio angen mynegai o gynnwys eich system. "
 "Nid oes mynegai ar gael nawr. Fe ellwch creu mynegai trwy rhedeg \"medusa-"
 "indexd\" fel root yn y llinell gorchymyn. Ni fydd chwilio cynnwys ar gael, "
 "nes bod mynegai cyflawn ar gael."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Nid ydi chwilio sydyn wedi ei galluogi ar eich cyfrifiadur"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5518,11 +5676,12 @@ msgstr ""
 "system. Mae eich gweinyddwr system wedi analluogi chwilio sydyn ar eich "
 "cyfrifiadur, felly nid oes mynegai ar gael."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Nid ydi chwilio sydyn wedi ei galluogi ar eich cyfrifiadur"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Chwilio sydyn ddim ar gael"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Ble"
 
@@ -5531,7 +5690,7 @@ msgstr "Ble"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Dat_guddio mewn Ffenestr Newydd"
@@ -5542,7 +5701,7 @@ msgstr "Dat_guddio mewn Ffenestr Newydd"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Datguddio mewn %d _Ffenestr Newydd"
@@ -5551,15 +5710,21 @@ msgstr "Datguddio mewn %d _Ffenestr Newydd"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Mae Nautilus wedi darganfod mwy o canlyniadau na ellith ei ddangos. Bydd "
+"rhai eitemau cyfartal ddim yn cael ei dangos."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Mae Nautilus wedi darganfod mwy o canlyniadau na ellith ei ddangos. Bydd "
 "rhai eitemau cyfartal ddim yn cael ei dangos."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Gormod o Canlyniadau"
 
@@ -5573,12 +5738,12 @@ msgid "Create L_auncher"
 msgstr "Creu _Lansiwr"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Creu lansiwr newydd"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Dileu pob eitem o'r spwriel"
 
@@ -5599,7 +5764,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Defnyddio Cefndir Rhagosod"
@@ -5621,58 +5786,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Dewis gwelydd arall i agor yr eitem dewisiedig"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Creu _Plygell"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Creu _Plygell"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Creu plygell wag newydd o fewn y blygell hon"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Creu plygell wag newydd o fewn y blygell hon"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Creu cyswllt symbolaidd ar gyfer pob eitem a ddewiswyd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_yblygu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Dileu pob eitem dewisiedig, heb ei symyd i'r spwriel"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Dyblyg pob eitem dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Golygu Lansiwr"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Golygu'r wybodaeth am y lanswir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Fformatio'r cyfrol dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Cyfr_yngau Priodweddau"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Datosod y cyfrol dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Symyd neu copïo'r ffeiliau dewisiedig o'r blaen gan Gorchymyn Torri'r "
 "Ffeiliau neu y Copïo'r Ffeil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5680,130 +5855,139 @@ msgstr ""
 "Symyd neu copïo'r ffeiliau dewisiedig o'r blaen gan Gorchymyn Torri'r "
 "Ffeiliau neu y Copïo'r Ffeil i mewn i'r plygell dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Agor _Gyda"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Agor pob eitem mewn ffenestr newydd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Agor mewn Ffenestr _Newydd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Agor yr eitem yn y ffenestr yma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Paratoi y ffeiliau dewisiedig i cael ei copïo hefo'r gorchymyn gludo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Paratoi y ffeiliau dewisiedig i cael ei symyd hefo'r gorchymyn gludo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Dio_gelu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Diogelu y cyfrol dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Ailenwi'r eitemau dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Ailosod y Golwg i'r _Rhagosodion"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ailosod y drefn trefnu ac y lefel chwyddo i cydweddo hoffterau i'r golwg"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Rhedeg neu trefnu sgriptiau o ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Dewis _Pob Ffeil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Patrymmau"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Dewis pob eitem yn y ffenestr yma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Dewis pob eitem yn y ffenestr yma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Dangos priodweddau Cyfryngau cyfrol dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 "Dangos y plygell sydd yn dal y sgriptiau sydd yn ymddangos yn y dewislen yma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Datosod y cyfrol dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Defnyddio y cefndir rhagosod ar gyfer y lleoliad yma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Gweld neu addasu y hoffterau ar gyfer pob un o'r eitemau dewisiedig"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copio Ffeil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Fformat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Datosod Cyfrol"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Agor"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Agor Plygell _Sgriptiau"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Gludo Ffeiliau"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "G_ludo Ffeiliau mewn i'r plygell"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Priodweddau"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Sgriptiau"
 
@@ -5889,7 +6073,12 @@ msgstr "â llaw"
 msgid "Indexing is %d%% complete."
 msgstr "Mynegai yn %d%% wedi'i gyflawni."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Caiff y ffeiliau ei mynegi dwethaf ar %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5897,25 +6086,29 @@ msgstr ""
 "Unwaith y diwrnod bydd eich ffeiliau a cynnwys testun yn cael ei mynegi er "
 "mwyn i'ch chwilio cael bod yn cyflym."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Statws Mynegi"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Caiff y ffeiliau ei mynegi dwethaf ar %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Unwaith y diwrnod bydd eich ffeiliau a cynnwys testun yn cael ei mynegi er "
-"mwyn i'ch chwilio cael bod yn cyflym. Mae eich ffeiliau yn cael ei mynegi."
+"mwyn i'ch chwilio cael bod yn cyflym."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Nid oes mynegai o'ch ffeiliau nawr."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5925,15 +6118,19 @@ msgstr ""
 "chwilio. Nid ydy Chwilio sydyn wedi ei galluo ar eich cyfrifiadur, fellu nid "
 "oes ganddoch mynegai nawr."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Nid oes mynegai o'ch ffeiliau nawr."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Ymddiheuriad, ond nid ydi y gwasanaeth chwilio medusa ar gael."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5957,32 +6154,37 @@ msgstr "Dangos _Cyflwr Mynegai"
 msgid "Show status of indexing used when searching"
 msgstr "Dangos statws o'r mynegeio a defnyddwyd tra'n chwilio"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Methu creu y plygell angenrheidiol"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Methu Creu y Plygelli Angenrheidiol"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nid oedd Nautilus yn gallu creu y plygell a fynnir \"%s\". Cyn rhedeg "
 "Nautilus, creuwch y plygell, neu gosod y caniatadau fel bod modd i Nautilus "
 "creu o os gwelwch yn dda."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Methu Creu y Plygelli Angenrheidiol"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5993,22 +6195,27 @@ msgstr ""
 "Cyn rhedeg Nautilus, creuwch y plygell, neu gosod y caniatadau fel bod modd "
 "i Nautilus creu o os gwelwch yn dda."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Cyswllt I'r Hen Benbwrdd"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Mae lleoliad o'r cyfeiriadur penbwrdd wedi newid yn GNOME 2.4. Mae cyswllt a "
 "enwi'r \"Link to Old Desktop\" wedi cael ei creu ar y penbwrdd. Fe allwch "
 "agor ef i symyd y ffeiliau ydych eisiau, wedyn dileu y cyswllt."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Hen benbwrdd wedi mudo"
 
 #. Can't register myself due to trouble locating the
@@ -6021,7 +6228,7 @@ msgstr "Hen benbwrdd wedi mudo"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6032,7 +6239,7 @@ msgstr ""
 "dechrau eich cyfrifiadur neu gosod Nautilus eto."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6077,12 +6284,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Ni ellir defnyddio Nautilus nawr, oherwydd nam annisgwyl"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6090,7 +6297,7 @@ msgstr ""
 "Ni ellir defnyddio Nautilus nawr, oherwydd nam annisgwyl gan Bonobo pan "
 "ceisio i cofrestru y gweinyddiwr gwelydd trefnydd ffeiliau."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6100,7 +6307,7 @@ msgstr ""
 "ceisio lleoli y ffatri. Efallai gwneith lladd bonobo-activation-server ac "
 "ailgychwyn Nautilus yn gwyrio'r problem."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6110,6 +6317,17 @@ msgstr ""
 "ceisio lleoli y plisgyn gwrthrych. Efallai gwneith lladd bonobo-activation-"
 "server ac ailgychwyn Nautilus yn gwyrio'r problem."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Roedd gwall wrth ddangos cymorth: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Dim llyfrnodau wedi ddiffinio"
@@ -6143,36 +6361,45 @@ msgstr "Llai o Gosodiadau"
 msgid "Find Them!"
 msgstr "Darganfod Nhw!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Methu symyd mewn iddo i hun"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Mae'n flin gen i, ond dyw \"%s\" ddim yn enw ffeil dilys."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"Nid yw \"%s\" yn leeoliad dilys. Os gwelwch yn dda, gwiriwch y sillafu a "
-"ceisiwch eto."
+"Methwyd canfod \"%s\". Os gwelwch yn dda, gwiriwch y sillafu a ceisiwch eto."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Gweinyddion Rhwydwaith"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Enw:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Lleoliad:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Cysylltu"
@@ -6373,6 +6600,20 @@ msgstr ""
 "\n"
 "Fe allwch ddileu y ffeil yma â llaw er mwyn cyflwyno'r derwydd eto.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Ni allwch neilltuo mwy na un eicon addasiedig ar y tro! Llusgwch dim on un "
+"delwedd i osod fel eicon addasiedig."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Nid yw y ffeil a ollynir yn un lleol. Fe allwch ond defnyddio delweddau "
+"lleol fel eiconau addasiedig."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6383,26 +6624,25 @@ msgstr "Agor gyda %s"
 msgid "Open with..."
 msgstr "Agor gyda..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Methu lansio'r rhaglen llosgi CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Ni ellir lansio'r llosgwr CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Gwagio'r _Spwriel"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Ysgrifennu'r cynnwys i CD"
 
@@ -6410,37 +6650,37 @@ msgstr "_Ysgrifennu'r cynnwys i CD"
 msgid "Go To:"
 msgstr "Mynd I:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Ydych eisiau gweld y %d lleoliad yma mewn ffenestri arwahan?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Gweld mewn Sawl Ffenestr?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Methu Agor Lleoliad"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Perfformio casgliad sydyn o profion hunan-Gwirydd."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Creu y ffenestr gwreiddiol hefo'r geometreg a rhoddir"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETREG"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Ond creu ffenestri newydd i URIs benodwyd yn benodol"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6448,83 +6688,96 @@ msgstr ""
 "Peidiwch rheoli y penbwrdd (anwybyddu y hoffterau a osodwyd yn yr ymgom "
 "hoffterau)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Gadael Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Ailgychwyn Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Trefnydd Ffeiliau"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
 # TRWSIO
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: ni ellir defnyddio --check efo URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: ni ellir defnyddio --check efo opsiynnau eraill.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: ni ellir defnyddio --quit efo URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: ni ellir defnyddio --restart efo URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: ni ellir defnyddio --geometry efo mwy nag un 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ydych yn siwr bod chi eisiau dileu \"%s\" am byth?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Ydych chi'n siwr bod chi eisiau anghofio hanes? Os ydych, fyddech wedi ei "
 "tynghedu i'w ailadrodd."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Ydych yn siwr bod chi eisiau gwagu y rhestr o lleoliadau ydych wedi ymweld?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Gwagu Hanes"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Nid ydi y lleoliad \"%s\" yn bodoli. Ydych eisiau dileu ynrhyw llyfrnodau "
 "hefo'r lleoliad yma o'ch rhestr?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Nid yw y lleoliad \"%s\" yn bodoli rhagor."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Llyfyrnod i lleoliad sydd ddim yn bodoli"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Gwaredu"
 
@@ -6557,7 +6810,6 @@ msgid "Close _All Windows"
 msgstr "Cau _Pob Ffenest"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Cau pob ffenest Nautilus"
@@ -6580,107 +6832,119 @@ msgid "Forward"
 msgstr "Ymlaen"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Mynd i'r plygell Sbwriel"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Mynd i'r lleoliad a aethwyd iddi nesaf"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Mynd i'r lleoliad a aethwyd iddi ddiwethaf"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Mynd i'r plygell Sbwriel"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Adre"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Bar Lleoliad"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Ail-lwytho"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Chwilio ffeiliu ar y cyfrifiadur yma"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Bar St_atws"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Atal"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "I fyny"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Ysgrifennu at CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Ychwanegu Llyfrnod"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Yn _ôl"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Llyfrnodau"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Clirio'r Hanes"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Pen Cownter"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Newid Llyfrnodau"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Mynd"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Cartref"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lleoliad..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Panel _Ochr"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Enwau:"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Sbwriel"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "I _fyny"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Golwg"
 
@@ -6698,34 +6962,39 @@ msgstr "Dangos fel..."
 msgid "File Browser: %s"
 msgstr "Perchenog ffeil:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Roedd gwall gyda un o baneli y panel ochr a ni all barhau. Yn anffodus dyd I "
 "ddim yn gwybod pa un."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Cafodd y syllwr %s wall tra'n cychwyn."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Ganfwyd y syllwr %s nam ac yn methu cadw ymlaen. Os mae hyn yn parhau i "
 "degwydd, efallai dyliwch diffodd y banel yma."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Methodd Panel Ochr"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Panel Ochr"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Yn cynnwys golwg panel ochr"
 
@@ -6759,149 +7028,182 @@ msgstr "_Ychwannegu newydd..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Mae'n flin gen i, ond methwyd dilu y patrwm %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Methwyd dileu y patrwm"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Mae'n flin gen i, ond methwyd dileu y bathodyn %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Methwyd tynnu'r bathodyn"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Creu Bathodyn Newydd:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Allweddair:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Delwedd:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Dewiswch ffeil delwedd ar gyfer y bathodyn newydd:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Creu Lliw Newydd:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Enw'r lliw:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Gwerth y lliw:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Mae'n flin gen i, ond dyw \"%s\" ddim yn enw ffeil dilys."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Mae'n flin gen i, ond ni wnaethoch chi ddarparu enw ffeil dilys."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Methwyd sefydlu y patrwm"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Mae'n flin, on ni allwch amnewid y delwedd datosod."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nid yw'n Ddelwedd"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Mae'n flin, on methwyd sefydlu y patrwm %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Dewis ffeil delwedd i'w ychwannegu fel patrwm"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 "Mae'n flin gen i, ond rhaid i chi benodi enw nid yw'n wag ar gyfer y lliw "
 "newydd."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Methwyd sefydlu y lliw"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Dewiswch liw i'w ychwanegu"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Mae'n flin gen i, ond nid yw '%s' yn ffeil delwedd gellir defnyddio."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Tydi'r ffeil '%s' ddim yn delwedd gwir"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Dewiswch Gategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_anslo Tynnu"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Ychwanegu Patrwm Newydd..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Ychwanegu Lliw Newydd..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Ychwanegu Bathodyn Newydd..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Cliciwch ar batrwm er mwyn ei dynnu"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Cliciwch ar liw er mwyn ei dynnu"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Cliciwch ar fathodyn er mwyn ei dynnu"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patrymau:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Lliwiau:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Bathodynnau:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Tynnu Patrwm..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Tynnu Lliw..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Tynnu Bathodyn..."
 
@@ -7291,34 +7593,39 @@ msgstr "Crëwr _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Cau _Pob Ffenest"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Cau'r panel ochr"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Mynd i'r plygell CD Gwag"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Mynd i'r plygell Sbwriel"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lleoliad..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "plygelli"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Patrymmau"
@@ -7348,10 +7655,13 @@ msgid "View Failed"
 msgstr "Methodd Syllwr"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Cafodd y syllwr %s wall tra'n cychwyn."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Ganfwyd y syllwr %s nam ac yn methu cadw ymlaen. Fe allwch dewis syllwr "
 "arall neu mynd i lleoliad arall."
@@ -7361,98 +7671,128 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Cafodd y syllwr %s wall tra'n cychwyn."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Y NautilusApplication sy'n cysylltiedig hefo'r ffenestr yma."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Golwg Cynnwyd"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Golwg o'r ffeil neu blygell cyfredol"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Methwyd canfod \"%s\". Os gwelwch yn dda, gwiriwch y sillafu a ceisiwch eto."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Methu ychwanegu bathodynnau"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Ni Ellir Nautilus dangos \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Ni ellir dangos \"%s\", oherwydd ni all Nautilus benderfynnu pa fath o ffeil "
 "ydyw."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Does dim syllwr wedi ei sefydlu gan Nautilus all ddangos \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Methwyd dangos \"%s\", oherwydd ni all Nautilus ymdrin a lleoliadau %s:."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Methwyd dangos \"%s\", oherwydd methodd y cais mewngofnodi."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Methwyd dangos \"%s\", oherwydd gwrthodwyd mynediad."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Methwyd dangos \"%s\", oherwyddmethwyd canfod gwesteiwr o'r enw \"%s\". "
 "Gwiriwch fod y sillafu'n gywir a bod eich gosodiadau dirprwy yn gywir."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "Methwyd dangos \"%s\". Gwiriwch fod eich gosodiadau dirprwy yn gywir."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Methwyd dangos \"%s\", oherwydd ni all Nautilus ymdrin a lleoliadau %s:."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Methu dangos \"%s\", oherwydd ni ellir Nautilus cysylltu hefo'r Prif Porwr "
-"SMB.\n"
-"Gwiriwch bod gweinydd SMB yn rhedeg ar y rhwydwaith lleol."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Nid yw Chwilio ar gael ar y fynyd, oherwydd unai nad oes gennych mynegai, "
 "neu nid yw y gwasanaeth chwilio yn rhedeg. Gwnewch yn siwr bod chi wedi "
 "dechrau y gwasanaeth chwilio Medusa, ac os nad oes gennych mynegai, bod y "
 "mynegwr Medusa yn rhedeg."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Nid yw Chwilio ar gael ar y fynyd, oherwydd unai nad oes gennych mynegai, "
+"neu nid yw y gwasanaeth chwilio yn rhedeg. Gwnewch yn siwr bod chi wedi "
+"dechrau y gwasanaeth chwilio Medusa, ac os nad oes gennych mynegai, bod y "
+"mynegwr Medusa yn rhedeg."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Chwilio ddim ar Gael"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Ni Ellir Nautilus dangos \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Methu dangos lleoliad"
 
@@ -7464,7 +7804,7 @@ msgstr "Mynd at y lleoliad a benodwyd gan y llyfrnod hwn"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Hawlfraint (C) 1999-2001 Eazel, Inc."
 
@@ -7472,7 +7812,7 @@ msgstr "Hawlfraint (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Chris Jackson <chris@www.linux.org.uk>,\n"
@@ -7480,7 +7820,7 @@ msgstr ""
 "Telsa Gwynne <hobbit@aloss.ukuu.org.uk>,\n"
 "Bryn Salisbury <bryn.salisbury@operamail.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7496,39 +7836,44 @@ msgstr "Mynd yn ôl rhai tudalennau"
 msgid "Go forward a number of pages"
 msgstr "Mynd ymlaen rhai tudalennau"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Dangoswch y lleoliad yma gan \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_Cynnwys"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Enwau:"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Crëwr _CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID Rhaglen"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID rhaglenn y ffenest hon."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Rhaglen"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Y NautilusApplication sy'n cysylltiedig hefo'r ffenestr yma."
 
@@ -7564,6 +7909,248 @@ msgstr "Gweinyddion Rhwydwaith"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Ffatri ar gyfer gwelydd caledwedd"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Edrychydd Caledwedd"
+
+#~ msgid "Hardware view"
+#~ msgstr "Golygfa Caledwedd"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Gweld fel Caledwedd"
+
+#~ msgid "hardware view"
+#~ msgstr "golygfa caledwedd"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "enw yr eicon ar gyfer gwelydd caledwedd"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "crynodeb o'r gwybodaeth caledwedd"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K maint cache"
+
+#~ 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 "Amser rhedeg: %d dydd, %d awr, %d munud"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Trosolwg Caledwedd"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Mae hwn yn cynhalydd ar gyfer y tydalen IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Gwall tra'n copïo i \"%s\".\n"
+#~ "\n"
+#~ "Nid oes digon o lle yn y cyrchfan."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Gwall tra'n creu cyswllt yn \"%s\".\n"
+#~ "\n"
+#~ "Nid oes digon o lle yn y cyrchfan."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Gwall tra'n symyd eitemau i \"%s\".\n"
+#~ "\n"
+#~ "Nid oes gannoch caniatad i ysgrifennu i'r cyfeiriadur."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Gwall tra'n symyd eitemau i \"%s\".\n"
+#~ "\n"
+#~ "Mae'r disg cyrchfan yn darllen yn unig."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Gwall tra'n creu cysylltiadau yn \"%s\".\n"
+#~ "\n"
+#~ "Nid oes gannoch caniatad i ysgrifennu i'r cyfeiriadur."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Gwall tra'n creu cysylltiadau yn \"%s\".\n"
+#~ "\n"
+#~ "Mae'r disg cyrchfan yn darllen yn unig."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n copïo \"%s\".\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n symyd \"%s\".\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n dileu \"%s\".\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n copïo.\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n symyd.\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gwall \"%s\" tra'n dileu.\n"
+#~ "\n"
+#~ "A hoffech chi parhau?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Methu Copïo i'r Spwriel"
+
+#~ 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 ""
+#~ "Nid ydy y gweithred rhagosod yn gallu agor \"%s\" achos bod o methu "
+#~ "cyrchu y ffeiliau yn lleoliad \"%s\". Does dim gweithred arall ar gael i "
+#~ "olygu y ffeil. Os gwnewch copïo'r ffeil i'ch cyfrifiadur, bydych efallai "
+#~ "yn galu ei hagor."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Yn Chwilio Disgiau"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Mae Nautilus yn chwilio eich disgiau ar gyfer plygellau sbwriel."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Nid yw'r %d eitem dewisiedig yn gallu cael ei symyd i'r spwriel. Ydych "
+#~ "eisiau ei dileu ar unwaith?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Nid yw'r %d eitem dewisiedig yn gallu cael ei symyd i'r spwriel. Ydych "
+#~ "eisiau dileu y %d eitem ar unwaith?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Nid yw y ffeil a ollynir ganddoch yn delwedd. Fe allwch ond defnyddio "
+#~ "delweddau lleol fel eiconau addasiedig."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Ymddiheuriad, on nid yw y gwasanaeth chwilio Medusa ar gael achos nad yw "
+#~ "wedi ei sefydlu."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Unwaith y diwrnod bydd eich ffeiliau a cynnwys testun yn cael ei mynegi "
+#~ "er mwyn i'ch chwilio cael bod yn cyflym. Mae eich ffeiliau yn cael ei "
+#~ "mynegi."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "Nid yw \"%s\" yn leeoliad dilys. Os gwelwch yn dda, gwiriwch y sillafu a "
+#~ "ceisiwch eto."
+
+#~ 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 ""
+#~ "Methu dangos \"%s\", oherwydd ni ellir Nautilus cysylltu hefo'r Prif "
+#~ "Porwr SMB.\n"
+#~ "Gwiriwch bod gweinydd SMB yn rhedeg ar y rhwydwaith lleol."
+
+#~ msgid "file icon"
+#~ msgstr "eicon ffeil"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Enw:"
+
 #~ msgid "Unknown"
 #~ msgstr "Anhysbys"
 
@@ -7658,9 +8245,6 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "_Bar Offer"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Nid yw y lleoliad \"%s\" yn bodoli rhagor."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Mynd i lleoliad nad yw'n bodoli"
 
@@ -7671,17 +8255,10 @@ msgstr "Gweld eich gweinyddion rhwydwaith yn y trefnydd ffeiliau Nautilus"
 #~ "Os wedi gosod i gwir, bydd Nautilus ond yn dangos y cyfeiriaduron  yn y "
 #~ "panel ochr coeden. Amgen gwnaith dangos y cyfeiriaduron a'r ffeiliau."
 
-#~ msgid "_Location:"
-#~ msgstr "_Lleoliad:"
-
 #, fuzzy
 #~ msgid "_Fixed"
 #~ msgstr "_Ffeil"
 
-#, fuzzy
-#~ msgid "_Times"
-#~ msgstr "_Enwau:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Rhaid i'r Sbwriel aros ar y penbwrdd."
 
diff --git a/po/da.po b/po/da.po
index caa978ce4..7994c63b5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,9 +1,9 @@
 # Danish translation of Nautilus strings.
-# Copyright (C) 2000, 01, 02, 03 Free Software Foundation, Inc.
+# Copyright (C) 2000, 01, 02, 03, 03 Free Software Foundation, Inc.
 # Kenneth Christiansen <kenneth@gnu.org>, 2000, 2001.
 # Keld Simonsen <keld@dkuug.dk>, 2000.
 # Kim Schulz <kim@schulz.dk>, 2001.
-# Ole Laursen <olau@hardworking.dk>, 2001, 02, 03.
+# Ole Laursen <olau@hardworking.dk>, 2001, 02, 03, 03.
 #
 # Konventioner:
 #
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-10 23:15+0100\n"
-"PO-Revision-Date: 2003-11-10 23:19+0100\n"
+"POT-Creation-Date: 2004-01-01 18:41+0100\n"
+"PO-Revision-Date: 2004-01-01 18:41+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -57,8 +57,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() mislykkedes."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemer"
 
@@ -72,47 +72,55 @@ msgstr "Emblemvisning til Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Kunne ikke slette emblemet ved navn '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Kunne ikke slette emblemet med navnet '%s'. Dette skyldes sandsynligvis at "
-"emblemet er permanent og ikke et du selv har tilføjet."
+"Dette skyldes sandsynligvis at emblemet er permanent og ikke et du selv har "
+"tilføjet."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
-msgstr "Kunne ikke fjerne emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
+msgstr "Kunne ikke slette emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kunne ikke omdøbe emblemet ved navn '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Kunne ikke omdøbe emblemet med navnet '%s'. Dette skyldes sandsynligvis at "
-"emblemet er permanent og ikke et du selv har tilføjet."
+"Dette skyldes sandsynligvis at emblemet er permanent og ikke et du selv har "
+"tilføjet."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "Kunne ikke omdøbe emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Omdøb emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Indtast et nyt navn for det viste emblem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Omdøb"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Tilføj emblemer..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -120,7 +128,7 @@ msgstr ""
 "Indtast et beskrivende navn ud for hvert emblem. Dette navn vil blive brugt "
 "andre steder til at identificere emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -128,139 +136,55 @@ msgstr ""
 "Indtast et beskrivende navn ud for emblemet. Dette navn vil blive brugt "
 "andre steder til at identificere emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Nogle af filerne kunne ikke tilføjes som emblemer fordi de ikke så ud til at "
-"være gyldige billeder."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Nogle af filerne kunne ikke tilføjes som emblemer."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Emblemerne ser ikke ud til at være gyldige billeder."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "Kunne ikke tilføje emblemer"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Ingen af filerne kunne tilføjes som emblemer fordi de ikke så ud til at være "
-"gyldige billeder."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Ingen af filerne kunne tilføjes som emblemer."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Emblemet kan ikke tilføjes."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Den trækkede tekst var ikke en gyldig filplacering."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Kunne ikke tilføje emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Filen '%s' ser ikke ud til at være et gyldigt billede."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Den trækkede fil ser ikke ud til at være et gyldigt billede."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Slet"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrik for udstyrsvisning"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Udstyr"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Udstyrsviser"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Udstyrsvisning"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vis som udstyr"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "udstyrsvisning"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "navnet på ikonet til udstyrsvisning"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "sammendrag af udstyrsoplysninger"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K mellemlager"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Gb RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu Mb RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Gb"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mb"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Oppetiden er %d dage, %d timer og %d minutter"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Udstyrsoversigt"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Dette er en pladsoptager for processorsiden"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Dette er en pladsoptager for RAM-siden"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Dette er en pladsoptager for IDE-siden"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historik"
@@ -924,6 +848,10 @@ msgstr "Gnome.org"
 msgid "GNU.org"
 msgstr "Gnu.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Udstyr"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "International"
@@ -1209,30 +1137,18 @@ msgid "Desktop trash icon name"
 msgstr "Ikonnavn for skrivebordspapirkurv"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Store mapper over denne størrelse vil blive afkortet til omkring denne "
-"størrelse. Formålet med dette er at undgå at bruge al hukommelsen og dermed "
-"slå Nautilus ihjel ved meget store mapper. En negativ værdi indikerer ingen "
-"grænse. Grænsen er ikke helt præcis fordi mapper indlæses i klumper."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Aktivér \"specielle\" kørselstilvalg i filegenskabsvinduet"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Filnavn for denn forvalgte mappebaggrund. Benyttes kun hvis background_set "
-"er sand."
+"Filnavn for den forvalgte mappebaggrund. Benyttes kun hvis background_set er "
+"sand."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1240,6 +1156,18 @@ msgstr ""
 "Filnavn for den forvalgte sidepanelsbaggrund. Benyttes kun hvis "
 "side_pane_background_set er sand."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Store mapper over denne størrelse vil blive afkortet til omkring denne "
+"størrelse. Formålet med dette er at undgå at bruge al hukommelsen og dermed "
+"slå Nautilus ihjel ved meget store mapper. En negativ værdi indikerer ingen "
+"grænse. Grænsen er ikke helt præcis fordi mapper indlæses i klumper."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Skjul standardbogmærker i bogmærkemenuen"
@@ -1250,8 +1178,8 @@ msgstr "Hjemmeikon synligt på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Hvis sat til sand, vil Nautilus kun vise mapper i træsidepanelet. Ellers "
 "vises både mapper og filer."
@@ -1283,8 +1211,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Hvis sat til sand, vil Nautilus vise mapper før filer i ikon- og "
 "listevisningerne."
@@ -1329,7 +1257,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Hvis sat til sand, vil Nautilus benytte brugerens hjemmemappe som "
@@ -1348,7 +1276,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Hvis sat til sand, vil skjulte filer blive vist i filhåndteringen. Skjulte "
 "filer er enten punktumfiler eller angivet i en mappes \".hidden\"-fil."
@@ -1365,19 +1293,25 @@ msgstr ""
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr "Hvis sat til sand, vil et ikon der henviser til computer-placeringen, blive vist på skrivebordet."
+msgstr ""
+"Hvis sat til sand, vil et ikon der henviser til computer-placeringen, blive "
+"vist på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr "Hvis sat til sand, vil et ikon der henviser til hjemmemappen, blive vist på skrivebordet."
+msgstr ""
+"Hvis sat til sand, vil et ikon der henviser til hjemmemappen, blive vist på "
+"skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr "Hvis sat til sand, vil et ikon der henviser til papirkurven, blive vist på skrivebordet."
+msgstr ""
+"Hvis sat til sand, vil et ikon der henviser til papirkurven, blive vist på "
+"skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
@@ -1401,7 +1335,7 @@ msgstr ""
 "\" i stedet for fra \"a\" til \"Ã¥\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Hvis sand vil ikoner blive placeret tættere som standard i nye vinduer."
 
@@ -1431,7 +1365,7 @@ msgid "List of possible captions on icons"
 msgstr "Liste over mulige tekster for ikoner"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr "Maksimalt håndterede filer i en mappe"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1451,11 +1385,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus håndterer optegning af skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus benytter brugerens hjemmemappe som skrivebord"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr "Vis kun mapper i træsidepanelet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1475,7 +1409,7 @@ msgid "Reverse sort order in new windows"
 msgstr "Omvendt sorteringsorden i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Vis mapper først i vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1515,7 +1449,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1528,10 +1462,10 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Hastighedsvalg for hvornår miniaturer af billeder skal vises. Hvis sat til "
 "\"always\", vil der altid blive genereret miniaturer også selvom filen er på "
@@ -1541,9 +1475,9 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Hastighedsvalg for hvornår antallet af objekter i en mappe skal vises. Hvis "
@@ -1555,18 +1489,18 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Den forvalgte sorteringsorden for objekter i ikonvisningen. Mulige værdier "
 "er \"name\", \"size\", \"type\", \"modification_date\" og \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Den forvalgte sorteringsorden for objekter i listevisningen. Mulige værdier "
-"er name, size, type og modification_date."
+"er \"name\", \"size\", \"type\", \"modification_date\" og \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
@@ -1609,7 +1543,7 @@ msgid "Use manual layout in new windows"
 msgstr "Benyt manuel placering i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Benyt tættere placering i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1638,7 +1572,7 @@ msgstr ""
 "for mappen. Mulige værdier er \"list_view\" og \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Hvornår antallet af objekter i en mappe skal vises"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1650,7 +1584,7 @@ msgid "When to show thumbnails of image files"
 msgstr "Hvornår miniaturer af billedfiler skal vises"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Om en brugerdefineret forvalgt mappebaggrund er valgt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1808,67 +1742,77 @@ msgstr "nulstil"
 msgid "on the desktop"
 msgstr "på skrivebordet"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Du kan ikke slette et arkivikon."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Du kan ikke slette et arkivikon. Vælg punktet 'skub ud' i højrekliksmenuen "
-"for arkivet hvis du ønsker at skubbe det ud."
+"Vælg punktet 'skub ud' i højrekliksmenuen for arkivet hvis du ønsker at "
+"skubbe mediet ud."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "Kan ikke slette arkiv"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Flyt hertil"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopiér hertil"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Kæd hertil"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Vælg som _baggrund"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Annullér"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Vælg som baggrund for _alle mapper"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Vælg som baggrund for _denne mappe"
 
 #: 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 ikke installeres."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Beklager, men du skal angive et ikke-tomt nøgleord for det nye emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "Kunne ikke installere emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1879,20 +1823,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Desværre, der eksisterer allerede et emblem med navnet \"%s\". Vælg venligst "
-"et andet navn."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Desværre, der eksisterer allerede et emblem med navnet \"%s\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Vælg venligst et andet emblemnavn."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Kunne ikke installere emblem"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Beklager, kunne ikke gemme brugerdefineret emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Beklager, kunne ikke gemme brugerdefineret emblemnavn."
 
@@ -1911,310 +1859,211 @@ msgstr "Fra:"
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Fejl ved flytning."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Fejl ved flytning.\n"
-"\n"
-"'%s' kan ikke flyttes fordi den er på en skrivebeskyttet disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "\"%s\" kan ikke flyttes fordi den er på en skrivebeskyttet disk."
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Fejl ved sletning."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Fejl ved sletning.\n"
-"\n"
-"'%s' kan ikke slettes fordi du ikke har lov til at ændre dens forældremappe."
+"\"%s\" kan ikke slettes fordi du ikke har lov til at ændre dens overliggende "
+"mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Fejl ved sletning.\n"
-"\n"
-"'%s' kan ikke slettes fordi den er på en skrivebeskyttet disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "\"%s\" kan ikke slettes fordi den er på en skrivebeskyttet disk."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Fejl ved flytning.\n"
-"\n"
-"'%s' kan ikke flyttes fordi du ikke har lov til at ændre den eller dens "
-"forældremappe."
+"\"%s\" kan ikke flyttes fordi du ikke har lov til at ændre den eller dens "
+"overliggende mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Fejl ved flytning."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Fejl ved flytning.\n"
-"\n"
-"'%s' kan ikke flyttes fordi enten den eller den mappe der indeholder den, er "
-"indeholdt i destinationen."
+"\"%s\" kan ikke flyttes fordi enten den eller den mappe der indeholder den, "
+"er indeholdt i destinationen."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Fejl under flytning.\n"
-"\n"
-"'%s' kan ikke flyttes til papirkurven da du ikke har adgang til at ændre den "
-"eller dens overliggende mappe."
+"\"%s\" kan ikke flyttes til papirkurven da du ikke har adgang til at ændre "
+"den eller dens overliggende mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Fejl ved kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"Fejl ved kopiering.\n"
-"\n"
-"'%s' kan ikke kopieres fordi du ikke har lov til at læse den."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr "\"%s\" kan ikke kopieres fordi du ikke har lov til at læse den."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fejl ved kopiering til '%s'.\n"
-"\n"
-"Der er ikke nok plads ved destinationen."
+msgid "Error while copying to \"%s\"."
+msgstr "Fejl ved kopiering til \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fejl ved flytning til '%s'.\n"
-"\n"
-"Der er ikke nok plads ved destinationen."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Der er ikke nok plads på destinationen."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fejl ved oprettelse af henvisning i '%s'.\n"
-"\n"
-"Der er ikke nok plads ved destinationen."
+msgid "Error while moving to \"%s\"."
+msgstr "Fejl ved flytning til \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fejl ved kopiering til '%s'.\n"
-"\n"
-"Du har ikke lov til at skrive i denne mappe."
+msgid "Error while creating link in \"%s\"."
+msgstr "Fejl ved oprettelse af henvisning i \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fejl ved kopiering til '%s'.\n"
-"\n"
-"Destinationsdisken er skrivebeskyttet."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "Du har ikke lov til at skrive i denne mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fejl ved flytning af filer til \"%s\".\n"
-"\n"
-"Du har ikke lov til at skrive til denne mappe."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "Destinationsdisken er skrivebeskyttet."
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fejl ved flytning af filer til '%s'.\n"
-"Destinationsdisken er skrivebeskyttet."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fejl ved oprettelse af henvisninger i '%s'.\n"
-"\n"
-"Du har ikke lov til at skrive til denne mappe."
+msgid "Error while moving items to \"%s\"."
+msgstr "Fejl ved flytning af objekter til \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fejl ved oprettelse af henvisninger i '%s'.\n"
-"\n"
-"Destinationsdisken er skrivebeskyttet."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved kopiering af \"%s\".\n"
-"\n"
-"Vil du fortsætte?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Fejl ved oprettelse af henvisninger i \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved flytning af \"%s\".\n"
-"\n"
-"Vil du fortsætte?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Fejl \"%s\" ved kopiering af \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Vil du fortsætte?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved oprettelse af en henvisning til \"%s\".\n"
-"\n"
-"Vil du fortsætte?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Fejl \"%s\" ved flytning af \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved sletning af \"%s\".\n"
-"\n"
-"Vil du gerne fortsætte?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Fejl \"%s\" ved oprettelse af en henvisning til \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved kopiering.\n"
-"\n"
-"Vil du gerne fortsætte?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Fejl \"%s\" ved sletning af \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved flytning.\n"
-"\n"
-"Vil du gerne fortsætte?"
+msgid "Error \"%s\" while copying."
+msgstr "Fejl \"%s\" ved kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved oprettelse af henvisning.\n"
-"\n"
-"Vil du gerne fortsætte?"
+msgid "Error \"%s\" while moving."
+msgstr "Fejl \"%s\" ved flytning."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fejl \"%s\" ved sletning.\n"
-"\n"
-"Vil du gerne fortsætte?"
+msgid "Error \"%s\" while linking."
+msgstr "Fejl \"%s\" ved oprettelse af henvisning."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Fejl ved kopiering."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Fejl \"%s\" ved sletning."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Fejl ved flytning."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Fejl ved kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Fejl ved oprettelse af henvisning."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Fejl ved flytning"
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Fejl ved sletning."
+msgid "Error While Linking"
+msgstr "Fejl ved oprettelse af henvisning"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Spring over"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Fejl ved sletning"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Prøv igen"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Spring over"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Prøv igen"
+
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kunne ikke flytte \"%s\" til den nye placering."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kunne ikke blive flyttet til den nye placering fordi dets navn "
 "allerede bliver brugt til et specielt objekt som ikke kan omdøbes eller "
@@ -2222,13 +2071,16 @@ msgstr ""
 "\n"
 "Hvis du stadig ønsker at flytte \"%s\" så omdøb den og prøv igen."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kunne ikke fuldføre angivet handling."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kunne ikke blive kopieret til den nye placering fordi dets navn "
 "allerede bliver brugt til et specielt objekt som ikke kan omdøbes eller "
@@ -2236,44 +2088,47 @@ msgstr ""
 "\n"
 "Hvis du stadig ønsker at kopiere \"%s\" så omdøb den og prøv igen."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Kan ikke erstatte fil."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Fil '%s' eksisterer allerede.\n"
 "\n"
 "Vil du gerne erstatte den?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "Konflikt ved kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Erstat"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Erstat"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Erstat alt"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Erstat _alle"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "henvisning til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "en anden henvisning til %s"
@@ -2282,25 +2137,25 @@ msgstr "en anden henvisning til %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. henvisning til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. henvisning til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. henvisning til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. henvisning til %s"
@@ -2310,561 +2165,601 @@ msgstr "%d. henvisning til %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (ny kopi)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". (kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". (kopi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ny kopi)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ukendt GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Flytter filer til papirkurv"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Filer smidt ud:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Flytter"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Forbereder flytning til papirkurven..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Flytter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Filer flyttet:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Forbereder flytning..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Færdiggør flytning..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Opretter henvisninger til filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Filer kædet sammen:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Sammenkæder"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Forbereder oprettelse af henvisninger..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Fuldfører oprettelse af henvisninger..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopierer filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Filer kopieret:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopierer"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Forbereder kopiering..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Du kan ikke kopiere filer til papirkurven."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Du kan ikke kopiere objekter til papirkurven."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Kan ikke kopiere til papirkurv"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Filer og mapper kan kun flyttes til papirkurven."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Du kan ikke flytte denne papirkurv."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Du kan ikke kopiere denne papirkurv."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"En papirkurvsmappe bruges til at opbevare objekter der er blevet flyttet til "
+"papirkurven."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Kan ikke ændre placering af papirkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Kan ikke kopiere papirkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikke flytte en mappe til den selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikke kopiere en mappe til den selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Opret en ny tom mappe i denne mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Kan ikke flytte til sig selv"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kan ikke kopiere til sig selv"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikke kopiere en fil til den selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "Destinationen og kilden er den samme fil."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kan ikke kopiere til sig selv"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Fejl ved oprettelse af ny mappe.\n"
 "\n"
 "Du har ikke lov til at skrive til målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Fejl ved oprettelse af ny mappe.\n"
 "\n"
 "Der er ikke plads på målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fejl '%s' ved oprettelse af ny mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Fejl ved oprettelse af ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Fejl ved oprettelse af ny mappe"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "mappe uden navn"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Fejl '%s' ved oprettelse af ny mappe."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Fejl ved oprettelse af ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Fejl ved oprettelse af ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fil"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Sletter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Filer slettet:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Sletter"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Forbereder sletning af filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tømmer papirkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Forbereder tømning af papirkurv..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Er du sikker på at du ønsker at slette alle filer i papirkurven?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Hvis du tømmer papirkurven, vil filerne blive slettet permanent."
 
 # det er et udsagnsord
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tøm"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "fæ"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "fæ (kopiér)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".fæ.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".fæ (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "fæ fæ"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "fæ fæ (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "fæ.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "fæ (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "fæ fæ.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "fæ fæ (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "fæ fæ.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "fæ fæ (kopi).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "fæ...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "fæ.. (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "fæ..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "fæ... (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "fæ. (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "fæ. (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "fæ (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "fæ (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "fæ (3. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "fæ (3. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "fæ fæ (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "fæ fæ (3. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "fæ (13. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "fæ (14. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "fæ (13. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "fæ (14. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "fæ (21. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "fæ (22. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "fæ (21. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "fæ (22. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "fæ (23. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "fæ (23. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "fæ (24. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "fæ (24. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "fæ (25. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "fæ (25. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "fæ fæ (24. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "fæ fæ (25. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "fæ fæ (24. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "fæ fæ (25. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "fæ fæ (100000000000000te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "fæ (10. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "fæ (11. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "fæ (10. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "fæ (11. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "fæ (12. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "fæ (12. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "fæ (110. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "fæ (111. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "fæ (110. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "fæ (111. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "fæ (122. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "fæ (123. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "fæ (122. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "fæ (123. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "fæ (124. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "fæ (124. kopi).txt"
 
@@ -2883,65 +2778,65 @@ msgstr "fæ (124. kopi).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "i dag kl. 00:00:00"
 
 # H i stedet for I for 24-timers ur
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "i dag kl. %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "i dag kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "i dag kl. %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "i dag, kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "i dag, kl. %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "i dag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "i går kl. 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "i går kl. %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "i går kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "i går kl. %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "i går, kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "i går, kl. %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "i går"
 
@@ -2950,134 +2845,134 @@ msgstr "i går"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "onsdag d. 0. september 0000 kl. 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A d. %-d. %B %Y kl. %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "man. d. 0. sept. 0000 kl. 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a d. %-d. %b. %Y kl. %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "ons. d. 0. sept. 0000 kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a d. %-d. %b. %Y kl. %-H:%M"
 
 # afspejler teksten nedenfor
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0/10-0000 kl. 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d/%-m-%Y kl. %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0/10-0000, 01:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d/%-m-%Y, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00-00, 01:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%-m-%Y, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00-00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%-d/%-m-%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 objekter"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mapper"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 objekt"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u objekter"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mapper"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? objekter"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ukendt type"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "ukendt MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ukendt"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3087,7 +2982,7 @@ msgstr ""
 "skyldes sandsynligvis at din gnome-vfs.keys-fil er det forkerte sted eller "
 "ikke bliver fundet af en eller anden grund."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3096,11 +2991,11 @@ msgstr ""
 "Ingen beskrivelse fundet for MIME-typen '%s' (filen er '%s'), fortæl det "
 "venligst til Gnome VFS-postlisten."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "henvisning"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "henvisning (ødelagt)"
 
@@ -3221,11 +3116,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Søg efter filer efter filnavn og -egenskaber"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonvisning"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listevisning"
@@ -3384,147 +3281,152 @@ msgstr "Hjemmemappe%.0s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Computer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "filikon"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "redigerbar tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "den redigerbare etiket"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "ekstra tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "noget mere tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "fremhævet til markering"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "om der bliver fremhævet til en markering"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "fremhævet for tastaturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "om der bliver fremhævet for at vise tastaturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "fremhævet for slip"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "om der bliver fremhævet til en træk og slip-slipning"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Markeringsrektanglet"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Indram tekst"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Tegn en ramme omkring ikke-markeret tekst"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Markeringsboksens farve"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Farven for markeringsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Markeringsboksens alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Uigennemsigtigheden af markeringsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Fremhævningsalfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Uigennemsigtigheden af fremhævningen for markerede ikoner"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Lys infofarve"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Farve der benyttes til infotekst mod en mørk baggrund"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Mørk infofarve"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Farve der benyttes til infotekst mod en lys baggrund"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Denne mappe bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade punktet blive hvor du slap det? Dette vil ødelægge den "
 "gemte manuelle placering."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Denne mappe benyttet automatisk placering."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Denne mappe bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade disse filer blive hvor du slap dem? Dette vil ødelægge den "
 "gemte manuelle placering."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Denne mappe bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade filen blive hvor du slap den?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Denne mappe bruger automatisk placering. Ønsker du at skifte til manuel "
 "placering og lade disse filer blive hvor du slap dem?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Skift til manuel opbygning af udseende?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Skift"
 
@@ -3635,74 +3537,74 @@ msgstr "Er forvalgt for \"%s\"-filer."
 msgid "Is the default for all \"%s\" items."
 msgstr "Er forvalgt for alle \"%s\"-filer."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Ændr '%s'"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Medtag i menuen for \"%s\"-filer."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Er i menuen for alle \"%s\"-filer."
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Medtag i menuen for \"%s\" kun."
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Benyt som forvalg for \"%s\" kun."
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Medtag ikke i menuen for \"%s\"-filer."
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Navn"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Vælg"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Færdig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Ændr..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Filtyper og programmer"
 
 # 'du kan vælge hvilke programmer der skal bla bla
 # i kontrolcentret' - dette står på en knap ved siden af
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_GÃ¥ til kontrolcentret"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3710,49 +3612,49 @@ msgstr ""
 "Du kan vælge hvilke programmer der foreslås for hvilke filtyper i "
 "filtypeassocieringsvinduet."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Ã…bn med andet program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Vælg et program som skal bruges til at åbne \"%s\" med:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Ã…bn med anden fremviser"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Vælg en visning for \"%s\":"
 
 # ikke 'views' (visninger), men eksterne programmer, 'viewers'
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Ingen fremvisere er til stede for \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Ingen fremvisere tilgængelige"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Der er intet program associeret med \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Intet program associeret"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Der er ingen handling associeret med \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Ingen handling associeret"
 
@@ -3760,11 +3662,9 @@ msgstr "Ingen handling associeret"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3773,42 +3673,41 @@ msgstr ""
 "Du kan konfigurere Gnome til at associere programmer med filtyper. Vil du "
 "associere et program med denne filtype nu?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Associér program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Fremviseren associeret med \"%s\" er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Ugyldig fremviser associeret"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Programmet associeret med \"%s\" er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Ugyldigt program associeret"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Handlingen associeret med \"%s\" er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Ugyldig handling associeret"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3819,115 +3718,139 @@ msgstr ""
 "fremviser med denne filtype. Vil du associere et program eller en fremviser "
 "med denne filtype nu?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Associér handling"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" kan ikke åbne \"%s\" fordi \"%s\" ikke kan få adgang til filer "
+"placeret på \"%s\". Ønsker du at vælge et andet program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" kan ikke åbne \"%s\" fordi \"%s\" ikke kan få adgang til filer "
 "placeret på \"%s\". Ønsker du at vælge et andet program?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Den forvalgte handling kan ikke åbne \"%s\" fordi den ikke kan få adgang til "
 "filer placeret på \"%s\". Ønsker du at vælge en anden handling?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Kan ikke vise sted"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" kan ikke åbne \"%s\" fordi \"%s\" ikke kan få adgang til filer "
+"placeret på \"%s\". Ønsker du at vælge et andet program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" kan ikke åbne \"%s\" fordi \"%s\" ikke kan få adgang til filer "
 "placeret på \"%s\". Der er ikke adgang til andre programmer som kan vise "
 "denne fil. Hvis du kopierer filen over på din computer, så kan du måske åbne "
 "den."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Den forvalgte handling kan ikke åbne \"%s\" fordi den ikke kan få adgang til "
-"filer placeret på \"%s\". Der er ikke adgang til andre programmer som kan "
-"vise denne fil. Hvis du kopierer filen over på din computer, så kan du måske "
-"Ã¥bne den."
+"filer placeret på \"%s\". Ønsker du at vælge en anden handling?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" kan ikke åbne \"%s\" fordi \"%s\" ikke kan få adgang til filer "
+"placeret på \"%s\". Der er ikke adgang til andre programmer som kan vise "
+"denne fil. Hvis du kopierer filen over på din computer, så kan du måske åbne "
+"den."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Ã…bner %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Desværre, men du kan ikke udføre kommandoer fra et ekstern nebsted pga. "
-"sikkerhedshensyn."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Desværre, men du kan ikke udføre kommandoer fra et fjernt sted."
+
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Dette er deaktiveret af sikkerhedshensyn."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "Kan ikke køre eksterne henvisninger"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Der opstod en fejl under kørsel af programmet:\n"
-"\n"
-"Detajler: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detaljer:"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Der opstod en fejl under kørsel af programmet."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Fejl ved kørsel af program"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Denne slippedestination understøtter kun lokale filer"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Denne slippedestination understøtter kun lokale filer.\n"
-"\n"
 "For at åbne ikke-lokale filer kopiér dem til en lokal mappe og slip dem igen."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "Slippedestination understøtter kun lokale filer"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Denne slippedestination understøtter kun lokale filer.\n"
-"\n"
 "For at åbne ikke-lokale filer kopiér dem til en lokal mappe og slip dem "
 "igen. De lokale filer du har sluppet, er allerede blevet åbnet."
 
@@ -4174,14 +4097,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementer indeholdende \"medusa\" i navnet og som er mapper"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Søger på diskene"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus søger på din disk for at finde skraldespandsmapper"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Redigér"
@@ -4384,96 +4299,104 @@ msgstr "Baggrund"
 msgid "Empty Trash"
 msgstr "Tøm papirkurv"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Dette vil åbne %d separate vinduer. Er du sikker på at du vil dette?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Ã…bn %d nye vinduer?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Er du sikker på at du ønsker at åbne alle filer?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Dette vil åbne %d separate vinduer."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Er du sikker på at du en gang for alle ønsker at slette '%s'?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Er du sikker på at du en gang for alle ønsker at slette de %d markerede "
 "elementer?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Hvis du sletter et objekt, er det gået tabt permanent."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Slet?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Vælg mønster"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "_Mønster:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "'%s' markeret"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mappe markeret"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mapper markeret"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (med 0 objekter)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (med 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (med %d objekter)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (med et totalt antal af 0 objekter)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (med et totalt antal af 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (med et totalt antal af %d objekter)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "'%s' markeret (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d objekter markeret (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 andet objekt markeret (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andre objekter markeret (%s)"
@@ -4485,7 +4408,7 @@ msgstr "%d andre objekter markeret (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4494,106 +4417,121 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
-msgstr ""
-"Mappen '%s' indeholder flere filer end Nautilus kan håndtere. Nogle filer "
-"vil ikke blive vist."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
+msgstr "Mappen '%s' indeholder flere filer end Nautilus kan håndtere."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Nogle filer vil ikke blive vist."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "For mange filer"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "'%s' kan ikke flyttes til papirkurven. Ønsker du at slette den helt? "
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"De %d markerede objekter kan ikke flyttes til papirkurven. Ønsker du at "
-"slette dem helt?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "'%s' kan ikke flyttes til papirkurven. Ønsker du at slette den helt? "
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d af de markerede objekter kan ikke flyttes til papirkurven. Ønsker du at "
-"slette de %d objekter helt?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "'%s' kan ikke flyttes til papirkurven. Ønsker du at slette den helt? "
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Slet med det samme?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "er du sikker på at du vil slette '%s' permanent fra papirkurven?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Er du sikker på at du vil slette de %d valgte objekter fra papirkurven "
 "permanent?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+#, fuzzy
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Hvis du tømmer papirkurven, vil filerne blive slettet permanent."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Slet fra papirkurven?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Brug '%s' til at åbne det markerede objekt"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Andre programmer..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Et _program..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Anden frem_viser..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "En frem_viser..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Kunne ikke fuldføre angivet handling: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Kunne ikke fuldføre angivet handling."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Benyt '%s' til de markerede filer"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Alle kørbare filer i denne mappe vil blive vist i programmenuen. Valg af et "
+"program fra menuen vil køre programmet med alle de markerede elementer som "
+"inddata."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4601,11 +4539,11 @@ msgstr ""
 "program fra menuen vil køre programmet med alle de markerede elementer som "
 "inddata."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Om programmer"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4646,24 +4584,24 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position og størrelse af det aktive vindue"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "'%s' vil blive flyttet hvis du vælger kommandoen 'indsæt filer'"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "'%s' vil blive kopieret hvis du vælger kommandoen 'indsæt filer'"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "De %d markerede filer blive flyttet hvis du vælger kommandoen 'indsæt filer'"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4671,155 +4609,162 @@ msgstr ""
 "De %d markerede filer vil blive kopieret hvis du vælger kommandoen 'indsæt "
 "filer'"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Der er intet på klippebordet at indsætte."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Monteringsfejl"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Felj ved afmontering"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr "Udskubningsfejl"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Skub _ud"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Afmontér arkiv"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Ã…bn i nyt vindue"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Ã…bn i %d nye vinduer"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Gennemse mappe"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Gennemse mapper"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Slet fra papirkurv"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Slet alle valgte elementer permanent"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Smi_d i papirkurv"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Flyt alle de valgte elementer til papirkurven"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Slet"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Opret _henvisninger"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Opret _henvisning"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurv"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "K_lip fil"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "K_lip filer"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopiér fil"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopiér filer"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Denne henvisning kan ikke benyttes da den ikke har en destination. Ønsker du "
 "at smide henvisningen i papirkurven? "
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Denne henvisning kan ikke benyttes da den ikke har en destination. Ønsker du "
+"at smide henvisningen i papirkurven? "
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Denne henvisning kan ikke benyttes da dens destination '%s' ikke eksisterer. "
 "Ønsker du at smide henvisningen i papirkurven? "
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Ødelagt henvisning"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "'%s' er en udførbar tekstfil. Vil du køre den eller vise dens indhold?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Kørbare tekstfiler"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Kør eller fremvis"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Fremvis"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Kør i _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Fremvis"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Kør"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Ã…bner '%s'"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Fortryd åbning?"
 
@@ -4840,17 +4785,22 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Desværre, kunne ikke vise hele indholdet af '%s'."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Rettighederne for \"%s\" kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fejl ved visning af mappe"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Navnet '%s' er allerede i brug i denne mappe. Benyt venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4858,12 +4808,12 @@ msgstr ""
 "Der er ingen '%s' i denne mappe. MÃ¥ske er den lige blevet flyttet eller "
 "slettet?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Du har ikke de nødvendige rettigheder til at omdøbe '%s'."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4872,62 +4822,77 @@ msgstr ""
 "Navnet \"%s\" er ikke gyldigt fordi det indeholder tegnet '/'. Benyt "
 "venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Navnet \"%s\" er ikke gyldigt. Benyt venligst et andet navn."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Kunne ikke omdøbe '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Desværre, kunne ikke omdøbe \"%s\" til \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Desværre, men dette tema kunne ikke fjernes!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Fejl ved omdøbelse"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ikke de nødvendige rettigheder til at ændre gruppen til '%s.'"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Kunne ikke ændre gruppen til '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Desværre, kunne ikke ændre gruppen til '%s'."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Rettighederne for \"%s\" kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Fejl under sætning af gruppe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Kunne ikke ændre ejeren af '%s' fordi den er på en skrivebeskyttet disk."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Desværre, kunne ikke ændre ejeren af '%s'."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Rettighederne for \"%s\" kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Fejl ved ændring af ejer"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4935,21 +4900,26 @@ msgstr ""
 "Kunne ikke ændre rettighederne til '%s' fordi den er på en skrivebeskyttet "
 "disk."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Desværre, kunne ikke ændre rettighederne til '%s'."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Rettighederne for \"%s\" kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Fejl ved sætning af rettigheder"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Omdøber '%s' til '%s'"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Fortryd omdøbning?"
 
@@ -5008,130 +4978,152 @@ msgstr "Nulstil _ikonstørrelser"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Nulstil _ikonstørrelse"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pegende på '%s'"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Træk og slip er kun understøttet til lokale filsystemer."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Træk og slip er kun understøttet til lokale filsystemer."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Træk og slip-fejl"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "En ugyldig trækketype blev brugt."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Dato for ændring"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Du kan ikke angive mere end et brugerdefineret ikon ad gangen! Træk venligst "
+"kun ét billede for at vælge et brugerdefineret ikon."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Du kan ikke angive mere end et brugerdefineret ikon ad gangen! Træk venligst "
 "kun ét billede for at vælge et brugerdefineret ikon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mere end 1 billede"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Filen du slap, er ikke lokal. Du kan kun bruge lokale billeder som "
 "brugerdefinerede ikoner."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Filen du slap, er ikke lokal. Du kan kun bruge lokale billeder som "
+"brugerdefinerede ikoner."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Kun lokale billeder"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Filen du slap, er ikke et billede. Du kan kun bruge lokale billeder som "
+"Filen du slap, er ikke lokal. Du kan kun bruge lokale billeder som "
 "brugerdefinerede ikoner."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Kun billeder"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaber for %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Fortryd ændring af gruppe?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Skifter gruppe"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Fortryd ændring af ejer?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Skifter ejer"
 
 # der står 'Indhold:' foran
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "intet"
 
 # ditto
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ulæseligt"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element med størrelsen %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementer, totalt %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(noget indhold ulæseligt)"
 
@@ -5141,195 +5133,195 @@ msgstr "(noget indhold ulæseligt)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Indhold:"
 
 # er den første fane under egenskaberne for en fil - 'basal' ser ikke godt ud
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Generelt"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Navne:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "-"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Placering:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Arkiv:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Fri plads"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Henvisningsmål:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Mime-type"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Ændret:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Berørt:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Vælg eget ikon..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Fjern eget ikon"
 
 # rettigheder, ikke bydeform
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Læse"
 
 # ditto
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Skrive"
 
 # ditto
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Udførsel"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Sæt _bruger-id"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Specielle kørselstilvalg:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Sæt _gruppe-id"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Klæbrig"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Rettigheder"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du er ikke ejeren, så du kan ikke ændre disse rettigheder."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Filens ejer:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Filens ejer:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Filens gruppe:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Filens gruppe:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Ejer:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Gruppe"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstvisning:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Talvisning:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Senest ændret:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rettighederne for \"%s\" kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Rettighederne for den valgte fil kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Der opstod en fejl under visning af hjælp:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Der opstod en fejl under visning af hjælp: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Kunne ikke vise hjælp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Annullér visning af egenskaber-vinduet?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Opretter egenskaber-vinduet"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Vælg et ikon"
 
@@ -5347,72 +5339,111 @@ msgid "Search Results"
 msgstr "Søgeresultat"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Beklager, men Medusa søgningstjenesten er ikke tilgængelig fordi den ikke er "
-"installeret."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Beklager men Medusa søgningstjenesten er ikke tilgængelig."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Søgetjeneste ikke tilgængelig"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Den søgning du har valgt, er nyere end indekset på dit system. Søgningen vil "
 "ikke give noget resultat nu. Du kan oprette et nyt indeks ved at køre "
 "'medusa-indexd' som root ved kommandolinjen."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Søgningen kan ikke åbne dit filsystemsindeks. Indekset mangler måske eller "
+"er beskadiget. Du kan oprette et indeks manuelt ved at køre \"medusa-indexd"
+"\" som root fra kommandolinjen."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Søg efter filer som er for nye"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Alle indekserede filer på din maskine passer på det kriterium, du har valgt. "
+"Du kan tjekke stavemåden for dine valg, eller tilføje flere kriterier for at "
+"indsnævre resultaterne."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Alle indekserede filer på din maskine passer på det kriterium, du har valgt. "
 "Du kan tjekke stavemåden for dine valg, eller tilføje flere kriterier for at "
 "indsnævre resultaterne."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Fejl under søgning"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Søgningen kan ikke åbne dit filsystemsindeks. Indekset mangler måske eller "
 "er beskadiget. Du kan oprette et indeks manuelt ved at køre \"medusa-indexd"
 "\" som root fra kommandolinjen."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Fejl ved læsning af filindeks"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "En fejl skete ved indlæsning af indholdet i denne søgning: %s"
 
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"For at søge efter indhold kræves et indeks over filerne på systemet. Der kan "
+"i øjeblikket ikke opnås adgang til indekset."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"For at søge efter indhold kræves et indeks over filerne på systemet. Der kan "
+"i øjeblikket ikke opnås adgang til indekset."
+
 # sætningen er i passiv for at undgå at blande Find ind i det
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5420,25 +5451,23 @@ msgstr ""
 "systemet. Der kan ikke opnås adgang til dit indeks lige nu så en langsommere "
 "søgning der ikke benytter indekset, vil blive udført."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"For at søge efter indhold kræves et indeks over filerne på systemet. Der kan "
-"i øjeblikket ikke opnås adgang til indekset."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Hurtige søgninger ikke tilgængelige"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Søgninger efter indhold ikke tilgængelige"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5452,56 +5481,87 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "For at kunne foretage en hurtig søgning kræves et indeks over filerne på "
 "systemet. Maskinen er i øjeblikket ved at lave det. Fordi indekset så ikke "
 "kan bruges, kan søgningen tage flere minutter."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "For at kunne foretage en søgning efter indhold kræves et indeks over filerne "
-"på systemet. Maskinen er i øjeblikket ved at lave det. Indholdssøgning "
-"bliver tilgængeligt når indekset er færdigt."
+"på systemet. Et indeks kan ikke laves lige nu."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indekserede søgninger er ikke tilgængelige"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"For at søge efter indhold kræves et indeks over filerne på systemet. Der kan "
+"i øjeblikket ikke opnås adgang til indekset."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"For at kunne foretage en søgning efter indhold kræves et indeks over filerne "
+"på systemet. Et indeks kan ikke laves lige nu."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "For at kunne foretage en hurtig søgning kræves et indeks over filerne på "
 "systemet. Intet indeks er tilgængeligt i øjeblikket. Du kan oprette ét ved "
 "at køre \"medusa-indexd\" som root ved kommandolinjen. Når et indeks ikke er "
 "til stede, kan søgninger tage flere minutter."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "For at kunne foretage en søgning efter indhold kræves et indeks over filerne "
 "på systemet. Intet indeks er i øjeblikket tilgængeligt. Du kan oprette ét "
 "ved at køre \"medusa-indexd\" som root ved kommandolinjen. Før et komplet "
 "indeks er oprettet, kan du ikke foretage søgninger efter indhold."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Hurtige søgninger er ikke aktiveret på din maskine"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5511,11 +5571,12 @@ msgstr ""
 "systemet. Din systemadministrator har deaktiveret hurtige søgninger på "
 "maskinen så intet indeks er tilgængeligt."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Hurtige søgninger er ikke aktiveret på din maskine"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Hurtige søgninger ikke tilgængelige"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Hvor"
 
@@ -5524,7 +5585,7 @@ msgstr "Hvor"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Ã…bn i et nyt vindue"
@@ -5535,7 +5596,7 @@ msgstr "_Ã…bn i et nyt vindue"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Ã…bn i %d _nye vinduer"
@@ -5544,15 +5605,21 @@ msgstr "Ã…bn i %d _nye vinduer"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus fandt flere søgeresultater end der kan fremvises. Nogle bliver "
+"udeladt."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus fandt flere søgeresultater end der kan fremvises. Nogle bliver "
 "udeladt."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "For mange fundet"
 
@@ -5567,12 +5634,12 @@ msgid "Create L_auncher"
 msgstr "Opret _genvej"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Opret en ny genvej"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Slet alle elementer i papirkurven"
 
@@ -5592,7 +5659,7 @@ msgstr "Vælg mønstret eller farven på din skrivebordsbaggrund"
 # 'desktop' giver sig selv i konteksten og en kortere tekst giver en kønnere menu
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Nulstil _baggrund"
@@ -5615,57 +5682,67 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Vælg en anden fremviser som du vil bruge til at vise det valgte objekt"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Opret _mappe"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Opret _mappe"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Opret en ny tom mappe i denne mappe"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Opret en ny tom mappe i denne mappe"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Opret en symbolsk henvisning for hver markeret element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplikér"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Slet alle markerede elementer uden at flytte dem til papirkurven."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplikér alle markerede elementer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Redigér genvej"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Redigér oplysningerne i genvejen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatér det valgte arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "_Medieegenskaber"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr "Montér det valgte arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Flyt eller kopiér filer som tidligere var markeret af en 'klip filer'- eller "
 "'kopiér filer'-kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5673,128 +5750,137 @@ msgstr ""
 "Flyt eller kopiér filer som tidligere var markeret af en 'klip filer'- eller "
 "'kopiér filer'-kommando, ind i den markerede mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ã…bn _med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Ã…bn hver valgt objekt i et navigationsvindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Ã…bn i navigationsvindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Ã…bn det markerede element i dette vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Forbered de markerede filer til at blive kopieret med en 'indsæt filer'-"
 "kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Forbered de markerede filer til at blive flyttet med en indsæt filer-kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Besk_yt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Beskyt det valgte arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Omdøb det markerede element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Nulstil visning til _forvalg"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Nulstil sorteringsordnen og zoomniveauet til at passe med det foretrukne for "
 "denne visning"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Kør eller håndter programmer fra ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Vælg _alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Vælg _mønster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Vælg alle objekter i dette vindue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr "Vælg objekter i dette vindue som passer til et givet mønster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Vis medieegenskaberne for det valgte arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Vis den mappe som indeholder kommandolinjeprogrammerne i denne menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Afmontér det valgte arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Benyt standardbaggrunden for dette sted"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Vis eller ændr egenskaberne for hver af de markerede elementer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopiér fil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatér"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr "_Montér arkiv"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Ã…bn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Ã…bn programmappen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Indsæt filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Indsæt filer i mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Egenskaber"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Omdøb..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Programmer"
 
@@ -5882,7 +5968,12 @@ msgstr "_Manuelt"
 msgid "Indexing is %d%% complete."
 msgstr "Indeksering er %d%% færdig."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Dine filer blev sidst indekseret %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5890,25 +5981,29 @@ msgstr ""
 "En gang om dagen bliver dine filer og tekstindhold indekseret så søgninger "
 "er hurtige."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indekseringsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Dine filer blev sidst indekseret %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "En gang om dagen bliver dine filer og tekstindhold indekseret så søgninger "
-"er hurtige. Din filer bliver i øjeblikket indekseret."
+"er hurtige."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Der er i øjeblikket intet indeks over dine filer."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5918,15 +6013,19 @@ msgstr ""
 "til at gå hurtigere. Hurtig søgning er ikke aktiveret på din maskine så der "
 "er i øjeblikket ikke et indeks."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Der er i øjeblikket intet indeks over dine filer."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Beklager men Medusa søgningstjenesten er ikke tilgængelig."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5950,32 +6049,37 @@ msgstr "Vis _indekseringsstatus"
 msgid "Show status of indexing used when searching"
 msgstr "Vis status for indeksering som bruges for søgning"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Kan ikke oprette krævet mappe"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Kan ikke oprette påkrævede mapper"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus kunne ikke oprette den påkrævede mappe \"%s\". Opret denne mappe "
 "eller ændr rettigheder sådan at Nautilus kan oprette den, før du kører "
 "programmet igen."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Kan ikke oprette påkrævede mapper"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5986,23 +6090,28 @@ msgstr ""
 "Opret denne mappe eller ændr rettigheder sådan at Nautilus kan oprette den, "
 "før du kører programmet igen."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Henvisning til tidligere skrivebord"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Placeringen af skrivebordsmappen er blevet ændret i Gnome 2.4. En henvisning "
 "ved navn \"Henvisning til tidligere skrivebord\" er blevet oprettet på "
 "skrivebordet. Du kan åbne den for at flytte de filer over du ønsker, og "
 "derefter slette henvisningen."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Migreret tidligere skrivebord"
 
 #. Can't register myself due to trouble locating the
@@ -6015,7 +6124,7 @@ msgstr "Migreret tidligere skrivebord"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6026,7 +6135,7 @@ msgstr ""
 "maskinen eller geninstallere Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6072,12 +6181,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus kan ikke bruges nu pga. en uventet fejl."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6085,7 +6194,7 @@ msgstr ""
 "Nautilus kan ikke bruges nu pga. en uventet fejl fra Bonobo ved forsøg på at "
 "registrere serveren for filhåndteringsvisning."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6095,7 +6204,7 @@ msgstr ""
 "at finde fabrikken. At dræbe bonobo-activation-server og genstarte Nautilus "
 "kan måske løse problemet."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6105,6 +6214,17 @@ msgstr ""
 "at finde skalobjektet. At dræbe bonobo-activation-server og genstarte "
 "Nautilus kan måske løse problemet."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Der opstod en fejl under visning af hjælp:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Ingen bogmærker defineret"
@@ -6138,31 +6258,44 @@ msgstr "Færre valgmuligheder"
 msgid "Find Them!"
 msgstr "Find dem!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+#, fuzzy
+msgid "You must enter a name for the server."
 msgstr "Du skal indtaste et navn til serveren"
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+#, fuzzy
+msgid "Can't Connect to Server"
 msgstr "Kan ikke tilkoble til server"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "er ikke en gyldig blok-enhed"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" er ikke et gyldigt sted. Kontrollér stavningen og prøv igen."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Kunne ikke finde \"%s\". Kontrollér stavningen og prøv igen."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
 msgstr "Tilkobl til server"
 
-#: src/nautilus-connect-server-dialog.c:185
-msgid "Name:"
-msgstr "Navn:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Placering:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
 msgstr "Tilkobl"
 
@@ -6363,6 +6496,20 @@ msgstr ""
 "\n"
 "Du kan slette denne fil manuelt for at få hjælperen frem igen.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Du kan ikke angive mere end et brugerdefineret ikon ad gangen! Træk venligst "
+"kun ét billede for at vælge et brugerdefineret ikon."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Filen du slap, er ikke lokal. Du kan kun bruge lokale billeder som "
+"brugerdefinerede ikoner."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6373,26 +6520,25 @@ msgstr "Ã…bn med %s"
 msgid "Open with..."
 msgstr "Ã…bn med..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Kan ikke køre cd-brænderprogrammet:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Kan ikke køre cd-brænder"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Tøm papirkurv"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Skriv indhold til cd"
 
@@ -6400,120 +6546,134 @@ msgstr "_Skriv indhold til cd"
 msgid "Go To:"
 msgstr "GÃ¥ til:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Vil du vise disse %d steder i forskellige vinduer?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Vis i flere vinduer?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Ã…bn placering"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Udfør et hurtigt sæt af selvtjek-kontroller."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Opret det første vindue med den angivne geometri."
 
 # Tilvalgsnavn
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Opret kun vinduer til eksplicit angivne URI'er."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Håndter ikke skrivebordet (ignorér indstillingen i indstillingsvinduet)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr "Ã¥bn et navigeringsvindue."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Afslut Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Genstart Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Filhåndtering"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan ikke bruges med URI'er.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan ikke bruges med andre tilvalg.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan ikke bruges med URI'er.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan ikke bruges med URI'er.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan ikke bruges med mere end én URI.\n"
 
-# historik kan ikke bruges - det er en vittighed
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Er du sikker på at du en gang for alle ønsker at slette '%s'?"
+
+# historik kan ikke bruges - det er en vittighed
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Er du sikker på at du ønsker at glemme fortiden? Hvis det er tilfældet, er "
 "du dømt til at gentage den."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Er du sikker på at du ønsker at rydde listen over steder du har besøgt?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+#, fuzzy
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Hvis du tømmer papirkurven, vil filerne blive slettet permanent."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Ryd historik"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Stedet \"%s\" eksisterer ikke. Ønsker du at fjerne alle bogmærker med dette "
 "sted fra din liste?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Stedet \"%s\" eksisterer ikke længere."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bogmærke for ikke-eksisterende sted"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Fjern"
 
@@ -6546,7 +6706,6 @@ msgid "Close _All Windows"
 msgstr "Luk _alle vinduer"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Luk alle navigationsvinduer"
 
@@ -6568,107 +6727,118 @@ msgid "Forward"
 msgstr "Fremad"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "GÃ¥ til papirkurvsmappen"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Gå til næste besøgte sted"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Gå til forrige besøgte sted"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "GÃ¥ til papirkurvsmappen"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Hjem"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Adresselinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Genindlæs"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Søg efter filer på denne maskine"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "S_tatuslinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Op"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Skriv til cd"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Tilføj bogmærke"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Tilbage"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bogmærker"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Ryd historik"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr "_Computer"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Redigér bogmærker"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Fremad"
 
 # er et menunavn - gå er desværre misvisende, navigation benyttes også i Galeon
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "Navi_gation"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Hjem"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Placering..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Sidepanel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Skabeloner"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Papirkurv"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Op"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
@@ -6686,33 +6856,35 @@ msgstr "Vis som..."
 msgid "File Browser: %s"
 msgstr "Filnavigator: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Et af sidepanelerne stødte på en fejl og kan ikke fortsætte."
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
-"Et af sidepanelerne stødte på en fejl og kan ikke fortsætte. Beklageligvis "
-"foreligger der ikke nogen oplysninger om hvilket panel dette gælder."
+"Beklageligvis foreligger der ikke nogen oplysninger om hvilket panel dette "
+"gælder."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Sidepanelet %s stødte på en fejl og kan ikke fortsætte. Hvis dette sker "
-"igen, kan du slå panelet fra."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Sidepanelet %s stødte på en fejl og kan ikke fortsætte."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Hvis dette sker igen, kan du slå panelet fra."
 
 # overskrift til et vindue
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "Sidepanelet stødte på en fejl"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Sidepanel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Indeholder en sidepanelsvisning"
 
@@ -6746,147 +6918,175 @@ msgstr "_Tilføj ny..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Beklager, men mønsteret %s kunne ikke slettes."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Tjek at du har rettighed til at slette mønsteret."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Kunne ikke slette mønster"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Desværre, men emblem %s kunne ikke slettes."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Tjek at du har rettighed til at slette emblemet."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Kunne ikke slette emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Opret et nyt emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Nøgleord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Billede:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Vælg en billedfil for det nye emblem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Opret en ny farve:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Farve_navn:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Farve_værdi:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Beklager, men \"%s\" er ikke et gyldigt filnavn."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Beklager, men du angav ikke et gyldigt filnavn."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Forsøg venligst igen."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Kunne ikke installere mønster"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Beklager, men du kan ikke erstatte nulstillingsbilledet"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Nulstil er et specielt billede som ikke kan slettes."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ikke et billede"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Beklager, men mønsteret %s kunne ikke installeres."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Vælg en billedfil som skal tilføjes som et mønster"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Farven kan ikke installeres."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Beklager, men du skal angive et ikke-tomt navn for den nye farve."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Kunne ikke installere farve"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Vælg en farve der skal tilføjes"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Beklager, men '%s' er ikke en brugbar billedfil!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Beklager, men \"%s\" er ikke en brugbar billedfil."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Filen er ikke et billede."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Vælg en kategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Annullér fjernelse"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Tilføj et nyt mønster..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Tilføj en ny farve..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Tilføj et nyt emblem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klik på et mønster for at fjerne det"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klik på en farve for at fjerne den"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klik på et emblem for at fjerne det"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mønstre:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Farver:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemer:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Fjern et mønster..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Fjern en farve..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Fjern et emblem..."
 
@@ -7277,30 +7477,34 @@ msgid "CD _Creator"
 msgstr "Cd-_brænder"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
-msgstr "Luk _alle ophav"
+msgid "Close P_arent Folders"
+msgstr "Luk _ophavsmapper"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Luk denne mappens overliggende mapper"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr "GÃ¥ til computer"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Gå til cd-brænderen"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "Ã…bn _placering..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Ã…bn _ophav"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr "Åbn mappen et niveau højere oppe"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Steder"
 
@@ -7329,10 +7533,13 @@ msgid "View Failed"
 msgstr "Visning mislykkedes"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s-visningen stødte på en fejl ved opstart."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Visningen %s stødte på en fejl og kan ikke fortsætte. Du kan vælge en anden "
 "visning eller gå til et andet sted."
@@ -7342,96 +7549,125 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "%s-visningen stødte på en fejl ved opstart."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Den NautilusApplication som er associeret med dette vindue"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Indholdsvisning"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Visning af den aktuelle fil eller mappe"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Kunne ikke finde \"%s\". Kontrollér stavningen og prøv igen."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Kunne ikke indlæse %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Kunne ikke indlæse %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Kunne ikke vise \"%s\" fordi Nautilus ikke kan finde ud af hvilken type fil "
 "det drejer sig om."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus har ingen fremviser installeret der kan vise \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "Kunne ikke vise \"%s\" fordi Nautilus ikke kan behandle %s:-steder."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Kunne ikke vise \"%s\" fordi forsøget på at logge ind mislykkedes."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Tilgang blev nægtet."
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Kunne ikke vise \"%s\" fordi adgang blev nægtet."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Kunne ikke vise \"%s\" fordi værten \"%s\" ikke blev fundet. Kontrollér at "
 "stavningen og mellemværtsindstillingerne er korrekte."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Kunne ikke vise \"%s\". Kontrollér at mellemværtsindstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "Kunne ikke vise \"%s\" fordi Nautilus ikke kan behandle %s:-steder."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Kunne ikke vise \"%s\" fordi Nautilus ikke kan komme i kontakt med SMB-"
-"browseren.\n"
-"Kontrollér at der at der kører en SMB-server på lokalnetværket."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Søgning er ikke muligt nu fordi du enten ikke har noget indeks eller "
 "søgetjenesten ikke kører. Sikr dig at du har startet Medusa-søgetjenesten, "
 "og hvis du ikke har et indeks, at Medusas indeksering kører."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Søgning er ikke muligt nu fordi du enten ikke har noget indeks eller "
+"søgetjenesten ikke kører. Sikr dig at du har startet Medusa-søgetjenesten, "
+"og hvis du ikke har et indeks, at Medusas indeksering kører."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Søgning ikke tilgængelig"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan ikke vise \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Kan ikke vise sted"
 
@@ -7443,7 +7679,7 @@ msgstr "Gå til stedet givet ved dette bogmærke"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7451,11 +7687,11 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Ole Laursen <olau@hardworking.dk>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7471,36 +7707,40 @@ msgstr "GÃ¥ nogle sider tilbage"
 msgid "Go forward a number of pages"
 msgstr "GÃ¥ nogle sider fremad"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Vis denne placering med '%s'"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 msgid "Network"
 msgstr "Netværk"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr "Cd-brænder"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Program-id"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Program-id'en for vinduet"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Program"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Den NautilusApplication som er associeret med dette vindue"
 
@@ -7536,6 +7776,255 @@ msgstr "Netværksservere"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrik for udstyrsvisning"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Udstyrsviser"
+
+#~ msgid "Hardware view"
+#~ msgstr "Udstyrsvisning"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Vis som udstyr"
+
+#~ msgid "hardware view"
+#~ msgstr "udstyrsvisning"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "navnet på ikonet til udstyrsvisning"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "sammendrag af udstyrsoplysninger"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K mellemlager"
+
+#~ 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 "Oppetiden er %d dage, %d timer og %d minutter"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Udstyrsoversigt"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Dette er en pladsoptager for processorsiden"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Dette er en pladsoptager for RAM-siden"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Dette er en pladsoptager for IDE-siden"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fejl ved kopiering til '%s'.\n"
+#~ "\n"
+#~ "Der er ikke nok plads ved destinationen."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fejl ved oprettelse af henvisning i '%s'.\n"
+#~ "\n"
+#~ "Der er ikke nok plads ved destinationen."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fejl ved flytning af filer til \"%s\".\n"
+#~ "\n"
+#~ "Du har ikke lov til at skrive til denne mappe."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fejl ved flytning af filer til '%s'.\n"
+#~ "Destinationsdisken er skrivebeskyttet."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fejl ved oprettelse af henvisninger i '%s'.\n"
+#~ "\n"
+#~ "Du har ikke lov til at skrive til denne mappe."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fejl ved oprettelse af henvisninger i '%s'.\n"
+#~ "\n"
+#~ "Destinationsdisken er skrivebeskyttet."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved kopiering af \"%s\".\n"
+#~ "\n"
+#~ "Vil du fortsætte?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved flytning af \"%s\".\n"
+#~ "\n"
+#~ "Vil du fortsætte?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved sletning af \"%s\".\n"
+#~ "\n"
+#~ "Vil du gerne fortsætte?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved kopiering.\n"
+#~ "\n"
+#~ "Vil du gerne fortsætte?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved oprettelse af henvisning.\n"
+#~ "\n"
+#~ "Vil du gerne fortsætte?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fejl \"%s\" ved sletning.\n"
+#~ "\n"
+#~ "Vil du gerne fortsætte?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Kan ikke kopiere til papirkurv"
+
+#~ 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 ""
+#~ "Den forvalgte handling kan ikke åbne \"%s\" fordi den ikke kan få adgang "
+#~ "til filer placeret på \"%s\". Der er ikke adgang til andre programmer som "
+#~ "kan vise denne fil. Hvis du kopierer filen over på din computer, så kan "
+#~ "du måske åbne den."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Søger på diskene"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus søger på din disk for at finde skraldespandsmapper"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "De %d markerede objekter kan ikke flyttes til papirkurven. Ønsker du at "
+#~ "slette dem helt?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d af de markerede objekter kan ikke flyttes til papirkurven. Ønsker du "
+#~ "at slette de %d objekter helt?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Filen du slap, er ikke et billede. Du kan kun bruge lokale billeder som "
+#~ "brugerdefinerede ikoner."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Beklager, men Medusa søgningstjenesten er ikke tilgængelig fordi den ikke "
+#~ "er installeret."
+
+#~ 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 ""
+#~ "For at kunne foretage en søgning efter indhold kræves et indeks over "
+#~ "filerne på systemet. Maskinen er i øjeblikket ved at lave det. "
+#~ "Indholdssøgning bliver tilgængeligt når indekset er færdigt."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "En gang om dagen bliver dine filer og tekstindhold indekseret så "
+#~ "søgninger er hurtige. Din filer bliver i øjeblikket indekseret."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" er ikke et gyldigt sted. Kontrollér stavningen og prøv igen."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Beklager, men '%s' er ikke en brugbar billedfil!"
+
+#~ 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 ""
+#~ "Kunne ikke vise \"%s\" fordi Nautilus ikke kan komme i kontakt med SMB-"
+#~ "browseren.\n"
+#~ "Kontrollér at der at der kører en SMB-server på lokalnetværket."
+
+#~ msgid "file icon"
+#~ msgstr "filikon"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
 #~ msgid "Unknown"
 #~ msgstr "Ukendt"
 
@@ -7630,9 +8119,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "_Toolbar"
 #~ msgstr "_Værktøjslinje"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Stedet \"%s\" eksisterer ikke længere."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "GÃ¥ til ikke-eksisterende placering"
 
@@ -7670,9 +8156,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "Authentication Required"
 #~ msgstr "Brugerverifikation påkrævet"
 
-#~ msgid "_Location:"
-#~ msgstr "_Placering:"
-
 #~ msgid "You cannot copy the Trash."
 #~ msgstr "Du kan ikke kopiere papirkurven."
 
@@ -7724,9 +8207,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "Click Behavior"
 #~ msgstr "Klik-opførsel"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Kørbare tekstfiler"
-
 #~ msgid "Show Options"
 #~ msgstr "Visningsindstillinger"
 
@@ -7822,9 +8302,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Kunne ikke tilføje tema"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Desværre, men temaet '%s' kunne ikke installeres."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Kunne ikke installere tema"
 
@@ -7841,9 +8318,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ "Desværre, men du kan ikke fjerne det aktuelle tema. Skift venligst til et "
 #~ "andet tema før dette fjernes."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Desværre, men dette tema kunne ikke fjernes!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Kunne ikke fjerne tema"
 
@@ -8330,9 +8804,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "Set Cover Image"
 #~ msgstr "Omslagsbillede"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Beklager, men '%s' er ikke en brugbar billedfil."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Vælg en billedfil til pladeomslaget:"
 
@@ -8388,9 +8859,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "<span size=\"xx-large\">%s - %s</span>"
 #~ msgstr "<span size=\"xx-large\">%s - %s</span>"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Beklager, men billedet på %s kunne ikke installeres som et emblem."
-
 #~ msgid "Delete"
 #~ msgstr "Slet"
 
@@ -8460,9 +8928,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "%I:%M %p"
 #~ msgstr "%H:%M"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Kunne ikke indlæse %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Indlæser %s"
 
@@ -9411,9 +9876,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "er skrivebeskyttet, monterer ligeså"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "er ikke en gyldig blok-enhed"
-
 #~ msgid "No medium found"
 #~ msgstr "Intet medium fundet"
 
@@ -9537,9 +9999,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgid "No selection made"
 #~ msgstr "Intet markeret"
 
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
 #~ msgid "Warning"
 #~ msgstr "Advarsel"
 
@@ -9550,13 +10009,6 @@ msgstr "Vis dine netværksservere i Nautilus-filhåndteringen"
 #~ msgstr "Spørgsmål"
 
 #~ msgid ""
-#~ "To do a content search, Find requires an index of the content on your "
-#~ "system.  An index can't be created right now."
-#~ msgstr ""
-#~ "For at kunne foretage en søgning efter indhold kræves et indeks over "
-#~ "filerne på systemet. Et indeks kan ikke laves lige nu."
-
-#~ msgid ""
 #~ "To do a fast search, Find requires an index of the files on your system. "
 #~ "Fast search is disabled in your Search preferences, so no index is "
 #~ "available."
diff --git a/po/de.po b/po/de.po
index 53823b50d..6bad501dc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,6 @@
 # history	= Chronik
 # date modified	= Änderungsdatum
 # date changed	= Änderungsdatum
-# custom image	= eigenes Bild
 # sidebarpanel	= Seitenleistenkarte
 # Factory	= Fabrik
 # URL		= Adresse
@@ -32,8 +31,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.4.0\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-09-15 20:13+0200\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-21 15:59+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -66,8 +65,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() fehgeschlagen."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Embleme"
 
@@ -81,49 +80,55 @@ msgstr "Nautilus-Emblemansicht"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Das Emlbem mit Namen »%s« konnte nicht entfernt werden."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Das Emblem mit Namen »%s« konnte nicht entfernt werden. Dies ist "
-"wahrscheinlich der Fall, da dieses Emblem permanent ist und nicht von Ihnen "
-"hinzugefügt wurde."
+"Wahrscheinlich ist dieses Emblem permanent und wurde daher nicht von Ihnen "
+"hinzugefügt."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "Emblem konnte nicht entfernt werden"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Emblem mit Namen »%s« konnte nicht umbenannt werden"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Das Emblem mit Namen »%s« konnte nicht umbenannt werden. Dies ist "
-"Wahrscheinlich der Falls, da dieses Emblem permanent ist und nicht von Ihnen "
-"hinzugefügt wurde."
+"Wahrscheinlich ist dieses Emblem permanent und wurde daher nicht von Ihnen "
+"hinzugefügt."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "Emblem konnte nicht umbenannt werden"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Emblem umbenennen"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Geben Sie einen neuen Namen für das angezeigte Emblem an:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Embleme hinzufügen..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -131,7 +136,7 @@ msgstr ""
 "Bitte geben Sie neben jedem Emblem einen Namen ein. Anhand dieses Namens "
 "können Sie das jeweilige Emblem später identifizieren."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -139,139 +144,56 @@ msgstr ""
 "Bitte geben Sie neben dem Emblem einen Namen ein. Anhand dieses Namens "
 "können Sie das Emblem später identifizieren."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
-"Mindestens eine der Dateien konnte nicht als Emblem hinzugefügt werden, da "
-"sie nicht als Bilddateien erkannt werden konnte."
+"Mindestens eine der Dateien konnte nicht als Emblem hinzugefügt werden."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Die Embleme scheinen keine gültigen Bilder zu sein."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "Embleme konnten nicht hinzugefügt werden"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Keine der Dateien konnte als Emblem hinzugefügt werden, da keine von ihnen "
-"als Bilddateien erkannt werden konnte."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Keine der Dateien konnte als Emblem hinzugefügt werden."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Das Emblem konnte nicht hinzugefügt werden."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Der abgelegte Text war kein gültiger Datei-Speicherort."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Emblem konnte nicht hinzugefügt werden"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Die Datei »%s« scheint kein gültiges Bild zu sein."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Die abgelegte Datei konnte nicht als Bilddatei erkannt werden."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Löschen"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrik für Hardware-Ansicht"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardware-Ansicht"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardware-Ansicht"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Hardware-Ansicht"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "Hardware-Ansicht"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "Name des Symbols für die Hardware-Ansicht"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "Zusammenfassung der Hardware-Info"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"CPU: %s\n"
-"%s MHz\n"
-"Cachegröße: %s kB"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Betriebszeit ist %d Tage, %d Stunden, %d Minuten"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardware-Ãœbersicht"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Dies ist ein Platzhalter für die CPU-Seite."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Dies ist ein Platzhalter für die RAM-Seite."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Dies ist ein Platzhalter für die IDE-Seite."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Chronik"
@@ -297,51 +219,49 @@ msgid "Nautilus Image Properties view"
 msgstr "Nautilus-Bildeigenschaften-Ansicht"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Kamera"
+msgstr "Kameramarke"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Kamera"
+msgstr "Kameramodell"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Aufnahmedatum"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Belichtungsdauer"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "Programm"
+msgstr "Belichtungsprogramm"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Blendenwert"
 
+# CHECK
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Messmethode"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Blitzlicht"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Brennweite"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Verschlussgeschwindigkeit"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO-Geschwindigkeitsabschätzung"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -937,6 +857,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "International"
@@ -1142,9 +1066,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Jede geöffnete Datei in neuem Fenster anzeigen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "»Persönlicher Ordner«-Symbol auf Desktop anzeigen"
+msgstr "Computer-Symbol auf Desktop anzeigen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1227,34 +1150,19 @@ msgid "Desktop trash icon name"
 msgstr "Name des Desktop-Müllsymbols"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Große Ordner, die größer sind als der Wert dieses Schlüssels werden "
-"abgeschnitten, sodass sie ungefähr so groß wie dieser Wert sind. Der Zweck "
-"dieses Schlüssels besteht darin, unerwüschte Nautilus-Abstürze zu vermeiden, "
-"die durch eine nicht bewältigbare Datenmenge verursacht werden. Ein "
-"negativer Schlüssel Wert führt dazu, dass keine Obergrenze festgelegt wird. "
-"Da Ordner in größeren Dateneinheiten eingelesen werden, ist dies ein "
-"Näherungswert."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "»Besondere« Attribute im Dateieigenschaftendialog anzeigen"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Der Dateiname des voreingestellten Verzeichnishintergrunds. Dieser Schlüssel "
+"Der Dateiname des voreingestellten Ordnerhintergrunds. Dieser Schlüssel "
 "kommt ausschließlich zum Tragen, falls der Schlüssel »background_set« wahr "
 "ist."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1263,6 +1171,21 @@ msgstr ""
 "Schlüssel kommt ausschließlich zum Tragen, falls der Schlüssel "
 "»side_pane_background_set« wahr ist."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Große Ordner, die größer sind als der Wert dieses Schlüssels werden "
+"abgeschnitten, sodass sie ungefähr so groß wie dieser Wert sind. Der Zweck "
+"dieses Schlüssels besteht darin, unerwüschte Nautilus-Abstürze zu vermeiden, "
+"die durch eine nicht bewältigbare Datenmenge verursacht werden. Ein "
+"negativer Schlüssel Wert führt dazu, dass keine Obergrenze festgelegt wird. "
+"Da Ordner in größeren Dateneinheiten eingelesen werden, ist dies ein "
+"Näherungswert."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Vorgabelesezeichen im Lesezeichenmenü verbergen"
@@ -1273,11 +1196,11 @@ msgstr "»Persönlicher Ordner«-Symbol auf Desktop anzeigen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
-"Falls dieser Schlüssel wahr ist, zeigt Nautilus ausschließlich Ordner in der "
-"Baumseitenleiste an. Andernfalls werden sowohl Ordner als auch Dateien "
+"Falls dieser Schlüssel wahr ist, zeigt Nautilus in der Baumseitenleiste "
+"ausschließlich Ordner an. Andernfalls werden sowohl Ordner als auch Dateien "
 "angezeigt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1315,8 +1238,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, zeigt Nautilus in der Symbol- und "
 "Listenansicht Ordner vor Dateien an."
@@ -1364,7 +1287,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Falls dieser Schlüssel wahr ist, verwendet Nautilus den persönlichen Ordner "
@@ -1384,11 +1307,11 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, werden im Dateimanager verborgene Dateien "
 "angezeigt. Diese sind entweder dot-Dateien oder in der Datei ».hidden« des "
-"Verzeichnisses eingetragen."
+"Ordners eingetragen."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -1400,17 +1323,16 @@ msgstr ""
 "sich anmelden."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, wird auf dem Desktop eine Verknüpfung mit "
-"dem Müll angezeigt."
+"dem Computer-Ort angezeigt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, wird auf dem Desktop eine Verknüpfung mit "
@@ -1449,7 +1371,7 @@ msgstr ""
 "statt absteigend angezeigt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Falls dieser Schlüssel wahr ist, werden Symbole in neu geöffneten Fenstern "
 "per Vorgabe enger angeordnet."
@@ -1483,8 +1405,8 @@ msgid "List of possible captions on icons"
 msgstr "Liste zulässiger Symbolbeschriftungen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
-msgstr "Maximale Anzahl berücksichtigter Dateien je Verzeichnis"
+msgid "Maximum handled files in a folder"
+msgstr "Maximale Anzahl berücksichtigter Dateien je Ordner"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Maximum image size for thumbnailing"
@@ -1502,13 +1424,14 @@ msgstr ""
 msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus verwenden, um den Desktop zu zeichnen"
 
+# CHECK
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr "Persönlichen Ordner des Benutzers als Desktop verwenden?"
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus verwendet den persönlichen Ordner als Desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr "Nur Ordner in der Baum-Seitenleiste anzeigen"
+msgid "Only show folders in the tree sidebar"
+msgstr "Ausschließlich Ordner in der Baum-Seitenleiste anzeigen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -1527,8 +1450,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Sortierreihenfolge in neu geöffneten Fenstern umkehren?"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr "Ordner vor Dateien anzeigen?"
+msgid "Show folders first in windows"
+msgstr "Ordner in Fenstern zuerst anzeigen?"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1567,7 +1490,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1580,10 +1503,10 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Legt fest, wann Miniatur-Vorschaubilder von Bildern angelegt werden sollen. "
 "Zulässige Werte: »always« (immer anlegen, selbst wenn sie sich auf einem "
@@ -1592,20 +1515,20 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Legt fest, wann die Anzahl der Objekte in einem Ordner angezeigt werden "
-"sollen. Zulässige Werte: »always« (immer anzeigen, selbst wenn er sich auf "
+"soll. Zulässige Werte: »always« (immer anzeigen, selbst wenn er sich auf "
 "einem entfernten Server befindet), »local_only« (nur anzeigen, falls er sich "
 "auf einem lokalen Dateisystem befindet) sowie »never« (keinesfalls anzeigen)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Die voreingestellte Sortierreihenfolge für Objekte in der Symbolansicht. "
 "Zulässige Werte: »name« (Name), »size« (Größe), »type« (Typ), "
@@ -1613,8 +1536,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Die voreingestellte Sortierreihenfolge für Objekte in der Listenansicht. "
 "Zulässige Werte: »name« (Name), »size« (Größe), »type« (Typ) sowie "
@@ -1661,7 +1584,7 @@ msgid "Use manual layout in new windows"
 msgstr "Manuelle Anordnung in neu geöffneten Fenster verwenden?"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Engere Anordnung in neu geöffneten Fenster verwenden?"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1693,7 +1616,7 @@ msgstr ""
 "»icon_view« (Symbolansicht)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Wann die Anzahl der Objekte in einem Ordner angezeigt werden soll"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1705,10 +1628,10 @@ msgid "When to show thumbnails of image files"
 msgstr "Wann Miniatur-Vorschaubilder von Bilddateien angezeigt werden sollen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 "Legt fest, ob ein benutzerdefinierter, voreingestellter Ordnerhintergrund "
-"festgelegtwurde."
+"festgelegt wurde."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
@@ -1870,68 +1793,78 @@ msgstr "zurücksetzen"
 msgid "on the desktop"
 msgstr "auf dem Desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Datenträger-Symbole können nicht gelöscht werden."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Sie können Datenträgersymbole nicht löschen. Verwenden Sie »Auswerfen« im "
-"Rechtsklick-Menü des Datenträgers, falls Sie sie aushängen möchten."
+"Verwenden Sie »Auswerfen« im Rechtsklick-Menü des Datenträgers, falls Sie "
+"ihn aushängen möchten."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "Datenträger konnte nicht gelöscht werden"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Müll"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Hierher _verschieben"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "Hierher _kopieren"
 
 # CHECK
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Verknüpfung hier"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Als _Hintergrund verwenden"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Als Hintergrund für _alle Ordner verwenden"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Als Hintergrund für _diesen Ordner verwenden"
 
 #: 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 "Das Emblem konnte nicht installiert werden."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Sie müssen ein Stichwort zum neuen Emblem angeben."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "Emblem konnte nicht installiert werden"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1942,20 +1875,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Leider existiert bereits ein Emblem mit dem Namen »%s«. Bitte wählen Sie "
-"einen anderen Namen."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Leider existiert bereits ein Emblem mit Namen »%s«."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Bitte wählen Sie einen anderen Namen für das Emblem."
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Emblem konnte nicht installiert werden"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Leider konnte das benutzerdefinierte Emblem nicht gespeichert werden."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 "Leider konnte der Name des benutzerdefinierten Emblems nicht gespeichert "
@@ -1976,376 +1913,274 @@ msgstr "Von:"
 msgid "To:"
 msgstr "Nach:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Fehler beim Verschieben."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
-"Fehler beim Verschieben.\n"
-"\n"
 "»%s« konnte nicht verschoben werden, da es sich auf einer schreibgeschützten "
 "Platte befindet."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Fehler beim Löschen."
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Fehler beim Löschen.\n"
-"\n"
 "»%s« konnte nicht gelöscht werden, da Sie nicht die nötigen Zugriffsrechte "
 "haben, um seinen Elternordner zu verändern."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
-"Fehler beim Löschen.\n"
-"\n"
 "»%s« konnte nicht gelöscht werden, da es sich auf einer schreibgeschützten "
 "Platte befindet."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Fehler beim Verschieben.\n"
-"\n"
 "»%s« konnte nicht verschoben werden, da Sie nicht die nötigen Zugriffsrechte "
 "haben, um es oder seinen Elternordner zu verändern."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Fehler beim Verschieben."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Fehler beim Verschieben.\n"
-"\n"
-"»%s« konnte nicht verschoben werden, da dieses Objekt oder der Elternordner "
-"sich auf einer schreibgeschützten Platte befindet."
+"»%s« konnte nicht verschoben werden, da sich das Objekt oder sein "
+"Elternordner am Ziel befindet."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Fehler beim Verschieben.\n"
-"\n"
 "»%s« konnte nicht in den Müll verschoben werden, da Sie nicht die nötigen "
-"Zugriffsrechte haben, um es oder seinen Elternordner zu verändern."
+"Zugriffsrechte haben, um das Objekt oder seinen Elternordner zu verändern."
+
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Fehler beim Kopieren."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Fehler beim Kopieren.\n"
-"\n"
 "»%s« konnte nicht verschoben werden, da Sie nicht die nötigen Zugriffsrechte "
-"haben, um es zu lesen."
+"haben, um das Objekt zu lesen."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fehler beim Kopieren nach »%s«.\n"
-"\n"
-"Am Ziel ist kein Platz."
+msgid "Error while copying to \"%s\"."
+msgstr "Fehler beim Kopieren nach »%s«."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fehler beim Verschieben nach »%s«.\n"
-"\n"
-"Am Ziel ist kein Platz."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Am Ziel ist nicht genug Platz."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fehler beim Anlegen einer Verknüpfung in »%s«.\n"
-"\n"
-"Am Ziel ist kein Platz."
+msgid "Error while moving to \"%s\"."
+msgstr "Fehler beim Verschieben nach »%s«."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fehler beim Kopieren nach »%s«.\n"
-"\n"
-"Sie haben nicht die nötigen Zugriffsrechte, um in diesen Ordner zu schreiben."
-
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fehler beim Kopieren nach »%s«.\n"
-"\n"
-"Die Zielplatte ist schreibgeschützt."
+msgid "Error while creating link in \"%s\"."
+msgstr "Fehler beim Anlegen einer Verknüpfung in »%s«."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
-"Fehler beim Verschieben von Objekten nach »%s«.\n"
-"\n"
 "Sie haben nicht die nötigen Zugriffsrechte, um in diesen Ordner zu schreiben."
 
-#: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fehler beim Verschieben von Objekten nach »%s«.\n"
-"\n"
-"Die Zielplatte ist schreibgeschützt."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "Die Zielplatte ist schreibgeschützt."
 
-#: libnautilus-private/nautilus-file-operations.c:695
+#: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fehler beim Anlegen von Verknüpfungen in »%s«.\n"
-"\n"
-"Sie haben nicht die nötigen Zugriffsrechte, um in diesen Ordner zu schreiben."
+msgid "Error while moving items to \"%s\"."
+msgstr "Fehler beim Verschieben von Objekten nach »%s«."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fehler beim Anlegen von Verknüpfungen in »%s«.\n"
-"\n"
-"Die Zielplatte ist schreibgeschützt."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Kopieren von »%s«.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Fehler beim Anlegen von Verknüpfungen in »%s«."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Verschieben von »%s«.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Fehler »%s« beim Kopieren von »%s«."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Wollen Sie fortfahren?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Anlegen einer Verknüpfung mit »%s«.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Fehler »%s« beim Verschieben von »%s«."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Löschen von »%s«.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Fehler »%s« beim Anlegen einer Verknüpfung mit »%s«."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Kopieren.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Fehler »%s« beim Löschen von »%s«."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Verschieben.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while copying."
+msgstr "Fehler »%s« beim Kopieren."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Anlegen einer Verknüpfung.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while moving."
+msgstr "Fehler »%s« beim Verschieben."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fehler »%s« beim Löschen.\n"
-"\n"
-"Wollen Sie fortfahren?"
+msgid "Error \"%s\" while linking."
+msgstr "Fehler »%s« beim Anlegen einer Verknüpfung."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Fehler beim Kopieren."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Fehler »%s« beim Löschen."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Fehler beim Verschieben."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Fehler beim Kopieren"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Fehler beim Anlegen einer Verknüpfung."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Fehler beim Verschieben"
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Fehler beim Löschen."
+msgid "Error While Linking"
+msgstr "Fehler beim Anlegen einer Verknüpfung"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Ãœberspringen"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Fehler beim Löschen"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Wiederholen"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "Ü_berspringen"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Wiederholen"
+
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "»%s« konnte nicht an den neuen Ort verschoben werden."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"»%s« konnte nicht an den neuen Ort verschoben werden, da sein Name bereits "
-"für ein Spezialobjekt verwendet wird, das nicht gelöscht oder ersetzt werden "
-"kann.\n"
-"\n"
-"Wenn Sie »%s« immer noch verschieben wollen, benennen Sie es um und "
-"versuchen Sie es noch einmal."
+"Der Name wird bereits für ein Spezialobjekt verwendet, das weder gelöscht "
+"noch ersetzt werden kann. Falls Sie das Objekt immer noch verschieben "
+"wollen, benennen Sie es um und versuchen Sie es noch einmal."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "»%s« konnte nicht an den neuen Ort kopiert werden."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"»%s« konnte nicht an den neuen Ort kopiert werden, da sein Name bereits für "
-"ein Spezialobjekt verwendet wird, das nicht gelöscht oder ersetzt werden "
-"kann.\n"
-"\n"
-"Wenn Sie »%s« immer noch kopieren wollen, benennen Sie es um und versuchen "
-"Sie es noch einmal."
+"Der Name wird bereits für ein Spezialobjekt verwendet, das weder gelöscht "
+"noch ersetzt werden kann. Falls Sie das Objekt immer noch kopieren wollen, "
+"benennen Sie es um und versuchen Sie es noch einmal."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Datei konnte nicht ersetzt werden."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "Datei konnte nicht ersetzt werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Die Datei »%s« existiert bereits. Wollen Sie sie ersetzen?"
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
-"Die Datei »%s« existiert bereits.\n"
-"\n"
-"Wollen Sie sie ersetzen?"
+"Falls Sie eine existierende Datei ersetzen, wird deren Inhalt überschrieben."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "Konflikt beim Kopieren"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Ersetzen"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Ersetzen"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Alle ersetzen"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "_Alle ersetzen"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "Verknüpfung mit %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "noch eine Verknüpfung mit %s"
@@ -2354,25 +2189,25 @@ msgstr "noch eine Verknüpfung mit %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. Verknüpfung mit %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. Verknüpfung mit %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. Verknüpfung mit %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. Verknüpfung mit %s"
@@ -2382,562 +2217,590 @@ msgstr "%d. Verknüpfung mit %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (Kopie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (noch eine Kopie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". Kopie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". Kopie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (Kopie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (noch eine Kopie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. Kopie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Unbekannter GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Dateien werden in den Müll verschoben"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Weggeworfene Dateien:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Verschieben"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Verschieben in den Müll wird vorbereitet..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Dateien werden verschoben"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Verschobene Dateien:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Verschieben wird vorbereitet..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Verschieben wird fertiggestellt..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Verknüpfungen mit Dateien werden angelegt"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Verknüpfte Dateien:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Verknüpfen"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Anlegen von Verknüpfungen wird vorbereitet..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Anlegen von Verknüpfungen wird fertiggestellt..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Dateien werden kopiert"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Kopierte Dateien:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopieren"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Kopieren wird vorbereitet..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Sie können Dateien nicht in den Müll kopieren."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Sie können Objekte nicht in den Müll kopieren."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "In den Müll konnte nicht kopiert werden"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Dateien und Ordner können ausschließlich in den Müll verschoben werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Sie können diesen Müllordner nicht verschieben."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Sie können diesen Müllordner nicht kopieren."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"Ein Müll-Ordner wird zum Speichern von in den Müll verschobenen Objekte "
+"verwendet."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Ort des Mülls kann nicht geändert werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Müll konnte nicht kopiert werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Sie können einen Ordner nicht in sich selbst verschieben."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Sie können einen Ordner nicht in sich selbst kopieren."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "Der Zielordner befindet sich im Quellordner."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Kann nicht auf sich selbst verschoben werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kann nicht auf sich selbst kopiert werden"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Sie können eine Datei nicht über sich selbst kopieren."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "Ziel- und Quelldatei sind identisch."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kann nicht über sich selbst kopiert werden"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
-"Fehler beim Anlegen eines neuen Ordners.\n"
-"\n"
 "Sie haben nicht die nötigen Zugriffsrechte, um auf das Ziel zu schreiben."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Fehler beim Anlegen eines neuen Ordners.\n"
-"\n"
-"Am Ziel ist kein Platz."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "Am Ziel ist kein Platz."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fehler »%s« beim Anlegen eines neuen Ordners."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Fehler beim Anlegen eines neuen Ordners."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
 msgstr "Fehler beim Anlegen eines neuen Ordners"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "Namenloser Ordner"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Fehler »%s« beim Anlegen eines neuen Dokuments."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Fehler beim Anlegen eines neuen Dokuments."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Fehler beim Anlegen eines neuen Dokuments"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "neue Datei"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Dateien werden gelöscht"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Gelöschte Dateien:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Löschen"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Löschen von Dateien wird vorbereitet..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Müll wird geleert"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Leeren des Mülls wird vorbereitet..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
-"Sind sie sicher, dass Sie alle Objekte im Müll auf Dauer löschen wollen?"
+"Sind sie sicher, dass Sie alle Objekte im Müll dauerhaft löschen wollen?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
+"Falls Sie den Müll leeren, werden darin enthaltene Objekte dauerhaft "
+"gelöscht."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Leeren"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (Kopie).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (noch eine Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (noch eine Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (noch eine Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (noch eine Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (111. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. Kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. Kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. Kopie).txt"
 
@@ -2956,64 +2819,64 @@ msgstr "foo (124. Kopie).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "heute um 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "heute um %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "heute um 00.00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "heute um %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "heute, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "heute, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "heute"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "gestern um 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "gestern um %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "gestern um %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "gestern um %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "gestern, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "gestern, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "gestern"
 
@@ -3022,133 +2885,133 @@ msgstr "gestern"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Donnerstag, 00. September 0000 um 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y um %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mon, 00. Okt 0000 um 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y um %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mon, 00. Okt 0000 um 00.00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y um %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00. Okt 0000 um 00.00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y um %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00. Okt 0000, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 Objekte"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 Ordner"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 Dateien"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 Objekt"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 Datei"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u Objekte"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u Ordner"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u Dateien"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? Objekte"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? Bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "unbekannter MIME-Typ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "unbekannt"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "Programm"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3158,7 +3021,7 @@ msgstr ""
 "Das heißt wahrscheinlich, dass Ihre Datei gnome-vfs.keys am falschen Ort ist "
 "oder aus irgend einem anderen Grund nicht gefunden werden kann."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3167,11 +3030,11 @@ msgstr ""
 "Keine Beschreibung für MIME-Type »%s« gefunden (Datei ist »%s«), teilen Sie "
 "dies der gnome-vfs-Mailingliste mit."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "Verknüpfung"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "Verknüpfung (fehlerhaft)"
 
@@ -3292,11 +3155,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Dateien nach Dateinamen und ihren Eigenschaften suchen"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Symbolansicht"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listenansicht"
@@ -3425,6 +3290,7 @@ msgstr "MIME-Typ"
 msgid "none"
 msgstr "Keine"
 
+# Das wäre zu lang, wenn wir auch noch den Benutzernamen anhängen würden
 #. Note to translators: If it's hard to compose a good home
 #. * icon name from the user name, you can use a string without
 #. * an "%s" here, in which case the home icon name will not
@@ -3436,156 +3302,153 @@ msgstr "Keine"
 #: libnautilus-private/nautilus-global-preferences.c:543
 #, c-format
 msgid "%s's Home"
-msgstr "Persönlicher Ordner von %s"
+msgstr "Persönlicher Ordner%.0s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Theke"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "Dateisymbol"
+msgstr "Computer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "änderbarer Text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "die änderbare Beschriftung"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "zusätzlicher Text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "noch mehr Text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "hervorgehoben als Auswahl"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "sind wir als Auswahl hervorgehoben"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "hervorgehoben durch Tasturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "sind wir hervorgehoben, um den Tastaturfokus darzustellen"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "zum Fallenlassen hervorgehoben"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "sind wir für einen DND-Drop hervorgehoben"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Das Auswähl-Rechteck"
 
 # !! CHECK !!
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Rahmentext"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Einen Rahmen um nicht markierten Text zeichnen"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Farbe für Auswahlrechteck"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Die Farbe des Auswahlrechtecks"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha-Wert des Auswahlrechtecks"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Die Deckkraft des Auswahlrechtecks"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alpha-Wert der Hervorhebung"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Deckkraft der Hervorhebung für gewählten Symbole"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Helle Info-Farbe"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 "Für Informationstext vor einem dunklen Hintergrund zu verwendender Text"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Dunkle Info-Farbe"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Für Informationstext vor einem hellen Hintergrund zu verwendender Text"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"Dieser Ordner verwendet automatisches Layout. Wollen Sie auf manuelles "
-"Layout umschalten und dieses Objekt dort lassen, wo Sie es fallen gelassen "
-"haben? Dies wird das gespeicherte manuelle Layout überschreiben."
+"Wollen Sie auf manuelles Layout umschalten und dieses Objekt dort lassen, wo "
+"Sie es abgelegt haben? Dies überschreibt das gespeicherte manuelle Layout."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Dieser Ordner verwendet automatisches Layout"
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Dieser Ordner verwendet automatisches Layout. Wollen Sie auf manuelles "
-"Layout umschalten und diese Objekte dort lassen, wo Sie sie fallen gelassen "
-"haben? Dies wird das gespeicherte manuelle Layout überschreiben."
+"Wollen Sie auf manuelles Layout umschalten und diese Objekte dort lassen, wo "
+"Sie sie abgelegt haben? Dies würde das gespeicherte manuelle Layout "
+"überschreiben."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Dieser Ordner verwendet automatisches Layout. Wollen Sie auf manuelles "
-"Layout umschalten und dieses Objekt dort lassen, wo Sie es fallen gelassen "
-"haben?"
+"Wollen Sie auf manuelles Layout umschalten und dieses Objekt dort lassen, wo "
+"Sie es abgelegt haben?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Dieser Ordner verwendet automatisches Layout. Wollen Sie auf manuelles "
-"Layout umschalten und diese Objekte dort lassen, wo Sie sie fallen gelassen "
-"haben?"
+"Wollen Sie auf manuelles Layout umschalten und diese Objekte dort lassen, wo "
+"Sie sie abgelegt haben?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Auf manuelles Layout umschalten?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Umschalten"
 
@@ -3603,7 +3466,7 @@ msgid ""
 "Fast searches will not be available until an initial index of your files has "
 "been created.  This may take a long time."
 msgstr ""
-"Wenn Sie schnelle Suchen ermöglichen wollen, können Sie als »root«-Benutzer "
+"Wenn Sie die Schnellsuche ermöglichen wollen, können Sie als »root«-Benutzer "
 "die Datei %s bearbeiten. Wenn Sie das Flag »enabled« auf »yes« setzen, "
 "schaltet dies die Medusa-Dienste ein.\n"
 "Um die Indizierungs- und Suchdienste sofort zu starten, sollten Sie auch "
@@ -3612,7 +3475,7 @@ msgstr ""
 "medusa-index\n"
 "medusa-searchd\n"
 "\n"
-"Schnelle Suchen sind erst dann möglich, wenn ein erster Index Ihrer Dateien "
+"Die Schnellsuche ist erst dann möglich, wenn ein erster Index Ihrer Dateien "
 "angelegt wurde. Dies kann lange dauern."
 
 #: libnautilus-private/nautilus-medusa-support.c:138
@@ -3695,72 +3558,72 @@ msgstr "Ist voreingestellt für alle »%s«-Objekte."
 msgid "Is the default for all \"%s\" items."
 msgstr "Ist voreingestellt für alle »%s«-Objekte."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "»%s« ändern"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Für alle »%s«-Objekte ins Menü aufnehmen"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Als Vorgabe für alle »%s«-Objekte verwenden"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Nur für »%s« ins Menü aufnehmen"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Nur als Vorgabe für »%s« verwenden"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nicht ins Menü für »%s«-Objekte aufnehmen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Name"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Aus_wählen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Fertig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "Ä_ndern..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Dateitypen und Programme"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Dorthin gehen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3768,48 +3631,48 @@ msgstr ""
 "Sie können im Dialog »Dateitypen und Programme« konfigurieren, welche "
 "Programme für welche Dateitypen angeboten werden."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Mit einer anderen Anwendung öffnen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Wählen Sie die Anwendung, mit der »%s« geöffnet werden soll:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Mit einer anderen Ansicht öffnen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Wählen Sie eine Ansicht für »%s«:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Es sind keine Ansichten für »%s« verfügbar."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Keine Ansichten verfügbar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Mit »%s« ist keine Anwendung verknüpft."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Keine Anwendung verknüpft"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Es ist keine Aktion mit »%s« verknüpft."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Keine Aktion verknüpft"
 
@@ -3818,178 +3681,187 @@ msgstr "Keine Aktion verknüpft"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
 "Sie können GNOME anweisen, Anwendungen mit Dateitypen zu verknüpfen. Möchten "
 "Sie jetzt eine Anwendung mit diesem Dateityp verknüpfen?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Verknüpfte Anwendung"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "Anwendung _verknüpfen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Die mit »%s« verknüpfte Ansicht ist ungültig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Verknüpfte Ansicht ungültig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Die mit »%s« verknüpfte Anwendung ist ungültig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Verknüpfte Anwendung ungültig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Die mit »%s« verknüpfte Ansicht ist ungültig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Verknüpfte Aktion ungültig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
 "Sie können GNOME anweisen, eine andere Anwendung oder Ansicht mit diesem "
 "Dateityp zu verknüpfen. Möchten Sie jetzt eine Anwendung oder Ansicht mit "
 "diesem Dateityp verknüpfen?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Aktion verknüpfen"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "Aktion _verknüpfen"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Öffnen fehlgeschlagen. Wollen Sie eine andere Anwendung wählen?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "»%s« kann »%s« nicht öffnen, da »%s« nicht auf Dateien an »%s«-Orten "
-"zugreifen kann. Möchten Sie eine andere Anwendung wählen?"
+"zugreifen kann."
+
+# CHECK
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Öffnen fehlgeschlagen, wollen Sie eine andere Aktion ausführen?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Die Vorgabeaktion kann »%s« nicht öffnen, da sie nicht auf Dateien an »%s«-"
-"Orten zugreifen kann. Möchten Sie eine andere Aktion wählen?"
+"Orten zugreifen kann."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ort konnte nicht geöffnet werden"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "»%s« kann »%s« nicht öffnen, da »%s« nicht auf Dateien an »%s«-Orten "
-"zugreifen kann. Keine anderen Anwendungen sind verfügbar, mit denen Sie "
-"diese Datei anzeigen können. Möglicherweise können Sie sie öffnen, wenn Sie "
-"sie auf Ihren Computer kopieren"
+"zugreifen kann."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"Es sind keine weiteren Anwendungen zum Anzeigen dieser Datei verfügbar. "
+"Möglicherweise können Sie sie öffnen, wenn Sie sie auf Ihren Computer "
+"kopieren."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Die Vorgabeaktion kann »%s« nicht öffnen, da sie nicht auf Dateien an »%s«-"
-"Orten zugreifen kann. Es sind keine anderen Anwendungen, mit denen Sie diese "
-"Datei anzeigen können. Möglicherweise können Sie sie öffnen, wenn Sie sie "
-"auf Ihren Computer kopieren"
+"Orten zugreifen kann."
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Es sind keine weiteren Anwendungen zum Anzeigen dieser Datei verfügbar. "
+"Möglicherweise können Sie sie öffnen, wenn Sie sie auf Ihren Computer "
+"kopieren."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
-"Aus Sicherheitsgründen von einem entfernten Rechner aus dürfen Sie keine "
-"Befehle ausführen."
+"Leider dürfen Sie keine Befehle von einer entfernten Gegenstelle aus "
+"ausführen."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Dies ist auf Grund von Sicherheitserwägungen deaktiviert."
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "Entfernte Verknüpfungen können nicht ausgeführt werden"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Beim Start der Anwendung ist ein Fehler aufgetreten.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Details: "
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Beim Ausführen der Anwendung ist ein Fehler aufgetreten."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
+msgstr "Fehler beim Ausführen einer Anwendung"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
-msgstr "Fehler beim Start der Anwendung"
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Dieses Ablegeziel unterstützt ausschließlich lokale Dateien."
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Dieses Ziel unterstützt nur lokale Dateien.\n"
-"\n"
-"Um nichtlokale Dateien zu öffnen, kopieren Sie sie in einen lokalen Ordner "
-"und lassen Sie sie dann noch einmal hier fallen."
+"Um nichtlokale Dateien zu öffnen, müssen Sie Sie sie in einen lokalen Ordner "
+"kopieren und dann noch einmal hier ablegen."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
-msgstr "Ziel unterstützt nur lokale Dateien"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "Ablegeziel unterstützt ausschließlich lokale Dateien"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Dieses Ziel unterstützt nur lokale Dateien.\n"
-"\n"
-"Um nichtlokale Dateien zu öffnen, kopieren Sie sie in einen lokalen Ordner "
-"und lassen Sie sie dann noch einmal hier fallen. Die lokalen Dateien, die "
-"Sie fallen gelassen haben, wurden bereits geöffnet."
+"Um nichtlokale Dateien zu öffnen, müssen Sie Sie sie in einen lokalen Ordner "
+"kopieren und dann noch einmal hier ablegen. Die lokalen, abgelegten Dateien "
+"wurden bereits geöffnet."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4236,14 +4108,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Objekte mit »medusa« in ihren Namen, die Ordner sind"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Platten durchsuchen"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus durchsucht Ihre Platten nach Müllordnern."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -4310,9 +4174,10 @@ msgstr "Den gesamten Text in einem Textfeld markieren"
 msgid "_Paste Text"
 msgstr "Text _einfügen"
 
+# CHECK
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Ihren Computer-Speicherort anzeigen"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4326,14 +4191,14 @@ msgstr "Verwaltung von Dateien"
 msgid "View your home folder in the Nautilus file manager"
 msgstr "Ihren persönlichen Ordner im Dateimanager Nautilus anzeigen"
 
+# CHECK
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Dateisystem"
+msgstr "Dateisystem-Browser"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Das Dateisystem mit Hilfe des Dateimanagers anzeigen"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4446,99 +4311,103 @@ msgstr "Hintergrund"
 msgid "Empty Trash"
 msgstr "Müll leeren"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Dies wird %d getrennte Fenster öffnen. Sind Sie sicher, dass Sie das tun "
-"wollen?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d Fenster öffnen?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Sind sie sicher, dass Sie alle Fenster öffnen wollen?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Dies würde %d Einzelfenster öffnen."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Sind sie sicher, dass Sie »%s« auf Dauer löschen wollen?"
+msgstr "Sind sie sicher, dass Sie »%s« dauerhaft löschen wollen?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
-"Sind sie sicher, dass Sie die %d gewählten Objekte auf Dauer löschen wollen?"
+"Sind sie sicher, dass Sie die %d gewählten Objekte dauerhaft löschen wollen?"
+
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Sobald Sie ein Objekt löschen, geht es dauerhaft verloren."
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Löschen?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Wählen Sie eine Kategorie:"
+msgstr "Muster wählen"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Muster"
+msgstr "_Muster:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "»%s« ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 Ordner ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d Ordner ausgewählt"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (enthält 0 Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (enthält 1 Objekt)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (enthält %d Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (enthalten insgesamt 0 Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (enthalten insgesamt 1 Objekt)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (enthalten insgesamt %d Objekte)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "»%s« ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d Objekte ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 anderes Objekt ausgewählt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andere Objekte ausgewählt (%s)"
@@ -4550,7 +4419,7 @@ msgstr "%d andere Objekte ausgewählt (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4559,120 +4428,132 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
-"Der Ordner »%s« enthält mehr Dateien, als Nautilus vertragen kann. Einige "
+"Der Ordner »%s« enthält mehr Dateien, als Nautilus handhaben kann. Einige "
 "Dateien werden nicht angezeigt."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Einige Dateien werden nicht angezeigt."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Zu viele Dateien"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
-"»%s« konnte nicht in den Müll verschoben werden. Soll es sofort gelöscht "
-"werden?"
+"Die Datei konnte nicht in den Müll verschoben werden. Soll sie sofort "
+"gelöscht werden?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Die Datei »%s« konnte nicht in den Müll verschoben werden."
+
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
-"Die %d gewählten Objekte können nicht in den Müll verschoben werden. Wollen "
-"Sie sie sofort löschen?"
+"Die Objekte konnten nicht in den Müll verschoben werden. Sollen sie sofort "
+"gelöscht werden?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d der gewählten Objekte können nicht in den Müll verschoben werden. Wollen "
-"Sie diese %d Objekte sofort löschen?"
+"Einige Objekte konnten nicht in den Müll verschoben werden. Sollen sie "
+"sofort gelöscht werden?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Sofort löschen?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "Sind Sie sicher, dass Sie »%s« auf Dauer aus dem Müll löschen wollen?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Sind Sie sicher, dass Sie »%s« dauerhaft aus dem Müll löschen wollen?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
-"Sind Sie sicher, dass Sie die %d gewählten Objekte auf Dauer aus dem Müll "
+"Sind Sie sicher, dass Sie die %d gewählten Objekte dauerhaft aus dem Müll "
 "löschen wollen?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Sobald Sie ein Objekt löschen, geht es dauerhaft verloren."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Aus Müll löschen?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "»%s« verwenden, um das gewählte Objekt zu öffnen"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Anderer _Anwendung..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Einer _Anwendung..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Anderer _Ansicht..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Einer _Ansicht..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Die angegebene Aktion konnte nicht fertiggestellt werden: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Die angegebene Aktion konnte nicht fertiggestellt werden."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "»%s« mit allen gewählten Objekten ausführen"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Dokument aus Vorlage »%s« anlegen"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr "Alle ausführbaren Dateien in diesem Ordner erscheinen im Skriptmenü."
+
+# CHECK - Das - Bezug
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Alle ausführbaren Dateien in diesem Ordner werden im Skriptmenü erscheinen. "
-"Das aus diesem Menü gewählte Skript wird mit allen ausgewählten Objekten als "
-"Eingabe ausgeführt."
+"Das aus diesem Menü gewählte Skript wird ausgeführt, wobei alle gewählte "
+"Objekte als Eingabe verwendet werden."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Info zu den Skripten"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4713,17 +4594,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: Position und Größe des aktuellen Fensters"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "»%s« wird verschoben, sobald Sie »Dateien einfügen« auswählen"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "»%s« wird kopiert, sobald Sie »Dateien einfügen« auswählen"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4731,7 +4612,7 @@ msgstr ""
 "Die %d gewählten Objekte werden verschoben, sobald Sie »Dateien einfügen« "
 "auswählen"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4739,161 +4620,160 @@ msgstr ""
 "Die %d gewählten Objekte werden kopiert, sobald Sie »Dateien einfügen« "
 "auswählen"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "In der Zwischenablage ist nichts zum Einfügen."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Fehler beim Einbinden"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Fehler beim Lösen der Einbindung"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Fehler beim Einbinden"
+msgstr "Auswurf-Fehler"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Aus_werfen"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Datenträger aushängen"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "_In neuem Fenster öffnen"
+msgstr "In neuem Fenster öffnen"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "_In %d neuen Fenstern öffnen"
+msgstr "In %d neuen Fenstern öffnen"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+# CHECK
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Persönlicher Ordner"
+msgstr "Ordner-Browser"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+# CHECK
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Persönlicher Ordner"
+msgstr "Ordner-Browser"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Aus Müll _löschen"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
-msgstr "Alle gewählten Objekte auf Dauer löschen"
+msgstr "Alle gewählten Objekte dauerhaft löschen"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "In den _Müll verschieben"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Jedes gewählte Objekt in den Müll verschieben"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Verknüpfungen anlegen"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Verknüpfung anlegen"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Müll _leeren"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Datei _ausschneiden"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Dateien _ausschneiden"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Datei _kopieren"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Dateien _kopieren"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr ""
+"Diese Verknüpfung ist fehlerhaft. Soll sie in den Müll verschoben werden?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
 msgstr ""
-"Diese Verknüpfung kann nicht verwendet werden, da sie auf kein Ziel "
-"verweist. Soll sie in den Müll verschoben werden?"
+"Diese Verknüpfung kann nicht verwendet werden, da sie auf kein Ziel verweist."
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Diese Verknüpfung kann nicht verwendet werden, da ihr Ziel »%s« nicht "
-"existiert. Soll sie in den Müll verschoben werden?"
+"existiert."
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Fehlerhafte Verknüpfung"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"»%s« ist eine ausführbare Textdatei. Wollen Sie sie ausführen oder Ihren "
-"Inhalt anzeigen lassen?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Wollen Sie »%s« ausführen oder Ihren Inhalt anzeigen lassen?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "»%s« ist eine ausführbare Textdatei."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Ausführen oder anzeigen?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Anzeigen"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Im _Terminal ausführen"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Anzeigen"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Ausführen"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Öffnen von »%s«"
+msgid "Opening \"%s\"."
+msgstr "»%s« wird geöffnet."
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Öffnen abbrechen?"
 
@@ -4917,10 +4797,14 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Leider konnte nicht der gesamte Inhalt von »%s« angezeigt werden."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "Der Ordnerinhalt konnte nicht angezeigt werden."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fehler beim Anzeigen eines Ordners"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4928,7 +4812,7 @@ msgstr ""
 "Der Name »%s« wird in diesem Ordner bereits verwendet. Bitte benutzen Sie "
 "einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4936,12 +4820,12 @@ msgstr ""
 "Es gibt kein »%s« in diesem Ordner. Möglicherweise wurde es gerade "
 "verschoben oder gelöscht?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Sie haben nicht die nötigen Zugriffsrechte, um »%s« umzubenennen."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4950,67 +4834,79 @@ msgstr ""
 "Der Name »%s« ist nicht gültig, da er das Zeichen »/« enthält. Bitte "
 "benutzen Sie einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Der Name »%s« ist ungültig. Bitte benutzen Sie einen anderen Namen."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Der Name von »%s« konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "»%s« konnte nicht in »%s« umbenannt werden."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Das Objekt konnte nicht umbenannt werden."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Fehler beim Umbenennen"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Sie haben nicht die nötigen Zugriffsrechte, um die Gruppe von »%s« zu ändern."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Die Gruppe von »%s« konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Die Gruppe von »%s« konnte nicht geändert werden."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Die Gruppe konnte nicht festgelegt werden."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Fehler beim Ändern der Gruppe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Der Besitzer von »%s« konnte nicht geändert werden, da es sich auf einer "
 "schreibgeschützten Platte befindet"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Der Besitzer von »%s« konnte nicht geändert werden."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Der Besitzer konnte nicht festgelegt werden."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Fehler beim Ändern des Besitzers"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -5018,21 +4914,25 @@ msgstr ""
 "Die Zugriffsrechte von »%s« konnten nicht geändert werden, da es sich auf "
 "einer schreibgeschützten Platte befindet."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Die Zugriffsrechte von »%s« konnten nicht geändert werden."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Die Zugriffsrechte konnten nicht festgelegt werden."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Fehler beim Festlegen der Zugriffsrechte"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "»%s« wird in »%s« umbenannt."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Umbenennen abbrechen`"
 
@@ -5090,128 +4990,136 @@ msgstr "_Originalgröße der Symbole wiederherstellen"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Originalgröße des Symbols wiederherstellen"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "zeigt auf »%s«"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr "Drag und Drop wird nur auf lokalen Laufwerken unterstützt."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Ziehen und Ablegen wird nicht unterstützt."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
-msgstr "Fehler beim Drag und Drop"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr ""
+"Ziehen und Ablegen wird ausschließlich auf lokalen Dateisystemen unterstützt."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr "Fehler beim Ziehen und Ablegen"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
-msgstr "Ein ungültiger Drag-Typ wurde verwendet."
+msgstr "Es wurde ein ungültiger Zieh-Typ verwendet."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Größe"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Änderungsdatum"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
-"Sie können nicht mehr als ein eigenes Symbol auf einmal zuweisen! Bitte "
-"ziehen Sie immer nur ein Bild, um ein eigenes Symbol einzustellen."
+"Sie können nicht mehr als ein benutzerdefiniertes Symbol auf einmal zuweisen."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Bitte ziehen Sie immer nur ein Bild, um ein benutzerdefiniertes Symbol "
+"festzulegen."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mehr als ein Bild"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr "Die abgelegte Datei ist nicht lokal."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
-"Die Datei, die Sie fallengelassen haben, ist nicht lokal. Sie können nur "
-"lokale Bilder als eigene Symbole verwenden."
+"Sie können ausschließlich lokale Bilder als benutzerdefiniertes Symbol "
+"verwenden."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Nur lokale Bilder"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Die Datei, die Sie fallengelassen haben, ist kein Bild. Sie können nur "
-"lokale Bilder als eigene Symbole verwenden."
+msgid "The file that you dropped is not an image."
+msgstr "Die abgelegte Datei ist kein Bild."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Nur Bilder"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Eigenschaften von %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Gruppenwechsel abbrechen?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "Gruppenwechsel..."
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Gruppenwechsel."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Besitzerwechsel abbrechen?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "Besitzerwechsel..."
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Besitzerwechsel."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nichts"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "unlesbar"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 Objekt, mit Größe %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d Objekte, zusammen %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(Teile des Inhalts unlesbar)"
 
@@ -5221,193 +5129,189 @@ msgstr "(Teile des Inhalts unlesbar)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Inhalt:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Namen:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Name:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Ort:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Datenträger:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Freier Speicherplatz:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Verknüpfungsziel:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-Typ:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Geändert:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Zugegriffen:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
-msgstr "E_igenes Symbol verwenden..."
+msgstr "_Benutzerdefiniertes Symbol verwenden..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
-msgstr "Eigenes Symbol _entfernen"
+msgstr "Benutzerdefiniertes Symbol _entfernen"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lesen"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Schreiben"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Ausführen"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "_Benutzerkennung festlegen"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Besondere Attribute:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "_Gruppenkennung festlegen"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Klebrig"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Zugriffsrechte"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Sie sind nicht der Besitzer, daher können Sie die Zugriffsrechte nicht "
 "ändern."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Datei_besitzer:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Dateibesitzer:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Gruppe der _Datei:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Gruppe der Datei:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Andere:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Textansicht:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Zahlenansicht:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Zuletzt geändert:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Die Zugriffsrechte von »%s« konnten nicht ermittelt werden."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Die Zugriffsrechte der gewählten Datei konnten nicht ermittelt werden."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Beim Anzeigen der Hilfe ist ein Fehler aufgetreten: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Beim Anzeigen der Hilfe ist ein Fehler aufgetreten."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr "Hilfe konnte nicht angezeigt werden"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
-msgstr "Anzeigen des Eigenschaften-Fensters abbrechen?"
+msgstr "Anzeigen des Eigenschaftsfensters abbrechen?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "Eigenschaften-Fenster wird erzeugt"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Eigenschaftsfenster wird erzeugt."
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Wählen Sie ein Symbol"
 
@@ -5425,98 +5329,113 @@ msgid "Search Results"
 msgstr "Suchergebnisse"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Der Medusa-Suchdienst wurde nicht installiert und ist daher nicht verfügbar."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Leider ist der Medusa-Suchdienst nicht verfügbar."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa ist nicht installiert."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Suchdienst nicht verfügbar"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "Die von Ihnen gewählte Suche ist neuer als der Index auf Ihrem System. Die "
-"Suche wird darum jetzt noch keine Ergebnisse liefern. Sie können einen Index "
-"anlegen, indem Sie als »root«-Benutzer auf der Befehlszeile »medusa-index« "
-"ausführen."
+"Suche liefert daher momentan noch keine Ergebnisse."
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Sie können einen neuen Index anlegen, indem Sie in der Befehlszeile als "
+"»root«-Benutzer »medusa-indexd« ausführen."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr "Suche nach zu neuen Objekten"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Auf die von Ihnen festgelegten Kriterien passen alle auf Ihrem Computer "
+"indizierte Dateien."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Jede indizierte Datei auf Ihrem Computer passt auf die von Ihnen "
-"festgelegten Kriterien. Sie können die Rechtschreibung Ihrer Angaben "
-"überprüfen oder mehr Kriterien hinzufügen, um die Trefferzahl einzuschränken."
+"Überprüfen Sie die Rechtschreibung Ihrer Angaben oder fügen Sie weitere "
+"Kriterien hinzu, um die Trefferzahl einzuschränken."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Fehler beim Suchen"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 "Die Suche kann Ihren Dateisystem-Index nicht finden. Möglicherweise fehlt "
-"Ihr Index ist beschädigt. Sie können einen neuen anlegen, indem Sie als "
-"»root«-Benutzer auf der Befehlszeile »medusa-indexd« ausführen."
+"Ihr Index oder er ist fehlerhaft."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "Fehler beim Lesen des Dateiindex"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Fehler beim Lesen des Dateiindizes"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Ein Fehler trat beim Laden des Inhalts dieser Suche auf: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Beim Laden des Suchinhalts trat ein Fehler auf."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Da der Zugriff auf diesen Index momentan nicht möglich "
-"ist, wird eine langsamere Suche durchgeführt, bei der der Index nicht "
-"berücksichtigt wird."
+"Um eine Schnellsuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
-"Um eine Inhaltssuche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Momentan ist der Zugriff auf diesen Index nicht möglich."
+"Um eine Inhaltssuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
-msgstr "Schnelles Suchen ist nicht verfügbar"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Im Moment ist es nicht möglich, auf Ihren Index zuzugreifen. Daher wird eine "
+"langsamere Suche durchgeführt, die nicht auf den Index zurückgreift."
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
-msgstr "Inhaltssuchen sind nicht verfügbar"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Der Zugriff auf Ihren Index ist momentan nicht möglich."
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Die Schnellsuche ist nicht verfügbar"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Die Inhaltssuch ist nicht verfügbar"
+
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5531,74 +5450,92 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Dieser Index wird momentan von Ihrem Computer angelegt, "
-"weswegen nicht auf ihn zurückgegriffen werden kann und die Suche "
-"möglicherweise mehere Minuten dauert."
+"Um eine Schnellsuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich. Dieser Index wird momentan von Ihrem Computer angelegt."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"Um eine Inhaltssuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich. Dieser Index wird momentan von Ihrem Computer angelegt."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Dieser Index wird momentan von Ihrem Computer angelegt. "
-"Inhalttsuchen sind erst wieder möglich, sobald dieser Vorgang abgeschlossen "
-"wurde."
+"Da kein Index verwendet werden kann, dauert diese Suche möglicherweise "
+"einige Minuten."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Indizierte Suche ist nicht verfügbar"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Die Inhaltssuche ist verfügbar, sobald der Index vollständig ist."
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Die indizierte Suche ist nicht verfügbar"
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Momentan ist kein Index verfügbar. Sie können einen "
-"anlegen, indem Sie auf der Befehlszeile als »root«-Benutzer »medusa-indexd« "
-"ausführen. Bevor kein vollständiger Index verfügbar ist, dauern Suchvorgänge "
-"mehrere Minuten."
+"Um eine Inhaltssuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich. Momentan ist kein Index verfügbar."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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 ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Sie können einen anlegen, indem Sie auf der "
-"Befehlszeile als »root«-Benutzer »medusa-indexd« ausführen. Solange kein "
-"vollständiger Index verfügbar ist, können keine Inhaltssuchen durchgeführt "
-"werden."
+"system.  No index is available right now."
+msgstr ""
+"Um eine Inhaltssuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich. Momentan ist kein Index verfügbar."
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Sie können einen Index anlegen, indem Sie in der Befehlszeile als »root«-"
+"Benutzer »medusa-indexd« ausführen. Bevor kein vollständiger Index verfügbar "
+"ist, dauern Suchvorgänge mehrere Minuten."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Sie können einen Index anlegen, indem Sie in der Befehlszeile als »root«-"
+"Benutzer »medusa-indexd« ausführen. Solange kein vollständiger Index "
+"verfügbar ist, können keine Inhaltssuchen durchgeführt werden."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Auf Ihrem Computer ist die Schnellsuche nicht aktiviert."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 ""
-"Um eine schnelle Suche durchzuführen ist ein Index der Dateien auf Ihrem "
-"System erforderlich. Ihr Systemadministrator hat die schnelle Suche auf "
-"Ihrem Computer deaktiviert, so dass kein Index verfügbar ist."
+"Um eine Schnellsuche durchzuführen, ist ein Index der Dateien auf Ihrem "
+"System erforderlich. Ihr Systemadministrator hat die Schnellsuche auf Ihrem "
+"Computer deaktiviert, so dass kein Index verfügbar ist."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Schnelle Suchen sind auf Ihrem Computer nicht aktiv"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Die Schnellsuche ist nicht aktiviert"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Wo"
 
@@ -5607,7 +5544,7 @@ msgstr "Wo"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "In neuem Fenster ent_hüllen"
@@ -5618,7 +5555,7 @@ msgstr "In neuem Fenster ent_hüllen"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "In %d _neuen Fenstern enthüllen"
@@ -5627,15 +5564,15 @@ msgstr "In %d _neuen Fenstern enthüllen"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"Nautilus hat mehr Suchergebnisse gefunden als dargestellt werden können. "
-"Einige Treffer werden nicht angezeigt."
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus hat mehr Suchergebnisse gefunden als angezeigt werden können."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Einige Treffer werden nicht angezeigt."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Zu viele Treffer"
 
@@ -5649,12 +5586,12 @@ msgid "Create L_auncher"
 msgstr "_Starter anlegen"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Einen neuen Starter anlegen"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Alle Objekte im Müll löschen"
 
@@ -5675,7 +5612,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "_Vorgabe-Hintergrund verwenden"
@@ -5700,58 +5637,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Eine andere Ansicht zum Anzeigen der gewählten Objekte auswählen"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "_Dokument anlegen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "_Ordner anlegen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Ein neue leere Datei in diesem Ordner anlegen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Einen neuen leeren Ordner in diesem Ordner anlegen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Eine symbolische Verknüpfung für jedes gewählte Objekt anlegen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Duplizieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Jedes gewählte Objekt löschen, ohne es in den Müll zu verschieben"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Alle gewählten Objekte duplizieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Starter bearbeiten"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Starter-Informationen bearbeiten"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Den gewählten Datenträger formatieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "_Medieneigenschaften"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Den gewählten Datenträger aushängen"
+msgstr "Den gewählten Datenträger einbinden"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Zuvor ausgewählte Dateien durch »Dateien ausschneiden« oder »Dateien "
 "kopieren« verschieben oder kopieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5759,132 +5703,137 @@ msgstr ""
 "Zuvor durch »Dateien ausschneiden« oder »Dateien kopieren« gewählte Dateien "
 "in den gewählten Ordner verschieben oder kopieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Keine Vorlagen installiert"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Öffnen _mit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Jedes gewählte Objekt in einem eigenen Fenster öffnen"
+msgstr "Jedes gewählte Objekt in einem einzelnen Navigationsfenster öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "_In neuem Fenster öffnen"
+msgstr "In Navigationsfenster öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Das gewählte Objekt in diesem Fenster öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Die gewählten Dateien auf Kopieren mit »Dateien einfügen« vorbereiten"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Die gewählten Dateien auf Verschieben mit »Dateien einfügen« vorbereiten"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Schützen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Den gewählten Datenträger schützen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Ausgewähltes Objekt umbenennen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Ansicht auf _Vorgaben zurücksetzen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Sortierreihenfolge und Vergrößerungsstufe auf Vorgaben für diese Ansicht "
 "zurücksetzen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Skripte in ~/Nautilus/Skripte ausführen / verwalten"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Alle Dateien a_uswählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "_Muster"
+msgstr "_Muster wählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Alle Objekte in diesem Fenster auswählen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Alle Objekte in diesem Fenster auswählen"
+msgstr ""
+"Alle Objekte in diesem Fenster auswählen, wie auf ein bestimmtes Muster "
+"passen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
-msgstr "Medieneigenschaften des gewählten Datenträgers anzeigen"
+msgstr "Die Medieneigenschaften des gewählten Datenträgers anzeigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 "Den Ordner anzeigen, der die in diesem Menü aufgeführten Skripte enthält"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Den gewählten Datenträger aushängen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Den Vorgabe-Hintergrund für diesen Ort verwenden"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Die Eigenschaften aller gewählten Objekte anzeigen/ändern"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "_Leere Datei"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatieren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "_Datenträger aushängen"
+msgstr "Datenträger _einbinden"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Skript_ordner öffnen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Dateien e_infügen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Dateien in Ordner e_infügen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "Ei_genschaften"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "S_kripte"
 
@@ -5971,7 +5920,12 @@ msgstr "_Manuell"
 msgid "Indexing is %d%% complete."
 msgstr "Indizierung ist zu %d%% abgeschlossen."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Ihre Dateien wurden zuletzt am %s indiziert."
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5979,43 +5933,49 @@ msgstr ""
 "Einmal am Tag wird der Inhalt Ihrer Dateien indiziert, sodass Suchvorgänge "
 "schnell sind."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indizierungsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Ihre Dateien wurden zum letzten Mal am %s indiziert"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Ihre Dateien werden im Moment indiziert."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Einmal am Tag wird der Inhalt Ihrer Dateien indiziert, sodass Suchvorgänge "
-"schnell sind. Ihre Dateien werden gerade indiziert."
+"Einmal am Tag werden Ihre Dateien und ihr Inhalt indiziert, sodass die "
+"Schnellsuche möglich ist."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Es gibt momentan keinen Index Ihrer Dateien."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
-"Wenn die schnelle Suche aktiv ist, legt die Suche einen Index an, um das "
-"Suchen zu beschleunigen. Schnelles Suchen ist auf Ihrem Computer nicht "
-"aktiv, so dass Sie momentan keinen Index haben."
+"Wenn die Schnellsuche aktiv ist, legt die Suche einen Index an, um das "
+"Suchen zu beschleunigen. Die Schnellsuche ist auf Ihrem Computer nicht "
+"aktiviert, so dass Sie momentan keinen Index haben."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Es gibt momentan keinen Index Ihrer Dateien."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Kein Dateiindex"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Der Medusa-Suchdienst ist nicht verfügbar."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Bitte stellen Sie sicher, dass medusa korrekt eingerichtet wurde."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -6040,60 +6000,63 @@ msgstr "_Indizierungsstatus anzeigen"
 msgid "Show status of indexing used when searching"
 msgstr "Status der von der Suchfunktion benutzen Indizes anzeigen"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Erforderlicher Ordner konnte nicht angelegt werden"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus konnte den erforderlichen Ordner »%s« nicht anlegen."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus konnte den erforderlichen Ordner »%s« nicht anlegen. Legen Sie ihn "
-"an, bevor Sie Nautilus starten oder ändern Sie die Zugriffsrechte so, dass "
-"Nautilus ihn anlegen kann."
+"Bitte legen Sie folgenden Ordner vor dem Starten von Nautilus an oder ändern "
+"Sie die Zugriffsrechte so, dass Nautilus ihn anlegen kann."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
-msgstr "Erfoderlicher Ordner konnten nicht angelegt werden"
+msgstr "Erforderliche Ordner konnten nicht angelegt werden"
 
-#: src/nautilus-application.c:262
+# CHECK
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus konnte folgende, erforderliche Ordner nicht anlegen: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus konnte die folgenden erforderlichen Ordner nicht anlegen:\n"
-"\n"
-"%s\n"
-"\n"
-"Legen Sie diese an, bevor Sie Nautilus starten oder ändern Sie die "
-"Zugriffsrechte so, dass Nautilus sie anlegen kann."
+"Bitte legen Sie folgende Ordner vor dem Starten von Nautilus an oder ändern "
+"Sie die Zugriffsrechte so, dass Nautilus sie anlegen kann."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Verknüpfung mit altem Desktop"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Es wurde eine Verknüpfung namens »Verknüpfung mit altem Desktop« auf dem "
+"Desktop angelegt."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Der Speicherort des Desktop-Ordners hat sich in GNOME 2.4 geändert. Auf dem "
-"Desktop wurde eine Verknüpfung mit Namen »Verknüpfung mit altem Desktop« "
-"angelegt. Sie können diesen öffnen, die gewünschten Dateien in den neuen "
-"Desktop-Ordner verschieben und dann die Verknüpfung löschen."
+"Der Speicherort des Desktop-Ordners hat sich in GNOME 2.4 geändert. Sie "
+"können die Verknüpfung öffnen, die gewünschten Dateien in den neuen Desktop-"
+"Ordner verschieben und dann die Verknüpfung löschen."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr "Ãœbernommener alter Desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "Migrierter alter Desktop"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6105,7 +6068,7 @@ msgstr "Ãœbernommener alter Desktop"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6117,7 +6080,7 @@ msgstr ""
 "Neuem."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6163,14 +6126,14 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "Nautilus kann auf Grund eines unerwarteten Fehlers jetzt nicht verwendet "
 "werden."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6179,7 +6142,7 @@ msgstr ""
 "Bonobo auftrat, als versucht wurde, den Ansichts-Server des Dateimanagers zu "
 "registrieren."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6189,7 +6152,7 @@ msgstr ""
 "Bonobo auftrat, als versucht wurde, die Fabrik zu finden. Beenden von bonobo-"
 "activation und Neustarten von Nautilus könnte das Problem beheben."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6199,6 +6162,17 @@ msgstr ""
 "Bonobo auftrat, als versucht wurde, die Fabrik zu finden. Beenden von bonobo-"
 "activation-server und Neustarten von Nautilus könnte das Problem beheben."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Beim Anzeigen der Hilfe ist ein Fehler aufgetreten: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Keine Lesezeichen vorhanden"
@@ -6232,39 +6206,43 @@ msgstr "Weniger Optionen"
 msgid "Find Them!"
 msgstr "Finde sie!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Sie müssen einen Server-Namen angeben."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Kann nicht auf sich selbst verschoben werden"
+msgid "Please enter a name and try again."
+msgstr "Bitte geben Sie einen Namen ein und versuchen Sie es noch einmal."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"»%s« ist kein gültiger Ort. Bitte prüfen Sie die Rechtschreibung und "
-"versuchen Sie es noch einmal."
+msgid "\"%s\" is not a valid location."
+msgstr "»%s« ist kein gültiger Ort."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Bitte prüfen Sie die Rechtschreibung und versuchen Sie es noch einmal."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Netzwerk-Server"
+msgstr "Mit Server verbinden"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Name:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Ort:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "_Verbinden"
+msgstr "Verbinden"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6466,6 +6444,16 @@ msgstr ""
 "Sie können diese Datei von Hand löschen, um den Druiden nochmals zu\n"
 "bearbeiten.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Sie können nicht mehr als ein benutzerdefiniertes Symbol auf einmal zuweisen."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+"Sie können ausschließlich Bilder als benutzerdefiniertes Symbol verwenden."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6476,27 +6464,22 @@ msgstr "Mit %s öffnen"
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Die CD-Brennanwendung konnte nicht gestartet werden:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Die CD-Brennanwendung konnte nicht gestartet werden."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr "CD-Brenner konnte nicht gestartet werden"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
 # CHECK - mnemonic
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "Inhalt auf CD _schreiben"
 
@@ -6504,37 +6487,36 @@ msgstr "Inhalt auf CD _schreiben"
 msgid "Go To:"
 msgstr "Gehe zu:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Wollen Sie diese %d Orte in getrennten Fenstern sehen?"
+msgid "Do you want to view %d locations?"
+msgstr "Wollen Sie %d Orte anzeigen?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "In mehreren Fenstern anzeigen?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Ort konnte nicht geöffnet werden"
+msgstr "Ort öffnen"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Einen Satz schnelle Selbsttests durchführen."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Das erste Fenster mit der angegebenen Geometrie öffnen."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Nur für ausdrücklich angegebene URIs Fenster anlegen."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6542,45 +6524,45 @@ msgstr ""
 "Den Desktop nicht verwalten (die Einstellungen im Einstellungen-Dialog "
 "ignorieren)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "ein Browser-Fenster öffnen."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
-msgstr "Nautilus beenden..."
+msgstr "Nautilus beenden."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus neu starten."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Dateimanager"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kann nicht mit URIs verwendet werden.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kann nicht mit anderen Optionen verwendet werden.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kann nicht mit URIs verwendet werden.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kann nicht mit URIs verwendet werden.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --geometry kann nicht mit mehr als einer URI verwendet werden.\n"
@@ -6588,38 +6570,47 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Sind Sie sicher, dass Sie die Geschichte vergessen wollen? Wenn ja, werden "
-"Sie dazu verdammt sein, sie zu wiederholen."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Sind sie sicher, dass Sie die Chronik leeren wollen?"
+
+# CHECK - sowas dämliches
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Wenn ja, werden Sie dazu verdammt sein, sie zu wiederholen."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Sind Sie sicher, dass Sie die Liste der von Ihnen besuchten Orte löschen "
 "wollen?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Falls Sie die Ortsliste leeren, geht diese dauerhaft verloren."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Chronik löschen"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"Der Ort %s existiert nicht. Möchten Sie alle Lesezeichen mit diesem Ort aus "
-"Ihrer Liste entfernen?"
+"Sollen alle Lesezeichen mit dem nichtvorhandenen Ort aus Ihrer Liste "
+"entfernt werden?"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Der Ort »%s« existiert nicht."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Lesezeichen für nicht existierenden Ort"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -6652,15 +6643,13 @@ msgid "Close _All Windows"
 msgstr "_Alle Fenster schließen"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Alle Nautilus-Fenster schließen"
+msgstr "Alle Navigationsfenster schließen"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Mit _Server verbinden..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6677,107 +6666,116 @@ msgid "Forward"
 msgstr "Vor"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Zum Vorlagenordner gehen"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Zum nächsten besuchten Ort gehen"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Zum vorher besuchten Ort gehen"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Zum Müllordner gehen"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Adressleiste"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Aktualisieren"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Auf diesem Computer nach Dateien suchen"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "S_tatusleiste"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Rauf"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Auf CD schreiben"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Lesezeichen _hinzufügen"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Zurück"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Lesezeichen"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Chronik vergessen"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Theke"
+msgstr "_Computer"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Lesezeichen _bearbeiten"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Vor"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Persönlicher Ordner"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Ort..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "S_eitenleiste"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Vorlagen"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Müll"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Rauf"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -6791,38 +6789,39 @@ msgid "View as..."
 msgstr "Ansicht auswählen..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Dateibesitzer:"
+msgstr "Datei-Browser: %s"
 
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
-"Eines der Seitenleistenkarten stieß auf einen Fehler und kann nicht "
-"weitermachen. Leider ist nicht bekannt, welches."
+"Eine der Seitenleisten stieß auf einen Fehler und kann nicht weitermachen."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Leider konnte nicht ermittelt werden, welche."
+
+#: src/nautilus-navigation-window.c:1109
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
 msgstr ""
-"Die Seitenleiste %s stieß auf einen Fehler und kann nicht weitermachen. Wenn "
-"dies öfter vorkommt, ist es ratsam, diese zu deaktivieren."
+"Die Seitenleiste %s stieß beim Starten auf einen Fehler und kann daher nicht "
+"mehr ausgeführt werden."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Wenn dies öfter vorkommt, ist es ratsam, diese zu deaktivieren."
 
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Seitenleistenkarte fehlgeschlagen"
+msgstr "Seitenleiste fehlgeschlagen"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Seitenleiste"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Enthält eine Seitenleisten-Ansicht"
 
@@ -6856,147 +6855,179 @@ msgstr "Neues hinzufügen..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Das Muster %s konnte nicht gelöscht werden."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+"Stellen Sie sicher, dass Sie die erforderlichen Zugriffsrechte haben, um das "
+"Muster zu löschen."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Muster konnte nicht gelöscht werden"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Das Emblem %s konnte nicht gelöscht werden."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+"Stellen Sie sicher, dass Sie die erforderlichen Zugriffsrechte haben, um das "
+"Emblem zu löschen."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Emblem konnte nicht gelöscht werden"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Ein neues Emblem hinzufügen"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Stichwort:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Bild:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Wählen Sie eine Bilddatei für das neue Emblem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Eine neue Farbe anlegen:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Farb_name:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Farb_wert:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "»%s« ist kein gültiger Dateiname."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Sie haben keinen gültigen Dateinamen angegeben."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Notte versuchen Sie es noch einmal"
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Muster konnte nicht installiert werden"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sie können das zurückgesetzte Bild nicht ersetzen."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Zurücksetzen ist ein Spezialbild, das nicht gelöscht werden kann."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Kein Bild"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Das Muster %s konnte nicht installiert werden."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Wählen Sie eine Bilddatei, die als Muster hinzugefügt werden soll"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Die Farbe kann nicht installiert werden."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sie müssen einen Namen für die neue Farbe angeben."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Farbe konnte nicht installiert werden"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Wählen Sie die hinzuzufügende Farbe"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "»%s« ist keine verwendbare Bilddatei!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Leider ist »%s« keine verwendbare Bilddatei."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Die Datei ist kein Bild."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Wählen Sie eine Kategorie:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Entfernen a_bbrechen"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Ein neues Muster _hinzufügen..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Eine neue Farbe _hinzufügen..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Ein neues Emblem _hinzufügen..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klicken Sie auf ein Muster, um es zu entfernen"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klicken Sie auf eine Farbe, um sie zu entfernen"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klicken Sie auf ein Emblem, um es zu entfernen"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Muster:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Farben:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Embleme:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Ein Muster _entfernen..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Eine Farbe _entfernen..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Ein Emblem _entfernen..."
 
@@ -7211,7 +7242,7 @@ msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:3
 msgid "Close this window"
-msgstr "Diese Fenster schließen"
+msgstr "Dieses Fenster schließen"
 
 #: src/nautilus-shell-ui.xml.h:5
 msgid "Display Nautilus help"
@@ -7389,44 +7420,40 @@ msgid "Show %s"
 msgstr "%s anzeigen"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
-msgstr "_CD-Ersteller"
+msgstr "CD-_Ersteller"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "_Alle Fenster schließen"
+msgid "Close P_arent Folders"
+msgstr "E_ltern-Ordner schließen"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Die Eltern-Ordner dieses Ordners schließen"
 
-# CHECK - Zu oder Zum?
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Zum leeren CD-Ordner gehen"
+msgstr "Zum Computer gehen"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "Zum Müllordner gehen"
+msgstr "Zum CD-Ersteller gehen"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "_Ort..."
+msgstr "O_rt öffnen..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "_Eltern-Ordner öffnen"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Objekte, die ]Ordner[ sind]"
+msgstr "Den Eltern-Ordner öffnen"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Muster"
+msgstr "_Orte"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7446,7 +7473,7 @@ msgstr "die aktuelle Auswahl"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "der Typ des Fensters, in den die Ansicht eingebettet ist"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
@@ -7454,117 +7481,133 @@ msgstr "Fehler in der Ansicht"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+"Die Ansicht %s stieß beim Starten auf einen Fehler und kann daher nicht mehr "
+"ausgeführt werden."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
-"Die Ansicht %s stieß auf einen Fehler und kann nicht weitermachen. Sie "
-"können eine andere Ansicht auswählen oder zu einem anderen Ort wechseln."
+"Sie können eine andere Ansicht auswählen oder zu einem anderen Ort wechseln."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Die Ansicht %s stieß beim Starten auf einen Fehler."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Der Ort kann mit dieser Ansicht nicht angezeigt werden."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Inhaltsansicht"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Ansicht der aktuellen Datei bzw. des aktuellen Ordners"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"»%s« konnte nicht gefunden werden. Bitte prüfen Sie die Rechtschreibung und "
-"versuchen Sie es noch einmal."
+msgid "Couldn't find \"%s\"."
+msgstr "»%s« konnte nicht gefunden werden."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"»%s« konnte nicht dargestellt werden, da Nautilus seinen Dateityp nicht "
-"bestimmen konnte."
+msgid "Couldn't display \"%s\"."
+msgstr "»%s« konnte nicht angezeigt werden."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus hat keine Ansicht installiert, die »%s« anzeigen kann."
+# CHECK
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus konnte nicht ermitteln, welcher Dateityp es ist."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
-"»%s« konnte nicht angezeigt werden, da Nautilus nicht mit %s:-Orten umgehen "
-"kann."
+"Es ist keine Nautilus-Ansicht installiert, die die Datei anzeigen kann."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr ""
-"»%s« konnte nicht angezeigt werden, da der Versuch, sich anzumelden, "
-"fehlgeschlagen ist."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus kann nicht mit %s:-Orten umgehen."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "»%s« konnte nicht angezeigt werden, da der Zugriff verweigert wurde."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Der Anmeldeversuch schlug fehl."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Der Zugriff wurde verweigert."
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr ""
-"»%s« konnte nicht angezeigt werden, da der Rechner »%s« nicht gefunden "
-"werden konnte. Überprüfen Sie, ob der Rechnername richtig geschrieben wurde "
-"und ob Ihre Proxy-Einstellungen korrekt sind."
+"»%s« konnte nicht angezeigt werden, da kein Rechner namens »%s« gefunden "
+"werden konnte."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1319
+msgid ""
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"»%s« konnte nicht angezeigt werden. Überprüfen Sie, ob Ihre Proxy-"
-"Einstellungen korrekt sind."
+"Überprüfen Sie, ob der Rechnername richtig geschrieben wurde und ob Ihre "
+"Proxy-Einstellungen korrekt sind."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Überprüfen Sie, ob Ihre Proxy-Einstellungen korrekt sind."
+
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"»%s« konnte nicht dargestellt werden, da Nautilus den SMB-Masterbrowser "
-"nicht kontaktieren kann.\n"
-"Stellen Sie sicher, dass ein SMB-Server im lokalen Netzwerk läuft."
+"»%s« konnte nicht angezeigt werden, da Nautilus den SMB-Master-Browser nicht "
+"kontaktieren konnte."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Stellen Sie sicher, dass ein SMB-Server im lokalen Netzwerk läuft."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Die Suche ist zur Zeit nicht verfügbar, weil Sie entweder keinen Index haben "
+"oder der Suchdienst nicht läuft."
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
-"Die Suche ist zur Zeit nicht verfügbar, entweder weil Sie keinen Index haben "
-"oder weil der Suchdienst nicht läuft. Stellen Sie sicher, dass Sie den "
-"Medusa-Suchdienst gestartet haben, bzw., falls Sie noch keinen Index haben, "
-"dass der Medusa-Indizierer läuft."
+"Stellen Sie sicher, dass Sie den Medusa-Suchdienst gestartet haben, bzw., "
+"falls Sie noch keinen Index haben, dass der Medusa-Indizierer läuft."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Suche nicht verfügbar"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kann »%s« nicht anzeigen."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Bitte wählen Sie eine andere Ansicht und versuchen Sie es noch einmal."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Ort konnte nicht angezeigt werden"
 
@@ -7576,7 +7619,7 @@ msgstr "Zum durch dieses Lesezeichen angegebenen Ort gehen"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7584,7 +7627,7 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Deutsche Ãœbersetzung:\n"
@@ -7592,7 +7635,7 @@ msgstr ""
 "Benedikt Roth <Benedikt.Roth@gmx.net>\n"
 "Matthias Warkus <mawarkus@gnome.org>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7608,41 +7651,42 @@ msgstr "Ein paar Seiten zurückgehen"
 msgid "Go forward a number of pages"
 msgstr "Eine Anzahl Seiten vorgehen"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Diesen Ort mit der %s anzeigen"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Netzwerk"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Punkte"
+msgstr "Schriften"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Themen"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "_CD-Ersteller"
+msgstr "CD-Ersteller"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Anwendungskennung"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Die Anwendungskennung des Fensters."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Anwendung"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
-msgstr "Die NautilusAnwendung verbunden mit diesem Fenster."
+msgstr "Die mit diesem Fenster verknüpfte NautilusApplication-Anwendung."
 
 #: src/nautilus-zoom-control.c:83
 msgid "Zoom In"
@@ -7675,116 +7719,3 @@ msgstr "Netzwerk-Server"
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Ihre Netzwerk-Server im Dateimanager Nautilus anzeigen"
-
-#~ msgid "Unknown"
-#~ msgstr "Unbekannt"
-
-#~ msgid "Floppy"
-#~ msgstr "Diskette"
-
-#~ msgid "CD-ROM"
-#~ msgstr "CD-ROM"
-
-#~ msgid "Zip Drive"
-#~ msgstr "Zip-Laufwerk"
-
-#~ msgid "Audio CD"
-#~ msgstr "Audio-CD"
-
-#~ msgid "Root Volume"
-#~ msgstr "Wurzeldatenträger"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. There is probably no "
-#~ "floppy in the drive."
-#~ msgstr ""
-#~ "Nautilus konnte das Diskettenlaufwerk nicht einbinden. Wahrscheinlich ist "
-#~ "keine Diskette im Laufwerk."
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the volume. There is probably no media in "
-#~ "the device."
-#~ msgstr ""
-#~ "Nautilus konnte den Datenträger nicht einbinden. Wahrscheinlich ist kein "
-#~ "Medium im Laufwerk."
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
-#~ "a format that cannot be mounted."
-#~ msgstr ""
-#~ "Nautilus konnte das Diskettenlaufwerk nicht einbinden. Die Diskette hat "
-#~ "wahrscheinlich ein Format, das nicht eingebunden werden kann."
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the selected volume. The volume is probably "
-#~ "in a format that cannot be mounted."
-#~ msgstr ""
-#~ "Nautilus konnte den gewählten Datenträger nicht einbinden. Sie hat "
-#~ "wahrscheinlich ein Format, das nicht eingebunden werden kann."
-
-#~ msgid "Nautilus was unable to mount the selected floppy drive."
-#~ msgstr "Nautilus konnte das gewählte Diskettenlaufwerk nicht einbinden."
-
-#~ msgid "Nautilus was unable to mount the selected volume."
-#~ msgstr "Nautilus konnte den gewählten Datenträger nicht einbinden."
-
-#~ msgid "Nautilus was unable to unmount the selected volume."
-#~ msgstr "Nautilus konnte den gewählten Datenträger nicht aushängen."
-
-#~ msgid "ISO 9660 Volume"
-#~ msgstr "ISO-9660-Datenträger"
-
-#~ msgid "Error executing utility program '%s': %s"
-#~ msgstr "Fehler beim Ausführen des Hilfsprogramms »%s«: %s"
-
-#~ msgid "Dis_ks"
-#~ msgstr "_Platten"
-
-#~ msgid "Mount or unmount disks"
-#~ msgstr "Platten einbinden oder Einbindung lösen"
-
-#~ msgid "Open _in This Window"
-#~ msgstr "_In diesem Fenster öffnen"
-
-#~ msgid "_Open activated item in a new window"
-#~ msgstr "Alle gewählten Objekte jeweils in einem _neuen Fenster öffnen"
-
-#~ msgid "Change the visibility of this window's toolbar"
-#~ msgstr "Die Sichtbarkeit der Werkzeugleiste dieses Fensters ändern"
-
-#~ msgid "Go to the Start Here folder"
-#~ msgstr "Zum Start-Ordner gehen"
-
-#~ msgid "Open New _Window"
-#~ msgstr "Neues _Fenster öffnen"
-
-#~ msgid "Open another Nautilus window for the displayed location"
-#~ msgstr "Ein anderes Nautilus-Fenster für den angezeigten Ort öffnen"
-
-#~ msgid "_Find"
-#~ msgstr "_Suchen"
-
-#~ msgid "_Start Here"
-#~ msgstr "Hier _starten"
-
-#~ msgid "_Toolbar"
-#~ msgstr "_Werkzeugleiste"
-
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Der Ort »%s« existiert nicht mehr."
-
-#~ msgid "Go to Nonexistent Location"
-#~ msgstr "Gehe zu nichtexistentem Ort"
-
-#~ msgid "Default zoom level used by the icon view"
-#~ msgstr "Voreingestellte Vergrößerungsstufe der Symbolansicht"
-
-#~ msgid "Default zoom level used by the list view"
-#~ msgstr "Voreingestellte Vergrößerungsstufe der Listenansicht"
-
-#~ msgid ""
-#~ "If set to true, then hidden files (dotfiles) are shown in the file "
-#~ "manager."
-#~ msgstr ""
-#~ "Falls dieser Schlüssel wahr ist, werden verborgene (dot-)Dateien im "
-#~ "Dateimanager angezeigt."
diff --git a/po/el.po b/po/el.po
index 8a92e0548..237403245 100644
--- a/po/el.po
+++ b/po/el.po
@@ -30,22 +30,23 @@
 # kostas:15Aug2003, one more update
 # Nikos: 28Aug2003, fixes
 # kostas:30Oct2003, one more update
+# kostas:13Dec2003, one more update,1549 messages
 # Simos Xenitellis <simos74@gmx.net>, 2000, 2001, 2002, 2003.
-# Nikos Charonitakis <frolix68@yahoo.gr>, 2003
-# Kostas Papadimas <pkst@gnome.org>, 2003
+# Nikos Charonitakis <frolix68@yahoo.gr>, 2003.
+# Kostas Papadimas <pkst@gnome.org>, 2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-10-30 22:39+0200\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-14 12:41+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
-"X-Generator: KBabel 1.0\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -72,8 +73,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Αποτυχία του bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Εμβλήματα"
 
@@ -87,51 +88,57 @@ msgstr "Όψη Εμβλήματος του �αυτίλου"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Δεν είναι δυνατή η απομάκ�υνση του εμβλήματος με όνομα '%s'. "
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Δεν είναι δυνατή η απομάκ�υνση του εμβλήματος με όνομα '%s'. Αυτό συμβαίνει "
-"γιατί είναι πιθανόν το έμβλημα να είναι μόνιμο και όχι έμβλημα που "
-"π�οσθέσατε εσείς."
+"Αυτό συμβαίνει γιατί είναι πιθανόν το έμβλημα να είναι μόνιμο και όχι "
+"έμβλημα που π�οσθέσατε εσείς."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "Αδ�νατη η διαγ�αφή εμβλήματος"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Δεν είναι δυνατή η μετονομασία του εμβλήματος με όνομα '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Δεν είναι δυνατή η μετονομασία του εμβλήματος με όνομα '%s'. Αυτό συμβαίνει "
-"γιατί είναι πιθανόν το έμβλημα να είναι μόνιμο και όχι έμβλημα που "
-"π�οσθέσατε εσείς."
+"Αυτό συμβαίνει γιατί είναι πιθανόν το έμβλημα να είναι μόνιμο και όχι "
+"έμβλημα που π�οσθέσατε εσείς."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "Αδ�νατη η μετονομασία εμβλήματος"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Μετονομασία Εμβλήματος"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Επιλέξτε ένα  νέο όνομα για το εμφανιζόμενο έμβλημα:"
 
 #
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Μετονομασία"
 
 #
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Π�οσθήκη Εμβλημάτων..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -139,7 +146,7 @@ msgstr ""
 "Εισάγετε ένα πε�ιγ�αφικό όνομα δίπλα από κάθε έμβλημα. Αυτό το όνομα θα "
 "χ�ησιμοποιηθεί σε άλλα μέ�η ώστε να πιστοποιεί το έμβλημα."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -147,139 +154,55 @@ msgstr ""
 "Εισάγετε ένα πε�ιγ�αφικό όνομα δίπλα από το έμβλημα. Αυτό το όνομα θα "
 "χ�ησιμοποιηθεί σε άλλα μέ�η ώστε να πιστοποιεί το έμβλημα."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Με�ικά από τα α�χεία δε μπο�ο�ν να π�οστεθο�ν ως εμβλήματα επειδή δε "
-"φαίνεται να είναι έγκυ�ες εικόνες."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Με�ικά από τα α�χεία δε μπο�ο�ν να π�οστεθο�ν ως εμβλήματα."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
-msgstr "Αδ�νατη η π�όσθεση εμβλημάτων"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Τα α�χεία δεν φαίνεται να είναι έγκυ�ες εικόνες."
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Αυτά τα α�χεία δε μπο�ο�ν να π�οστεθο�ν ως εμβλήματα επειδή δε φαίνεται να "
-"είναι έγκυ�ες εικόνες."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr "Αδ�νατη η π�οσθήκη εμβλημάτων"
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Κανένα από τα α�χεία δε μπο�ο�ν να π�οστεθο�ν ως εμβλήματα."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Δεν είναι δυνατή η π�οσθήκη του εμβλήματος."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Το συ�όμενο κείμενο δεν ήταν έγκυ�η τοποθεσία α�χείου."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Αδ�νατη η π�οσθήκη εμβλήματος"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Το α�χείο '%s'  δε φαίνεται να είναι μια έγκυ�η εικόνα."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Το συ�όμενο α�χείο δε φαίνεται να είναι μια έγκυ�η εικόνα."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Διαγ�αφή"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Ε�γοστάσιο για όψη υλικο�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Υλικό"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Π�οβολή Υλικο�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Π�οβολή υλικο�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Π�οβολή ως Υλικό"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "π�οβολή υλικο�"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "όνομα εικονιδίου για την όψη υλικο�"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "πε�ίληψη όψης υλικο�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s ΚΜΕ\n"
-"%s MHz\n"
-"%s K λανθάνουσα μνήμη"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Σ�στημα σε χ�ήση επί %d ημέ�ες, %d ώ�ες και %d λεπτά."
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Επισκόπηση Υλικο�"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Αυτή είναι θέση για τη σελίδα ΚΜΕ."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Αυτή είναι θέση για τη σελίδα RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Αυτή είναι θέση για τη σελίδα IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Ιστο�ικό"
@@ -390,7 +313,7 @@ msgstr "Πλευ�ικό ταμπλώ σημειώσεων του �αυτίλο
 
 #: components/text/Nautilus_View_text.server.in.in.h:1
 msgid "Factory for text view"
-msgstr "Ε�γοστάσιο για όψη κειμένου"
+msgstr "Ε�γοστάσιο για π�οβολή κειμένου"
 
 #
 #: components/text/Nautilus_View_text.server.in.in.h:2
@@ -408,7 +331,7 @@ msgstr "Π�οβολή κειμένου"
 #
 #: components/text/Nautilus_View_text.server.in.in.h:5
 msgid "Text view factory"
-msgstr "Ε�γοστάσιο όψης κειμένου"
+msgstr "Ε�γοστάσιο π�οβολής κειμένου"
 
 #: components/text/Nautilus_View_text.server.in.in.h:6
 msgid "View as Text"
@@ -471,7 +394,7 @@ msgstr "Πλευ�ικό ταμπλώ Δέντ�ου του �αυτίλου"
 
 #: components/tree/Nautilus_View_tree.server.in.in.h:2
 msgid "Nautilus Tree view"
-msgstr "Όψη Δέντ�ου του �αυτίλου"
+msgstr "Π�οβολή Δέντ�ου του �αυτίλου"
 
 #: components/tree/Nautilus_View_tree.server.in.in.h:3
 msgid "Tree"
@@ -970,6 +893,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Υλικό"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Διεθνή"
@@ -1118,7 +1045,7 @@ msgstr "Eazel"
 
 #: icons/default/default.xml.h:2
 msgid "This is the default theme for Nautilus."
-msgstr "Αυτό είναι το εξ΄ ο�ισμο� θέμα του �αυτίλου."
+msgstr "Αυτό είναι το π�οεπιλεγμένο θέμα του �αυτίλου."
 
 #: icons/gnome/gnome.xml.h:1
 msgid "A theme designed to fit well with the classic GNOME environment."
@@ -1175,9 +1102,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Εμφάνιση ενός νέου πα�αθ��ου για κάθε ανοιγμένο α�χείο"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "Εικονίδιο α�χικο� καταλόγου ο�ατό στην επιφάνεια ε�γασίας"
+msgstr "Εικονίδιο υπολογιστή ο�ατό στην επιφάνεια ε�γασίας"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1210,45 +1136,45 @@ msgstr "ΟÏ�ισμός Ï€Ï�οσαÏ�μοσμένου παÏ�ασκηνίου πλÎ
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Color"
-msgstr "Εξ ο�ισμο� χ�ώμα πα�ασκηνίου"
+msgstr "Π�οεπιλεγμένο χ�ώμα πα�ασκηνίου"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Default Background Filename"
-msgstr "Εξ ο�ισμο� όνομα α�χείου πα�ασκηνίου"
+msgstr "Π�οεπιλεγμένο όνομα α�χείου πα�ασκηνίου"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Default Side Pane Background Color"
-msgstr "Εξ ο�ισμο� χ�ώμα πα�ασκηνίου πλευ�ικο� ταμπλώ"
+msgstr "Π�οεπιλεγμένο χ�ώμα πα�ασκηνίου πλευ�ικο� ταμπλώ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default Side Pane Background Filename"
-msgstr "Εξ ο�ισμο� όνομα α�χείου πα�ασκηνίου πλευ�ικο� ταμπλώ"
+msgstr "Π�οεπιλεγμένο όνομα α�χείου πα�ασκηνίου πλευ�ικο� ταμπλώ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Default folder viewer"
-msgstr "Εξ ο�ισμο� όψη φακέλου"
+msgstr "Π�οεπιλεγμένη π�οβολή φακέλου"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Default icon zoom level"
-msgstr "Εξ ο�ισμο� επίπεδο εστίασης εικονιδίου"
+msgstr "Π�οεπιλεγμένο επίπεδο εστίασης εικονιδίου"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default list zoom level"
-msgstr "Εξ ο�ισμο� επίπεδο εστίασης λίστας"
+msgstr "Π�οεπιλεγμένο επίπεδο εστίασης λίστας"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default sort order"
-msgstr "Εξ΄ ο�ισμο� σει�ά ταξινόμησης"
+msgstr "Π�οεπιλεγμένη σει�ά ταξινόμησης"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default zoom level used by the icon view."
 msgstr ""
-"Εξ ο�ισμο� επίπεδο εστίασης που χ�ησιμοποιείται από την π�οβολή εικονιδίων"
+"Π�οεπιλεγμένο επίπεδο εστίασης που χ�ησιμοποιείται από την π�οβολή εικονιδίων"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default zoom level used by the list view."
 msgstr ""
-"Εξ ο�ισμο� επίπεδο εστίασης που χ�ησιμοποιείται από την π�οβολή λίστας."
+"Π�οεπιλεγμένο επίπεδο εστίασης που χ�ησιμοποιείται από την π�οβολή λίστας."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Desktop font"
@@ -1263,40 +1189,40 @@ msgid "Desktop trash icon name"
 msgstr "Όνομα εικονιδίου απο��ιμάτων"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Τε�άστιοι κατάλογοι πάνω από αυτό το μέγεθος θα συμπυκνώνονται γ��ω από αυτό "
-"το μέγεθος. Ο σκοπός είναι να αποφευχθο�ν άσκοπες υπε�φο�τώσεις και ο "
-"τε�ματισμός του ναυτίλου σε υπε�μεγέθεις καταλόγους. Μια α�νητική τιμή "
-"δηλώνει χω�ίς ό�ιο."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Ενε�γοποίηση ειδικών σημαιών στο πα�άθυ�ο ιδιοτήτων α�χείου"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Όνομα α�χείου για τον εξ ο�ισμο� κατάλογο πα�ασκηνίου. Χ�ησιμοποιείται μόνο "
-"αν είναι true ο ο�ισμός πα�ασκηνίου."
+"Όνομα α�χείου για το πα�ασκήνιου του π�οεπιλεγμένου φακέλου. Χ�ησιμοποιείται "
+"μόνο αν είναι true ο ο�ισμός πα�ασκηνίου."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
-"'Ονομα α�χείου για το εξ ο�ισμο� πα�ασκηνίο πλευ�ικο� ταμπλώ. "
+"'Ονομα α�χείου για το π�οεπιλεγμένο πα�ασκηνίο πλευ�ικο� ταμπλώ. "
 "Χ�ησιμοποιείται μόνο αν είναι true τοι side_pane_background_set"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Τε�άστιοι κατάλογοι πάνω από αυτό το μέγεθος θα συμπυκνώνονται γ��ω από αυτό "
+"το μέγεθος. Ο σκοπός είναι να αποφευχθο�ν άσκοπες υπε�φο�τώσεις και ο "
+"τε�ματισμός του ναυτίλου σε υπε�μεγέθεις καταλόγους. Μια α�νητική τιμή "
+"δηλώνει χω�ίς ό�ιο."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
-msgstr "Απόκ�υψη εξ ο�ισμο� σελιδοδεικτών από το μενο� σελιδοδεικτών"
+msgstr "Απόκ�υψη π�οεπιλεγμένων σελιδοδεικτών από το μενο� σελιδοδεικτών"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Home icon visible on desktop"
@@ -1304,8 +1230,8 @@ msgstr "Εικονίδιο α�χικο� καταλόγου ο�ατό στην
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Αν ο�ισθεί σε true, τότε ο �αυτίλος θα π�οβάλλει μόνο καταλόγους στο δένδ�ο "
 "του πλευ�ικο� ταμπλώ. Σε αντίθετη πε�ίπτωση θα π�οβάλλει και καταλόγους και "
@@ -1341,8 +1267,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Αν ο�ισθεί σε true, τότε ο �αυτίλος π�οβάλλει τους καταλόγους π�ιν από τα "
 "α�χεία στις π�οβολές εικονιδίων και λίστας."
@@ -1389,7 +1315,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Αν ο�ισθεί σε true, τότε ο �αυτίλος θα χ�ησιμοποιεί το α�χικό κατάλογο του "
@@ -1409,7 +1335,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Αν ο�ισθεί σε true, τότε π�οβάλλονται τα  κ�υφά α�χεία. Τα κ�υφά α�χεία "
 "είναι είτε dotfiles  είναι είναι στη λίστα καταλόγου .hidden"
@@ -1423,20 +1349,19 @@ msgstr ""
 "κάθε φο�ά που ξεκινά. Αυτό σημαίνει ότι θα ξεκινήσει στην επόμενη είσοδο σας."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
-"Αν ο�ισθεί σε true, τότε θα τοποθετηθεί  στην επιφάνεια ε�γασίας ένα "
-"εικονίδιο με δεσμό στα απο��ίματα."
+"Αν ο�ισθεί σε true, τότε θα τοποθετηθεί ένα εικονίδιο στην επιφάνεια "
+"ε�γασίας με δεσμό στην τοποθεσία του υπολογιστή."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
-"Αν ο�ισθεί σε true, τότε θα τοποθετηθεί  στην επιφάνεια ε�γασίας ένα "
+"Αν ο�ισθεί σε true, τότε θα τοποθετηθεί στην επιφάνεια ε�γασίας ένα "
 "εικονίδιο με δεσμό στον α�χικό κατάλογο."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
@@ -1471,7 +1396,7 @@ msgstr ""
 "ταξινόμηση."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Αν ο�ισθεί σε true, τότε η διάταξη των εικονιδίων θα είναι εφα�μοστή στα νέα "
 "πα�άθυ�α."
@@ -1486,8 +1411,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If true, new windows will use manual layout by default."
 msgstr ""
-"Αν ο�ισθεί σε true, τότε τα νέα πα�άθυ�α θα χ�ησιμοποιο�ν εξ ο�ισμο� την "
-"χει�ωνακτική διάταξη."
+"Αν ο�ισθεί σε true, τότε τα νέα πα�άθυ�α θα χ�ησιμοποιο�ν την χει�ωνακτική "
+"διάταξη ως π�οεπιλογή."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
@@ -1505,7 +1430,7 @@ msgid "List of possible captions on icons"
 msgstr "Λίστα των πιθανών επεξηγήσεων σε εικονίδια."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr "Μέγιστος α�ιθμός διαχει�ιζόμενων α�χείων σε έναν κατάλογο"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1525,11 +1450,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Χ�ήση του �αυτίλου στη σχεδίαση της επιφάνειας ε�γασίας"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Χ�ήση του καταλόγου χ�ήστη ως επιφάνεια ε�γασίας"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr "Εμφάνιση μόνο των καταλόγων στο πλευ�ικό ταμπλώ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1550,7 +1475,7 @@ msgid "Reverse sort order in new windows"
 msgstr "Αντίστ�οφη σει�ά ταξινόμησης σε νέα πα�άθυ�α"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Π�οβολή π�ώτα των καταλόγων σε πα�άθυ�α"
 
 #
@@ -1575,7 +1500,7 @@ msgstr "Εμφάνιση ε�γαλειοθήκης στα νέα πα�άθυ�
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid "Side pane view"
-msgstr "Όψη Πλευ�ικο� Ταμπλώ"
+msgstr "Π�οβολή Πλευ�ικο� Ταμπλώ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid ""
@@ -1595,7 +1520,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1609,10 +1534,10 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Κατά την π�οεπισκόπηση α�χείων εικόνας στο πέ�ασμα του ποντικιο� θα υπά�χει "
 "μια καθυστέ�ηση του συστήματος. Αν ο�ισθεί στο \"πάντα\" τότε θα γίνεται "
@@ -1623,9 +1548,9 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Κατά την π�οβολή του α�ιθμο� των αντικειμένων στον κατάλογο θα υπά�χει μια "
@@ -1638,24 +1563,25 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
-"Η εξ ο�ισμο� σει�ά ταξινόμησης για το αντικείμενο στην π�οβολή εικονιδίων. "
-"Οι πιθανές τιμές είναι, \"όνομα\" \"μέγεθος\", \"τ�πος\", \"ημε�ομηνία "
-"τ�οποποίησης\", \"εμβλήματα."
+"Η π�οεπιλεγμένη σει�ά ταξινόμησης για το αντικείμενο στην π�οβολή "
+"εικονιδίων. Οι πιθανές τιμές είναι, \"όνομα\" \"μέγεθος\", \"τ�πος\", "
+"\"ημε�ομηνία τ�οποποίησης\", και \"εμβλήματα\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"Η εξ ο�ισμο� σει�ά ταξινόμησης για το αντικείμενο στην π�οβολή λίστας. Οι "
-"πιθανές τιμές είναι, μέγεθος, τ�πος, ημε�ομηνία τ�οποποίησης, εμβλήματα."
+"Η π�οεπιλεγμένη σει�ά ταξινόμησης για το αντικείμενο στην π�οβολή λίστας. Οι "
+"πιθανές τιμές είναι, \"όνομα\", \"μέγεθος\", \"τ�πος\", \"ημε�ομηνία "
+"τ�οποποίησης\"."
 
 #
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
-msgstr "Το εξ ο�ισμο� πλάτος του πλευ�ικο� ταμπλώ στα νέα πα�άθυ�α."
+msgstr "Το π�οεπιλεγμέν πλάτος του πλευ�ικο� ταμπλώ στα νέα πα�άθυ�α."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid "The font description used for the icons on the desktop."
@@ -1665,7 +1591,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid "The side pane view to show in newly opened windows."
-msgstr "Η όψη πλευ�ικο� ταμπλώ που θα εμφανίζεται σε νέα πα�άθυ�α."
+msgstr "Η π�οβολή πλευ�ικο� ταμπλώ που θα εμφανίζεται σε νέα πα�άθυ�α."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
@@ -1697,7 +1623,7 @@ msgstr "ΧÏ�ήση χειÏ�ωνακτικής διάταξης για νέα Ï€Î
 
 #
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Χ�ήση εφα�μοστής διάταξης για νέα πα�άθυ�α"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1728,7 +1654,7 @@ msgstr ""
 "\"π�οβολή λίστας\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Αν θα εμφανίζεται ο α�ιθμός αντικειμένων σε ένα κατάλογο"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1740,8 +1666,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Αν θα γίνεται π�οεισκόπηση για α�χεία εικόνας"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
-msgstr "Αν έχει ο�ισθεί ένα  εξ ο�ισμο� πα�ασκήνιο καταλόγου."
+msgid "Whether a custom default folder background has been set."
+msgstr "Αν έχει ο�ισθεί ένα π�οεπιλεγμένο πα�ασκήνιο καταλόγου."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
@@ -1900,71 +1826,81 @@ msgstr "α�χικοποίηση"
 msgid "on the desktop"
 msgstr "στην επιφάνεια ε�γασίας"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Δεν είναι δυνατή η διαγ�αφή ενός εικονιδίου τόμου."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "Δεν είναι δυνατή η διαγ�αφή του τόμου"
 
 #
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Απο��ίμματα"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Μετάβαση εδώ"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Αντιγ�αφή εδώ"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Σ�νδεση εδώ"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Καθο�ισμός ως _Πα�ασκηνίου"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Ακ��ωση"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Καθο�ισμός ως πα�ασκηνίου για ό_λους τους  φακέλους"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+msgid "The emblem cannot be installed."
+msgstr "Δεν είναι δυνατή η εγκατάσταση του εμβλήματος."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Συγγνώμη, αλλά π�έπει να καθο�ίσετε ένα μη κενό λεκτικό για το νέο έμβλημα."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "Αδ�νατη η εγκατάσταση εμβλήματος"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1975,20 +1911,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Συγγνώμη, αλλά υπά�χει ήδη ένα έμβλημα που ονομάζεται \"%s\". Πα�ακαλώ "
-"επιλέξτε ένα διαφο�ετικό όνομα για αυτό. "
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Συγγνώμη, αλλά υπά�χει ήδη ένα έμβλημα που ονομάζεται \"%s\"."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Πα�ακαλώ επιλέξτε ένα διαφο�ετικό όνομα εμβλήματος."
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Αδ�νατη η εγκατάσταση εμβλήματος"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Συγγνώμη, αδυναμία αποθήκευσης π�οσα�μοσμένου εμβλήματος."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Συγγνώμη, αδυναμία αποθήκευσης π�οσα�μοσμένου ονόματος εμβλήματος."
 
@@ -2010,372 +1950,273 @@ msgstr "Από:"
 msgid "To:"
 msgstr "Π�ός:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Σφάλμα κατά τη μεταφο�ά."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
-"Σφάλμα κατά τη μετακίνηση.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να μετακινηθεί διότι β�ίσκεται σε δίσκο μόνο για "
 "ανάγνωση."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Σφάλμα κατά τη διαγ�αφή."
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Σφάλμα κατά τη διαγ�αφή.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να μετακινηθεί διότι δεν έχετε δικαίωματα τ�οποποίησης "
 "στο γονικό φάκελο."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
-"Σφάλμα κατά τη διαγ�αφή.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να διαγ�αφεί διότι β�ίσκεται σε δίσκο μόνο για ανάγνωση. "
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Σφάλμα κατά τη μετακίνηση.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να μετακινηθεί διότι δεν έχετε δικαίωματα τ�οποποίησης "
 "στο γονικό φάκελο."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Σφάλμα κατά τη μεταφο�ά."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Σφάλμα κατά τη μετακίνηση.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να μετακινηθεί διότι αυτό ή ο μητ�ικός του φάκελος "
 "πε�ιέχονται στον π�οο�ισμό."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Σφάλμα κατά τη μετακίνηση.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να μετακινηθεί στα Απο��ίμματα διότι δεν έχετε δικαίωμα "
 "τ�οποποίησης στο γονικό φάκελο."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Σφάλμα κατά την αντιγ�αφή."
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Σφάλμα κατά την αντιγ�αφή.\n"
-"\n"
 "Το \"%s\" δε μπο�εί να αντιγ�αφεί διότι δεν έχετε δικαίωμα ανάγνωσής του."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Σφάλμα κατά την αντιγ�αφή στο \"%s\".\n"
-"\n"
-"Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
+msgid "Error while copying to \"%s\"."
+msgstr "Σφάλμα κατά την αντιγ�αφή στο \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Σφάλμα κατά τη μετακίνηση στο \"%s\".\n"
-"\n"
-"Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Σφάλμα κατά τη δημιου�γία συνδέσμου στο \"%s\".\n"
-"\n"
-"Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
+msgid "Error while moving to \"%s\"."
+msgstr "Σφάλμα κατά τη μεταφο�ά στο \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Σφάλμα κατά την αντιγ�αφή στο \"%s\".\n"
-"\n"
-"Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
+msgid "Error while creating link in \"%s\"."
+msgstr "Σφάλμα κατά την δημιου�γία δεσμο� στο  \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Σφάλμα κατά την αντιγ�αφή στο \"%s\".\n"
-"\n"
-"Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Σφάλμα κατά τη μετακίνηση αντικειμένων στο \"%s\".\n"
-"\n"
-"Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Σφάλμα κατά τη μετακίνηση αντικειμένων στο \"%s\".\n"
-"\n"
-"Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Σφάλμα κατά τη δημιου�γία συνδέσεων στο \"%s\".\n"
-"\n"
-"Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
+msgid "Error while moving items to \"%s\"."
+msgstr "Σφάλμα κατά τη μεταφο�ά αντικειμένων στο \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Σφάλμα κατά τη δημιου�γία συνδέσεων στο \"%s\".\n"
-"\n"
-"Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά την αντιγ�αφή του \"%s\".\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error while creating links in \"%s\"."
+msgstr "Σφάλμα κατά τη δημιου�γίας δεσμών στο \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη μετακίνηση του \"%s\".\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Σφάλμα \"%s\"κατά την αντιγ�αφή \"%s\".."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Θέλετε να συνεχίσετε;"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη δημιου�γία συνδέσμου στο \"%s\".\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Σφάλμα \"%s\" κατά τη μεταφο�ά \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη διαγ�αφή του \"%s\".\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Σφάλμα \"%s\" κατά τη δημιου�γία συνδέσμου στο \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά την αντιγ�αφή.\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Σφάλμα \"%s\" κατά τη διαγ�αφή \"%s\".."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη μεταφο�ά.\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while copying."
+msgstr "Σφάλμα \"%s\" κατά την αντιγ�αφή."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη σ�νδεση.\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while moving."
+msgstr "Σφάλμα \"%s\" κατά τη μεταφο�ά."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Σφάλμα \"%s\" κατά τη διαγ�αφή.\n"
-"\n"
-"Θέλετε να συνεχίσετε;"
+msgid "Error \"%s\" while linking."
+msgstr "Σφάλμα \"%s\" κατά τη σ�νδεση."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Σφάλμα κατά την αντιγ�αφή."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Σφάλμα \"%s\" κατά τη διαγ�αφή."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Σφάλμα κατά τη μεταφο�ά."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Σφάλμα κατά την αντιγ�αφή"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Σφάλμα κατά τη σ�νδεση."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Σφάλμα κατά τη μεταφο�ά"
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Σφάλμα κατά τη διαγ�αφή."
+msgid "Error While Linking"
+msgstr "Σφάλμα κατά τη σ�νδεση"
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Σφάλμα κατά τη διαγ�αφή"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Π�οσπέ�αση"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Π�οσπέ�αση"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Επανάληψη"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "Επα_νάληψη"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Αδ�νατη η μετακίνηση \"%s\" στη νέα τοποθεσία."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"Το \"%s\" δε μπό�εσε να μετακινηθεί στη νέα θέση διότι το όνομά του "
-"χ�ησιμοποιείτε ήδη από ένα ειδικό αντικείμενο που δε μπο�εί να μετακινηθεί ή "
-"να διαγ�αφεί.\n"
-"Αν θέλετε να μετακινήσετε το \"%s\", μετονομάστε το και δοκιμάστε ξανά."
+"Το όνομα χ�ησιμοποιείται ήδη από ένα ειδικό αντικείμενο που δε μπο�εί να "
+"μετακινηθεί ή να αντικατασταθεί. Αν θέλετε να μετακινήσετε το αντικείμενο, "
+"μετονομάστε το και δοκιμάστε ξανά."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Αδ�νατη η αντιγ�αφή \"%s\" στη νέα τοποθεσία."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"Το \"%s\" δε μπό�εσε να αντιγ�αφεί στη νέα θέση διότι το όνομά του "
-"χ�ησιμοποιείται για ένα ειδικό αντικείμενο που δε μπο�εί να διαγ�αφεί ή να "
-"αντικατασταθεί.\n"
-"\n"
-"Αν θέλετε σίγου�α να αντιγ�άψετε το \"%s\", μετονομάστε το και δοκιμάστε "
-"ξανά."
+"Το όνομα χ�ησιμοποιείται για ένα ειδικό αντικείμενο που δε μπο�εί να "
+"διαγ�αφεί ή να αντικατασταθεί.Αν θέλετε σίγου�α να αντιγ�άψετε το "
+"αντικείμενο, μετονομάστε το και δοκιμάστε ξανά."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr "Αδ�νατη η αντικατάσταση α�χείου."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Το α�χείο '%s' υπά�χει ήδη. Θέλετε να το αντικαταστήσετε;"
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
-"Το α�χείο '%s' υπά�χει ήδη.\n"
-"\n"
-"Θέλετε να το αντικαταστήσετε;"
+"Αν αντικαταστήσετε ένα υπά�χον α�χείο, τα πε�ιεχόμενα του θα αντικατασταθο�ν."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "Σ�γκ�ουση κατά την αντιγ�αφή"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Αντικατάσταση"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "Α_ντικατάσταση"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Αντικατάσταση Όλων"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Αντικατάσταση Ό_λων"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "σ�νδεσμος στο %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "άλλος σ�νδεσμος στο %s"
@@ -2384,25 +2225,25 @@ msgstr "άλλος σ�νδεσμος στο %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dος σ�νδεσμος στο %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dος σ�νδεσμος στο %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dος σ�νδεσμος στο %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dος σ�νδεσμος στο %s"
@@ -2412,564 +2253,590 @@ msgstr "%dος σ�νδεσμος στο %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (αντίγ�αφο)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (επιπλέον αντίγ�αφο)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "νιοστό αντίγ�αφο)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "το αντίγ�αφο)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "�ο αντίγ�αφο)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "το αντίγ�αφο)"
 
 #
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (αντίγ�αφο)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (άλλο αντίγ�αφο)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-στό αντίγ�αφο)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dτο αντίγ�αφο)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d�ο αντίγ�αφο)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Άγνωστο GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Μεταφο�ά α�χείων στα Απο��ίματα"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Α�χεία που πετάχτηκαν:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Γίνετε μετακίνηση"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Π�οετοιμασία Μεταφο�άς στα Απο��ίματα..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Μετακίνηση α�χείων"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Α�χεία που μετακινήθηκαν:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Π�οετοιμασία Για Μετακίνηση..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Ολοκλή�ωση Μετακίνησης..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Δημιου�γία συνδέσμων στα α�χεία"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Α�χεία που συνδέθηκαν:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Σ�νδεση"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Π�οετοιμασία Δημιου�γίας Συνδέσμων..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Ολοκλή�ωση Δημιου�γίας Συνδέσμων..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Αντιγ�αφή α�χείων"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Α�χεία που αντιγ�άφησαν:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Αντιγ�αφή"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Π�οετοιμασία Για Αντιγ�αφή..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Δε μπο�είτε να αντιγ�άψετε τα αντικείμενα στα Απο��ίμματα."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Δε μπο�είτε να αντιγ�άψετε αντικείμενα στα Απο��ίμματα."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Δε μπο�εί να γίνει Αντιγ�αγή στα Απο��ίματα"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Α�χεία και φάκελοι μπο�ο�ν μόνο να μετακινηθο�ν στα απο��ίματα."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Δε μπο�είτε να μετακινήσετε τον φάκελο απο��ιμμάτων."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Δε μπο�είτε να αντιγ�άψετε αυτόν το φάκελο απο��ιμμάτων."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"Ο φάκελος απο��ιμάτων χ�ησιμοποιείται για την αποθήκευση α�χείων που έχουν "
+"μετακινηθεί στα απο��ίματα."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Δε μπο�είτε να Αλλάξετε τη Θέση των Απο��ιμάτων"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Αδ�νατη η Αντιγ�αφή των Απο��ιμάτων"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Δε μπο�είτε να μετακινήσετε ένα φάκελο μέσω στο εαυτό του."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Δε μπο�είτε να αντιγ�άψετε ένα φάκελο στον εαυτό του."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "Ο φάκελος π�οο�ισμο� β�ίσκεται μέσα στον πηγαίο φάκελο."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Αδ�νατη η Μεταφο�ά Μέσα στο Ίδιο"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Αδ�νατη η Αντιγ�αγή Μέσα στο Ίδιο"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Δε μπο�είτε να αντιγ�άψετε ένα α�χείο πάνω στο ίδιο το α�χείο."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "Ο π�οο�ισμός και η πηγή είναι το ίδιο α�χείο."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Αδ�νατη η Αντιγ�αφή Πάνω στο Ίδιο"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Σφάλμα δημιου�γίας νέου καταλόγου.\n"
-"\n"
-"Δεν έχετε δικαίωμα εγγ�αφής στον π�οο�ισμό."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "Δεν έχετε δικαίωμα εγγ�αφής στον π�οο�ισμό."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Σφάλμα δημιου�γίας νέου καταλόγου.\n"
-"\n"
-"Δεν υπά�χει διαθέσιμος χώ�ος στον π�οο�ισμό."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "Δεν υπά�χει διαθέσιμος χώ�ος στον π�οο�ισμό."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Σφάλμα \"%s\" κατά τη δημιου�γία νέου φακέλου."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
-msgstr "Σφάλμα δημιου�γίας νέου φακέλου"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Σφάλμα δημιου�γίας νέου φακέλου."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
+msgstr "Σφάλμα δημιου�γίας νέου φακέλου."
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "ανώνυμος φάκελος"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Σφάλμα \"%s\" κατά τη δημιου�γία νέου εφφ�άφου."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Σφάλμα δημιου�γίας νέου εγγ�άφου."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Σφάλμα δημιου�γίας νέου εγγ�άφου."
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "νέο α�χείο"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Διαγ�αφή α�χείων"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Διεγ�αμμένα α�χεία:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Διαγ�άφονται"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Π�οετοιμασία για Διαγ�αφή α�χείων..."
 
 #
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Άδειασμα των Απο��ιμάτων"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Π�οετοιμασία Αδειάσματος των Απο��ιμμάτων..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε να αδειάσετε ο�ιστικά όλα τα πε�ιεχόμενά των "
 "Απο��ιμμάτων;"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Αν αδειάσετε τα απο��ίματα, τα αντικείμενα θα διαγ�αφο�ν ο�ιστικά."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Ά_δειασμα"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "φου"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "φου (αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".φου.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".φου (αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "φου φου"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "φου φου (αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "φου.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "φου (αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "φου φου.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "φου φου (αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "φου φου.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "φου φου (αντίγ�αφο).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "φου...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "φου... (αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "φου..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "φου... (αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "φου. (αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "φου. (άλλο αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "φου (άλλο αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "φου (άλλο αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "φου (3το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "φου (3το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "φου φου (άλλο αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "φου φου (3το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "φου (13το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "φου (14το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "φου (13το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "φου (14το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "φου (21το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "φου (22�ο αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "φου (21το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "φου (22�ο αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "φου (23το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "φου (23το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "φου (24το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "φου (24το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "φου (25το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "φου (25το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "φου φου (24το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "φου φου (25το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "φου φου (24το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "φου φου (25το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "φου φου (100000000000000το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "φου (10το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "φου (11το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "φου (10το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "φου (11το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "φου (12το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "φου (12το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "φου (110το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "φου (111το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "φου (110το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "φου (111το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "φου (122�ο αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "φου (123το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "φου (122�ο αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "φου (113το αντίγ�αφο).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "φου (124το αντίγ�αφο)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "φου (124το αντίγ�αφο).txt"
 
@@ -2988,65 +2855,65 @@ msgstr "φου (124το αντίγ�αφο).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "σήμε�α στις 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "σήμε�α στις %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "σήμε�α στις 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "σήμε�α στις %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "σήμε�α, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "σήμε�α, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "σήμε�α"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "χτες στις 00:00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "χτες στις %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "χτες στις 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "χτες στις %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "χτες, 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "χτες, %-I:%M %p"
 
 #
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "χτες"
 
@@ -3055,117 +2922,117 @@ msgstr "χτες"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Τετά�τη, Σεπτέμβ�ιος 00 0000 στις 00:00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y στις %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Δευ, Οκτ 00 0000 στις 00:00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y στις %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Δευ, Οκτ 00 0000 στις 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y στις %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Οκτ 00 0000 στις 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y στις %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Οκτ 00 0000, 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 μμ"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 αντικείμενα"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 φάκελοι"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 α�χεία"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 αντικείμενο"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 α�χείο"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u αντικείμενα"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u φάκελοι"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u α�χεία"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "; αντικείμενα"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "; byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "άγνωστος τ�πος"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "άγνωστο είδος MIME"
 
@@ -3173,16 +3040,16 @@ msgstr "άγνωστο είδος MIME"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "π�όγ�αμμα"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3192,7 +3059,7 @@ msgstr ""
 "Αυτό πιθανότατα σημαίνει ότι το α�χείο σας gnome-vfs.keys είναι σε λάθος "
 "μέ�ος ή δε μπο�εί να β�εθεί για κάποιο άλλο λόγο."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3201,11 +3068,11 @@ msgstr ""
 "Δε β�έθηκε πε�ιγ�αφή για το είδος ΜΙΜΕ \"%s\" (το α�χείο είναι \"%s\"), "
 "πα�ακαλώ ενημε�ώστε τη λίστα συνδ�ομητών gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "σ�νδεσμος"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "σ�νδεσμος (σπασμένος)"
 
@@ -3327,14 +3194,16 @@ msgid "Search for files by file name and file properties"
 msgstr "Αναζήτηση α�χείων βάση ονόματος και ιδιοτήτων"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
-msgstr "Όψη Εικονιδίων"
+msgstr "Π�οβολή Εικονιδίου"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
-msgstr "Όψη Λίστας"
+msgstr "Π�οβολή Λίστας"
 
 #: libnautilus-private/nautilus-global-preferences.c:184
 msgid "Manually"
@@ -3477,152 +3346,152 @@ msgstr "Ο Α�χικός Κατάλογος του %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Αντικο�υφή"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "εικονίδιο α�χείου"
+msgstr "Υπολογιστής"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "τ�οποποιήσιμο κείμενο"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "επεξε�γάσιμη ετικέτα"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "π�όσθετο κείμενο"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "λίγο πε�ισσότε�ο κείμενο"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "φωτισμένο για επιλογή"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "όταν είναι φωτισμένο για επιλογή"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "φωτισμένο ως εστίαση πληκτ�ολογίου"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "αν είναι φωτισμένο για να υποδηλώσει την εστίαση πληκτ�ολογίου"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "φωτισμένο για �ίψη"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "αν είναι φωτισμένο για �ίψη D&D"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Το ο�θογώνιο επιλογής"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Κείμενο Πλαισίου"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Σχηματισμός πλαισίου γ��ω από το μη επιλεγμένο κείμενο"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Χ�ώμα κουτιο� επιλογής"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Χ�ώμα του κουτιο� επιλογής"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Κουτί Επιλογής Άλφα"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Αδιαφάνεια του κουτιο� επιλογής"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Επισήμανση Άλφα"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Αδιαφάνεια του φωτισμο� για επιλογμένα εικονίδια"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Πλη�οφο�ίες φωτεινο� χ�ώματος"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 "Χ�ώμα που χ�ησιμοποιείται για κείμενο πλη�οφο�ιών μέσα σε σκοτεινό πα�ασκήνιο"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Πλη�οφο�ίες σκοτεινο� χ�ώματος"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 "Χ�ώμα που χ�ησιμοποιείται για κείμενο πλη�οφο�ιών μέσα σε φωτεινό πα�ασκήνιο"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Αυτός ο φάκελος χ�ησιμοποιεί την αυτόματη διάταξη."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Αυτός ο φάκελος χ�ησιμοποιεί την αυτόματη διάταξη. Θέλετε να μεταβείτε σε "
-"χει�ωνακτική διάταξη και να αφήσετε το αντικείμενο εκεί που το �ίξατε; "
+"Θέλετε να μεταβείτε σε χει�ωνακτική διάταξη και να αφήσετε το αντικείμενο "
+"εκεί που το �ίξατε; "
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Αυτός ο φάκελος χ�ησιμοποιεί την αυτόματη διάταξη. Θέλετε να μεταβείτε σε "
-"χει�ωνακτική διάταξη και να αφήσετε τα αντικείμενα εκεί που τα �ίξατε; "
+"Θέλετε να μεταβείτε σε χει�ωνακτική διάταξη και να αφήσετε τα αντικείμενα "
+"εκεί που τα �ίξατε; "
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Αλλαγή σε Χει�ωνακτική Διάταξη;"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Αλλαγή"
 
@@ -3690,13 +3559,13 @@ msgstr "στο μενο� για το \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:345
 msgid "default for this file"
-msgstr "εξ ο�ισμο� για αυτό το α�χείο"
+msgstr "π�οεπιλογή για αυτό το α�χείο"
 
 #: libnautilus-private/nautilus-program-chooser.c:348
 #: libnautilus-private/nautilus-program-chooser.c:351
 #, c-format
 msgid "default for \"%s\""
-msgstr "εξ ο�ισμο� για το \"%s\""
+msgstr "π�οεπιλογή για το \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:396
 #, c-format
@@ -3721,88 +3590,88 @@ msgstr "Είναι στο μενοÏ� για όλα τα \"%s\" αντικείμÎ
 #: libnautilus-private/nautilus-program-chooser.c:408
 #, c-format
 msgid "Is the default for \"%s\"."
-msgstr "Είναι το εξ ο�ισμο� για το \"%s\"."
+msgstr "Είναι το π�οεπιλεγμένο για το \"%s\"."
 
 #: libnautilus-private/nautilus-program-chooser.c:411
 #, c-format
 msgid "Is the default for \"%s\" items."
-msgstr "Είναι το εξ ο�ισμο� για \"%s\" αντικείμενα."
+msgstr "Είναι το π�οεπιλεμένο για \"%s\" αντικείμενα."
 
 #: libnautilus-private/nautilus-program-chooser.c:414
 #, c-format
 msgid "Is the default for all \"%s\" items."
-msgstr "Είναι το εξ ο�ισμο� για όλα τα \"%s\" αντικείμενα."
+msgstr "Είναι το π�οεπιλεμένο για όλα τα \"%s\" αντικείμενα."
 
 #
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Τ�οποποίηση του \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Συμπε�ίληψη στο μενο� για \"%s\" αντικείμενα"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
-msgstr "Χ�ήση ως εξ ο�ισμο� για \"%s\" αντικείμενα"
+msgstr "Χ�ήση ως π�οεπιλογής για \"%s\" αντικείμενα"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Συμπε�ίληψη στο μενο� μόνο για \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
-msgstr "Χ�ήση ως εξ ο�ισμο� μόνο για \"%s\" "
+msgstr "Χ�ήση ως π�οεπιλογής μόνο για \"%s\" "
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�α μην συμπε�ιληφθεί στο μενο� για \"%s\" αντικείμενα"
 
 #
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Όνομα"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Επι_λέξτε"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Έγινε"
 
 #
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "Τ�οπο_ποίηση..."
 
 #
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Είδη Α�χείων και Εφα�μογές"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Μετάβαση εκεί"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3810,48 +3679,48 @@ msgstr ""
 "Μπο�είτε να �υθμίσετε ποια π�ογ�άμματα συνδέονται με ποια είδη α�χείων στο "
 "διάλογο Είδη Α�χείων και Π�ογ�άμματα."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Άνοιγμα με Άλλη Εφα�μογή"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Επιλογή εφα�μογής για το άνοιγμα του \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Άνοιγμα με Άλλη Εφα�μογή Εμφάνισης"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Επιλογή εμφάνισης για το \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Δεν υπά�χουν διαθέσιμα π�ογ�άμματα π�οβολής για το \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Κανένα Π�όγ�αμμα Π�οβολής Διαθέσιμο"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Δεν υπά�χει εφα�μογή για το άνοιγμα του \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Καμία Εφα�μογή Δεν Έχει Αντιστοιχιθεί"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Δεν υπά�χει εφα�μογή συνδεδεμένη με \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Δεν υπά�χει ενέ�γεια συνδεδεμένη"
 
@@ -3859,175 +3728,183 @@ msgstr "Δεν υπά�χει ενέ�γεια συνδεδεμένη"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
 "Μπο�είτε να �υθμίσετε το GNOME να αντιστοιχεί εφα�μογές με είδη α�χείων. "
 "Θέλετε να αντιστοιχίσετε μια εφα�μογή με αυτό το είδος α�χείου τώ�α;"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Αντιστοίχιση Εφα�μογής"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "Αντι_στοίχιση Εφα�μογής"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Η εφα�μογή που είναι συνδεδεμένη με το\"%s\" δεν είναι έγκυ�η."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Μή έγκυ�η συνδεδεμένη εφα�μογή"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Η εφα�μογή που είναι συνδεδεμένη με το\"%s\" δεν είναι έγκυ�η."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Μή έγκυ�η συνδεδεμένη εφα�μογή"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Η ενέ�γεια που είναι συνδεδεμένη με το\"%s\" δεν είναι έγκυ�η."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Μή έγκυ�η συνδεδεμένη ενέγεια"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
 "Μπο�είτε να �υθμίσετε το GNOME να αντιστοιχεί διαφο�ετικές εφα�μογές με "
 "διαφο�ετικά είδη α�χείων. Θέλετε να αντιστοιχίσετε μια εφα�μογή με αυτό το "
 "είδος α�χείου τώ�α;"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Αντιστοίχιση Εφα�μογής"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "Αντι_στοίχιση Εφα�μογής"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Το άνοιγμα απέτυχε. Θέλετε να επιλέξετε άλλη εφα�μογή;"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "Το \"%s\" δε μπο�εί να ανοίξει το \"%s\" διότι το \"%s\" δε μπο�εί να "
-"π�οσπελάσει τις \"%s\" τοποθεσίες. Θέλετε να επιλέξετε άλλη εφα�μογή;"
+"π�οσπελάσει τις \"%s\" τοποθεσίες."
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Το άνοιγμα απέτυχε, θέλετε να επιλέξετε άλλη ενέ�γεια;"
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
-"Η εξ ο�ισμο� ενέ�γεια δε μπο�εί να ανοίξει το \"%s\" διότι δε μπο�εί να "
-"π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες. Θέλετε να επιλέξετε άλλη ενέ�γεια?"
+"Η π�οεπιλεγμένη ενέ�γεια δε μπο�εί να ανοίξει το \"%s\" διότι δε μπο�εί να "
+"π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Αδ�νατο το Άνοιγμα Τοποθεσίας"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Το \"%s\" δε μπο�εί να ανοίξει το \"%s\" διότι το \"%s\" δε μπο�εί να "
-"π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες.  Δεν υπά�χουν άλλες εφα�μογές για "
-"την εμφάνιση αυτο� του α�χείου.  Αν αντιγ�άψετε αυτό το α�χείο στον "
-"υπολογιστή σας, ίσως μπο�έσετε να το ανοίξετε."
+"π�οσπελάσει τις \"%s\" τοποθεσίες."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+" Δεν υπά�χουν άλλες εφα�μογές για την εμφάνιση αυτο� του α�χείου.  Αν "
+"αντιγ�άψετε αυτό  το α�χείο στον υπολογιστή σας, ίσως μπο�έσετε να το "
+"ανοίξετε."
+
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Η εξ ο�ισμο� ενέ�γεια δε μπο�εί να ανοίξει το \"%s\" διότι δεν μπο�εί να "
-"π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες.  Δεν υπά�χουν άλλες ενέ�γειες για "
-"την εμφάνιση αυτο� του α�χείου.  Αν αντιγ�άψετε αυτό το α�χείο στον "
-"υπολογιστή σας, ίσως μπο�έσετε να το ανοίξετε."
+"Η π�οεπιλεγμένη ενέ�γεια δε μπο�εί να ανοίξει το \"%s\" διότι δε μπο�εί να "
+"π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Δεν υπά�χουν άλλες εφα�μογές για την εμφάνιση αυτο� του α�χείου.  Αν "
+"αντιγ�άψετε αυτό  το α�χείο στον υπολογιστή σας, ίσως μπο�έσετε να το "
+"ανοίξετε."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα του %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Συγγνώμη, αλλά δε μπο�είτε να εκτελέσετε εντολές από ένα απομακ�υσμένο "
-"σ�στημα λόγω των συνεπειών ασφάλειας."
+"σ�στημα."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Αυτό έχει απενε�γοποιηθεί για λόγους ασφαλείας."
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "Δεν είναι δυνατή η εκτέλεση απομακ�υσμένων συνδέσμων"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Συνέβει ένα σφάλμα στην εκκίνηση της εφα�μογής.\n"
-"\n"
-"Λεπτομέ�ειες:"
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Λεπτομέ�ειες:"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Συνέβει ένα σφάλμα στην εκκίνηση της εφα�μογής."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Σφάλμα στην εκκίνηση εφα�μογής"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Ο στόχος �ίψης υποστη�ίζει μόνο τοπικά α�χεία."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Αυτός ο στόχος �ίψης υποστη�ίζει μόνο τοπικά α�χεία.\n"
-"\n"
 "Για να ανοίξετε μη τοπικά α�χεία, αντιγ�άψτε τα σε ένα τοπικό κατάλογο και "
 "�ίξτε τα ξανά."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "Ο στόχος �ίψης υποστη�ίζει μόνο τοπικά α�χεία"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Αυτός ο στόχος �ίψης υποστη�ίζει μόνο τοπικά α�χεία.\n"
-"\n"
 "Για να ανοίξετε μη τοπικά α�χεία, αντιγ�άψτε τα σε ένα τοπικό κατάλογο και "
 "�ίξτε τα ξανά. Τα τοπικά α�χεία που �ίξατε έχει ήδη ανοιχτεί."
 
@@ -4281,14 +4158,6 @@ msgstr ""
 "Αντικείμενα που πε�ιέχουν τη λέξη \"μέδουσα\" στο όνομά τους και είναι "
 "φάκελοι"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Αναζήτηση των Δίσκων"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Ο �αυτίλος ψάχνει στους δίσκους σας για φακέλους απο��ιμμάτων."
-
 #
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
@@ -4365,7 +4234,7 @@ msgstr "_Επικόλληση Κειμένου"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Π�οβολή του αποθηκευτικο� χώ�ου του υπολογιστή"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4381,13 +4250,12 @@ msgstr "Εμφάνιση του καταλόγου χÏ�ήστη στο διαχÎ
 
 #
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Σ�στημα α�χείων"
+msgstr "Εξε�ε�νηση του συστήματος α�χείων"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Εξε�ε�νηση του συστήματος α�χείων με τον διαχει�ιστή α�χείων"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4506,101 +4374,109 @@ msgstr "Πα�ασκήνιο"
 msgid "Empty Trash"
 msgstr "Άδειασμα Απο��ιμάτων"
 
-#
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Αυτό θα ανοίξει %d διαφο�ετικά πα�άθυ�α. Π�άγματι θέλετε να το κάνετε;"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "�α ανοιχτο�ν %d Πα�άθυ�α;"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Είσαστε βέβαιοι ότι θέλετε να ανοίξετε όλα τα α�χεία?"
+
+#
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Αυτό θα ανοίξει %d διαφο�ετικά πα�άθυ�α."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Είσαστε βέβαιοι ότι θέλετε να διαγ�άψετε ο�ιστικά το \"%s\";"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε να διαγ�άψετε ο�ιστικά τα %d επιλεγμένα αντικείμενα;"
 
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Αν διαγ�άψετε ένα αντικείμενο θα διαγ�αφεί ο�ιστικά."
+
 #
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Διαγ�αφή;"
 
 #
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Επιλογή μοτίβου"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "Μο_τίβο"
 
 #
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Επιλέχθησαν \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "Επιλέχθηκε ένας φάκελος"
 
 #
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "Επιλέχθησαν %d φάκελοι"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (πε�ιέχουν 0 αντικείμενα)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (πε�ιέχουν 1 αντικείμενο)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (πε�ιέχουν %d αντικείμενα)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (πε�ιέχουν σε σ�νολο 0 αντικείμενα)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (πε�ιέχουν σε σ�νολο 1 αντικείμενο)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (πε�ιέχει σε σ�νολο %d αντικείμενα)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Επιλέχθησαν \"%s\" (%s)"
 
 #
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "Επιλέχθησαν %d αντικείμενα (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "Επιλέχθηκε 1 άλλο αντικείμενο (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "Επιλέχθηκαν %d άλλα αντικείμενα (%s)"
@@ -4612,7 +4488,7 @@ msgstr "Επιλέχθηκαν %d άλλα αντικείμενα (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4621,127 +4497,140 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Ο φάκελος \"%s\" πε�ιέχει πε�ισσότε�α α�χεία από τον α�ιθμό που ο �αυτίλος "
-"μπο�εί να χει�ιστεί. Με�ικά α�χεία δε θα εμφανιστο�ν."
+"μπο�εί να χει�ιστεί."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Με�ικά α�χεία δε θα εμφανιστο�ν."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Πά�α Πολλά Α�χεία"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
-"Το \"%s\" δε μπο�εί να μετακινηθεί στα Απο��ίμματα. Θέλετε να το διαγ�άψετε "
+"Το α�χείο δε μπο�εί να μετακινηθεί στα Απο��ίμματα. Θέλετε να το διαγ�άψετε "
 "αμέσως;"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Το α�χείο \"%s\" δε μπο�εί να μετακινηθεί στα Απο��ίμματα"
+
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
-"Τα %d επιλεγμένα αντικείμενα δε μπο�ο�ν να μετακινηθο�ν στα Απο��ίμματα. "
-"Θέλετε να τα διαγ�άψετε αμέσως;"
+"Τα αντικείμενα δε μπο�ο�ν να μετακινηθο�ν στα Απο��ίμματα. Θέλετε να τα "
+"διαγ�άψετε αμέσως;"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d από τα επιλεγμένα αντικείμενα δε μπο�ο�ν να μετακινηθο�ν στα Απο��ίμματα. "
-"Θέλετε να διαγ�άψετε αυτά τα %d αντικείμενα αμέσως;"
+"Με�ικά α�χεία δεν μπο�ο�ν να μετακινηθο�ν στα Απο��ίμματα. Θέλετε να τα "
+"διαγ�άψετε αμέσως;"
 
 #
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Διαγ�αφή Αμέσως;"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Είσαστε βέβαιοι ότι θέλετε να διαγ�άψετε ο�ιστικά το \"%s\" από τα "
 "Απο��ίμματα;"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Είστε βέβαιοι ότι θέλετε να διαγ�άψετε ο�ιστικά τα %d επιλεγμένα αντικείμενα "
 "από τα Απο��ίμματα;"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Αν διαγ�άψετε ένα αντικείμενο θα διαγ�αφεί ο�ιστικά."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Διαγ�αφή Από Τα Απο��ίμματα;"
 
 #
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Χ�ήση του \"%s\" για το άνοιγμα του επιλεγμένου αντικειμένου"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Άλλη _Εφα�μογή..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Μία _Εφα�μογή..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Άλλο Π�όγ�αμμα _Π�οβολής..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Ένα Π�όγ�αμμα _Π�οβολής..."
 
 #
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Αδ�νατη η ολοκλή�ωση της καθο�ισμένης ενέ�γειας: %s"
 
 #
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Αδ�νατη η ολοκλή�ωση της καθο�ισμένης ενέ�γειας."
 
 #
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Εκτέλεση του \"%s\" σε κάθε επιλεγμένο αντικείμενο"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Δημιου�γία  εγγ�άφου. από π�ότυπο \"%s\""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Όλα τα εκτελέσιμα α�χεία σε αυτόν τον κατάλογο θα εμφανιστο�ν στο μενο� "
+"π�ογ�αμμάτων εντολών."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Όλα τα εκτελέσιμα α�χεία σε αυτόν τον κατάλογο θα εμφανιστο�ν στο μενο� "
-"π�ογ�αμμάτων εντολών. Η επιλογή ενός π�ογ�άμματος εντολών από το μενο� θα "
-"εκτελέσει το π�όγ�αμμα εντολών με τα ήδη επιλεγμένα στοιχεία ως είσοδο."
+"Η επιλογή ενός π�ογ�άμματος εντολών από το μενο� θα  εκτελέσει το π�όγ�αμμα "
+"εντολών  με τα ήδη επιλεγμένα στοιχεία ως είσοδο."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Σχετικά με τα Π�ογ�άμματα Εντολών"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4784,17 +4673,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: θέση και μέγεθος του τ�έχοντος πα�αθ��ου"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "Το \"%s\" θα μεταφε�θεί αν επιλέξετε την εντολή Επικόλληση Α�χείων"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "Το \"%s\" θα αντιγ�αφεί αν επιλέξετε την εντολή Επικόλληση Α�χείων"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4802,7 +4691,7 @@ msgstr ""
 "Τα %d επιλεγμένα αντικείμενα θα μετακινηθο�ν αν επιλέξτε την εντολή "
 "Επικόλληση Α�χείων"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4810,166 +4699,166 @@ msgstr ""
 "Τα %d επιλεγμένα αντικείμενα θα αντιγ�αφο�ν αν επιλέξτε την εντολή "
 "Επικόλληση Α�χείων"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Δεν υπά�χει τίποτα στο τεμάχιο για να επικολληθεί."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Σφάλμα Π�οσά�τησης"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Σφάλμα Αποπ�οσά�τησης"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Σφάλμα Π�οσά�τησης"
+msgstr "Σφάλμα Αποβολής"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Αποβο_λή"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Αποπ�ο_σά�τηση Τόμου"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Άνοιγμα σε �έο Πα�άθυ�ο"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Άνοιγμα σε %d �έα Πα�άθυ�α"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Πε�ιήγηση φακέλου"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Πε�ιήγηση φακέλων"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Διαγ�αφή από τα _Απο��ίμματα"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Ο�ιστική διαγ�αφή των επιλεγμένων αντικειμένων"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Μεταφο�ά στα Απο_��ίμματα"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Μετακίνηση κάθε επιλεγμένου αντικειμένου στα Απο��ίμματα"
 
 #
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Διαγ�αφή"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Δημιου�γία _Συνδέσμων"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Δημιου�γία Συν_δέσμου"
 
 #
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Άδειασμα Απο��ι_μμάτων"
 
 #
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Αποκοπή _Α�χείου"
 
 #
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Αποκοπή _Α�χείων"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Αντιγ�αφή Α�χείου"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Αντιγ�αφή Α�χείων"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Αυτός ο σ�νδεσμος δε μπο�εί να χ�ησιμοποιηθεί διότι δεν έχει στόχο. Θέλετε "
 "να τοποθετήσετε αυτόν το σ�νδεσμο στα Απο��ίμματα;"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Αυτός ο σ�νδεσμος δε μπο�εί να χ�ησιμοποιηθεί διότι δεν έχει στόχο."
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Αυτός ο σ�νδεσμος δε μπο�εί να χ�ησιμοποιηθεί διότι ο στόχος του \"%s\" δεν "
-"υπά�χει. Θέλετε να τον τοποθετήσετε στα Απο��ίμματα;"
+"υπά�χει."
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Διακοπείσα Σωλήνωση"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"Το \"%s\" είναι ένα εκτελέσιμο α�χείο κειμένου. Θέλετε να το εκτελέσετε ή να "
-"εμφανίσετε τα πε�ιεχόμενά του;"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Θέλετε να εκτελέσετε το\"%s\", ή να εμφανίσετε τα πε�ιεχόμενά του;"
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Το \"%s\" είναι ένα εκτελέσιμο α�χείο κειμένου."
 
 #
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Εκτέλεση ή Εμφάνιση;"
 
+#: src/file-manager/fm-directory-view.c:5924
+msgid "Run in _Terminal"
+msgstr "Εκτέλεση σε _Τε�ματικό"
+
 #
-#: src/file-manager/fm-directory-view.c:5430
+#: src/file-manager/fm-directory-view.c:5925
 msgid "_Display"
 msgstr "Εμ_φάνιση"
 
-#: src/file-manager/fm-directory-view.c:5431
-msgid "Run in _Terminal"
-msgstr "Εκτέλεση σε _Τε�ματικό"
-
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Εκ_τέλεση"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Άνοιγμα του \"%s\""
+msgid "Opening \"%s\"."
+msgstr "Άνοιγμα \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Ακ��ωση Ανοίγματος;"
 
@@ -4992,10 +4881,14 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Συγγνώμη, δε μπό�εσαν να εμφανιστο�ν όλο το πε�ιεχόμενο του \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "Δεν ήταν δθνατή η π�οβολή των πε�ιεχομένων του φακέλου."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Σφάλμα στην Εμφάνιση του Φακέλου"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -5003,7 +4896,7 @@ msgstr ""
 "Το όνομα \"%s\" χ�ησιμοποιείται ήδη σε αυτόν τον φάκελο. Πα�ακαλώ δοκιμάστε "
 "άλλο όνομα."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -5011,12 +4904,12 @@ msgstr ""
 "Δεν υπά�χει \"%s\" σε αυτό το φάκελο. Ίσως να έχει μετακινηθεί ή διαγ�αφεί "
 "μόλις τώ�α;"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Δεν έχετε τα αναγκαία δικαιώματα για τη μετονομασία του \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -5025,68 +4918,80 @@ msgstr ""
 "Το όνομα \"%s\" δεν είναι έγκυ�ο διότι πε�ιέχει το χα�ακτή�α \"/\". Πα�ακαλώ "
 "χ�ησιμοποιήστε διαφο�ετικό όνομα."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Το όνομα \"%s\" δεν είναι έγκυ�ο. Πα�ακαλώ χ�ησιμοποιήστε άλλο όνομα."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Δε μπό�εσε να αλλάξει το όνομα του \"%s\" διότι β�ίσκετε σε δίσκο μόνο για "
 "ανάγνωση"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Συγγνώμη, δεν ήταν δυνατή η μετονομασία του \"%s\" σε \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Δεν είναι μετονομασία του αντικειμένου."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Σφάλμα Μετονομασίας"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Δεν έχετε τα αναγκαία δικαιώματα για την αλλαγή της ομάδας του \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Δε μπό�εσε να αλλάξει η ομάδα του \"%s\" διότι β�ίσκετε σε δίσκο μόνο για "
 "ανάγνωση"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Συγγνώμη, δε μπό�εσε να αλλάξει η ομάδα του \"%s\"."
 
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Δεν ήταν δυνατή η αλλαγή της ομάδας."
+
 #
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Σφάλμα Καθο�ισμο� Ομάδας"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Δε μπό�εσε να αλλάξει ο ιδιοκτήτης του \"%s\" διότι β�ίσκετε σε δίσκο μόνο "
 "για ανάγνωση"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Συγγνώμη, δε μπό�εσε να αλλάξει ο ιδιοκτήτης του \"%s\"."
 
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Δεν ήταν δυνατή η αλλαγή ιδιοκτήτη."
+
 #
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Σφάλμα Καθο�ισμο� Ιδιοκτήτη"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -5094,22 +4999,26 @@ msgstr ""
 "Δε μπό�εσε να αλλάξουν τα δικαιώματα του \"%s\" διότι β�ίσκετε σε δίσκο μόνο "
 "για ανάγνωση"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Συγγνώμη, δε μπό�εσαν να αλλάξουν τα δικαιώματα του \"%s\"."
 
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Δεν ήτα δυνατή η αλλαγή των δικαιωμάτων."
+
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Σφάλμα Καθο�ισμο� Δικαιωμάτων"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Μετονομασία του \"%s\" σε \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Ακ��ωση Μετονομασίας;"
 
@@ -5169,133 +5078,139 @@ msgstr "ΕπαναφοÏ�ά Εικονιδίων στα ΑÏ�χικά Με_γέθÎ
 msgid "Restore Icon's Original Si_ze"
 msgstr "Επαναφο�ά Εικονιδίου στο Α�χικό _Μέγεθος"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "δείχνει στο \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Η μεταφο�ά και �ίψη (drag και drop) δεν υποστη�ίζεται."
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
-"Η μεταφο�ά και �ίψη (drag και drop) είναι διαθέσιμο μόνο στα τοπικά "
+"Η μεταφο�ά και �ίψη (drag και drop) είναι διαθέσιμη μόνο στα τοπικά "
 "συστήματα α�χείων."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Σφάλμα Μεταφο�άς και Ρίψης (drag και drop)"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Χ�ησιμοποιήθηκε μη έγκυ�ο είδος μεταφο�άς."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Όνομα α�χείου"
 
 #
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Μέγεθος"
 
 #
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Τ�πος"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Ημε�ομηνία Τ�οποποίησης"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
 "Πα�ακαλώ σ��τε μόνο μια εικόνα για να θέσετε το πα�αμετ�οποιημένο εικονίδιο."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Πε�ισσότε�ες Από Μία Εικόνα"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr "Το α�χείο που �ίξατε δεν είναι τοπικό."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
-"Το α�χείο που �ίξατε δεν είναι τοπικό. Μπο�είτε να χ�ησιμοποιήσετε μόνο "
-"τοπικές εικόνες ως πα�αμετ�οποιημένα εικονίδια."
+"Μπο�είτε να χ�ησιμοποιήσετε μόνο τοπικές εικόνες ως πα�αμετ�οποιημένα "
+"εικονίδια."
 
 #
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Τοπικές Εικόνες Μόνο"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Το α�χείο που �ίξατε δεν είναι εικόνα. Μπο�είτε να χ�ησιμοποιήσετε μόνο "
-"τοπικές εικόνες ως πα�αμετ�οποιημένα εικονίδια."
+msgid "The file that you dropped is not an image."
+msgstr "Το α�χείο που �ίξατε δεν είναι τοπικό."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Μόνο Εικόνες"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Ιδιότητες %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Ακ��ωση Αλλαγής Ομάδας;"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "Αλλαγή ομάδας"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Αλλαγή ομάδας."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Ακ��ωση Αλλαγής Ιδιοκτήτη;"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "Αλλαγή ιδιοκτήτη"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Αλλαγή ιδιοκτήτη."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "τίποτα"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "μη αναγνώσιμο"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "ένα αντικείμενο, με μέγεθος %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d αντικείμενα, σε σ�νολο %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(με�ικά από τα πε�ιεχόμενα είναι μη αναγνώσιμα)"
 
@@ -5305,199 +5220,195 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Πε�ιεχόμενα:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Βασικό"
 
 #
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "Ό_νοματα:"
 
 #
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "Ό_νομα:"
 
 #
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Τ�πος:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
 #
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Μέγεθος:"
 
 #
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Τόμος:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Ελε�θε�ος χώ�ος:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Σ_τόχος Συνδέσμου:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Τ�πος MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Τ�οποποιημένο:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Π�οσπελάστηκε:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Επιλογή Εικονι_δίου Χ�ήστη..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Διαγ�α_φή Εικονιδίου Χ�ήστη"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Α_νάγνωση"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "Εγγ�α_φή"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Εκ_τέλεση"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Καθο�ισμός Ταυ_τότητας Ιδιοκτήτη"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Ειδικές σημαίες:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Καθο�ισμός Ταυτότητας Ο_μάδας"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Απανταχο� πα_�όν"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Δεν είστε ο ιδιοκτήτης, οπότε δε μπο�είτε να αλλάξετε τα δικαιώματα αυτά."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Ιδιο_κτήτης α�χείου:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Ιδιοκτήτης α�χείου:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Ο_μάδα α�χείου:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Ομάδα α�χείου:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Ιδιοκτήτης:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Ομάδα:"
 
 #
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Άλλοι:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Π�οβολή κειμένου:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Π�οβολή α�ιθμών:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Τελευταία αλλαγή:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Τα δικαιώματα του \"%s\" δε μπό�εσαν να εξακ�ιβωθο�ν."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Τα δικαιώματα του επιλεγμένου α�χείου δε μπό�εσαν να εξακ�ιβωθο�ν."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Συνέβει ένα σφάλμα στην εμφάνιση βοήθειας: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Συνέβει ένα σφάλμα κατά την εμφάνιση βοήθειας."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr "Αδ�νατη η π�οβολή βοήθειας"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Ακ��ωση της Εμφάνισης του Πα�αθ��ου Ιδιοτήτων"
 
 #
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "Δημιου�γία πα�αθ��ου Ιδιοτήτων"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Δημιου�γία πα�αθ��ου Ιδιοτήτων."
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Επιλέξτε ένα εικονίδιο"
 
@@ -5515,101 +5426,113 @@ msgid "Search Results"
 msgstr "Αποτελέσματα Αναζήτησης"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Συγγνώμη, αλλά η υπη�εσία αναζήτησης Μέδουσα δεν είναι διαθέσιμη διότι δεν "
-"είναι εγκατεστημένη."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Συγγνώμη αλλά η υπη�εσία αναζήτησης μέδουσα δεν είναι διαθέσιμη."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Η Medusa δεν έχει εγκατασταθεί."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Η Υπη�εσία Αναζήτησης Δεν Είναι Διαθέσιμη"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "Η αναζήτηση που επιλέξατε είναι νεώτε�η από το ευ�ετή�ιο του συστήματός σας. "
-"Η αναζήτηση δε θα επιστ�έψει αποτελέσματα τώ�α. Μπο�είτε να δημιου�γήσετε "
-"νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd\" ως διαχει�ιστής (root) "
-"από την γ�αμμή εντολών."
+"Η αναζήτηση δε θα επιστ�έψει αποτελέσματα τώ�α."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Μπο�είτε να δημιου�γήσετε νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd"
+"\" ως διαχει�ιστής (root) από την γ�αμμή εντολών."
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr "Αναζήτηση αντικειμένων που είναι πολ� π�όσφατα"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Κάθε αντιστοιχισμένο α�χείο στον υπολογιστή σας ται�ιάζει με τα κ�ιτή�ια που "
+"επιλέξατε."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Κάθε αντιστοιχισμένο α�χείο στον υπολογιστή σας ται�ιάζει με τα κ�ιτή�ια που "
-"επιλέξατε. Μπο�είτε να ελέγξετε την ο�θογ�αφία των επιλογών σας ή να "
-"π�οσθέσετε συνθήκες για να πε�ιο�ίσετε τα αποτελέσματα."
+"Μπο�είτε να ελέγξετε την ο�θογ�αφία των επιλογών σας ή να π�οσθέσετε "
+"συνθήκες για να πε�ιο�ίσετε τα αποτελέσματα."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Σφάλμα κατά την αναζήτηση"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 "Η Αναζήτηση δε μπο�εί να β�ει το ευ�ετή�ιο του συστήματος α�χείων. Το "
-"ευ�ετή�ιο μπο�εί να λείπει ή να έχει κάποιο π�όβλημα. Μπο�είτε να "
-"δημιου�γήσετε νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd\" ως "
-"διαχει�ιστής (root) από την γ�αμμή εντολών."
+"ευ�ετή�ιο μπο�εί να λείπει ή να έχει κάποιο π�όβλημα."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr "Σφάλμα ανάγνωσης ευ�ετη�ίου α�χείων"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Π�οέκυψε σφάλμα κατά τη φό�τωση των πε�ιεχομένων της αναζήτησης: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Π�οέκυψε σφάλμα κατά τη φό�τωση των πε�ιεχομένων της αναζήτησης."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Για να κάνετε μια γ�ήγο�η αναζήτηση, το Ευ�ετή�ιο απαιτεί ένα πίνακα από τα "
-"α�χεία του συστήματός σας. Το Ευ�ετή�ιο δε μπο�εί να χ�ησιμοποιήσει τον "
-"πίνακα αυτή τη φο�ά οπότε θα π�αγματοποιηθεί μια πιο α�γή αναζήτηση που δεν "
-"κάνει χ�ήση πίνακα."
+"Για να κάνετε μια γ�ήγο�η αναζήτηση, η Ε��εση απαιταί ένα πίνακα των α�χείων "
+"του συστήματός σας."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
 "Για να κάνετε μια αναζήτηση πε�ιεχομένου, η Ε��εση απαιταί ένα πίνακα των "
-"α�χείων του συστήματός σας. Το Ευ�ετή�ιο δε μπο�εί να π�οσπελάσει τον πίνακα "
-"αυτή τη στιγμή."
+"α�χείων του συστήματός σας."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Το Ευ�ετή�ιο δε μπο�εί να χ�ησιμοποιήσει τον πίνακα αυτή τη φο�ά οπότε θα "
+"π�αγματοποιηθεί μια πιο α�γή αναζήτηση που δεν κάνει χ�ήση πίνακα."
+
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Το Ευ�ετή�ιο δε μπο�εί να χ�ησιμοποιήσει τον πίνακα αυτή τη φο�ά."
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr "Οι γ�ήγο�ες αναζητήσεις δεν είναι διαθέσιμες"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr "Οι αναζητήσεις πε�ιεχομένου δεν είναι διαθέσιμες"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5623,61 +5546,82 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Για να κάνετε μια γ�ήγο�η αναζήτηση, το Ευ�ετή�ιο απαιτεί ένα πίνακα των "
-"α�χείων του συστήματός σας. Ο υπολογιστή σας δημιου�γεί αυτή τη στιγμή αυτό "
-"το ευ�ετή�ιο. Επειδή το Ευ�ετή�ιο δε μπο�εί να χ�ησιμοποιήσει ένα πίνακα, η "
-"αναζήτηση μπο�εί να δια�κέσει με�ικά λεπτά."
+"α�χείων του συστήματός σας. Ο υπολογιστής σας δημιου�γεί αυτή τη στιγμή αυτό "
+"το ευ�ετή�ιο."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Για να κάνετε μια αναζήτηση πε�ιεχομένου, το Ευ�ετή�ιο απαιτεί ένα πίνακα "
-"των πε�ιεχομένων του συστήματός σας. Ο υπολογιστή σας δημιου�γεί αυτή τη "
-"στιγμή αυτό το ευ�ετή�ιο. Οι αναζητήσεις πε�ιεχομένου θα είναι διαθέσιμες "
-"όταν το ευ�ετή�ιο ολοκλη�ωθεί. "
+"των πε�ιεχομένων του συστήματός σας. Ο υπολογιστής σας δημιου�γεί αυτή τη "
+"στιγμή αυτό το ευ�ετή�ιο."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Οι αναζητήσεις βάση ευ�ετη�ίου δεν είναι διαθέσιμες"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"Επειδή Ο υπολογιστής σας δημιου�γεί αυτή τη στιγμή  το ευ�ετή�ιο., αυτή η "
+"αναζήτηση θα δια�κέσει με�ικά λεπτά."
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+"Οι αναζητήσεις πε�ιεχομένου θα είναι διαθέσιμες όταν ολοκλη�ωθεί το "
+"ευ�ετή�ιο."
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Οι αναζητήσεις βάσει ευ�ετη�ίου δεν είναι διαθέσιμες"
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
-"Για να κάνετε μια γ�ήγο�η αναζήτηση, η Αναζήτηση απαιτεί ένα ευ�ετή�ιο των "
-"α�χείων του συστήματός σας. Ένα τέτοιο ευ�ετή�ιο δε υπά�χει τώ�α. Μπο�είτε "
-"να δημιου�γήσετε νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd\" ως "
-"διαχει�ιστής (root) από την γ�αμμή εντολών. Μέχ�ι να δημιου�γηθεί ένα πλή�ες "
-"ευ�ετή�ιο, οι αναζητήσεις θα δια�κο�ν με�ικά λεπτά."
+"Για να κάνετε μια αναζήτηση πε�ιεχομένου, η Ε��εση απαιτεί ένα πίνακα των "
+"α�χείων του συστήματός σας. Δεν υπά�χει διαθέσιμο ευ�ετή�ιο αυτή την στιγμή."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
-"Για να κάνετε μια αναζήτηση πε�ιεχομένου, το Ευ�ετή�ιο απαιτεί ένα πίνακα "
-"των πε�ιεχομένων του συστήματός σας. Ο υπολογιστής σας δεν έχει τέτοιο "
-"πίνακα αυτή τη στιγμή. Μπο�είτε να δημιου�γήσετε νέο ευ�ετή�ιο με την "
-"εκτέλεση του \"medusa-indexd\" ως διαχει�ιστής (root) από τη γ�αμμή εντολών. "
-"Μέχ�ι να δημιου�γηθεί ένα πλή�ες ευ�ετή�ιο, οι αναζητήσεις πε�ιεχομένου δε "
-"θα είναι δυνατές."
+"Για να κάνετε μια αναζήτηση πε�ιεχομένου, η Ε��εση απαιταί ένα πίνακα των "
+"α�χείων του συστήματός σας. Δεν υπά�χει διαθέσιμο ευ�ετή�ιο αυτή την στιγμή."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+" Μπο�είτε να δημιου�γήσετε νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd"
+"\" ως διαχει�ιστής (root) από την γ�αμμή εντολών. Μέχ�ι να δημιου�γηθεί ένα "
+"πλή�ες ευ�ετή�ιο, οι αναζητήσεις θα δια�κο�ν με�ικά λεπτά."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Μπο�είτε να δημιου�γήσετε νέο ευ�ετή�ιο με την εκτέλεση του \"medusa-indexd"
+"\"  ως διαχει�ιστής (root) από τη γ�αμμή εντολών. Μέχ�ι να δημιου�γηθεί ένα "
+"πλή�ες ευ�ετή�ιο,  οι αναζητήσεις πε�ιεχομένου δε θα είναι δυνατές."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Οι γ�ήγο�ες αναζητήσεις δεν είναι διαθέσιμες στον υπολογιστή σας"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5687,11 +5631,11 @@ msgstr ""
 "α�χείων του συστήματός σας. Ο διαχει�ιστής σας έχει απενε�γοποιήσει τη "
 "γ�ήγο�η αναζήτηση στον υπολογιστή σας, οπότε δεν υπά�χει διαθέσιμος πίνακας. "
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Οι γ�ήγο�ες αναζητήσεις δεν είναι διαθέσιμες στον υπολογιστή σας"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Οι γ�ήγο�ες αναζητήσεις δεν είναι ενε�γοποιημένες"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Που"
 
@@ -5700,7 +5644,7 @@ msgstr "Που"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Πα�ουσίαση σε �έο Πα�άθυ�ο"
@@ -5711,7 +5655,7 @@ msgstr "_Πα�ουσίαση σε �έο Πα�άθυ�ο"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Πα�ουσίαση σε %d _�έα Πα�άθυ�α"
@@ -5720,16 +5664,18 @@ msgstr "Πα�ουσίαση σε %d _�έα Πα�άθυ�α"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Ο �αυτίλος β�ήκε πε�ισσότε�α αποτελέσματα αναζήτησης από αυτά που μπο�εί να "
-"εμφανίσει. Με�ικά αποτελέσματα δε θα εμφανιστο�ν. "
+"εμφανίσει."
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Με�ικά αποτελέσματα δε θα εμφανιστο�ν. "
 
 #
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Πά�α Πολλά Ται�ιάσματα"
 
@@ -5743,12 +5689,12 @@ msgid "Create L_auncher"
 msgstr "Δημιου�γία Εκκινη_τή"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Δημιου�γία νέου εκκινητή"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Διαγ�αφή όλων των αντικειμένων από τα Απο��ίμματα"
 
@@ -5769,14 +5715,14 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
-msgstr "Χ�ήση Εξ ο�ισμο� Πα�ασκηνίου"
+msgstr "Χ�ήση π�οεπιλεμένου πα�ασκηνίου"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
 msgid "Use the default desktop background"
-msgstr "Χ�ήση εξ ο�ισμο� πα�ασκηνίου επιφάνειας ε�γασίας"
+msgstr "Χ�ήση π�οεπιλεμένου πα�ασκηνίου επιφάνειας ε�γασίας"
 
 #
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
@@ -5796,60 +5742,67 @@ msgstr ""
 "αντικειμένου"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "Δημιου�γία ε_γγ�άφου"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "Δημιου�γία _Φακέλου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Δημιου�γία ενός νέου κενο� α�χείου μέσα σε αυτό το φάκελο"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Δημιου�γία νέου κενο� φακέλου μέσα σε αυτό το φάκελο"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Δημιου�γία συμβολικο� συνδέσμου για κάθε επιλεγμένο αντικείμενο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Δημιου�γία Αντι_γ�άφου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 "Διαγ�αφή κάθε επιλεγμένου αντικειμένου, χω�ίς μετακίνηση στα Απο��ίμματα"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Δημιου�γία αντιγ�άφου για κάθε επιλεγμένο αντικείμενο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Επεξε�γασία Εκκινητή"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Επεξε�γασία των πλη�οφο�ιών εκκίνησης"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Μο�φοποίηση επιλεγμένου τόμου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Ιδιότητες _Μέσου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Αποπ�οσά�τηση του επιλεγμένου τόμου"
+msgstr "Π�οσά�τηση του επιλεγμένου τόμου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Μετακίνηση ή αντιγ�αφή α�χείων που π�οηγουμένων επιλέχθησαν με εντολή "
 "Αποκοπή Α�χείων ή Αντιγ�αφή Α�χείων"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5857,141 +5810,150 @@ msgstr ""
 "Μετακίνηση ή αντιγ�αφή α�χείων που π�οηγουμένως επιλέχθησαν με εντολή "
 "Αποκοπή Α�χείων ή Αντιγ�αφή Α�χείων στον επιλεγμένο φάκελο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Δεν υπά�χουν εγκατεστημένα π�ότυπα"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Άνοιγμα _Με"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Άνοιγμα κάθε επιλεγμένου αντικειμένου σε ένα πα�άθυ�ο πλοήγησης"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Άνοιγμα σε πα�άθυ�ο πλοήγησης"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Άνοιγμα του επιλεγμένου αντικειμένου σε αυτό το πα�άθυ�ο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Π�οετοιμασία των επιλεγμένων α�χείων π�ος αντιγ�αφή μέσω εντολής Επικόλληση "
 "Α�χείων"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Π�οετοιμασία των επιλεγμένων α�χείων π�ος μετακίνηση μέσω εντολής Επικόλληση "
 "Α�χείων"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Π�οστασία"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Π�οστασία του επιλεγμένου τόμου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Μετονομασία επιλεγμένου αντικειμένου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
-msgstr "Επαναφο�ά στην Εξ _ο�ισμο� Π�οβολή"
+msgstr "Επαναφο�ά στην π�οεπιλεγ_μένη π�οβολή"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Α�χικοποίηση της σει�άς ταξινόμησης και επιπέδου εστίασης για ταί�ιασμα των "
-"π�οτιμήσεων για αυτήν την όψη"
+"π�οτιμήσεων για αυτήν την π�οβολή"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Εκτέλεση ή διαχεί�ιση π�ογ�αμμάτων εντολών από το ~/Nautilus/scripts"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Επιλογή Ό_λων των Α�χείων"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Επιλογή _μοτίβου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Επιλογή όλων των αντικειμένων σε αυτό το πα�άθυ�ο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr ""
 "Επιλογή των αντικειμένων σε αυτό το πα�άθυ�ο που ται�ιάζουν σε ένα μοτίβο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Έμφανιση ιδιοτήτων μέσου για τον επιλεγμένο τόμο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 "Εμφάνιση του φακέλου που πε�ιέχει τα π�ογ�άμματα εντολών που εμφανίζονται "
 "στο μενο� αυτό"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Αποπ�οσά�τηση του επιλεγμένου τόμου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
-msgstr "Χ�ήση του εξ ο�ισμο� πα�ασκηνίου για αυτήν την τοποθεσία"
+msgstr "Χ�ήση του π�οεπιλεμένου πα�ασκηνίου για αυτήν την τοποθεσία"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Έμφανιση ή τ�οποποίηση των ιδιοτήτων κάθε επιλεγμένου αντικειμένου"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+# # NOTE: Translation of "Create" as "New" to
+# #       keep msg length relatively short...
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "_Κενό α�χείο"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Μο�φοποίηση"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "Αποπ�ο_σά�τηση Τόμου"
+msgstr "Π�ο_σά�τηση Τόμου"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "Ά_νοιγμα"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Άνοιγμα _Φακέλου Π�ογ�αμμάτων Εντολών"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Επικόλληση Α�χείων"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Επικόλληση Α�χείων στο φάκελο"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Ιδιότητες"
 
 #
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "Π�ογ�άμματα Εντο_λών"
 
@@ -6078,7 +6040,12 @@ msgstr "_Χει�οκίνητα"
 msgid "Indexing is %d%% complete."
 msgstr "Η δημιου�γία ευ�ετη�ίου είναι κατά %d%% ολοκλη�ωμένη."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Τα α�χεία σας ανανεώθηκαν στο ευ�ετή�ιο τελευταία φο�ά στις %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -6086,26 +6053,27 @@ msgstr ""
 "Μια φο�ά την ημέ�α τα α�χεία σας και το πε�ιεχόμενα κειμένου "
 "καταλογ�αφο�νται με σκοπό οι αναζητήσεις σας να είναι γ�ηγο�ότε�ες."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Κατάσταση Δημιου�γίας Ευ�ετη�ίου"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Τα α�χεία σας ανανεώθηκαν στο ευ�ετή�ιο τελευταία φο�ά στις %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Τα α�χεία σας καταγ�άγονται αυτή την στιγμή  στο ευ�ετή�ιο."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Μια φο�ά την ημέ�α τα α�χεία σας και το πε�ιεχόμενα κειμένου "
-"καταλογ�αφο�νται με σκοπό οι αναζητήσεις σας να είναι γ�ηγο�ότε�ες. Τα "
-"α�χεία σας καταλογ�αφο�νται αυτή τη στιγμή. "
+"καταλογ�αφο�νται με σκοπό οι αναζητήσεις σας να είναι γ�ηγο�ότε�ες."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Δεν υπά�χει ευ�ετή�ιο των α�χείων σας αυτή τη στιγμή."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -6116,15 +6084,19 @@ msgstr ""
 "είναι ενε�γοποιημένη στον υπολογιστή σας, οπότε δεν έχετε ένα ευ�ετή�ιο αυτή "
 "τη στιγμή."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Δεν υπά�χει ευ�ετή�ιο των α�χείων σας αυτή τη στιγμή."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Δεν υπά�χει ευ�ετή�ιο καταλόγου α�χείων"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Συγγνώμη αλλά η υπη�εσία αναζήτησης μέδουσα δεν είναι διαθέσιμη."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Βεβαιωθείτε ότι η medusa έχει εγκατασυαθεί σωστά."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -6148,61 +6120,65 @@ msgstr "Εμφάνιση Κατάσταση _Δημιου�γίας Ευ�ετη
 msgid "Show status of indexing used when searching"
 msgstr "Εμφάνιση κατάστασης χ�ήσης του ευ�ετη�ίου κατά την αναζήτηση"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Aδ�νατη η Δημιου�γία Απαιτο�μενου Φακέλου"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Aδ�νατη η δημιου�γία από τον �αυτίλο του απαιτο�μενου φακέλου  \"%s\"."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Ο �αυτίλος δε μπό�εσε να δημιου�γήσει τον απαιτο�μενο φάκελο \"%s\". Π�ιν "
-"την εκτέλεση του �αυτίλου, πα�ακαλώ δημιου�γήστε τον φάκελο ή καθο�ίστε τα "
-"δικαιώματα ο�τως ώστε ο �αυτίλος να μπο�έσει να τον δημιου�γήσει."
+" Π�ιν την εκτέλεση του �αυτίλου, πα�ακαλώ δημιου�γήστε τον φάκελο ή "
+"καθο�ίστε τα δικαιώματα ο�τως ώστε ο �αυτίλος να μπο�έσει να τον "
+"δημιου�γήσει."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Aδ�νατη η Δημιου�γία Απαιτο�μενου Φακέλου"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+"Ο �αυτίλος δε μπό�εσε να δημιου�γήσει τους ακόλουθους απαιτο�μενους "
+"φακέλους: %s.."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Ο �αυτίλος δε μπό�εσε να δημιου�γήσει τους επόμενους απαιτο�μενους "
-"φακέλους:\n"
-"\n"
-"%s\n"
-"\n"
 "Π�ιν την εκτέλεση του �αυτίλου, πα�ακαλώ δημιου�γήστε αυτο�ς τους φακέλους ή "
-"καθο�ίστε τα δικαιώματα ο�τως ώστε ο �αυτίλος να μπο�έσει να τον "
+"καθο�ίστε τα δικαιώματα ο�τως ώστε ο �αυτίλος να μπο�έσει να τους "
 "δημιου�γήσει."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Δεσμός στην Παλαιά Επιφάνεια Ε�γασίας"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Ένας δεσμός με το όνομα \"Δεσμός στην Παλαιά Επιφάνεια Ε�γασίας\" "
+"δημιου�γήθηκε στην επιφάνεια ε�γασίας"
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Η τοποθεσία του καταλόγου επιφάνειας ε�γασίας έχει αλλάξει στο Gnome 2.4. "
-"Έχει δημιου�γηθεί ένα δεσμός που ονομάζεται \"Δεσμός στην Παλαιά Επιφάνεια "
-"Ε�γασίας\". Μπο�είτε να το ανοίξετε, να μεταφέ�ετε τα α�χεία που επιθυμείτε "
-"και μετά να διαγ�άψετε το δεσμό."
+"Η τοποθεσία του καταλόγου επιφάνειας ε�γασίας έχει αλλάξει στο Gnome 2.4.  "
+"Μπο�είτε να ανοίξετε τον δεσμό, να μεταφέ�ετε τα α�χεία που επιθυμείτε και "
+"μετά να διαγ�άψετε το δεσμό."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr "Εισηγμένη παλαιά επιφάνεια ε�γασίας"
 
 #. Can't register myself due to trouble locating the
@@ -6215,7 +6191,7 @@ msgstr "Εισηγμένη παλαιά επιφάνεια ε�γασίας"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6226,7 +6202,7 @@ msgstr ""
 "επανεκκινήσετε τον υπολογιστή σας ή να εγκαταστήσετε το �αυτίλο ξανά."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6274,14 +6250,14 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "Ο �αυτίλος δε μπο�εί να χ�ησιμοποιηθεί τώ�α λόγω ενός μη αναμενόμενου "
 "σφάλματος."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6290,7 +6266,7 @@ msgstr ""
 "από το Bonobo κατά την π�οσπάθεια δήλωσης του εξυπη�ετητή όψης διαχει�ιστή "
 "α�χείων."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6301,7 +6277,7 @@ msgstr ""
 "του bonobo-activation-server και η επανεκκίνηση του �αυτίλου μπο�εί να "
 "βοηθήσει στην επίλυση του π�οβλήματος."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6312,6 +6288,17 @@ msgstr ""
 "τε�ματισμός του bonobo-activation-server και η επανεκκίνηση του �αυτίλου "
 "μπο�εί να βοηθήσει στην επίλυση του π�οβλήματός."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Συνέβει ένα σφάλμα στην εμφάνιση βοήθειας: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Δεν έχουν ο�ιστεί σελιδοδείκτες"
@@ -6345,41 +6332,45 @@ msgstr "Λιγότε�ες Επιλογές"
 msgid "Find Them!"
 msgstr "Β�ες τα!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Θα π�έπει να εισάγετε ένα όνομα για τον εξυπη�ετητή."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Αδ�νατη η Μεταφο�ά Μέσα στο Ίδιο"
+msgid "Please enter a name and try again."
+msgstr "Πα�ακαλώ εισάγετε ένα όνομα και π�οσπαθείστε ξανά."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Αδ�νατη η σ�νδεση με τον εξυπη�ετητή"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"Το \"%s\" δεν είναι έγκυ�η διαδ�ομή. Πα�ακαλώ ελέγξτε την ο�θογ�αφία και "
-"δοκιμάστε ξανά."
+msgid "\"%s\" is not a valid location."
+msgstr "Το \"%s\" δεν είναι έγκυ�η τοποθεσία"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Πα�ακαλώ ελέγξτε την ο�θογ�αφία και δοκιμάστε ξανά."
 
 #
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Εξυπη�ετητές Δικτ�ου"
+msgstr "Σ�νδεση με τον εξυπη�ετητή"
 
 #
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "Ό_νομα:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Τοποθεσία:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "Σ�ν_δεση"
+msgstr "Σ�νδεση"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6407,7 +6398,7 @@ msgstr "<span weight=\"bold\">Συμπε�ιφο�ά</span>"
 
 #: src/nautilus-file-management-properties.glade.h:25
 msgid "<span weight=\"bold\">Default View</span>"
-msgstr "<span weight=\"bold\">Εξ ο�ισμο� όψη</span>"
+msgstr "<span weight=\"bold\">Π�οεπιλεγμένη π�οβολή</span>"
 
 #: src/nautilus-file-management-properties.glade.h:26
 msgid "<span weight=\"bold\">Executable Text Files</span>"
@@ -6423,11 +6414,11 @@ msgstr "<span weight=\"bold\">Κείμενα εικονιδίου</span>"
 
 #: src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon View Defaults</span>"
-msgstr "<span weight=\"bold\">Εξ ο�ισμο� όψη εικονιδίων</span>"
+msgstr "<span weight=\"bold\">Π�οεπιλεγμένη π�οβολή εικονιδίων</span>"
 
 #: src/nautilus-file-management-properties.glade.h:30
 msgid "<span weight=\"bold\">List View Defaults</span>"
-msgstr "<span weight=\"bold\">Εξ ο�ισμο� όψη λίστας</span>"
+msgstr "<span weight=\"bold\">Π�οεπιλεγμένη π�οβολή λίστας</span>"
 
 #: src/nautilus-file-management-properties.glade.h:31
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
@@ -6447,7 +6438,7 @@ msgstr "<span weight=\"bold\">Απο��ίματα</span>"
 
 #: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
-msgstr "<span weight=\"bold\">Εξ ο�ισμο� όψη Δένδ�ου</span>"
+msgstr "<span weight=\"bold\">Π�οεπιλεγμένη π�οβολή Δένδ�ου</span>"
 
 #: src/nautilus-file-management-properties.glade.h:36
 msgid "Always"
@@ -6475,7 +6466,7 @@ msgstr "Μέτ�ηση α�ι_θμο� αντικειμένων:"
 
 #: src/nautilus-file-management-properties.glade.h:46
 msgid "Default _zoom level:"
-msgstr "Εξ ο�ισμο� επίπεδο εσ_τίασης:"
+msgstr "Π�οεπιλεγμένο επίπεδο εσ_τίασης:"
 
 #: src/nautilus-file-management-properties.glade.h:47
 msgid "File Management Preferences"
@@ -6536,7 +6527,7 @@ msgstr "_Ταξινόμηση στοιχείων:"
 
 #: src/nautilus-file-management-properties.glade.h:66
 msgid "_Default zoom level:"
-msgstr "Εξ ο�ισμο� επίπεδο εσ_τίασης:"
+msgstr "Π�οεπιλεγμένο επίπεδο εσ_τίασης:"
 
 #: src/nautilus-file-management-properties.glade.h:67
 msgid "_Double click to activate items"
@@ -6579,6 +6570,17 @@ msgstr ""
 "Μπο�είτε να διαγ�άψετε χει�ωνακτικά το α�χείο για να πα�ουσιαστεί ο δ�υίδης "
 "ξανά.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Δε μπο�είτε να καθο�ίσετε πε�ισσότε�α από ένα πα�αμετ�οποιημένα εικονίδια."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+"Μπο�είτε να χ�ησιμοποιήσετε μόνο τοπικές εικόνες ως πα�αμετ�οποιημένα "
+"εικονίδια."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6589,26 +6591,21 @@ msgstr "Άνοιγμα με %s"
 msgid "Open with..."
 msgstr "Άνοιγμα με..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Αδυναμία εκκίνησης της εφα�μογής αντιγ�αφής cd :\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Αδυναμία εκκίνησης της εφα�μογής αντιγ�αφής cd."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr "Αδυναμία εκκίνησης της εφα�μογής αντιγ�αφής cd"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Άδειασμα Α_πο��ιμάτων"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "Ε_γγ�αφή πε�ιεχομένων στο CD"
 
@@ -6616,37 +6613,37 @@ msgstr "Ε_γγ�αφή πε�ιεχομένων στο CD"
 msgid "Go To:"
 msgstr "Επίσκεψη Του:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Θέλετε να δείτε αυτές τις %d τοποθεσίες σε διαφο�ετικά πα�άθυ�α;"
+msgid "Do you want to view %d locations?"
+msgstr "Θέλετε να δείτε αυτές τις %d τοποθεσίες?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Π�οβολή σε Πολλαπλά Πα�άθυ�α;"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Άνοιγμα Τοποθεσίας"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Εκτέλεση μια γ�ήγο�η ομάδα από δοκιμές εγκυ�ότητας."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Δημιου�γία του α�χικο� πα�αθ��ου με την δοθείσα γεωμετ�ία."
 
 #
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ΔΙΑΣΤΑΣΕΙΣ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Μόνο δημιου�γία πα�αθ��ων για καθο�ισμένα URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6654,45 +6651,45 @@ msgstr ""
 "�α μη γίνει διαχεί�ιση της επιφάνειας ε�γασίας (αγνοεί τις π�οτιμήσεις στο "
 "διάλογο π�οτιμήσεων)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "άνοιγμα ένός πα�αθ��ου φυλλομετ�ητή"
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Τε�ματισμός του �αυτίλου."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Επανεκκίνηση του �αυτίλου."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Διαχει�ιστής Α�χείων"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "�αυτίλος"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: το --check δε μπο�εί να χ�ησιμοποιηθεί με URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: το --check δε μπο�εί να χ�ησιμοποιηθεί με άλλες επιλογές.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: το --quit δε μπο�εί να χ�ησιμοποιηθεί με URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: το --restart δε μπο�εί να χ�ησιμοποιηθεί με URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: το --geometry δε μπο�εί να χ�ησιμοποιηθεί με πε�ισσότε�α από ένα "
@@ -6701,39 +6698,48 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Σίγου�α θέλετε να λησμονήσετε το ιστο�ικό; Αν ναι, είστε καταδικασμένος/η να "
-"το επαναλάβετε."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Είσαστε βέβαιοι ότι θέλετε να διαγ�άψετε ο�ιστικά το ιστο�ικό?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Αν ναι, είστε καταδικασμένος/η να το επαναλάβετε."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Είσαστε βέβαιοι ότι θέλετε ο �αυτίλος να λησμονήσει τις τοποθεσίες που έχετε "
 "επισκεφτεί;"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+"Αν διαγ�άψετε την λίστα τοποθεσιών, τα αντικείμενα θα διαγ�αφο�ν ο�ιστικά."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Καθα�ισμός Ιστο�ικο�"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"Η τοποθεσία \"%s\" δεν υπά�χει. Θέλετε να διαγ�άψετε τους σελιδοδείκτες με "
-"αυτήν την τοποθεσία από τη λίστα σας;"
+"Θέλετε να διαγ�άψετε τους σελιδοδείκτες με αυτήν την αν�πα�κτη τοποθεσία από "
+"τη λίστα σας;"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Η τοποθεσία \"%s\" δεν υπά�χει πια."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Σελιδοδείκτης σε Μη Υπα�κτή Τοποθεσία"
 
 #
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Αφαί�εση"
 
@@ -6767,14 +6773,13 @@ msgid "Close _All Windows"
 msgstr "_Κλείσιμο Όλων των Πα�αθ��ων"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Κλείσιμο όλων των πα�αθ��ων"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Σ�νδεση με τον ε_ξυπη�ετητή..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6792,111 +6797,120 @@ msgid "Forward"
 msgstr "Μπ�οστά"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Μετάβαση στο φάκελο π�οτ�πων"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Μετάβαση στην επόμενη τοποθεσία της λίστας ιστο�ικο�"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Μετάβαση στην π�οηγο�μενη τοποθεσία της λίστα ιστο�ικο�"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Μετάβαση στο φάκελο απο��ιμμάτων"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Α�χή"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Μπά�ας _Τοποθεσίας"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Επαναφό�τωση"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Αναζήτηση σε αυτόν τον υπολογιστή για α�χεία"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Γ�αμμής Κατάστασης"
 
 #
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Διακοπή"
 
 #
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Επάνω"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Εγγ�αφή στο CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Π�όσθεση σελιδοδείκτη"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Πίσω"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Σελιδοδείκτες"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Καθα�ισμός _Ιστο�ικο�"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Αντικο�υφή"
+msgstr "Υ_πολογιστής"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Επεξε�γασία Σελιδοδεικτών"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Μπ�οστά"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Α�χική σελίδα"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "Τοποθε_σία..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Πλευ�ικό Ταμπλώ"
 
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "Π�ό_τυπα"
+
 #
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Απο��ίμματα"
 
 #
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Επάνω"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Π�οβολή"
 
@@ -6914,34 +6928,36 @@ msgstr "Π�οβολή ως..."
 msgid "File Browser: %s"
 msgstr "Φυλλομετ�ητής α�χείου: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
-"Ένα από τα πλευ�ικά ταμπλώ πα�ουσίασε ένα σφάλμα και δε μπο�εί να συνεχίσει. "
-"Δυστυχώς δεν είναι δυνατός ο ακ�ιβής εντοπισμός του."
+"Ένα από τα πλευ�ικά ταμπλώ πα�ουσίασε ένα σφάλμα και δε μπο�εί να συνεχίσει."
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Δυστυχώς δεν είναι δυνατός ο ακ�ιβής εντοπισμός του."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
 msgstr ""
-"Το πλευ�ικό ταμπλώ %s πα�ουσίασε ένα σφάλμα και δε μπο�εί να συνεχίσει. Αν "
-"αυτό συνεχίσει να συμβαίνει, ίσως θελήσετε να το απενε�γοποιήσετε."
+"Το πλευ�ικό ταμπλώ %s πα�ουσίασε ένα σφάλμα και δε μπο�εί να συνεχίσει."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Αν αυτό συνεχίσει να συμβαίνει, ίσως θελήσετε να το απενε�γοποιήσετε."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "Αποτυχία Πλευ�ικο� Ταμπλώ"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Πλευ�ικό Ταμπλώ"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
-msgstr "Πε�ιέχει μια όψη πλευ�ικής μπά�ας"
+msgstr "Πε�ιέχει μια π�οβολή πλευ�ικής μπά�ας"
 
 #: src/nautilus-profiler.c:209
 msgid "Print"
@@ -6974,154 +6990,183 @@ msgstr "_Π�οσθήκη νέου..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Συγγνώμη, αλλά το σχήμα %s δε μπό�εσε να διαγ�αφεί."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Ελέγξτε ότι έχετε τα απα�αίτητα δικαιώματα να διαγ�άψετε το σχέδιο."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Αδ�νατη η διαγ�αφή σχεδίου"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Συγγνώμη, αλλά το έμβλημα %s δε μπό�εσε να διαγ�αφεί."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Ελέγξτε ότι έχετε τα απα�αίτητα δικαιώματα να διαγ�άψετε το έμβλημα."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Αδ�νατη η διαγ�αφή εμβλήματος"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Δημιου�γία �έου Εμβλήματος:"
 
 #
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Λέξη κλειδί:"
 
 #
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Εικόνα:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Επιλέξτε ένα α�χείο εικόνας για το νέο έμβλημα:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Δημιου�γία �έου Χ�ώματος:"
 
 #
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Όνομα _χ�ώματος:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Τιμή χ�ώ_ματος:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Συγγνώμη, αλλά το \"%s\" δεν είναι έγκυ�ο όνομα α�χείου."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Συγγνώμη, αλλά δε δώσατε ένα έγκυ�ο όνομα α�χείου."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Πα�ακαλώ π�οσπαθήστε ξανά."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Αδ�νατη η εγκατάσταση σχεδίου"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 "Συγγνώμη, αλλά δε μπο�είτε να αντικαταστήσετε την εικόνα α�χικοποίησης."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Η α�χικοποίηση είναι μια ειδική εικόνα που δεν μπο�εί να διαγ�αφεί."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Δεν είναι Εικόνα"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Συγγνώμη, αλλά το σχέδιο %s δε μπό�εσε να εγκατασταθεί."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Επιλέξτε ένα α�χείο εικόνας για να π�οσθέσετε ως σχέδιο"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Δεν είναι δυνατή η εγκατάσταση του χ�ώματος."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 "Συγγνώμη, αλλά π�έπει να καθο�ίσετε ένα μη-κενό όνομα για το νέο χ�ώμα."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Αδ�νατη η εγκατάσταση χ�ώματος"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Επιλέξτε ένα χ�ώμα για να π�οσθέσετε"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Συγγνώμη, αλλά το '%s' δεν είναι ένα χ�ησιμοποιήσιμο α�χείο εικόνας!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr ""
+"Συγγνώμη, αλλά το '\"%s\" δεν είναι ένα χ�ησιμοποιήσιμο α�χείο εικόνας."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Το α�χείο δε φαίνεται να είναι μια έγκυ�η εικόνα."
 
 #
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Επιλέξτε μια κατηγο�ία:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Α_ναί�εση Διαγ�αφής"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Π�οσθήκη �έου Σχεδίου..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Π�οσθήκη �έου Χ�ώματος..."
 
 #
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Π�οσθήκη �έου Εμβλήματος..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr " Κάντε κλικ στο σχέδιο για να το αφαι�έσετε"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Κάντε κλικ στο χ�ώμα για να το αφαι�έσετε"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Κάντε κλικ στο έμβλημα για να το αφαι�έσετε"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Σχέδια:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Χ�ώματα:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Εμβλήματα:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Αφαί�εση Σχεδίου..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Αφαί�εση Χ�ώματος..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Αφαί�εση Εμβλήματος..."
 
@@ -7330,7 +7375,8 @@ msgstr "Σ�ν_δεση"
 #: src/nautilus-shell-ui.xml.h:2
 msgid "Choose a view for the current location, or modify the set of views"
 msgstr ""
-"Επιλογή όψης για την τ�έχουσα τοποθεσία ή τ�οποποίηση του συνόλου των όψεων"
+"Επιλογή όψης για την τ�έχουσα τοποθεσία ή τ�οποποίηση του συνόλου των "
+"π�οβολών"
 
 #: src/nautilus-shell-ui.xml.h:3
 msgid "Close this window"
@@ -7517,31 +7563,34 @@ msgid "CD _Creator"
 msgstr "CD _Creator"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Κλείσιμο ό_λων των μητ�ικών"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Κλείσιμο των μητ�ικών φακέλων"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Μετάβαση στο κενό φάκελο CD "
+msgstr "Μετάβαση στον Υπολογιστή"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Μετάβαση στο CD Creator"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "'Ανοιγμα Τοποθε_σίας..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Άνοιγμα μη_τ�ικο�"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr "Άνοιγμα του μητ�ικο� φακέλου"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Μέ�η"
 
@@ -7571,118 +7620,129 @@ msgstr "Αποτυχία Π�οβολής"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr "Π�οέκυψε σφάλμα κατά την εκκίνηση της π�οβολής %s."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
-"Η όψη %s πα�ουσίασε ένα σφάλμα και δε μπο�εί να συνεχίσει. Μπο�είτε να "
-"επιλέξτε μια άλλη όψη ή να πάτε σε διαφο�ετική τοποθεσία."
+"Μπο�είτε να επιλέξτε μια άλλη π�οβολή ή να πάτε σε διαφο�ετική τοποθεσία."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Π�οέκυψε σφάλμα κατά την εκκίνηση της π�οβολής %s."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Η τοποθεσία δεν μπο�εί να π�οβληθεί με αυτό το π�όγ�αμμα π�οβολής."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Π�οβολή Πε�ιεχομένου"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Π�οβολή του τ�έχοντος α�χείου ή φακέλου"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Αδ�νατη η ε��εση του \"%s\". Πα�ακαλώ ελέγξτε την ο�θογ�αφία και δοκιμάστε "
-"ξανά."
+msgid "Couldn't find \"%s\"."
+msgstr "Αδ�νατη η ε��εση \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\" διότι ο �αυτίλος δε μπο�εί να διακ�ίνει το "
-"είδος του α�χείου."
+msgid "Couldn't display \"%s\"."
+msgstr "Αδ�νατη η εμφάνιση του \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr ""
-"Ο �αυτίλος δεν έχει εγκατεστημένο π�όγ�αμμα πα�ουσίασης για την εμφάνιση του "
-"\"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Ο �αυτίλος δε μπο�εί να διακ�ίνει το είδος του α�χείου."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\" διότι ο �αυτίλος δε μπο�εί να χει�ιστεί "
-"διαδ�ομές %s:."
+"Ο �αυτίλος δεν έχει εγκατεστημένο π�όγ�αμμα πα�ουσίασης για την εμφάνιση του "
+"α�χείου."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\" διότι απέτυχε η π�οσπάθεια αυθεντικοποίησης."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Ο �αυτίλος δε μπο�εί να χει�ιστεί τοποθεσίες %s."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Αδ�νατη η εμφάνιση του \"%s\" διότι η π�όσβαση απαγο�ε�τηκε."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Απέτυχε η π�οσπάθεια αυθεντικοποίησης."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Δεν επιτ�άπηκε η π�όσβαση"
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Αδ�νατη η εμφάνιση του \"%s\" διότι δεν β�έθηκε σ�στημα \"%s\""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\" διότι δε β�έθηκε σ�στημα \"%s\". Πα�ακαλώ "
-"ελέγξτε ότι η ο�θογ�αφία είναι σωστή και ότι οι �υθμίσεις διαμεσολαβητή "
+"Ελέγξτε ότι η ο�θογ�αφία είναι σωστή και ότι οι �υθμίσεις διαμεσολαβητή "
 "είναι σωστές."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\". Ελέγξτε ότι οι �υθμίσεις διαμεσολαβητή είναι "
-"σωστές."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Ελέγξτε ότι οι �υθμίσεις διαμεσολαβητή είναι σωστές."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"Αδ�νατη η εμφάνιση του \"%s\" διότι ο �αυτίλος δε μπο�εί να συνδεθεί με τον "
-"Κ��ιο Πε�ιηγητή SMB.\n"
-"Ελέγξτε ότι ο πε�ιηγητής SMB λειτου�γεί στο τοπικό δίκτυο."
+"Αδ�νατη η εμφάνιση του \"%s\" διότι ο �αυτίλος δε μπο�εί  να επικοινωνήσει "
+"με τον  SMB master browser."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Ελέξτε οτι ο εξυπη�ετητής SMB εκτελείται στο τοπικό δίκτυο."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Η αναζήτηση δεν είναι διαθέσιμη αυτή τη στιγμή διότι είτε δεν έχει γίνει "
-"καταλογ�άφηση είτε η υπη�εσία αναζήτησης δεν εκτελείτε. Επιβεβαιώστε ότι "
-"έχετε εκκινήσει την υπη�εσία αναζήτησης Μέδουσα και αν δεν έχετε κάνει "
-"καταλογ�άφηση, ότι το π�όγ�αμμα καταλογ�άφησης Μέδουσα εκτελείτε."
+"καταλογ�άφηση είτε η υπη�εσία αναζήτησης δεν εκτελείται."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Επιβεβαιώστε ότι έχετε εκκινήσει την υπη�εσία αναζήτησης Μέδουσα και αν δεν "
+"έχετε κάνει καταλογ�άφηση, ότι το π�όγ�αμμα καταλογ�άφησης Μέδουσα εκτελείτε."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Αναζήτηση Δεν είναι Διαθέσιμη"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Ο �αυτίλος δε μπο�εί να απεικονίσει το \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Πα�ακαλώ επιλέξτε ένα άλλο π�όγ�αμμα π�οβολής και π�σπαθείστε ξανά."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Αδ�νατη η Εμφάνιση της Τοποθεσίας"
 
@@ -7695,7 +7755,7 @@ msgstr "Μετάβαση στη τοποθεσία που καθο�ίζεται
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Πνευματικά δικαιώματα © 1999-2002 Eazel, Inc."
 
@@ -7704,12 +7764,12 @@ msgstr "Πνευματικά δικαιώματα © 1999-2002 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
-"Συμεών (σίμος) Ξενιτέλλης <simos@hellug.gr> Κώστας Παπαδήμας <pkst@gmx.net>"
+"Συμεών (σίμος) Ξενιτέλλης <simos@hellug.gr> Κώστας Παπαδήμας <pkst@gnome.org>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7725,39 +7785,40 @@ msgstr "Μετάβαση πίσω με�ικές σελίδες"
 msgid "Go forward a number of pages"
 msgstr "Μετάβαση μπ�οστά με�ικές σελίδες"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Εμφάνιση αυτής της τοποθεσίας με \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Δίκτυο Red Hat"
+msgstr "Δίκτυο"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Σημεία"
+msgstr "Γ�αμματοσει�ές"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Θέματα"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "_CD Creator"
+msgstr "CD Creator"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Ταυτότητα Εφα�μογής"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Η ταυτότητα εφα�μογής του πα�αθ��ου."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Εφα�μογή"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Το NautilusApplication που αντιστοιχείται με το πα�άθυ�ο αυτό."
 
@@ -7787,7 +7848,7 @@ msgstr "Μεγέθυνση"
 
 #: src/nautilus-zoom-control.c:802
 msgid "Set the zoom level of the current view"
-msgstr "Ο�ισμός του επιπέδου εστίασης της τ�έχουσας όψης"
+msgstr "Ο�ισμός του επιπέδου εστίασης της τ�έχουσας π�οβολής"
 
 #
 #: src/network-scheme.desktop.in.h:1
@@ -7798,6 +7859,249 @@ msgstr "Εξυπη�ετητές Δικτ�ου"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Εμφάνιση των εξυπη�ετητών δικτ�ου στο διαχει�ιστή α�χείων του �αυτίλου"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Ε�γοστάσιο για όψη υλικο�"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Π�οβολή Υλικο�"
+
+#~ msgid "Hardware view"
+#~ msgstr "Π�οβολή υλικο�"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Π�οβολή ως Υλικό"
+
+#~ msgid "hardware view"
+#~ msgstr "π�οβολή υλικο�"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "όνομα εικονιδίου για την π�οβολή υλικο�"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "πε�ίληψη όψης υλικο�"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s ΚΜΕ\n"
+#~ "%s MHz\n"
+#~ "%s K λανθάνουσα μνήμη"
+
+#~ 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 "Σ�στημα σε χ�ήση επί %d ημέ�ες, %d ώ�ες και %d λεπτά."
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Επισκόπηση Υλικο�"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Αυτή είναι θέση για τη σελίδα ΚΜΕ."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Αυτή είναι θέση για τη σελίδα RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Αυτή είναι θέση για τη σελίδα IDE."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Αναζήτηση των Δίσκων"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Ο �αυτίλος ψάχνει στους δίσκους σας για φακέλους απο��ιμμάτων."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Σφάλμα κατά την αντιγ�αφή στο \"%s\".\n"
+#~ "\n"
+#~ "Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Σφάλμα κατά τη δημιου�γία συνδέσμου στο \"%s\".\n"
+#~ "\n"
+#~ "Δεν υπά�χει διαθέσιμος χώ�ος στο π�οο�ισμό."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Σφάλμα κατά τη μετακίνηση αντικειμένων στο \"%s\".\n"
+#~ "\n"
+#~ "Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Σφάλμα κατά τη μετακίνηση αντικειμένων στο \"%s\".\n"
+#~ "\n"
+#~ "Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Σφάλμα κατά τη δημιου�γία συνδέσεων στο \"%s\".\n"
+#~ "\n"
+#~ "Δεν έχετε δικαίωμα εγγ�αφής σε αυτό το φάκελο."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Σφάλμα κατά τη δημιου�γία συνδέσεων στο \"%s\".\n"
+#~ "\n"
+#~ "Ο δίσκος π�οο�ισμο� είναι μόνο για ανάγνωση."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά την αντιγ�αφή του \"%s\".\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά τη μετακίνηση του \"%s\".\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά τη διαγ�αφή του \"%s\".\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά την αντιγ�αφή.\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά τη σ�νδεση.\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Σφάλμα \"%s\" κατά τη διαγ�αφή.\n"
+#~ "\n"
+#~ "Θέλετε να συνεχίσετε;"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Δε μπο�εί να γίνει Αντιγ�αγή στα Απο��ίματα"
+
+#~ 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 ""
+#~ "Η εξ ο�ισμο� ενέ�γεια δε μπο�εί να ανοίξει το \"%s\" διότι δεν μπο�εί να "
+#~ "π�οσπελάσει α�χεία στις \"%s\" τοποθεσίες.  Δεν υπά�χουν άλλες ενέ�γειες "
+#~ "για την εμφάνιση αυτο� του α�χείου.  Αν αντιγ�άψετε αυτό το α�χείο στον "
+#~ "υπολογιστή σας, ίσως μπο�έσετε να το ανοίξετε."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Τα %d επιλεγμένα αντικείμενα δε μπο�ο�ν να μετακινηθο�ν στα Απο��ίμματα. "
+#~ "Θέλετε να τα διαγ�άψετε αμέσως;"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d από τα επιλεγμένα αντικείμενα δε μπο�ο�ν να μετακινηθο�ν στα "
+#~ "Απο��ίμματα. Θέλετε να διαγ�άψετε αυτά τα %d αντικείμενα αμέσως;"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Το α�χείο που �ίξατε δεν είναι εικόνα. Μπο�είτε να χ�ησιμοποιήσετε μόνο "
+#~ "τοπικές εικόνες ως πα�αμετ�οποιημένα εικονίδια."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Συγγνώμη, αλλά η υπη�εσία αναζήτησης Μέδουσα δεν είναι διαθέσιμη διότι "
+#~ "δεν είναι εγκατεστημένη."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Μια φο�ά την ημέ�α τα α�χεία σας και το πε�ιεχόμενα κειμένου "
+#~ "καταλογ�αφο�νται με σκοπό οι αναζητήσεις σας να είναι γ�ηγο�ότε�ες. Τα "
+#~ "α�χεία σας καταλογ�αφο�νται αυτή τη στιγμή. "
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "Το \"%s\" δεν είναι έγκυ�η διαδ�ομή. Πα�ακαλώ ελέγξτε την ο�θογ�αφία και "
+#~ "δοκιμάστε ξανά."
+
+#~ 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 ""
+#~ "Αδ�νατη η εμφάνιση του \"%s\" διότι ο �αυτίλος δε μπο�εί να συνδεθεί με "
+#~ "τον Κ��ιο Πε�ιηγητή SMB.\n"
+#~ "Ελέγξτε ότι ο πε�ιηγητής SMB λειτου�γεί στο τοπικό δίκτυο."
+
+#~ msgid "file icon"
+#~ msgstr "εικονίδιο α�χείου"
+
+#
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Ό_νομα:"
+
 #
 #~ msgid "Unknown"
 #~ msgstr "Άγνωστο"
@@ -7895,8 +8199,5 @@ msgstr "Εμφάνιση των εξυπηÏ�ετητών δικτÏ�ου στο Î
 #~ msgid "_Toolbar"
 #~ msgstr "_Ε�γαλειοθήκη"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Η τοποθεσία \"%s\" δεν υπά�χει πια."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Μετάβαση σε Μη Υπα�κτή Τοποθεσία"
diff --git a/po/en_GB.po b/po/en_GB.po
index 11bfa794a..8ecc08762 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-06-20 23:35+0000\n"
 "Last-Translator: Bastien Nocera <hadess@hadess.net>, Abigail Brady "
 "<morwen@evilmagic.org>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() failed."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblems"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus Emblem view"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Couldn't remove emblem"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Couldn't remove emblem with name '%s'.  This is probably because the emblem "
 "is a permanent one, and not one you added yourself."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Couldn't remove emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Couldn't rename emblem"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Couldn't rename emblem with name '%s'.  This is probably because the emblem "
 "is a permanent one, and not one that you added yourself."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Couldn't rename emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Rename Emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Enter a new name for the displayed emblem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Rename"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Add Emblems..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,64 @@ msgstr ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Some of the files could not be added as emblems because they did not appear "
 "to be valid images."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "The file '%s' does not appear to be a valid image."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Couldn't add emblems"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "None of the files could be added as emblems because they did not appear to "
 "be valid images."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "The dragged text was not a valid file location."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Couldn't add emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "The file '%s' does not appear to be a valid image."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "The dragged file does not appear to be a valid image."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Erase"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory for hardware view"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardware Viewer"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardware view"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "View as Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardware view"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "name of icon for the hardware view"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "summary of hardware info"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Uptime is %d days, %d hours, %d minutes"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardware Overview"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "This is a placeholder for the CPU page."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "This is a placeholder for the RAM page."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "This is a placeholder for the IDE page."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "History"
@@ -909,6 +846,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "International"
@@ -1199,31 +1140,19 @@ msgid "Desktop trash icon name"
 msgstr "Desktop wastebasket icon name"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-#, fuzzy
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Vast directories, 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Enable 'special' flags in file preferences dialogue"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Filename for the default directory background. Only used if background_set "
 "is true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1231,6 +1160,19 @@ msgstr ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Vast directories, 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 massive directories. A negative value denotes no limit. The "
+"limit is approximate due to the reading of directories chunk-wise."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1243,8 +1185,8 @@ msgstr "Home icon visible on desktop"
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 #, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "If set to true, Nautilus will show only show directories in the tree "
 "sidebar. Otherwise it will show both directories and files."
@@ -1280,8 +1222,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "If set to true, then nautilus shows directories prior to showing files in "
 "the icon and list views."
@@ -1330,7 +1272,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "If set to true, then nautilus will use the user's home directory as the "
@@ -1349,7 +1291,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1370,8 +1312,9 @@ msgstr ""
 "the desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "If this is set to true, an icon linking to the home directory will be put on "
@@ -1408,7 +1351,8 @@ msgstr ""
 "incrementally they will be sorted decrementally."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "If true, icons will be layed out tighter by default in new windows."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1438,7 +1382,8 @@ msgid "List of possible captions on icons"
 msgstr "List of possible captions on icons"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maximum handled files in a directory"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1458,11 +1403,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus handles drawing the desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus uses the users home directory as the desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Only show directories in the tree sidebar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1482,7 +1429,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Reverse sort order in new windows"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Show directories first in windows"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1519,10 +1467,11 @@ msgstr ""
 "local filesystems. If set to \"never\" then it never previews sound."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1536,10 +1485,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Speed tradeoff for when to show a image files as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the directory is on a remote "
@@ -1548,10 +1497,11 @@ msgstr ""
 "use a generic icon."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Speed tradeoff for when to show the number of items in a directory. If set "
@@ -1563,15 +1513,16 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "The default sort-order for the item in the icon view. Possible values are "
 "name, size, type, modification_date, emblems."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "The default sort-order for the item in the list view. Possible values are "
 "name, size, type, and modification_date."
@@ -1620,7 +1571,8 @@ msgid "Use manual layout in new windows"
 msgstr "Use manual layout new windows"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Use tighter Layout in new windows"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1651,7 +1603,8 @@ msgstr ""
 "icon_view."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "When to show number of items in a directory"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1663,7 +1616,8 @@ msgid "When to show thumbnails of image files"
 msgstr "When to show thumbnails of image files"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Whether a custom default directory background has been set."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1822,67 +1776,81 @@ msgstr "reset"
 msgid "on the desktop"
 msgstr "on the desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Can't delete volume"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "You cannot delete a volume icon. If you want to eject the volume, please use "
 "Eject in the right-click menu of the volume."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Can't delete volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Move here"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copy here"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Link here"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancel"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Set as background for _all folders"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Set as background for _this folder"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Sorry, but you must specify a non-blank keyword for the new emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Couldn't install emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1892,20 +1860,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Sorry, but there is already an emblem named \"%s\".  Please choose a "
 "different name for it."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Couldn't install emblem"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Sorry, unable to save custom emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Sorry, unable to save custom emblem name."
 
@@ -1924,22 +1898,28 @@ msgstr "From:"
 msgid "To:"
 msgstr "To:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Error while moving."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Error while moving.\n"
 "\n"
 "\"%s\" cannot be moved because it is on a read-only disk."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Error while deleting."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1948,22 +1928,17 @@ msgstr ""
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Error while deleting.\n"
 "\n"
 "\"%s\" cannot be deleted because it is on a read-only disk."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1972,12 +1947,15 @@ msgstr ""
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Error while moving."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Error while moving.\n"
@@ -1985,12 +1963,10 @@ msgstr ""
 "\"%s\" cannot be moved because it or its parent folder are contained in the "
 "destination."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Error while moving.\n"
@@ -1998,295 +1974,244 @@ msgstr ""
 "\"%s\" cannot be moved to the Wastebasket because you do not have "
 "permissions to change it or its parent folder."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Error while copying."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Error while copying.\n"
 "\n"
 "\"%s\" cannot be copied because you do not have permissions to read it."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Error while copying."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Error while moving to \"%s\".\n"
 "\n"
 "There is not enough space on the destination."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Error while moving."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Error while linking."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Error while copying to \"%s\".\n"
 "\n"
 "You do not have permissions to write to this folder."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Error while copying to \"%s\".\n"
 "\n"
 "The destination disk is read-only."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Error while moving."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Error while linking."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Error while copying."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Error \"%s\" while moving \"%s\".\n"
+"Error \"%s\" while moving.\n"
 "\n"
 "Would you like to continue?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Error while moving."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Error \"%s\" while deleting \"%s\".\n"
+"Error \"%s\" while creating a link to \"%s\".\n"
 "\n"
 "Would you like to continue?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Error while deleting."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Error while copying."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Error while moving."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Error while linking."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Error while deleting."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Error while copying."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Error while moving."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Error while linking."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Error while deleting."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Skip"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Retry"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Could not complete specified action."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" could not be moved to the new location, because its name is already "
 "used for a special item that cannot be removed or replaced.\n"
 "\n"
 "If you still want to move \"%s\", rename it and try again."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Could not complete specified action."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" could not be copied to the new location, because its name is already "
 "used for a special item that cannot be removed or replaced.\n"
 "\n"
 "If you still want to copy \"%s\", rename it and try again."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Unable to replace file."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "File \"%s\" already exists.\n"
 "\n"
 "Would you like to replace it?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflict while copying"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Replace"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Replace All"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "link to %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "another link to %s"
@@ -2295,25 +2220,25 @@ msgstr "another link to %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst link to %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd link to %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd link to %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth link to %s"
@@ -2323,563 +2248,602 @@ msgstr "%dth link to %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copy)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (another copy)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "th copy)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st copy)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd copy)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd copy)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copy)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (another copy)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth copy)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst copy)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd copy)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd copy)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Unknown GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Moving files to the Wastebasket"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Files thrown out:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Moving"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Preparing to Move to Wastebasket..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Moving files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Files moved:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Preparing To Move..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Finishing Move..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Creating links to files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Files linked:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Linking"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Preparing to Create Links..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Finishing Creating Links..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copying files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Files copied:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copying"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Preparing To Copy..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "You cannot copy items into the Wastebasket."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Can't Copy to Wastebasket"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "You cannot move this wastebasket folder."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "You cannot copy this wastebasket folder."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Can't Change Wastebasket Location"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Can't Copy Wastebasket"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "You cannot move a folder into itself."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "You cannot copy a folder into itself."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Create a new empty folder inside this folder"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Can't Move Into Self"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Can't Copy Into Self"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "You cannot copy a file over itself."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Can't Copy Over Self"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Error creating new folder.\n"
 "\n"
 "You do not have permissions to write to the destination."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Error creating new folder.\n"
 "\n"
 "There is no space on the destination."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Error \"%s\" creating new folder."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Error creating new folder"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Error creating new folder"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "untitled folder"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Error \"%s\" creating new folder."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Error creating new folder"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Error creating new folder"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 file"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Deleting files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Files deleted:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Deleting"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Preparing to Delete files..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Emptying the Wastebasket"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparing to Empty the Wastebasket..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Are you sure you want to permanently delete all of the items in the "
 "Wastebasket?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Empty"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th copy).txt"
 
@@ -2898,64 +2862,64 @@ msgstr "foo (124th copy).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "today at 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "today at %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "today at 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "today at %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "today, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "today, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "today"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "yesterday at 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "yesterday at %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "yesterday at 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "yesterday at %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "yesterday, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "yesterday, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "yesterday"
 
@@ -2964,133 +2928,133 @@ msgstr "yesterday"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Wednesday, September 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mon, Oct 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mon, Oct 00 0000 at 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y at %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Oct 00 0000 at 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y at %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Oct 00 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 items"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 folders"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 files"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 folder"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 file"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u items"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u folders"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u files"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? items"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "unknown type"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "unknown MIME type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "unknown"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3100,7 +3064,7 @@ msgstr ""
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3109,11 +3073,11 @@ msgstr ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "link"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "link (broken)"
 
@@ -3234,11 +3198,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Search for files by file name and file properties"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Icon View"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "List View"
@@ -3382,148 +3348,153 @@ msgstr "%s's Home"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "file icon"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "editable text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "the editable label"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "additional text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "some more text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "highlighted for selection"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "whether we are highlighted for a selection"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "highlighted as keyboard focus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "whether we are highlighted to render keyboard focus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "highlighted for drop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "whether we are highlighted for a D&D drop"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "The selection rectangle"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Frame Text"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Draw a frame around unselected text"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Selection Box Colour"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Colour of the selection box"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Selection Box Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacity of the selection box"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Highlight Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacity of the highlight for selected icons"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Light Info Colour"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Colour used for information text against a dark background"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Dark Info Colour"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Colour used for information text against a light background"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it? This will clobber the stored "
 "manual layout."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them? This will clobber the stored "
 "manual layout."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave this item where you dropped it?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "This folder uses automatic layout. Do you want to switch to manual layout "
 "and leave these items where you dropped them?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Switch to Manual Layout?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Switch"
 
@@ -3632,72 +3603,72 @@ msgstr "Is the default for \"%s\" items."
 msgid "Is the default for all \"%s\" items."
 msgstr "Is the default for all \"%s\" items."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modify \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Include in the menu for \"%s\" items"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Use as default for \"%s\" items"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Include in the menu for \"%s\" only"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Use as default for \"%s\" only"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Don't include in the menu for \"%s\" items"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Name"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "C_hoose"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Done"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modify..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "File Types and Programs"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Go There"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3705,48 +3676,48 @@ msgstr ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialogue."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Open with Other Application"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Choose an application with which to open \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Open with Other Viewer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Choose a view for \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "No viewers are available for \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "No Viewers Available"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "There is no application associated with \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "No Application Associated"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "There is no action associated with \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "No Action Associated"
 
@@ -3754,11 +3725,9 @@ msgstr "No Action Associated"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3767,42 +3736,41 @@ msgstr ""
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Associate Application"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "The viewer associated with \"%s\" is invalid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Invalid Viewer Associated"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "The application associated with \"%s\" is invalid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Invalid Application Associated"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "The action associated with \"%s\" is invalid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Invalid Action Associated"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3813,108 +3781,149 @@ msgstr ""
 "this file type. Do you want to associate an application or viewer with this "
 "file type now?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Associate Action"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
-msgid ""
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
+msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations."
 msgstr ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  Would you like to choose another application?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
 "locations.  Would you like to choose another action?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Can't Open Location"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"locations.  Would you like to choose another application?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
 "locations.  No other applications are available to view this file.  If you "
 "copy this file onto your computer, you may be able to open it."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "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."
+"locations.  Would you like to choose another action?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+"locations.  No other applications are available to view this file.  If you "
+"copy this file onto your computer, you may be able to open it."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Sorry, but you can't execute commands from a remote site due to security "
 "considerations."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Can't execute remote links"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "There was an error launching the application.\n"
 "\n"
 "Details: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Error launching application"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Drop target only supports local files"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "This drop target only supports local files.\n"
 "\n"
 "To open non-local files copy them to a local folder and then drop them again."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Drop target only supports local files"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4168,14 +4177,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Items containing \"medusa\" in their names and that are folders"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Searching Disks"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus is searching your disks for wastebasket folders."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Edit"
@@ -4377,96 +4378,106 @@ msgstr "Background"
 msgid "Empty Trash"
 msgstr "Empty Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "This will open %d separate windows. Are you sure you want to do this?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Open %d Windows?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Are you sure you want to permanently delete \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "This will open %d separate windows. Are you sure you want to do this?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Are you sure you want to permanently delete \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Are you sure you want to permanently delete the %d selected items?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Delete all selected items permanently"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Delete?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Select a Category:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Patterns"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" selected"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 folder selected"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d folders selected"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (containing 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (containing 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (containing %d items)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (containing a total of 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (containing a total of 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (containing a total of %d items)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" selected (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d items selected (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 other item selected (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d other items selected (%s)"
@@ -4478,7 +4489,7 @@ msgstr "%d other items selected (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4487,121 +4498,141 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
 "will not be displayed."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Too Many Files"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" cannot be moved to the Wastebasket. Do you want to delete it "
 "immediately?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"The %d selected items cannot be moved to the Wastebasket. Do you want to "
-"delete them immediately?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" cannot be moved to the Wastebasket. Do you want to delete it "
+"immediately?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d of the selected items cannot be moved to the Wastebasket. Do you want to "
-"delete those %d items immediately?"
+"\"%s\" cannot be moved to the Wastebasket. Do you want to delete it "
+"immediately?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Delete Immediately?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Are you sure you want to permanently delete \"%s\" from the Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Delete From Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Use \"%s\" to open the selected item"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Other _Application..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "An _Application..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Other _Viewer..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "A _Viewer..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Could not complete specified action:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Could not complete specified action."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Run \"%s\" on any selected items"
 
-#: src/file-manager/fm-directory-view.c:4356
-msgid ""
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
+msgid ""
+"Choosing a script from the menu will run that script with any selected items "
+"as input."
 msgstr ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "About Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4641,185 +4672,192 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" will be moved if you select the Paste Files command"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" will be copied if you select the Paste Files command"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "The %d selected items will be moved if you select the Paste Files command"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "The %d selected items will be copied if you select the Paste Files command"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "There is nothing on the clipboard to paste."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Mount Error"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Unmount Error"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Mount Error"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_ject"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Unmount Volume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Open _in New Window"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Open _in %d New Windows"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Home Folder"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Home Folder"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Delete from Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Delete all selected items permanently"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mo_ve to Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Move each selected item to the Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Delete"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Ma_ke Links"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Ma_ke Link"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cu_t File"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cu_t Files"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copy File"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copy Files"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr ""
 "This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+"link to the Wastebasket?"
+
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
 msgstr ""
 "This link can't be used, because it has no target. Do you want to move this "
 "link to the Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to move this link to the Wastebasket?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Broken Link"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
 "contents?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Run or Display?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Display"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Run in _Terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Display"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Run"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Opening \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Cancel Open?"
 
@@ -4841,29 +4879,34 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Sorry, couldn't display all the contents of \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "The permissions of \"%s\" could not be determined."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Error Displaying Folder"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "You do not have the permissions necessary to rename \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4872,82 +4915,102 @@ msgstr ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "The name \"%s\" is not valid. Please use a different name."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 "Couldn't change the name of \"%s\" because it is on a read-only disk"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sorry, couldn't rename \"%s\" to \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "The permissions of \"%s\" could not be determined."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Renaming Error"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "You do not have the permissions necessary to change the group of \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "Couldn't change the group of \"%s\" because it is on a read-only disk"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sorry, couldn't change the group of \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "The permissions of \"%s\" could not be determined."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Error Setting Group"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Couldn't change the owner of \"%s\" because it is on a read-only disk"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sorry, couldn't change the owner of \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "The permissions of \"%s\" could not be determined."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Error Setting Owner"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sorry, couldn't change the permissions of \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "The permissions of \"%s\" could not be determined."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Error Setting Permissions"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renaming \"%s\" to \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Cancel Rename?"
 
@@ -5005,128 +5068,150 @@ msgstr "Restore Icons' Original Si_zes"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Restore Icon's Original Si_ze"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pointing at \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Drag and drop is only supported to local file systems."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Drag and drop is only supported to local file systems."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Drag and Drop error"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "An invalid drag type was used."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "File name"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Size"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Date Modified"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "More Than One Image"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Local Images Only"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"The file that you dropped is not an image.  You can only use local images as "
+"The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Images Only"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Properties"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Properties"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Cancel Group Change?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Changing group"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Cancel Owner Change?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Changing owner"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nothing"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "unreadable"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, with size %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d items, totalling %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(some contents unreadable)"
 
@@ -5136,191 +5221,191 @@ msgstr "(some contents unreadable)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Contents:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Basic"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Names:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Name:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Size:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Location:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Free space:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Link target:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME type:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modified:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Accessed:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Select Custom Icon..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Remove Custom Icon"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Read"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Write"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xecute"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Set _user ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Special flags:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Set gro_up ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permissions"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "You are not the owner, so you can't change these permissions."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "File owner:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "File owner:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_File group:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "File group:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Owner:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Group:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Others:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Text view:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Number view:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Last changed:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "The permissions of \"%s\" could not be determined."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "The permissions of the selected file could not be determined."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "There was an error displaying help: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Couldn't show help"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Cancel Showing Properties Window?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Creating Properties window"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Select an icon"
 
@@ -5338,71 +5423,110 @@ msgid "Search Results"
 msgstr "Search Results"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Sorry, but the medusa search service is not available."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Search Service Not Available"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"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."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Search for items that are too new"
 
-#: src/file-manager/fm-search-list-view.c:200
-msgid ""
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
 "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."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
+msgid ""
+"You can check the spelling on your selections or add more criteria to narrow "
+"your results."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Error during search"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Error reading file index"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "An error occurred while loading this search's contents: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5410,25 +5534,23 @@ msgstr ""
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Fast searches are not available"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Content searches are not available"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5442,56 +5564,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indexed searches are not available"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Fast searches are not enabled on your computer"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5501,11 +5655,12 @@ msgstr ""
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Fast searches are not available"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Where"
 
@@ -5514,7 +5669,7 @@ msgstr "Where"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Reveal in New Window"
@@ -5525,7 +5680,7 @@ msgstr "_Reveal in New Window"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Reveal in %d _New Windows"
@@ -5534,15 +5689,21 @@ msgstr "Reveal in %d _New Windows"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
 "Nautilus found more search results than it can display. Some matching items "
 "will not be displayed. "
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus found more search results than it can display. Some matching items "
 "will not be displayed. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Too Many Matches"
 
@@ -5557,12 +5718,12 @@ msgid "Create L_auncher"
 msgstr "New L_auncher"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Create a new launcher"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Delete all items in the Wastebasket"
 
@@ -5583,7 +5744,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Use _Default Background"
@@ -5606,57 +5767,67 @@ msgstr "Choose another viewer with which to view the selected item"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Home Folder"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Home Folder"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Create a new empty folder inside this folder"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Create a new empty folder inside this folder"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Create a symbolic link for each selected item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplicate"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Delete each selected item, without moving to the Wastebasket"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplicate each selected item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Edit Launcher"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Edit the launcher information"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Format the selected volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medi_a Properties"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Unmount the selected volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5664,129 +5835,138 @@ msgid ""
 msgstr ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Open Wit_h"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Open each selected item in a new window"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Open _in New Window"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Open the selected item in this window"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Prepare the selected files to be copied with a Paste Files command"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Prepare the selected files to be moved with a Paste Files command"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_ect"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Protect the selected volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Rename selected item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Reset View to _Defaults"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Reset sorting order and zoom level to match preferences for this view"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Run or manage scripts from ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Select _All Files"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Patterns"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Select all items in this window"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Select all items in this window"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Show media properties for the selected volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Show the folder containing the scripts that appear in this menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Unmount the selected volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Use the default background for this location"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "View or modify the properties of each selected item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copy File"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Format"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Unmount Volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Open"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Open Scripts Folder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Paste Files"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "_Paste Files"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Properties"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5871,7 +6051,12 @@ msgstr "_Manually"
 msgid "Indexing is %d%% complete."
 msgstr "Indexing is %d%% complete."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Your files were last indexed at %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5879,25 +6064,29 @@ msgstr ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexing Status"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Your files were last indexed at %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"fast. "
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "There is no index of your files right now."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5907,15 +6096,19 @@ msgstr ""
 "Fast searching is not enabled on your computer, so you do not have an index "
 "right now."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Sorry, but the medusa search service is not available."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5939,32 +6132,37 @@ msgstr "Show _Indexing Status"
 msgid "Show status of indexing used when searching"
 msgstr "Show status of indexing used when searching"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Couldn't Create Required Folder"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Couldn't Create Required Folders"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus could not create the required folder \"%s\". Before running "
 "Nautilus, please create this folder, or set permissions such that Nautilus "
 "can create it."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Couldn't Create Required Folders"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5975,23 +6173,27 @@ msgstr ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Link To Old Desktop"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 #, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "The location of the desktop directory has changed in Gnome 2.4. A link "
 "called \"Link To Old Desktop\" has been created on the desktop. You can open "
 "this to move over the files you want, then delete the link."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Migrated old desktop"
 
 #. Can't register myself due to trouble locating the
@@ -6004,7 +6206,7 @@ msgstr "Migrated old desktop"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6015,7 +6217,7 @@ msgstr ""
 "installing Nautilus again."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6061,12 +6263,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus can't be used now, due to an unexpected error."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6074,7 +6276,7 @@ msgstr ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6084,7 +6286,7 @@ msgstr ""
 "attempting to locate the factory.Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6094,6 +6296,17 @@ msgstr ""
 "attempting to locate the shell object. Killing bonobo-activation-server and "
 "restarting Nautilus may help fix the problem."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"There was an error displaying help: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "No bookmarks defined"
@@ -6127,35 +6340,45 @@ msgstr "Fewer Options"
 msgid "Find Them!"
 msgstr "Find Them!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Can't Move Into Self"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Sorry, but \"%s\" is not a valid file name."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Couldn't find \"%s\". Please check the spelling and try again."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Network Servers"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Name:"
+msgid "_Location:"
+msgstr "Location:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Connect"
@@ -6356,6 +6579,20 @@ msgstr ""
 "\n"
 "You can manually erase this file to present the druid again.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"You can't assign more than one custom icon at a time! Please drag just one "
+"image to set a custom icon."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"The file that you dropped is not local.  You can only use local images as "
+"custom icons."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6366,26 +6603,25 @@ msgstr "Open with %s"
 msgid "Open with..."
 msgstr "Open with..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Unable to launch the cd burner application:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Can't launch cd burner"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Empty _Trash"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Write contents to CD"
 
@@ -6393,37 +6629,37 @@ msgstr "_Write contents to CD"
 msgid "Go To:"
 msgstr "Go To:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Do you want to view these %d locations in separate windows?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "View in Multiple Windows?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Can't Open Location"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Perform a quick set of self-check tests."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Create the initial window with the given geometry."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Only create windows for explicitly specified URIs."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6431,81 +6667,94 @@ msgstr ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialogue)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Quit Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Restart Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "File Manager"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check cannot be used with URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check cannot be used with other options.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit cannot be used with URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart cannot be used with URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry cannot be used with more than one 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Are you sure you want to permanently delete \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Are you sure you want to forget history? If you do, you will be doomed to "
 "repeat it."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Are you sure you want to clear the list of locations you have visited?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Clear History"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "The location \"%s\" does not exist. Do you want to remove any bookmarks with "
 "this location from your list?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "The location \"%s\" no longer exists."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bookmark for Nonexistent Location"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Remove"
 
@@ -6538,7 +6787,6 @@ msgid "Close _All Windows"
 msgstr "Close _All Windows"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Close all Nautilus windows"
@@ -6561,107 +6809,118 @@ msgid "Forward"
 msgstr "Forward"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Go to the wastebasket folder"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Go to the next visited location"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Go to the previous visited location"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Go to the wastebasket folder"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Location _Bar"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Reload"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Search this computer for files"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_atusbar"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Up"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Write to CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Add Bookmark"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Back"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Clear History"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Countertop"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Edit Bookmarks"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Forward"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Go"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Location..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Side Pane"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Trash"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Up"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_View"
 
@@ -6679,34 +6938,39 @@ msgstr "View as..."
 msgid "File Browser: %s"
 msgstr "File owner:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "One of the sidebar panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "The %s view encountered an error while starting up."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "The %s sidebar panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Sidebar Panel Failed"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Side Pane"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contains a side pane view"
 
@@ -6740,147 +7004,180 @@ msgstr "_Add new..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Sorry, but pattern %s couldn't be deleted."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Couldn't delete pattern"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Sorry, but emblem %s couldn't be deleted."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Couldn't remove emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Create a New Emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Keyword:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Image:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Select an image file for the new emblem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Create a New Colour:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Colour _name:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Colour _value:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Sorry, but \"%s\" is not a valid file name."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Sorry, but you did not supply a valid file name."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Couldn't install pattern"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sorry, but you can't replace the reset image."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Not an Image"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Sorry, but the pattern %s couldn't be installed."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Select an image file to add as a pattern"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sorry, but you must specify a non-blank name for the new colour."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Couldn't install colour"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Select a colour to add"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Sorry, but '%s' is not a usable image file!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "The file '%s' does not appear to be a valid image."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Select a Category:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_ancel Remove"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Add a New Pattern..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Add a New Colour..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Add a New Emblem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Click on a pattern to remove it"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Click on a colour to remove it"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Click on an emblem to remove it"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patterns:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Colours:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblems:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Remove a Pattern..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Remove a Colour..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Remove an Emblem..."
 
@@ -7271,34 +7568,39 @@ msgstr "_CD Creator"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Close _All Windows"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Close the side pane"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Go to Empty CD folder"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Go to the wastebasket folder"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Location..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]folders"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Patterns"
@@ -7328,10 +7630,13 @@ msgid "View Failed"
 msgstr "View Failed"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "The %s view encountered an error while starting up."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "The %s view encountered an error and can't continue. You can choose another "
 "view or go to a different location."
@@ -7341,98 +7646,128 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "The %s view encountered an error while starting up."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "The NautilusApplication associated with this window."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Content View"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "View of the current file or folder"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Couldn't find \"%s\". Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Couldn't add emblems"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus cannot display \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
 "it is."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus has no installed viewer capable of displaying \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Couldn't display \"%s\", because the attempt to log in failed."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Couldn't display \"%s\", because access was denied."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
 "the spelling is correct and that your proxy settings are correct."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Couldn't display \"%s\", because the host name was empty. Check that your "
 "proxy settings are correct."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
-"browser.\n"
-"Check that an SMB server is running in the local network."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
+"search service isn't running."
+msgstr ""
+"Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
 "search service, and if you don't have an index, that the Medusa indexer is "
 "running."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
 "search service, and if you don't have an index, that the Medusa indexer is "
 "running."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Searching Unavailable"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus cannot display \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Can't Display Location"
 
@@ -7444,7 +7779,7 @@ msgstr "Go to the location specified by this bookmark"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7452,11 +7787,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Translator Credits"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7472,39 +7807,43 @@ msgstr "Go back a few pages"
 msgid "Go forward a number of pages"
 msgstr "Go forward a number of pages"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Display this location with \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Dots"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD Creator"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Application ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "The application ID of the window."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Application"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "The NautilusApplication associated with this window."
 
@@ -7540,6 +7879,245 @@ msgstr "Network Servers"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "View your network servers in the Nautilus file manager"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory for hardware view"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Hardware Viewer"
+
+#~ msgid "Hardware view"
+#~ msgstr "Hardware view"
+
+#~ msgid "View as Hardware"
+#~ msgstr "View as Hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "hardware view"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "name of icon for the hardware view"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "summary of hardware info"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+
+#~ 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 "Uptime is %d days, %d hours, %d minutes"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Hardware Overview"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "This is a placeholder for the CPU page."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "This is a placeholder for the RAM page."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "This is a placeholder for the IDE page."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Can't Copy to Wastebasket"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Searching Disks"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus is searching your disks for wastebasket folders."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "The %d selected items cannot be moved to the Wastebasket. Do you want to "
+#~ "delete them immediately?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d of the selected items cannot be moved to the Wastebasket. Do you want "
+#~ "to delete those %d items immediately?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+
+#~ 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 ""
+#~ "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
+#~ "browser.\n"
+#~ "Check that an SMB server is running in the local network."
+
+#~ msgid "file icon"
+#~ msgstr "file icon"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Name:"
+
 #~ msgid "Unknown"
 #~ msgstr "Unknown"
 
@@ -7656,8 +8234,5 @@ msgstr "View your network servers in the Nautilus file manager"
 #~ msgid "_Toolbar"
 #~ msgstr "_Toolbar"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "The location \"%s\" no longer exists."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Go to Nonexistent Location"
diff --git a/po/es.po b/po/es.po
index 960cc045c..eac1d0aa5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,3 +1,4 @@
+# translation of es.po to Spanish
 # translation of nautilus.HEAD.po to Spanish
 # Nautilus' Spanish translation file.
 # Copyright © 2000-2003 Free Software Foundation, Inc.
@@ -6,20 +7,20 @@
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000,2002.
 # Ismael Olea <ismael@olea.org>, 2001.
 # Jorge Carrasquilla Soares <jorge@conectiva.com.br>, 2000.
-# Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-31 20:34+0100\n"
-"PO-Revision-Date: 2003-11-01 01:51+0100\n"
-"Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
+"Project-Id-Version: Nautilus.HEAD\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2004-01-02 02:28+0100\n"
+"Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 1.0.2\n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
@@ -35,7 +36,7 @@ msgid ""
 "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
 "look like Nautilus Views"
 msgstr ""
-"Fábrica para objetos que ajustan controles Bonobo ordinarios o incrustables "
+"Fábrica para objetos que ajustan controles Bonobo ordinarios o empotrables "
 "para que se vean como Vistas Nautilus"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:4
@@ -48,8 +49,8 @@ msgstr "bonobo_ui_init() ha fallado."
 
 # src/file-manager/fm-properties-window.c:1237
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2385
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -62,57 +63,67 @@ msgstr "Panel lateral de emblemas de Nautilus"
 msgid "Nautilus Emblem view"
 msgstr "Vista de emblemas de Nautilus"
 
+# components/services/install/lib/eazel-install-protocols.c:116
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "No se ha podido quitar el emblema con nombre «%s»."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"No se ha podido quitar el emblema llamado «%s». Probablemente esto se deba a "
-"que es un emblema permanente, y no ha sido añadido por usted."
+"Probablemente esto se deba a que es un emblema permanente, y no uno que haya "
+"sido añadido por usted."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "No se ha podido quitar el emblema"
 
-#: components/emblem/nautilus-emblem-view.c:238
+# components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "No se ha podido renombrar el emblema con el nombre «%s»."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"No se ha podido renombrar el emblema llamado «%s». Probablemente esto se "
-"deba a que es un emblema permanente, y no uno añadido por usted."
+"Probablemente esto se deba a que es un emblema permanente, y no uno que haya "
+"sido añadido por usted."
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "No se ha podido renombrar el emblema"
 
 # src/nautilus-property-browser.c:2014
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Renombrar el emblema"
 
 # src/nautilus-property-browser.c:875
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Introduzca un nombre nuevo para el emblema mostrado:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Renombrar"
 
 # src/nautilus-property-browser.c:1987
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Añadir emblemas..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -120,152 +131,66 @@ msgstr ""
 "Introduzca un nombre descriptivo junto con cada emblema. Este nombre será "
 "usado en otros lugares para identificar al emblema."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
-"Introduzca un nombre descriptivo junto con cada emblema. Este nombre será "
+"Introduzca un nombre descriptivo junto con el emblema. Este nombre será "
 "usado en otros lugares para identificar al emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Algunos de los archivos no han podido ser añadidos como emblemas porque no "
-"parecen ser imágenes válidas."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Algunos de los archivos no han podido ser añadidos como emblemas."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Los emblemas no parecen ser imágenes válidas."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "No se han podido añadir los emblemas"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Ninguno de los archivos ha podido ser añadidos como emblemas debido a que no "
-"parecen ser imágenes válidas."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Ninguno de los archivos pudo ser añadido como emblemas."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "El emblema no pudo añadirse."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
-msgstr "El texto arrastrado no fue una dirección de archivo válida."
+msgstr "El texto arrastrado no fue una ubicación de archivo válida."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "No se ha podido añadir el emblema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "El archivo «%s» no parece ser una imagen válida."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "El archivo arrastrado no parece ser una imagen válida."
 
 # components/music/nautilus-music-view.c:1146
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Borrar"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fábrica para vista de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visor de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vista de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Ver como hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vista de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nombre del icono para la vista de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "resumen de información sobre hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"CPU %s\n"
-"%s MHz\n"
-"%s Kb de memoria caché"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Gb de RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu Mb de RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Gb"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mb"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "El tiempo en funcionamiento es de %d días, %d horas, %d minutos"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Visión general del hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Esto es un contenedor para colocar la página de la CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Esto es un contenedor para colocar la página de RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Esto es un contenedor para la página IDE."
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-search-bar-criterion.c:134
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Histórico"
@@ -343,15 +268,15 @@ msgstr "Con flash"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr "Lente focal"
+msgstr "Longitud focal"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Velocidad de obturación"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr "Velocidad ISO"
+msgstr "Tasa de velocidad ISO"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -397,8 +322,6 @@ msgstr "Panel lateral de notas para Nautilus"
 msgid "Factory for text view"
 msgstr "Fábrica para la vista de texto"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/music/nautilus-music-view.c:1170
 #: components/text/Nautilus_View_text.server.in.in.h:2
 msgid "Text"
 msgstr "Texto"
@@ -411,7 +334,7 @@ msgstr "Visor de texto"
 # src/file-manager/fm-properties-window.c:1563
 #: components/text/Nautilus_View_text.server.in.in.h:4
 msgid "Text view"
-msgstr "Vista texto"
+msgstr "Vista de texto"
 
 #: components/text/Nautilus_View_text.server.in.in.h:5
 msgid "Text view factory"
@@ -463,7 +386,7 @@ msgstr "pulsador"
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:3
 msgid "throbber factory"
-msgstr "fábrica para pulsador"
+msgstr "fábrica de pulsadores"
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:4
 msgid "throbber object factory"
@@ -498,15 +421,15 @@ msgstr "Cargando..."
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: components/tree/nautilus-tree-view.c:542 nautilus.desktop.in.h:1
+#: components/tree/nautilus-tree-view.c:529 nautilus-home.desktop.in.h:1
 msgid "Home Folder"
-msgstr "Carpeta inicio"
+msgstr "Carpeta personal"
 
-#: components/tree/nautilus-tree-view.c:544
+#: components/tree/nautilus-tree-view.c:531
 msgid "Filesystem"
 msgstr "Sistema de archivos"
 
-#: components/tree/nautilus-tree-view.c:546
+#: components/tree/nautilus-tree-view.c:533
 msgid "Network Neighbourhood"
 msgstr "Entorno de red"
 
@@ -518,7 +441,7 @@ msgstr "Aplicaciones"
 
 #: data/applications.desktop.in.h:2
 msgid "Browse available software"
-msgstr "Visualizar el software disponible"
+msgstr "Examinar el software disponible"
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
@@ -542,7 +465,7 @@ msgstr "Negro"
 
 #: data/browser.xml.h:5
 msgid "Blue Ridge"
-msgstr "Azul cordillera"
+msgstr "Rayado azul"
 
 #: data/browser.xml.h:6
 msgid "Blue Rough"
@@ -550,7 +473,7 @@ msgstr "Azul arrugado"
 
 #: data/browser.xml.h:7
 msgid "Blue Type"
-msgstr "Azul tipo"
+msgstr "Letras azules"
 
 # libnautilus-private/nautilus-global-preferences.c:142
 #: data/browser.xml.h:8
@@ -559,23 +482,16 @@ msgstr "Metal pintado"
 
 #: data/browser.xml.h:9
 msgid "Bubble Gum"
-msgstr "Goma de mascar"
+msgstr "Chicle"
 
 #: data/browser.xml.h:10
 msgid "Burlap"
 msgstr "Arpillera"
 
-# src/nautilus-window.c:1267
 #: data/browser.xml.h:11
 msgid "C_olors"
 msgstr "C_olores"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1196
-# libnautilus-private/nautilus-search-bar-criterion.c:42
-# src/file-manager/fm-list-view.c:1581
-# src/file-manager/fm-search-list-view.c:140
-# src/nautilus-bookmarks-window.c:172
 #: data/browser.xml.h:12
 msgid "Camera"
 msgstr "Cámara"
@@ -595,7 +511,7 @@ msgstr "Tiza"
 
 #: data/browser.xml.h:16
 msgid "Charcoal"
-msgstr "Carbón"
+msgstr "Tizón"
 
 # libnautilus-private/nautilus-search-bar-criterion.c:43
 #: data/browser.xml.h:17
@@ -611,9 +527,10 @@ msgstr "Divertido"
 msgid "Cork"
 msgstr "Corcho"
 
+# Sin traducción al castellano
 #: data/browser.xml.h:20
 msgid "Countertop"
-msgstr "Contador"
+msgstr "Abstracto"
 
 # libnautilus-private/nautilus-program-chooser.c:1262
 #: data/browser.xml.h:21
@@ -631,7 +548,7 @@ msgstr "Corcho oscuro"
 
 #: data/browser.xml.h:24
 msgid "Dark GNOME"
-msgstr "GNOME oscuro"
+msgstr "Gnome oscuro"
 
 #: data/browser.xml.h:25
 msgid "Deep Teal"
@@ -658,15 +575,15 @@ msgstr "Borrador"
 
 #: data/browser.xml.h:30
 msgid "Drag a color to an object to change it to that color"
-msgstr "Arrastre un color hacia un objeto para cambiarle el color"
+msgstr "Arrastre un color sobre un objeto para colorearlo"
 
 #: data/browser.xml.h:31
 msgid "Drag a pattern tile to an object to change it"
-msgstr "Arrastre un mosaico de patrón hacia un objeto para cambiarlo"
+msgstr "Arrastre un patrón de mosaico sobre un objeto para cambiarlo"
 
 #: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "Arrastre un emblema hacia un objeto para adherirlo al objeto"
+msgstr "Arrastre un emblema sobre un objeto para pegarlo al objeto"
 
 #: data/browser.xml.h:33
 msgid "Eclipse"
@@ -676,20 +593,17 @@ msgstr "Eclipse"
 msgid "Envy"
 msgstr "Verde envidia"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1577
 #: data/browser.xml.h:36
 msgid "Favorite"
 msgstr "Favorito"
 
-# src/file-manager/fm-properties-window.c:1566
 #: data/browser.xml.h:37
 msgid "Fibers"
 msgstr "Fibras"
 
 #: data/browser.xml.h:38
 msgid "Fire Engine"
-msgstr "Auto-bomba"
+msgstr "Rojo bomberos"
 
 #: data/browser.xml.h:39
 msgid "Fleur De Lis"
@@ -705,7 +619,7 @@ msgstr "Fósil"
 
 #: data/browser.xml.h:42 icons/gnome/gnome.xml.h:2
 msgid "GNOME"
-msgstr "GNOME"
+msgstr "Gnome"
 
 # src/file-manager/fm-properties-window.c:1577
 #: data/browser.xml.h:43
@@ -759,7 +673,7 @@ msgstr "Papel manila"
 
 #: data/browser.xml.h:54
 msgid "Moss Ridge"
-msgstr "Colina de musgo"
+msgstr "Rayado musgo"
 
 #: data/browser.xml.h:55
 msgid "Mud"
@@ -788,7 +702,7 @@ msgstr "Franjas de océano"
 
 #: data/browser.xml.h:61
 msgid "Oh No"
-msgstr "Oh No"
+msgstr "¡Oh no!"
 
 #: data/browser.xml.h:62
 msgid "Onyx"
@@ -810,7 +724,7 @@ msgstr "Azul pálido"
 # src/file-manager/fm-properties-window.c:1493
 #: data/browser.xml.h:66
 msgid "Personal"
-msgstr "Personal"
+msgstr "Privado"
 
 #: data/browser.xml.h:67
 msgid "Pictures"
@@ -841,7 +755,7 @@ msgstr "Espuma del mar"
 
 #: data/browser.xml.h:73
 msgid "Shale"
-msgstr "Pizarra"
+msgstr "Esquisto"
 
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
@@ -857,12 +771,12 @@ msgstr "Cielo"
 
 #: data/browser.xml.h:76
 msgid "Sky Ridge"
-msgstr "Franjas de cielo"
+msgstr "Rayas azul cielo"
 
 # src/nautilus-window-menus.c:1303
 #: data/browser.xml.h:77
 msgid "Snow Ridge"
-msgstr "Colina nevada"
+msgstr "Rayas blanco nevado"
 
 # libnautilus-private/nautilus-global-preferences.c:640
 #: data/browser.xml.h:78
@@ -939,7 +853,7 @@ msgstr "Ajusta su entorno de usuario"
 # src/nautilus-first-time-druid.c:272
 #: data/preferences.desktop.in.h:2
 msgid "Desktop Preferences"
-msgstr "Preferencias del escritorio "
+msgstr "Preferencias del escritorio"
 
 #: data/serverconfig.desktop.in.h:1
 msgid "Configure network services (web server, DNS server, etc.)"
@@ -957,7 +871,7 @@ msgstr "Configurar servicios de red"
 #: data/starthere-link.desktop.in.h:1 data/starthere.desktop.in.h:1
 #: data/starthere.directory.in.h:1
 msgid "Start Here"
-msgstr "Empezar aquí"
+msgstr "Empiece aquí"
 
 # libnautilus-private/nautilus-search-bar-criterion.c:45
 #: data/static_bookmarks.xml.h:1
@@ -1012,12 +926,16 @@ msgstr "Freshmeat.net"
 
 #: data/static_bookmarks.xml.h:13
 msgid "GNOME.org"
-msgstr "GNOME.org"
+msgstr "Gnome.org"
 
 #: data/static_bookmarks.xml.h:14
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacional"
@@ -1141,8 +1059,7 @@ msgstr "Zero-Knowledge"
 
 #: data/sysconfig.desktop.in.h:1 data/sysconfig.directory.in.h:1
 msgid "Change systemwide settings (affects all users)"
-msgstr ""
-"Cambia las preferencias globales del sistema (afecta a todos los usuarios)"
+msgstr "Cambia las preferencias globales del sistema (afecta a todos los usuarios)"
 
 #: data/sysconfig.desktop.in.h:2 data/sysconfig.directory.in.h:2
 msgid "System Settings"
@@ -1150,7 +1067,7 @@ msgstr "Opciones del sistema"
 
 #: icons/crux_eggplant/crux_eggplant.xml.h:1
 msgid "An Eggplant variation of the Crux theme."
-msgstr "Una variación berenjena del tema Crux"
+msgstr "Una variación berenjena del tema Crux."
 
 #: icons/crux_eggplant/crux_eggplant.xml.h:2
 msgid "Crux-Eggplant"
@@ -1175,7 +1092,7 @@ msgstr "Este es el tema predeterminado para Nautilus."
 
 #: icons/gnome/gnome.xml.h:1
 msgid "A theme designed to fit well with the classic GNOME environment."
-msgstr "Un tema diseñado para encajar bien con el entorno clásico de GNOME."
+msgstr "Un tema diseñado para combinar bien con el entorno clásico de Gnome."
 
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
@@ -1194,11 +1111,11 @@ msgstr "Tahoe"
 
 #: icons/tahoe/tahoe.xml.h:2
 msgid "This theme uses photo-realistic folders."
-msgstr "Este tema utiliza fotos realistas de carpetas."
+msgstr "Este tema utiliza carpetas fotorealísticas."
 
 #: libbackground/preview-file-selection.c:207
 msgid "Can't find an hbox, using a normal file selection"
-msgstr "No se puede encontrar un hbox, usando un selector normal de archivos"
+msgstr "No se puede encontrar un hbox, usando una selección normal de archivos"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1122
@@ -1215,7 +1132,7 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
-"Una lista de descripciones debajo de un icono en la vista de icono y el "
+"Una lista de descripciones bajo un icono en la vista de icono y el "
 "escritorio. El número actual de descripciones mostradas depende del nivel de "
 "ampliación. Los valores posibles son «size», «type», «date_modified», "
 "«date_changed» «date_accessed» «owner», «group», «permissions», "
@@ -1230,10 +1147,14 @@ msgid "Bring up a new window for every opened file"
 msgstr "Lanzar una ventana nueva por cada archivo abierto"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-msgid "Criteria for search bar searching"
-msgstr "Criterio de búsqueda para la barra de búsqueda."
+msgid "Computer icon visible on desktop"
+msgstr "Icono del equipo visible en el escritorio"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
+msgid "Criteria for search bar searching"
+msgstr "Criterio de búsqueda para la barra de búsqueda"
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 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. "
@@ -1245,101 +1166,87 @@ msgstr ""
 "de archivo solamente. Si está definido como «search_by_text_and_properties» "
 "entonces Nautilus buscará los archivos por su nombre y propiedades."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Tema actual de Nautilus (obsoleto)"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Custom Background Set"
 msgstr "Configuración del fondo personalizado"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Custom Side Pane Background Set"
 msgstr "Configuración del fondo personalizado del panel lateral"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Color"
 msgstr "Color de fondo predeterminado"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Default Background Filename"
 msgstr "Nombre del archivo de fondo predeterminado"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Default Side Pane Background Color"
 msgstr "Color de fondo predeterminado del panel lateral"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default Side Pane Background Filename"
 msgstr "Nombre de archivo del fondo predeterminado del panel lateral"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Default folder viewer"
 msgstr "Visor predeterminado de la carpeta"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Default icon zoom level"
 msgstr "Nivel de ampliación predeterminado del icono"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default list zoom level"
 msgstr "Nivel de ampliación predeterminado de la lista"
 
 # libnautilus-private/nautilus-program-chooser.c:228
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default sort order"
-msgstr "Criterio de ordenación predeterminado"
+msgstr "Orden de colocación predeterminado"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default zoom level used by the icon view."
 msgstr "Nivel de ampliación predeterminado usado por la vista de iconos."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default zoom level used by the list view."
 msgstr "Nivel de ampliación predeterminado usado por la vista de lista."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Desktop font"
 msgstr "Tipografía del escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Desktop home icon name"
-msgstr "Nombre del icono del directorio personal del escritorio"
+msgstr "Nombre del icono de la carpeta personal del escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Desktop trash icon name"
 msgstr "Nombre del icono de la papelera del escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Los directorios por encima de este tamaño serán truncados aproximadamente a "
-"este valor. El propósito de esto es evitar que accidentalmente se desborde "
-"la pila y Nautilus se cierre en los directorios gigantescos. Un valor "
-"negativo anula este límite. El límite es aproximado debido a la lectura de "
-"directorios en forma completa."
-
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Enable 'special' flags in file preferences dialog"
-msgstr ""
-"Activar los atributos «especiales» en el diálogo de preferencias de archivo"
+msgstr "Activar los atributos «especiales» en el diálogo de preferencias de archivo"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Nombre de archivo para el fondo de directorio predeterminado. Sólo es "
-"utilizado si «set_background» es «true»."
+"Nombre de archivo para el fondo de carpeta predeterminado. Sólo es utilizado "
+"si «background_set» es «true»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
@@ -1350,48 +1257,60 @@ msgstr ""
 "utilizado si «side_pane_background_set» es «true»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Las carpetas por encima de este tamaño serán truncadas aproximadamente a "
+"este tamaño. El propósito de esto es evitar que accidentalmente se desborde "
+"la pila y Nautilus se cierre en las carpetas gigantescas. Un valor negativo "
+"anula este límite. El límite es aproximado debido a la lectura de carpetas "
+"en forma de bloques."
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Ocultar los marcadores predeterminados en el menú de marcadores"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Home icon visible on desktop"
-msgstr "Icono del directorio personal visible en el escritorio"
+msgstr "Icono de la carpeta personal visible en el escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
-"Si está definido como «true» Nautilus mostrará sólo los directorios en el "
-"árbol del panel lateral. De otro modo mostrará tanto los directorios como "
-"los archivos."
+"Si está definido como «true» Nautilus mostrará sólo las carpetas en el árbol "
+"del panel lateral. De otro modo mostrará tanto las carpetas como los "
+"archivos."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
-msgid ""
-"If set to true, newly opened windows will have the location bar visible."
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+msgid "If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "Si está definido como «true», las ventanas nuevas abiertas tendrán la barra "
 "de dirección visible."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr ""
 "Si esta definido como «true» la ventas nuevas abiertas tendrán el panel "
 "lateral visible."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "If set to true, newly opened windows will have the status bar visible."
 msgstr ""
 "Si está definido como «true» las ventas nuevas abiertas tendrán la barra de "
 "estado visible."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr ""
 "Si está definido como «true» las ventanas nuevas abiertas tendrán la barra "
 "de herramientas visible."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
 "If set to true, then Nautilus lets you edit some of the more esoteric "
 "options of a file in the file preferences dialog."
@@ -1400,15 +1319,15 @@ msgstr ""
 "de las opciones más raras de un archivo en el diálogo de preferencias de "
 "archivo."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
-"Si está definido como «true» entonces Nautilus mostrará a los directorios "
-"por delante de los archivos en las vistas de iconos y lista."
+"Si está definido como «true» entonces Nautilus mostrará las carpetas por "
+"delante de los archivos en las vistas de iconos y lista."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
@@ -1416,7 +1335,7 @@ msgstr ""
 "Si esta definido como «true» entonces Nautilus solicitará una confirmación "
 "cuando intente colocar archivos en la papelera."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid ""
 "If set to true, then Nautilus will bring up a new Nautilus window by default "
 "whenever an item is opened."
@@ -1424,13 +1343,13 @@ msgstr ""
 "Si está definido como «true» entonces Nautilus abrirá una ventana nueva de "
 "Nautilus de forma predeterminada cunado un elemento sea abierto."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr ""
 "Si está definido como «true» entonces Nautilus dibujará los iconos en el "
 "escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 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 "
@@ -1440,7 +1359,7 @@ msgstr ""
 "permitirá eliminar un archivo inmediatamente en lugar de moverlo a la "
 "papelera. Esta característica puede ser peligrosa, así que tenga cuidado."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "If set to true, then Nautilus will just show the user's bookmarks in the "
 "bookmark menu."
@@ -1448,35 +1367,35 @@ msgstr ""
 "Si está definido como «true» entonces Nautilus sólo mostrará los marcadores "
 "del usuario en el menú de marcadores."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
-"Si está definido como «true» entonces Nautilus usará el directorio personal "
-"del usuario como escritorio. Si está definido como «false» entonces "
-"utilizará ~/Desktop como el escritorio."
+"Si está definido como «true» entonces Nautilus usará la carpeta personal del "
+"usuario como escritorio. Si está definido como «false» entonces utilizará ~/"
+"Desktop como el escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 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 "
 "files."
 msgstr ""
-"Si está definido como «true» entonces los archivos de respaldo como los que "
-"crea Emacs serán mostrados. Actualmente sólo los archivos que terminan con "
+"Si está definido como «true» entonces se mostrarán los archivos de respaldo "
+"(como los que crea Emacs). Actualmente sólo los archivos que terminan con "
 "una tilde (~) son considerados archivos de respaldo."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Si está definido como «true» los archivos ocultos serán mostrados en el "
 "administrador de archivos. Los archivos ocultos son archivos que comienzan "
-"con un punto o que están listados en el archivo «.hidden» del directorio."
+"con un punto o que están listados en el archivo «.hidden» de la carpeta."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 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."
@@ -1485,15 +1404,23 @@ msgstr ""
 "se inicia. Esto significa que será iniciado la próxima vez que inicie su "
 "sesión."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the computer location will be put "
+"on the desktop."
+msgstr ""
+"Si está definido como «true» se colocará un icono enlazado con la ubicación "
+"del equipo en el escritorio."
+
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+msgid ""
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Si está definido como «true» se colocará en el escritorio un icono de enlace "
-"al directorio personal en el escritorio."
+"a la carpeta personal en el escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
@@ -1501,7 +1428,7 @@ msgstr ""
 "Si está definido como «true» se colocará un icono enlazado a la papelera en "
 "el escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 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 "
@@ -1511,7 +1438,7 @@ msgstr ""
 "ordenados en sentido inverso. ej. si son ordenados por nombre entonces en "
 "vez de ordenarlos de la «a» a la «z» serán ordenados de «z» a la «a»."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 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 "
@@ -1524,26 +1451,25 @@ msgstr ""
 "son ordenados por tamaño en lugar de ser ordenados incrementalmente serán "
 "ordenados decrementalmente."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
-msgid "If true, icons will be layed out tighter by default in new windows."
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Si está definido como «true» los iconos serán distribuidos por omisión más "
 "juntos en las ventanas nuevas."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid ""
-"If true, labels will be placed beside icons rather than underneath them."
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
+msgid "If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
 "Si es «true» las etiquetas serán colocadas a los lados de los iconos en "
-"lugar de por debajo de estos."
+"lugar de por debajo de éstos."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If true, new windows will use manual layout by default."
 msgstr ""
-"Si está definido como «true» las ventanas nuevas usarán una distribución "
+"Si está definido como «true» las ventanas nuevas usarán una organización"
 "manual de forma predeterminada."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 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 "
@@ -1553,19 +1479,19 @@ msgstr ""
 "propósito de esta configuración es evitar miniaturizar imágenes grandes que "
 "podrían llevar un largo tiempo en cargarse o utilizar un montón de memoria."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid "List of possible captions on icons"
 msgstr "Lista de las descripciones posibles de los iconos"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
-msgid "Maximum handled files in a directory"
-msgstr "Máximos archivos administrados en un directorio"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+msgid "Maximum handled files in a folder"
+msgstr "Número máximo de archivos administrados en una carpeta"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Maximum image size for thumbnailing"
 msgstr "Tamaño máximo de una imagen para ser miniaturizada"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
@@ -1573,19 +1499,19 @@ msgstr ""
 "Nombre del tema de Nautilus a usar. Esto ha sido reemplazado en Nautilus "
 "2.2. Por favor utilice el tema de icono en su lugar."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus administra el dibujo del escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr "Nautilus usa el directorio personal de los usuarios como escritorio"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus usa la carpeta personal de los usuarios como escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-msgid "Only show directories in the tree sidebar"
-msgstr "Mostrar sólo los directorios en el árbol del panel lateral"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+msgid "Only show folders in the tree sidebar"
+msgstr "Mostrar sólo las carpetas en el árbol del panel lateral"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -1593,42 +1519,42 @@ msgstr ""
 "Los valores posibles son «single» para ejecutar los archivos con una sola "
 "pulsación, o «double» para lanzarlos con una pulsación doble."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid "Put labels beside icons"
 msgstr "Colocar las etiquetas a los lados de los iconos"
 
 # src/file-manager/fm-directory-view.c:2126
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid "Reverse sort order in new windows"
-msgstr "Criterio inverso de ordenamiento en las ventanas nuevas"
+msgstr "Invertir el orden de colocación en las ventanas nuevas"
 
 # libnautilus-private/nautilus-global-preferences.c:687
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
-msgid "Show directories first in windows"
-msgstr "Mostrar los directorios en primer lugar en las ventanas"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
+msgid "Show folders first in windows"
+msgstr "Mostrar las carpetas en primer lugar en las ventanas"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
 msgstr "Mostrar la barra de dirección en las ventanas nuevas"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid "Show side pane in new windows"
 msgstr "Mostrar el panel lateral en las ventanas nuevas"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid "Show status bar in new windows"
 msgstr "Mostrar la barra de estado en las ventanas nuevas"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid "Show toolbar in new windows"
 msgstr "Mostrar la barra de herramientas en las ventanas nuevas"
 
 # libnautilus-private/nautilus-global-preferences.c:165
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 msgid "Side pane view"
 msgstr "Vista del panel lateral"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 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 "
@@ -1642,81 +1568,79 @@ msgstr ""
 "la reproducción previa sólo se realizará sobre archivos locales. Si está "
 "definido com «never» entonces nunca de reproducirá previamente el sonido."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
 "Balance de rendimiento para cuando se muestran previamente los contenidos de "
 "un archivo de texto en el icono del archivo. Si está definido como «always» "
-"entonces siempre se mostrará una previsualización, aún si el directorio se "
+"entonces siempre se mostrará una previsualización, aún si la carpeta se "
 "encuentra en un servidor remoto. Si está definido como «local_only» entonces "
 "sólo se previsualizará en los sistemas de archivos locales. Si está definido "
 "como «never» entonces nunca se leerán datos para la previsualización."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Balance de rendimiento para cuando se muestran archivos de imágenes como una "
 "miniatura. Si está definido como «always» entonces siempre se miniaturizará, "
-"aún si el directorio se encuentra en un servidor remoto. Si está definido "
-"como «local_only» entonces sólo se miniaturizará en los sistemas de archivos "
+"aún si la carpeta se encuentra en un servidor remoto. Si está definido como "
+"«local_only» entonces sólo se miniaturizará en los sistemas de archivos "
 "locales. Si está definido como «never» entonces no se miniaturizarán la "
 "imágenes, sólo se mostrará un icono genérico."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
-"Balance de rendimiento para cuando se muestra la cantidad de elementos en un "
-"directorio. Si está definido como «always» entonces siempre se contarán, aún "
-"si el directorio se encuentra en un servidor remoto. Si está definido como "
+"Balance de rendimiento para cuando se muestra la cantidad de elementos en "
+"una carpeta. Si está definido como «always» entonces siempre se contarán, "
+"aún si la carpeta se encuentra en un servidor remoto. Si está definido como "
 "«local_only» entonces sólo se contarán en los sistemas de archivos locales. "
 "Si está definido como «never» entonces nunca se contarán la cantidad de "
 "elementos."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
-"El criterio de ordenamiento de los elementos en la vista de icono. Los "
-"valores posibles son «name», «size», «type» «modification_date», «emblems»."
+"El criterio de ordenación de los elementos en la vista de icono. Los valores "
+"posibles son «name», «size», «type» «modification_date» y «emblems»."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"El criterio de ordenamiento de los elementos en la vista de lista. Los "
-"valores posibles son «name», «size», «type»  y «modification_date»."
+"El criterio de ordenación de los elementos en la vista de lista. Los valores "
+"posibles son «name», «size», «type»  y «modification_date»."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
-msgstr "El ancho predeterminado para el panel lateral en las ventanas nuevas."
+msgstr "La anchura predeterminada para el panel lateral en las ventanas nuevas."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid "The font description used for the icons on the desktop."
-msgstr ""
-"La descripción de la tipografía usada para los iconos en el escritorio."
+msgstr "La descripción de la tipografía usada para los iconos en el escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid "The side pane view to show in newly opened windows."
-msgstr ""
-"La vista del panel lateral que se mostrará en la ventanas nuevas abiertas."
+msgstr "La vista del panel lateral que se mostrará en la ventanas nuevas abiertas."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -1724,7 +1648,7 @@ msgstr ""
 "Este nombre puede ser definido si desea colocar un nombre personalizado al "
 "icono de «Carpeta de Inicio» del escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
@@ -1732,28 +1656,28 @@ msgstr ""
 "Este nombre puede ser definido si quiere colocar un nombre personalizado al "
 "icono de la papelera del escritorio."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid "Trash icon visible on desktop"
 msgstr "Icono de la papelera visible en el escritorio"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Type of click used to launch/open files"
 msgstr "El tipo de pulsación utilizado para ejecutar/abrir los archivos"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid "Use manual layout in new windows"
-msgstr "Utilizar una distribución manual en las ventanas nuevas"
+msgstr "Utilizar una organización manual en las ventanas nuevas"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
-msgid "Use tighter Layout in new windows"
-msgstr "Usar una distribución ajustada en las ventanas nuevas"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
+msgid "Use tighter layout in new windows"
+msgstr "Usar una organización más apretada en las ventanas nuevas"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
 msgstr "Qué hacer con los archivos de texto ejecutables cuando son activados"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 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, "
@@ -1765,7 +1689,7 @@ msgstr ""
 "como programas, «ask» para solicitar una confirmación por medio de un "
 "diálogo y «display» para mostrarlos como archivos de texto."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 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\" "
@@ -1775,53 +1699,51 @@ msgstr ""
 "seleccionado otro visor para esta carpeta en particular. Los valores "
 "posibles con «list_view» y «icon_view»."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
-msgid "When to show number of items in a directory"
-msgstr "Cuando mostrar la cantidad de elementos en un directorio"
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+msgid "When to show number of items in a folder"
+msgstr "Cuándo mostrar la cantidad de elementos en un carpeta"
 
 # libnautilus-private/nautilus-global-preferences.c:249
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "When to show preview text in icons"
 msgstr "Cuándo mostrar la previsualización de texto en los iconos"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "When to show thumbnails of image files"
 msgstr "Cuando mostrar las miniaturas de los archivos de imágenes"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
-msgid "Whether a custom default directory background has been set."
-msgstr "Define si se ha establecido un fondo predeterminado de directorio."
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
+msgid "Whether a custom default folder background has been set."
+msgstr "Define si se ha establecido un fondo predeterminado de carpeta."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
-msgstr ""
-"Indica si se ha establecido un fondo predeterminado en el panel lateral."
+msgstr "Indica si se ha establecido un fondo predeterminado en el panel lateral."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Whether to ask for confirmation when moving files to trash"
-msgstr ""
-"Indica si se debe solicitar una confirmación al mover archivos a la papelera"
+msgstr "Indica si se debe solicitar una confirmación al mover archivos a la papelera"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Whether to enable immediate deletion"
-msgstr "Indica si se debe habilitar la eliminación inmediata"
+msgstr "Indica si se debe activar la eliminación inmediata"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "Whether to preview sounds when mousing over an icon"
 msgstr ""
 "Indica si se deben escuchar previamente los sonidos al colocar el puntero "
 "sobre un icono"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid "Whether to show backup files"
 msgstr "Indica si se deben mostrar los archivos de respaldo"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid "Whether to show hidden files"
 msgstr "Indica si se deben mostrar los archivos ocultos"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
 msgid "Width of the side pane"
 msgstr "Ancho del panel lateral"
 
@@ -1954,77 +1876,84 @@ msgstr "reiniciar"
 msgid "on the desktop"
 msgstr "en el escritorio"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:102
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "No se puede borrar el icono del volumen."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"No puede borrar un icono de volumen. Si quiere expulsar el volumen por favor "
-"utilice la opción «Expulsar» del menú que aparece al pulsar el botón derecho "
-"sobre el volumen."
+"Si quiere expulsar el volumen, utilice la opción «Expulsar» del menú que "
+"aparece al pulsar el botón derecho sobre el volumen."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:105
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "No se puede borrar el volumen"
 
-#: libnautilus-private/nautilus-desktop-link.c:139
-#: libnautilus-private/nautilus-file.c:5616
-#: libnautilus-private/nautilus-global-preferences.c:537
-#: libnautilus-private/nautilus-trash-directory.c:383
+#: libnautilus-private/nautilus-desktop-link.c:169
+#: libnautilus-private/nautilus-file.c:5739
+#: libnautilus-private/nautilus-global-preferences.c:555
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papelera"
 
 # libnautilus-private/nautilus-program-chooser.c:1344
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Mover aquí"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copiar aquí"
 
 # src/nautilus-link-set-window.c:185
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "En_lazar aquí"
 
 # src/nautilus-sidebar.c:424
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Usar como _papel tapiz"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Establecer como fondo para _todas las carpetas"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Es_tablecer como fondo para esta carpeta"
 
 #: 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 "El emblema no puede ser instalado."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr ""
-"Lo siento, pero debe especificar una descripción para el emblema nuevo."
+msgstr "Lo siento, pero debe especificar una descripción para el emblema nuevo."
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "No se ha podido instalar el emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
-msgid ""
-"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+#: libnautilus-private/nautilus-emblem-utils.c:203
+msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Lo siento, pero la descripción del emblema sólo puede contener letras, "
 "espacios y números."
@@ -2034,20 +1963,25 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Lo siento, pero ya existe un emblema llamado «%s». Por favor seleccione un "
-"nombre distinto para nombrarlo."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Lo siento, pero ya existe un emblema llamado «%s»."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Elija un nombre de emblema diferente."
+
+# components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "No se ha podido instalar el emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Lo siento, no se puede guardar el emblema personalizado."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Lo siento, no se pudo guardar el nombre personalizado del emblema."
 
@@ -2070,393 +2004,297 @@ msgstr "De:"
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Error al mover."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Error al mover.\n"
-"\n"
-"«%s» no puede ser movido porque está en un disco de sólo lectura."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "«%s» no puede ser movido porque está en un disco de sólo lectura."
+
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Error al borrar."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Error al eliminar.\n"
-"\n"
 "«%s» no puede ser eliminado porque usted no tiene permisos para modificar la "
 "carpeta superior."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Error al eliminar.\n"
-"\n"
-"«%s» no puede ser eliminado porque está en un disco de sólo lectura."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "«%s» no puede ser eliminado porque está en un disco de sólo lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Error al mover.\n"
-"\n"
 "«%s» no puede ser movido porque no tiene permiso para cambiarlo a él ni a la "
 "carpeta superior."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Error al mover."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Error al mover.\n"
-"\n"
 "«%s» no puede ser movido porque él o su carpeta superior están contenidos en "
 "el destino."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Error al mover.\n"
-"\n"
 "«%s» no puede ser movido a la papelera porque usted no tiene permisos para "
 "cambiar éste o su carpeta superior."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Error al copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"Error al copiar\n"
-"\n"
-"«%s» no puede ser copiado porque no tiene permisos para leerlo."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr "«%s» no puede ser copiado porque no tiene permisos para leerlo."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error al copiar hacia «%s».\n"
-"\n"
-"No hay suficiente espacio en el destino."
+msgid "Error while copying to \"%s\"."
+msgstr "Error durante la copia a «%s»."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error al mover hacia «%s».\n"
-"\n"
-"No hay suficiente espacio en el destino."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "No hay suficiente espacio en el destino."
 
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error al crear un enlace en «%s».\n"
-"\n"
-"No hay suficiente espacio en el destino."
+msgid "Error while moving to \"%s\"."
+msgstr "Error mientras se mueve a «%s»"
 
-#: libnautilus-private/nautilus-file-operations.c:673
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error al copiar hacia «%s».\n"
-"\n"
-"No tiene permisos para escribir en esta carpeta."
+msgid "Error while creating link in \"%s\"."
+msgstr "Error crear un enlace en «%s»."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error al copiar hacia «%s».\n"
-"\n"
-"El disco de destino es de sólo lectura."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "No tiene permisos para escribir en esta carpeta."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error al mover elementos hacia «%s».\n"
-"\n"
-"No tiene permisos para escribir en esta carpeta."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "El disco de destino es de sólo lectura."
 
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error al mover elementos hacia «%s».\n"
-"\n"
-"El disco de destino es sólo de lectura."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error al crear enlaces en «%s».\n"
-"\n"
-"No tiene permisos para escribir en esta carpeta."
+msgid "Error while moving items to \"%s\"."
+msgstr "Error al mover elementos a «%s»."
 
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error al crear enlaces en «%s».\n"
-"\n"
-"El disco de destino es de sólo lectura."
-
-# src/file-manager/dfos-xfer.c:342
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al copiar «%s».\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Error al crear enlaces en «%s»."
 
-# src/file-manager/dfos-xfer.c:342
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al mover «%s».\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Error «%s» al copiar «%s»."
 
 # src/file-manager/dfos-xfer.c:342
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al crear un enlace hacia «%s».\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Error «%s» al mover «%s»."
 
 # src/file-manager/dfos-xfer.c:342
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al borrar «%s».\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Error «%s» al crear un enlace a «%s»."
 
-# src/file-manager/dfos-xfer.c:342
-#: libnautilus-private/nautilus-file-operations.c:756
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al copiar.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Error «%s» al borrar «%s»."
 
-# src/file-manager/dfos-xfer.c:342
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al mover.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while copying."
+msgstr "Error «%s» al copiar."
 
-# src/file-manager/dfos-xfer.c:342
+# src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al crear un enlace.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while moving."
+msgstr "Error «%s» al mover."
 
-# src/file-manager/dfos-xfer.c:342
-#: libnautilus-private/nautilus-file-operations.c:770
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error «%s» al borrar.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Error \"%s\" while linking."
+msgstr "Error «%s» al enlazar."
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Error al copiar."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Error «%s» al borrar."
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Error al mover."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Error copiando"
 
 # src/file-manager/dfos-xfer.c:745
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Error al enlazar."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Error moviendo"
 
 # src/file-manager/dfos-xfer.c:745
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Error al borrar."
+msgid "Error While Linking"
+msgstr "Error enlazando"
+
+# src/file-manager/dfos-xfer.c:745
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Error eliminando"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Omitir"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Omitir"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:372
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Reintentar"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Reintentar"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "No se pudo mover «%s» a la ubicación nueva."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"«%s» no ha podido ser movido a la nueva ubicación porque su nombre ya está "
-"siendo usado por un elemento especial que no puede ser quitado o "
-"reemplazado.\n"
-"\n"
-"Si aún quiere mover «%s», renómbrelo e inténtelo de nuevo."
+"El nombre está usado ya para un elemento especial que no puede ser eliminado "
+"o reemplazado.Si aún quiere mover el elemento, renómbrelo e inténtelo de "
+"nuevo."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "No se pudo copiar «%s» a la ubicación nueva."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"«%s» no ha podido ser copiado a la nueva ubicación porque su nombre ya está "
-"siendo utilizado por un elemento especial que no puede ser quitado o "
-"reemplazado.\n"
-"\n"
-"Si aún quiere copiar «%s» cámbiele el nombre e inténtelo de nuevo."
+"El nombre se usa ya para un elemento especial que no puede ser eliminado o "
+"reemplazado. Si aún quiere copiar el elemento, renómbrelo e intente de nuevo."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Imposible reemplazar el archivo."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "Imposible reemplazar el archivo"
 
 # src/file-manager/dfos-xfer.c:407
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"El archivo «%s» ya existe.\n"
-"\n"
-"¿Desea reemplazarlo?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "El archivo «%s» ya existe. ¿Desea reemplazarlo?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
-msgstr "Problemas mientras se copiaba"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Si reemplaza un archivo existente, sus contenidos serán sobreescritos."
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
+msgstr "Conflicto al copiar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Reemplazar"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Reemplazar"
 
 # src/file-manager/dfos-xfer.c:430
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Reemplazar todos"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Reemplazar _todos"
 
 # src/nautilus-link-set-window.c:185
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4436
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "enlace hacia %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "otro enlace hacia %s"
@@ -2465,627 +2303,653 @@ msgstr "otro enlace hacia %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%der enlace hacia %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
-msgstr "%do enlace hacia %s"
+msgstr "%dº enlace hacia %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%der enlace hacia %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
-msgstr "%der enlace hacia %s"
+msgstr "%dº enlace hacia %s"
 
 #. Localizers:
 #. * Feel free to leave out the st, nd, rd and th suffix or
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copiar)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (otra copia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
-msgstr "a copia)"
+msgstr "ª copia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
-msgstr "ra copia)"
+msgstr "ª copia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
-msgstr "da copia)"
+msgstr "ª copia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
-msgstr "ra copia)"
+msgstr "ª copia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (otra copia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
-msgstr "%s (%da copia)%s"
+msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
-msgstr "%s (%da copia)%s"
+msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
-msgstr "%s (%da copia)%s"
+msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
-msgstr "%s (%da copia)%s"
+msgstr "%s (%dª copia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # src/file-manager/dfos-xfer.c:526 src/file-manager/dfos-xfer.c:859
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d desconocido"
 
 # src/file-manager/dfos-xfer.c:961
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Moviendo archivos a la papelera"
 
 # src/file-manager/dfos-xfer.c:962
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
-msgstr "Archivos descartados:"
+msgstr "Archivos tirados:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Moviendo"
 
 # src/file-manager/dfos-xfer.c:964
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para mover a la papelera..."
 
 # src/file-manager/dfos-xfer.c:700
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Moviendo archivos"
 
 # src/file-manager/fm-properties-window.c:1526
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Archivos movidos:"
 
 # src/file-manager/dfos-xfer.c:703
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Preparando para mover..."
 
 # src/file-manager/dfos-xfer.c:704
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Finalizando mover..."
 
 # src/file-manager/dfos-xfer.c:713
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Creando enlaces a archivos"
 
 # src/file-manager/fm-properties-window.c:1526
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Archivos enlazados:"
 
 # src/file-manager/dfos-xfer.c:715
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Enlazando"
 
 # src/file-manager/dfos-xfer.c:716
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Preparándose para crear enlaces..."
 
 # src/file-manager/dfos-xfer.c:717
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Finalizando la creación de enlaces..."
 
 # src/file-manager/dfos-xfer.c:723
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copiando archivos"
 
 # src/file-manager/fm-properties-window.c:1536
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Archivos copiados:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:725
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copiando"
 
 # src/file-manager/dfos-xfer.c:726
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Preparando para copiar..."
 
 # src/file-manager/dfos-xfer.c:744
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "No puede copiar elementos en la papelera."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "No puede copiar elementos a la papelera."
 
-# src/file-manager/dfos-xfer.c:763
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "No puede copiar hacia la papelera"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Archivos y carpetas sólo pueden ser movidos a la papelera."
 
 # src/file-manager/dfos-xfer.c:778
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "No puede mover esta carpeta papelera."
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "No puede copiar esta carpeta papelera."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"Una carpeta papelera se usa para almacenar los elementos movidos a la "
+"papelera."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "No puede cambiar la ubicación de la papelera"
 
 # src/file-manager/dfos-xfer.c:763
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "No se puede copiar la papelera"
 
 # src/file-manager/dfos-xfer.c:778
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "No puede mover una carpeta dentro de sí misma."
 
 # src/file-manager/dfos-xfer.c:779
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "No puede copiar una carpeta dentro de sí misma."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "La carpeta de destino está dentro de la carpeta de origen."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "No se puede mover dentro de sí mismo"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "No se puede copiar dentro de sí mismo"
 
 # src/file-manager/dfos-xfer.c:779
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "No puede copiar un archivo sobre sí mismo."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "El destino y el origen son el mismo archivo."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "No se puede copiar sobre sí mismo"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Error al crear una carpeta nueva.\n"
-"\n"
-"No tiene permisos para escribir en el destino."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "No tiene permiso para escribir en el destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Error al crear una carpeta nueva.\n"
-"\n"
-"No hay espacio en el destino."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "No hay espacio en el destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Error «%s» al crear una carpeta nueva."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Error al crear una carpeta nueva."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
 msgstr "Error al crear una carpeta nueva"
 
 # src/nautilus-window-manage-views.c:173
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "carpeta sin título"
 
+#: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Error «%s» al crear un documento nuevo."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Error al crear un documento nuevo."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Error al crear un documento nuevo"
+
+# libnautilus-private/nautilus-file.c:2591
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "archivo nuevo"
+
 # src/file-manager/dfos-xfer.c:1006
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Eliminando archivos"
 
 # src/file-manager/dfos-xfer.c:1007 src/file-manager/dfos-xfer.c:1057
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Archivos eliminados:"
 
 # src/file-manager/dfos-xfer.c:1008 src/file-manager/dfos-xfer.c:1058
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Eliminando"
 
 # src/file-manager/dfos-xfer.c:1009
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Preparándose para eliminar archivos..."
 
 # src/file-manager/dfos-xfer.c:1056
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Vaciando la papelera"
 
 # src/file-manager/dfos-xfer.c:1059
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparándose para vaciar la papelera..."
 
 # src/file-manager/fm-directory-view.c:1855
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "¿Seguro que desea vaciar todos los elementos de la papelera?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Si vacía la papelera, los elementos serán borrados permanentemente."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Vaciar"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr ".foo foo (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (otra copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (otra copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (otra copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (otra copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (copia 13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (copia 14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (copia 13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (copia 14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (copia 21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (copia 22)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (copia 21).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (copia 22).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (copia 23)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo. (copia 23).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (copia 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (copia 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (copia 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (copia 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (copia 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (copia 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (copia 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (copia 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (copia 100000000000000).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (copia 11)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (copia 11).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (copia 12)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (copia 12).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (copia 110)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (copia 111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (copia 110).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (copia 111).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (copia 122)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (copia 123)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (copia 122).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (copia 123).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (copia 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (copia 124).txt"
 
@@ -3104,36 +2968,36 @@ msgstr "foo (copia 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2662
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hoy a las 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1557
-#: libnautilus-private/nautilus-file.c:2663
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hoy a las %-I:%M:%S %p"
 
 # libnautilus-private/nautilus-file.c:1557
-#: libnautilus-private/nautilus-file.c:2665
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hoy a las 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1557
-#: libnautilus-private/nautilus-file.c:2666
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hoy a las %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2668
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hoy, 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1557
-#: libnautilus-private/nautilus-file.c:2669
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hoy, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2671
-#: libnautilus-private/nautilus-file.c:2672
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hoy"
 
@@ -3141,39 +3005,39 @@ msgstr "hoy"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2681
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ayer a las 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1560
-#: libnautilus-private/nautilus-file.c:2682
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ayer a las %-I:%M:%S %p"
 
 # libnautilus-private/nautilus-file.c:1560
-#: libnautilus-private/nautilus-file.c:2684
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ayer a las 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1560
-#: libnautilus-private/nautilus-file.c:2685
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ayer a las %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2687
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ayer, 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1560
-#: libnautilus-private/nautilus-file.c:2688
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ayer, %-I:%M %p"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:94
 # components/services/install/command-line/eazel-revert.c:78
 # components/services/install/command-line/eazel-uninstall.c:69
-#: libnautilus-private/nautilus-file.c:2690
-#: libnautilus-private/nautilus-file.c:2691
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ayer"
 
@@ -3182,136 +3046,136 @@ msgstr "ayer"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2702
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Miércoles, Septiembre 00 0000 a las 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1563
-#: libnautilus-private/nautilus-file.c:2703
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y a las %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2705
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Lun, Oct 00 0000 a las 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1563
-#: libnautilus-private/nautilus-file.c:2706
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y a las %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2708
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Lun, Oct 00 0000 a las 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1563
-#: libnautilus-private/nautilus-file.c:2709
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y a las %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2711
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Oct 00 0000 a las 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1565
-#: libnautilus-private/nautilus-file.c:2712
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y a las %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2714
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Oct 00 0000, 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1565
-#: libnautilus-private/nautilus-file.c:2715
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2717
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
 # libnautilus-private/nautilus-file.c:1565
-#: libnautilus-private/nautilus-file.c:2718
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2720
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2721
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 # libnautilus-private/nautilus-file.c:2585
-#: libnautilus-private/nautilus-file.c:4016
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementos"
 
 # libnautilus-private/nautilus-file.c:2586
-#: libnautilus-private/nautilus-file.c:4016
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 carpetas"
 
 # libnautilus-private/nautilus-file.c:2586
-#: libnautilus-private/nautilus-file.c:4017
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 archivos"
 
 # libnautilus-private/nautilus-file.c:2590
-#: libnautilus-private/nautilus-file.c:4021
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 elemento"
 
 # libnautilus-private/nautilus-file.c:2591
-#: libnautilus-private/nautilus-file.c:4021
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 carpeta"
 
 # libnautilus-private/nautilus-file.c:2591
-#: libnautilus-private/nautilus-file.c:4022
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 archivo"
 
 # libnautilus-private/nautilus-file.c:2594
-#: libnautilus-private/nautilus-file.c:4025
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementos"
 
 # libnautilus-private/nautilus-file.c:2595
-#: libnautilus-private/nautilus-file.c:4025
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u carpetas"
 
 # libnautilus-private/nautilus-file.c:2595
-#: libnautilus-private/nautilus-file.c:4026
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u archivos"
 
 # libnautilus-private/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4338
-#: libnautilus-private/nautilus-file.c:4354
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementos"
 
 # libnautilus-private/nautilus-file.c:2585
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4344
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
 # libnautilus-private/nautilus-file.c:2929
-#: libnautilus-private/nautilus-file.c:4359
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipo desconocido"
 
 # libnautilus-private/nautilus-file.c:2931
-#: libnautilus-private/nautilus-file.c:4362
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "Tipo MIME desconocido"
 
@@ -3319,17 +3183,17 @@ msgstr "Tipo MIME desconocido"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4368
-#: src/file-manager/fm-properties-window.c:1130
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "desconocido"
 
 # libnautilus-private/nautilus-file.c:2965
-#: libnautilus-private/nautilus-file.c:4400
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4412
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3339,7 +3203,7 @@ msgstr ""
 "esto signifique que su archivo gnome-vfs.keys está en un lugar incorrecto o "
 "que no esta siendo encontrada por alguna otra razón."
 
-#: libnautilus-private/nautilus-file.c:4416
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3349,288 +3213,290 @@ msgstr ""
 "avise a la lista de correo de gnome-vfs."
 
 # src/file-manager/dfos-xfer.c:714
-#: libnautilus-private/nautilus-file.c:4430
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "enlace"
 
-#: libnautilus-private/nautilus-file.c:4450
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "enlace (roto)"
 
 # libnautilus-private/nautilus-global-preferences.c:582
-#: libnautilus-private/nautilus-global-preferences.c:101
+#: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Always"
 msgstr "_Siempre"
 
 # libnautilus-private/nautilus-global-preferences.c:587
-#: libnautilus-private/nautilus-global-preferences.c:102
+#: libnautilus-private/nautilus-global-preferences.c:103
 msgid "_Local File Only"
 msgstr "Sólo en archivos _locales"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: libnautilus-private/nautilus-global-preferences.c:103
+#: libnautilus-private/nautilus-global-preferences.c:104
 msgid "_Never"
 msgstr "_Nunca"
 
-#: libnautilus-private/nautilus-global-preferences.c:109
+#: libnautilus-private/nautilus-global-preferences.c:110
 #: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
 msgstr "25%"
 
-#: libnautilus-private/nautilus-global-preferences.c:111
+#: libnautilus-private/nautilus-global-preferences.c:112
 #: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
 msgstr "50%"
 
-#: libnautilus-private/nautilus-global-preferences.c:113
+#: libnautilus-private/nautilus-global-preferences.c:114
 #: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: libnautilus-private/nautilus-global-preferences.c:115
+#: libnautilus-private/nautilus-global-preferences.c:116
 #: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: libnautilus-private/nautilus-global-preferences.c:117
+#: libnautilus-private/nautilus-global-preferences.c:118
 #: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: libnautilus-private/nautilus-global-preferences.c:119
+#: libnautilus-private/nautilus-global-preferences.c:120
 #: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
 msgstr "200%"
 
-#: libnautilus-private/nautilus-global-preferences.c:121
+#: libnautilus-private/nautilus-global-preferences.c:122
 #: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
 msgstr "400%"
 
-#: libnautilus-private/nautilus-global-preferences.c:126
+#: libnautilus-private/nautilus-global-preferences.c:127
 msgid "100 K"
 msgstr "100 K"
 
-#: libnautilus-private/nautilus-global-preferences.c:127
+#: libnautilus-private/nautilus-global-preferences.c:128
 msgid "500 K"
 msgstr "500 K"
 
-#: libnautilus-private/nautilus-global-preferences.c:128
+#: libnautilus-private/nautilus-global-preferences.c:129
 #: src/nautilus-file-management-properties.glade.h:3
 msgid "1 MB"
-msgstr "1 Mb"
+msgstr "1 Mib"
 
-#: libnautilus-private/nautilus-global-preferences.c:129
+#: libnautilus-private/nautilus-global-preferences.c:130
 #: src/nautilus-file-management-properties.glade.h:15
 msgid "3 MB"
-msgstr "3 Mb"
+msgstr "3 Mib"
 
-#: libnautilus-private/nautilus-global-preferences.c:130
+#: libnautilus-private/nautilus-global-preferences.c:131
 #: src/nautilus-file-management-properties.glade.h:18
 msgid "5 MB"
-msgstr "5 Mb"
+msgstr "5 Mib"
 
-#: libnautilus-private/nautilus-global-preferences.c:131
+#: libnautilus-private/nautilus-global-preferences.c:132
 #: src/nautilus-file-management-properties.glade.h:4
 msgid "10 MB"
-msgstr "10 Mb"
+msgstr "10 Mib"
 
-#: libnautilus-private/nautilus-global-preferences.c:132
+#: libnautilus-private/nautilus-global-preferences.c:133
 #: src/nautilus-file-management-properties.glade.h:6
 msgid "100 MB"
-msgstr "100 Mb"
+msgstr "100 Mib"
 
 # libnautilus-private/nautilus-global-preferences.c:636
-#: libnautilus-private/nautilus-global-preferences.c:138
+#: libnautilus-private/nautilus-global-preferences.c:139
 msgid "Activate items with a _single click"
 msgstr "A_ctivar los elementos con una sola pulsación"
 
 # libnautilus-private/nautilus-global-preferences.c:641
-#: libnautilus-private/nautilus-global-preferences.c:142
+#: libnautilus-private/nautilus-global-preferences.c:143
 msgid "Activate items with a _double click"
 msgstr "Activar los elementos con una _doble pulsación"
 
-#: libnautilus-private/nautilus-global-preferences.c:150
+#: libnautilus-private/nautilus-global-preferences.c:151
 msgid "E_xecute files when they are clicked"
 msgstr "E_jecutar archivos cuando son seleccionados"
 
-#: libnautilus-private/nautilus-global-preferences.c:154
+#: libnautilus-private/nautilus-global-preferences.c:155
 msgid "Display _files when they are clicked"
 msgstr "Mostrar _archivos al seleccionarlos"
 
-#: libnautilus-private/nautilus-global-preferences.c:158
+#: libnautilus-private/nautilus-global-preferences.c:159
 #: src/nautilus-file-management-properties.glade.h:65
 msgid "_Ask each time"
 msgstr "_Preguntar siempre"
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: libnautilus-private/nautilus-global-preferences.c:166
+#: libnautilus-private/nautilus-global-preferences.c:167
 msgid "Search for files by file name only"
 msgstr "Buscar archivos sólo por nombre"
 
 # libnautilus-private/nautilus-global-preferences.c:732
-#: libnautilus-private/nautilus-global-preferences.c:170
+#: libnautilus-private/nautilus-global-preferences.c:171
 msgid "Search for files by file name and file properties"
 msgstr "Buscar archivos por nombre y por sus propiedades"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: libnautilus-private/nautilus-global-preferences.c:177
+#: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vista icono"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: libnautilus-private/nautilus-global-preferences.c:178
+#: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vista lista"
 
 # components/help/hyperbola-filefmt.c:396
-#: libnautilus-private/nautilus-global-preferences.c:183
+#: libnautilus-private/nautilus-global-preferences.c:184
 msgid "Manually"
 msgstr "Manualmente"
 
 # src/file-manager/fm-icon-view.c:109
-#: libnautilus-private/nautilus-global-preferences.c:185
-#: libnautilus-private/nautilus-global-preferences.c:194
+#: libnautilus-private/nautilus-global-preferences.c:186
+#: libnautilus-private/nautilus-global-preferences.c:195
 #: src/nautilus-file-management-properties.glade.h:41
 msgid "By Name"
 msgstr "Por nombre"
 
 # src/file-manager/fm-icon-view.c:116
-#: libnautilus-private/nautilus-global-preferences.c:186
-#: libnautilus-private/nautilus-global-preferences.c:195
+#: libnautilus-private/nautilus-global-preferences.c:187
+#: libnautilus-private/nautilus-global-preferences.c:196
 #: src/nautilus-file-management-properties.glade.h:42
 msgid "By Size"
 msgstr "Por tamaño"
 
 # src/file-manager/fm-icon-view.c:123
-#: libnautilus-private/nautilus-global-preferences.c:187
-#: libnautilus-private/nautilus-global-preferences.c:196
+#: libnautilus-private/nautilus-global-preferences.c:188
+#: libnautilus-private/nautilus-global-preferences.c:197
 #: src/nautilus-file-management-properties.glade.h:43
 msgid "By Type"
 msgstr "Por tipo"
 
 # src/file-manager/fm-icon-view.c:130
-#: libnautilus-private/nautilus-global-preferences.c:188
-#: libnautilus-private/nautilus-global-preferences.c:197
+#: libnautilus-private/nautilus-global-preferences.c:189
+#: libnautilus-private/nautilus-global-preferences.c:198
 #: src/nautilus-file-management-properties.glade.h:40
 msgid "By Modification Date"
 msgstr "Por fecha de modificación"
 
 # src/file-manager/fm-icon-view.c:137
-#: libnautilus-private/nautilus-global-preferences.c:189
-#: libnautilus-private/nautilus-global-preferences.c:198
+#: libnautilus-private/nautilus-global-preferences.c:190
+#: libnautilus-private/nautilus-global-preferences.c:199
 #: src/nautilus-file-management-properties.glade.h:39
 msgid "By Emblems"
 msgstr "Por emblemas"
 
-#: libnautilus-private/nautilus-global-preferences.c:203
+#: libnautilus-private/nautilus-global-preferences.c:204
 msgid "8"
 msgstr "8"
 
-#: libnautilus-private/nautilus-global-preferences.c:204
+#: libnautilus-private/nautilus-global-preferences.c:205
 msgid "10"
 msgstr "10"
 
-#: libnautilus-private/nautilus-global-preferences.c:205
+#: libnautilus-private/nautilus-global-preferences.c:206
 msgid "12"
 msgstr "12"
 
-#: libnautilus-private/nautilus-global-preferences.c:206
+#: libnautilus-private/nautilus-global-preferences.c:207
 msgid "14"
 msgstr "14"
 
-#: libnautilus-private/nautilus-global-preferences.c:207
+#: libnautilus-private/nautilus-global-preferences.c:208
 msgid "16"
 msgstr "16"
 
-#: libnautilus-private/nautilus-global-preferences.c:208
+#: libnautilus-private/nautilus-global-preferences.c:209
 msgid "18"
 msgstr "18"
 
-#: libnautilus-private/nautilus-global-preferences.c:209
+#: libnautilus-private/nautilus-global-preferences.c:210
 msgid "20"
 msgstr "20"
 
-#: libnautilus-private/nautilus-global-preferences.c:210
+#: libnautilus-private/nautilus-global-preferences.c:211
 msgid "22"
 msgstr "22"
 
-#: libnautilus-private/nautilus-global-preferences.c:211
+#: libnautilus-private/nautilus-global-preferences.c:212
 msgid "24"
 msgstr "24"
 
 # src/file-manager/fm-icon-text-window.c:75
-#: libnautilus-private/nautilus-global-preferences.c:216
+#: libnautilus-private/nautilus-global-preferences.c:217
 #: src/nautilus-file-management-properties.glade.h:81
 msgid "size"
 msgstr "tamaño"
 
 # src/file-manager/fm-icon-text-window.c:76
-#: libnautilus-private/nautilus-global-preferences.c:217
+#: libnautilus-private/nautilus-global-preferences.c:218
 #: src/nautilus-file-management-properties.glade.h:82
 msgid "type"
 msgstr "tipo"
 
 # src/file-manager/fm-icon-text-window.c:77
-#: libnautilus-private/nautilus-global-preferences.c:218
+#: libnautilus-private/nautilus-global-preferences.c:219
 #: src/nautilus-file-management-properties.glade.h:75
 msgid "date modified"
 msgstr "fecha de modificación"
 
 # src/file-manager/fm-icon-text-window.c:78
-#: libnautilus-private/nautilus-global-preferences.c:219
+#: libnautilus-private/nautilus-global-preferences.c:220
 msgid "date changed"
 msgstr "fecha de último cambio"
 
 # src/file-manager/fm-icon-text-window.c:79
-#: libnautilus-private/nautilus-global-preferences.c:220
+#: libnautilus-private/nautilus-global-preferences.c:221
 #: src/nautilus-file-management-properties.glade.h:74
 msgid "date accessed"
 msgstr "fecha de último acceso"
 
 # src/file-manager/fm-icon-text-window.c:80
-#: libnautilus-private/nautilus-global-preferences.c:221
+#: libnautilus-private/nautilus-global-preferences.c:222
 #: src/nautilus-file-management-properties.glade.h:79
 msgid "owner"
 msgstr "propietario"
 
 # src/file-manager/fm-icon-text-window.c:81
-#: libnautilus-private/nautilus-global-preferences.c:222
+#: libnautilus-private/nautilus-global-preferences.c:223
 #: src/nautilus-file-management-properties.glade.h:76
 msgid "group"
 msgstr "grupo"
 
 # src/file-manager/fm-icon-text-window.c:82
-#: libnautilus-private/nautilus-global-preferences.c:223
+#: libnautilus-private/nautilus-global-preferences.c:224
 #: src/nautilus-file-management-properties.glade.h:80
 msgid "permissions"
 msgstr "permisos"
 
 # src/file-manager/fm-icon-text-window.c:83
-#: libnautilus-private/nautilus-global-preferences.c:224
+#: libnautilus-private/nautilus-global-preferences.c:225
 #: src/nautilus-file-management-properties.glade.h:78
 msgid "octal permissions"
 msgstr "permisos octales"
 
 # src/file-manager/fm-icon-text-window.c:84
-#: libnautilus-private/nautilus-global-preferences.c:225
+#: libnautilus-private/nautilus-global-preferences.c:226
 #: src/nautilus-file-management-properties.glade.h:53
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 # src/file-manager/fm-icon-text-window.c:85
-#: libnautilus-private/nautilus-global-preferences.c:226
+#: libnautilus-private/nautilus-global-preferences.c:227
 #: src/nautilus-file-management-properties.glade.h:77
 msgid "none"
 msgstr "ninguno"
@@ -3643,158 +3509,161 @@ msgstr "ninguno"
 #. * 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:531
+#: libnautilus-private/nautilus-global-preferences.c:543
 #, c-format
 msgid "%s's Home"
 msgstr "Carpeta de inicio de %s"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "icono de archivo"
+#: libnautilus-private/nautilus-global-preferences.c:549
+#: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
+#: src/nautilus-window.c:1176
+msgid "Computer"
+msgstr "Equipo"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "texto editable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "la etiqueta editable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "texto adicional"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "un poco más de texto"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "resaltado para la selección"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "indica si seremos resaltados para una selección"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "resaltado a medida que toma el foco"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "indica si seremos resaltados para dibujar el foco del teclado"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "resaltado para soltar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "indica si seremos resaltados al soltar un A&S"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "El rectángulo de selección"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Cuadro de texto"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Dibujar un cuadro alrededor del texto no seleccionado"
 
 # src/nautilus-property-browser.c:1083
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Caja de selección de color"
 
 # src/nautilus-window-menus.c:670
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Color de la caja de selección"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa de la caja de selección"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacidad de la caja de selección"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Resaltado alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacidad del resaltado de los iconos seleccionados"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Color de información claro"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Color usado por el texto de información contra un fondo oscuro"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Color de información oscuro"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Color usado por el texto de información contra un fondo claro"
 
 # libnautilus-private/nautilus-icon-dnd.c:690
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
-"manual y dejar este elemento adonde lo soltó? Se pasará al modo de "
-"organización manual."
+"¿Quiere cambiar a organización manual y dejar este elemento adonde lo soltó? "
+"Se pasará al modo de organización manual."
+
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Esta carpeta usa organización automática."
 
 # libnautilus-private/nautilus-icon-dnd.c:694
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
-"manual y dejar estos elementos adonde lo soltó? Se pasará al modo de "
-"organización manual."
+"¿Quiere cambiar a organización manual y dejar estos elementos donde los "
+"soltó? Esto destruirá la organización manual almacenada."
 
 # libnautilus-private/nautilus-icon-dnd.c:700
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
-msgstr ""
-"Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
-"manual y dejar este elemento adonde lo soltó?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr "¿Quiere cambiar a organización manual y dejar este elemento donde lo soltó?"
 
 # libnautilus-private/nautilus-icon-dnd.c:703
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Esta carpeta usa organización automática. ¿Quiere cambiar a organización "
-"manual y dejar estos elementos adonde los soltó?"
+"¿Quiere cambiar a organización manual y dejar estos elementos donde los "
+"soltó?"
 
 # libnautilus-private/nautilus-icon-dnd.c:710
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "¿Cambiar a organización manual?"
 
 # libnautilus-private/nautilus-icon-dnd.c:711
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Cambiar"
 
@@ -3812,10 +3681,10 @@ msgid ""
 "Fast searches will not be available until an initial index of your files has "
 "been created.  This may take a long time."
 msgstr ""
-"Si quiere habilitar búsquedas rápidas, puede editar el archivo %s como root. "
+"Si quiere activar las búsquedas rápidas, puede editar el archivo %s como root. "
 "Poniendo la bandera activación a «yes» activará los servicios de medusa.\n"
 "Para iniciar los servicios de búsqueda e indexación, debe también ejecutar "
-"las siguientes órdenes como el usuario root:\n"
+"los comandos siguientes como usuario root:\n"
 "\n"
 "medusa-indexd\n"
 "medusa-searchd\n"
@@ -3897,7 +3766,7 @@ msgstr "Está en el menú para los elementos «%s»."
 #: libnautilus-private/nautilus-program-chooser.c:405
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
-msgstr "Está en el menú para los elementos de tipo «%s»."
+msgstr "Está en el menú para todos los elementos de tipo «%s»."
 
 # libnautilus-private/nautilus-program-chooser.c:273
 #: libnautilus-private/nautilus-program-chooser.c:408
@@ -3918,42 +3787,42 @@ msgid "Is the default for all \"%s\" items."
 msgstr "Es el predeterminado para todos los elementos «%s»."
 
 # libnautilus-private/nautilus-program-chooser.c:981
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modificar «%s»"
 
 # libnautilus-private/nautilus-program-chooser.c:1005
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Incluir en el menú para los elementos de tipo «%s»"
 
 # libnautilus-private/nautilus-program-chooser.c:1012
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Usar como predeterminado para todos los elementos «%s»"
 
 # libnautilus-private/nautilus-program-chooser.c:1005
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Incluir en el menú sólo para «%s»"
 
 # libnautilus-private/nautilus-program-chooser.c:1012
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Usar como predeterminado sólo para «%s»"
 
 # libnautilus-private/nautilus-program-chooser.c:1032
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "No incluir en el menú para los elementos «%s»"
@@ -3964,103 +3833,103 @@ msgstr "No incluir en el menú para los elementos «%s»"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nombre"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1199
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estado"
 
 # libnautilus-private/nautilus-program-chooser.c:1260
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "S_eleccionar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Hecho"
 
 # libnautilus-private/nautilus-program-chooser.c:1324
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modificar..."
 
 # libnautilus-private/nautilus-program-chooser.c:1335
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipos de archivos y programas"
 
 # libnautilus-private/nautilus-program-chooser.c:1344
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ir ahí"
 
 # libnautilus-private/nautilus-program-chooser.c:1353
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 "Puede configurar qué programas se ofrecen para determinados tipos de archivo "
-"en la ventana «Tipos de archivos y programas»."
+"en el diálogo «Tipos de archivos y programas»."
 
 # src/file-manager/fm-directory-view.c:2120
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Abrir con otra aplicación"
 
 # libnautilus-private/nautilus-program-chooser.c:1248
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Seleccione una aplicación con la cual abrir «%s»:"
 
 # libnautilus-private/nautilus-program-chooser.c:1247
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Abrir con otro visor"
 
 # libnautilus-private/nautilus-program-chooser.c:1253
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Seleccione una vista para «%s»:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "No hay visores disponibles para «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "No hay visores disponibles"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "No hay una aplicación asociada con «%s»."
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "No hay aplicaciones asociadas"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
-msgstr "No hay una acción asociada con «%s»"
+msgstr "No hay una acción asociada con «%s»."
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "No hay una acción asociada"
 
@@ -4068,181 +3937,185 @@ msgstr "No hay una acción asociada"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
-"Puede configurar GNOME para asociar aplicaciones con tipos de archivos. "
+"Puede configurar Gnome para asociar aplicaciones con tipos de archivos. "
 "¿Desea asociar una aplicación con este tipo de archivo ahora?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Asociar aplicación"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Asociar aplicación"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "El visor asociado con «%s» es inválido."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Visor asociado inválido"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "La aplicación asociada con «%s» es inválida."
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
-msgstr "Asociación de aplicación inválida"
+msgstr "Aplicación asociada inválida"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "La acción asociada con «%s» es inválida."
 
 # components/help/hyperbola-filefmt.c:398
 # components/help/hyperbola-filefmt.c:671
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
-msgstr "Asociación inválida de acción"
+msgstr "Acción asociada inválida"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"Puede configurar GNOME para asociar una aplicación distinta o un visor con "
+"Puede configurar Gnome para asociar una aplicación distinta o un visor con "
 "este tipo de archivo. ¿Desea asociar una aplicación o un visor con este tipo "
 "de archivo ahora?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Asociar acción"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Asociar acción"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "La apertura ha fallado, ¿quiere seleccionar otra aplicación?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "«%s» no puede abrir «%s» porque «%s» no puede acceder a los archivos en las "
-"direcciones «%s». ¿Le gustaría seleccionar otra aplicación?"
+"direcciones «%s»."
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "La apertura ha fallado, ¿quiere probar con otra acción?"
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "La acción predeterminada no puede abrir «%s» porque no puede acceder a los "
-"archivos de la dirección «%s».  ¿Le gustaría seleccionar otra acción?"
+"archivos en la dirección «%s»."
 
 # libnautilus-private/nautilus-global-preferences.c:693
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "No se puede abrir la dirección"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "«%s» no puede abrir «%s» porque «%s» no puede acceder a los archivos en las "
-"direcciones «%s». No existen otras aplicaciones para ver este archivo. Si "
-"copia este archivo en su computadora no tendrá con qué abrirlo."
+"direcciones «%s». "
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"No existen otras aplicaciones para ver este archivo. Si copia este archivo "
+"en su equipo no tendrá con qué abrirlo."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "La acción predeterminada no puede abrir «%s» porque no puede acceder a los "
-"archivos en la dirección «%s». No hay disponibles otras acciones para "
-"visualizar este archivo. Si copia este archivo en su computadora quizás "
-"pueda abrirlo."
+"archivos de la dirección «%s». "
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"No existen otras aplicaciones para ver este archivo. Si copia este archivo "
+"en su equipo no tendrá con qué abrirlo."
 
 # src/file-manager/fm-icon-view.c:1277
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Lo siento, pero no puede ejecutar comandos desde un sitio remoto debido a "
-"cuestiones de seguridad."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Lo siento, pero no puede ejecutar comandos desde un sitio remoto."
+
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Esto está deshabilitado debido a cuestiones de seguridad."
 
 # libnautilus-private/nautilus-program-choosing.c:252
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr "No se puede ejecutar enlaces remotos"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Se ha producido un error ejecutando la aplicación.\n"
-"\n"
-"Detalles: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detalles:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Se ha producido un error ejecutando la aplicación."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Error al ejecutar la aplicación"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
-msgid ""
-"This drop target only supports local files.\n"
-"\n"
-"To open non-local files copy them to a local folder and then drop them again."
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "El destino sólo soporta archivos locales."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+msgid "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Este destino para soltar sólo soporta archivos locales.\n"
-"\n"
 "Para abrir archivos no locales cópielos a una carpeta local y luego "
 "suéltelos nuevamente."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "El destino sólo soporta archivos locales"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Este destino sólo soporta archivos locales.\n"
-"\n"
 "Para abrir archivos no locales cópielos a una carpeta local y luego "
 "suéltelos nuevamente. Los archivos locales que ha soltado ya han sido "
 "abiertos."
@@ -4458,8 +4331,7 @@ msgstr "[Elementos ]sin ninguna de las palabras «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:555
 msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
-msgstr ""
-"[Elementos mayores de 400K] y [sin ninguna de las palabras «manzana naranja»]"
+msgstr "[Elementos mayores de 400K] y [sin ninguna de las palabras «manzana naranja»]"
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4506,15 +4378,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementos que tienen «medusa» en sus nombres y que son carpetas."
 
-# libnautilus-private/nautilus-global-preferences.c:277
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Buscando discos"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus está buscando carpetas papeleras en los discos."
-
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
@@ -4555,95 +4418,6 @@ msgstr "Ver como %s"
 msgid "%s Viewer"
 msgstr "Visor %s"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-file.c:2936
-#: libnautilus-private/nautilus-volume-monitor.c:901
-msgid "Unknown"
-msgstr "Desconocido"
-
-#. Populate table with items we know localized names for.
-#: libnautilus-private/nautilus-volume-monitor.c:1074
-msgid "Floppy"
-msgstr "Disquete"
-
-#: libnautilus-private/nautilus-volume-monitor.c:1075
-#: libnautilus-private/nautilus-volume-monitor.c:1104
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: libnautilus-private/nautilus-volume-monitor.c:1076
-msgid "Zip Drive"
-msgstr "Unidad zip"
-
-#: libnautilus-private/nautilus-volume-monitor.c:1091
-#: libnautilus-private/nautilus-volume-monitor.c:1135
-msgid "Audio CD"
-msgstr "Disco compacto de audio"
-
-#: libnautilus-private/nautilus-volume-monitor.c:1126
-msgid "Root Volume"
-msgstr "Volumen raíz"
-
-#: libnautilus-private/nautilus-volume-monitor.c:1805
-msgid "Mount Error"
-msgstr "Error al montar"
-
-# src/file-manager/fm-error-reporting.c:214
-#: libnautilus-private/nautilus-volume-monitor.c:1805
-msgid "Unmount Error"
-msgstr "Error al desmontar"
-
-#. Handle floppy case
-#: libnautilus-private/nautilus-volume-monitor.c:1878
-msgid ""
-"Nautilus was unable to mount the floppy drive. There is probably no floppy "
-"in the drive."
-msgstr ""
-"Nautilus no pudo montar la disquetera. Probablemente no haya un disquete "
-"colocado en ella."
-
-#. All others
-#: libnautilus-private/nautilus-volume-monitor.c:1882
-msgid ""
-"Nautilus was unable to mount the volume. There is probably no media in the "
-"device."
-msgstr ""
-"Nautilus no pudo montar el volumen. Probablemente no haya nada en el "
-"dispositivo."
-
-#: libnautilus-private/nautilus-volume-monitor.c:1888
-msgid ""
-"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
-"format that cannot be mounted."
-msgstr ""
-"Nautilus no pudo montar la disquetera. Probablemente el disquete esté "
-"formateado de forma tal que no se puede montar."
-
-#: libnautilus-private/nautilus-volume-monitor.c:1891
-msgid ""
-"Nautilus was unable to mount the selected volume. The volume is probably in "
-"a format that cannot be mounted."
-msgstr ""
-"Nautilus no pudo montar el volumen seleccionado. Probablemente el volumen "
-"esté formateado de forma tal que no se pueda montar."
-
-#: libnautilus-private/nautilus-volume-monitor.c:1896
-msgid "Nautilus was unable to mount the selected floppy drive."
-msgstr "Nautilus no pudo montar la disquetera seleccionada."
-
-#: libnautilus-private/nautilus-volume-monitor.c:1898
-msgid "Nautilus was unable to mount the selected volume."
-msgstr "Nautilus no pudo montar el volumen seleccionado."
-
-#. FIXME: Should we parse this message and report something more meaningful?
-#: libnautilus-private/nautilus-volume-monitor.c:1903
-msgid "Nautilus was unable to unmount the selected volume."
-msgstr "Nautilus no pudo desmontar el volumen seleccionado."
-
-#: libnautilus-private/nautilus-volume-monitor.c:2148
-msgid "ISO 9660 Volume"
-msgstr "Volumen ISO 9660"
-
 #: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
 msgid "C_lear Text"
 msgstr "_Limpiar el texto"
@@ -4683,18 +4457,30 @@ msgstr "Seleccionar todo el texto en un campo de texto"
 msgid "_Paste Text"
 msgstr "_Pegar el texto"
 
+#: nautilus-computer.desktop.in.h:2
+msgid "View your computer storage"
+msgstr "Ver el almacenamiento de su equipo"
+
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
-msgstr "Cambiar la administración de archivos"
+msgstr "Cambiar el modo de administración de archivos"
 
 #: nautilus-file-management-properties.desktop.in.h:2
 msgid "File Management"
 msgstr "Administración de archivos"
 
-#: nautilus.desktop.in.h:2
+#: nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
 msgstr "Ver su carpeta de inicio en el administrador de archivos Nautilus"
 
+#: nautilus.desktop.in.h:1
+msgid "Browse Filesystem"
+msgstr "Examinar sistema de archivos"
+
+#: nautilus.desktop.in.h:2
+msgid "Browse the filesystem with the file manager"
+msgstr "Examinar el sistema de archivos con el gestor de archivos"
+
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
 msgstr "Fábrica para el shell y administrador de archivos Nautilus"
@@ -4823,142 +4609,133 @@ msgid "View as _List"
 msgstr "Ver como _lista"
 
 # src/nautilus-sidebar.c:424
-#: src/file-manager/fm-desktop-icon-view.c:596
+#: src/file-manager/fm-desktop-icon-view.c:582
 msgid "Background"
 msgstr "Fondo"
 
-#: src/file-manager/fm-desktop-icon-view.c:766
-#, c-format
-msgid "Error executing utility program '%s': %s"
-msgstr "Error al ejecutar el programa utilitario «%s» : %s"
-
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-desktop-icon-view.c:1016
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+#: src/file-manager/fm-desktop-icon-view.c:655
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
 msgid "Empty Trash"
 msgstr "Vaciar la papelera"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-properties-window.c:1581
-#: src/file-manager/fm-desktop-icon-view.c:1034
-msgid "E_ject"
-msgstr "E_xpulsar"
-
-# components/html/gnome-dialogs.c:234
-#: src/file-manager/fm-desktop-icon-view.c:1134
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:20
-msgid "_Unmount Volume"
-msgstr "_Desmontar el volumen"
-
-#: src/file-manager/fm-directory-view.c:487
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Esto abrirá %d ventanas separadas. ¿Está seguro de que quiere hacer esto?"
-
 # src/file-manager/fm-directory-view.c:2128
-#: src/file-manager/fm-directory-view.c:489
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "¿Abrir %d ventanas?"
 
 # src/file-manager/fm-directory-view.c:1855
-#: src/file-manager/fm-directory-view.c:813
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "¿Seguro que desea abrir todos los archivos?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Esto abrirá %d ventanas individuales."
+
+# src/file-manager/fm-directory-view.c:1855
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "¿Está seguro que desea eliminar permanentemente «%s»?"
 
 # src/file-manager/fm-directory-view.c:1860
-#: src/file-manager/fm-directory-view.c:817
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "¿Está seguro de que desea eliminar permanentemente los %d elementos "
 "seleccionados?"
 
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Si borra un elemento, se perderá permanentemente."
+
 # src/file-manager/fm-directory-view.c:1865
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "¿Eliminar?"
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: src/file-manager/fm-directory-view.c:962
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Patrón se selección"
 
-#: src/file-manager/fm-directory-view.c:978
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "_Patrón:"
 
 # src/file-manager/fm-directory-view.c:1015
-#: src/file-manager/fm-directory-view.c:1575
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "«%s» seleccionado"
 
 # src/file-manager/fm-directory-view.c:1017
-#: src/file-manager/fm-directory-view.c:1577
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 carpeta seleccionada"
 
 # src/file-manager/fm-directory-view.c:1020
-#: src/file-manager/fm-directory-view.c:1580
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d carpetas seleccionadas"
 
 # src/file-manager/fm-directory-view.c:1026
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (contiene 0 elementos)"
 
 # src/file-manager/fm-directory-view.c:1028
-#: src/file-manager/fm-directory-view.c:1589
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contiene 1 elemento)"
 
 # src/file-manager/fm-directory-view.c:1030
-#: src/file-manager/fm-directory-view.c:1591
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contiene %d elementos)"
 
 # src/file-manager/fm-directory-view.c:1026
-#: src/file-manager/fm-directory-view.c:1598
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contiene un total de 0 elementos)"
 
 # src/file-manager/fm-directory-view.c:1028
-#: src/file-manager/fm-directory-view.c:1600
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contiene un total de 1 elemento)"
 
 # src/file-manager/fm-directory-view.c:1030
-#: src/file-manager/fm-directory-view.c:1602
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contiene un total de %d elementos)"
 
 # src/file-manager/fm-directory-view.c:1041
-#: src/file-manager/fm-directory-view.c:1615
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "«%s» seleccionado (%s)"
 
 # src/file-manager/fm-directory-view.c:1045
-#: src/file-manager/fm-directory-view.c:1619
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementos seleccionados (%s)"
 
 # src/file-manager/fm-directory-view.c:1052
-#: src/file-manager/fm-directory-view.c:1626
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "otro elemento seleccionado (%s)"
 
 # src/file-manager/fm-directory-view.c:1055
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "otros %d elementos seleccionados (%s)"
@@ -4971,7 +4748,7 @@ msgstr "otros %d elementos seleccionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1658
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4980,125 +4757,134 @@ 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:1783
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
-msgstr ""
-"La carpeta «%s» contiene más archivos de los que Nautilus puede manejar. "
-"Algunos archivos no se mostrarán."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
+msgstr "La carpeta «%s» contiene más archivos de los que Nautilus puede manejar."
 
-#: src/file-manager/fm-directory-view.c:1790
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Algunos archivos no se mostrarán."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Demasiados archivos"
 
-#: src/file-manager/fm-directory-view.c:3022
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr ""
-"«%s» no puede ser movido a la papelera. ¿Quiere eliminarlo directamente?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "No puede mover el archivo a la papelera. ¿Quiere eliminarlo inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3027
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "El archivo «%s» no puede ser movido a la papelera."
+
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
-"Los %d elementos seleccionados no pueden ser movidos a la papelera. ¿Quiere "
-"eliminarlos directamente?"
+"No puede mover los elementos a la papelera. ¿Quiere eliminarlos "
+"inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3031
-#, c-format
-msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+#: src/file-manager/fm-directory-view.c:3220
+msgid "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d de los elementos seleccionados no pueden ser movidos a la papelera. "
-"¿Quiere eliminar los %d elementos directamente?"
+"No puede mover algunos de los elementos a la papelera, ¿quiere borrarlos "
+"directamente?"
 
-#: src/file-manager/fm-directory-view.c:3039
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
-msgstr "¿Eliminar directamente?"
+msgstr "¿Borrar directamente?"
 
 # src/file-manager/fm-directory-view.c:1855
-#: src/file-manager/fm-directory-view.c:3071
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "¿Está seguro que desea eliminar permanentemente a «%s» de la papelera?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "¿Está seguro que desea borrar permanentemente a «%s» de la papelera?"
 
 # src/file-manager/fm-directory-view.c:1860
-#: src/file-manager/fm-directory-view.c:3075
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
-"¿Está seguro de que desea eliminar permanentemente los %d elementos "
+"¿Está seguro de que desea borrar permanentemente los %d elementos "
 "seleccionados de la papelera?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Si borra un elemento, se perderá para siempre."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "¿Eliminar de la papelera?"
 
-#: src/file-manager/fm-directory-view.c:3360
-#: src/file-manager/fm-directory-view.c:3402
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar «%s» para abrir el elemento seleccionado"
 
 # src/file-manager/fm-directory-view.c:2120
-#: src/file-manager/fm-directory-view.c:3481
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Otra _aplicación..."
 
 # src/file-manager/fm-directory-view.c:2120
-#: src/file-manager/fm-directory-view.c:3481
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Una _aplicación..."
 
 # src/file-manager/fm-directory-view.c:2122
-#: src/file-manager/fm-directory-view.c:3503
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Otro _visor..."
 
 # src/file-manager/fm-directory-view.c:2122
-#: src/file-manager/fm-directory-view.c:3503
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Un _visor..."
 
-#: src/file-manager/fm-directory-view.c:3596
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "No se ha podido completar la acción especificada: %s"
 
-#: src/file-manager/fm-directory-view.c:3620
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "No se ha podido completar la acción especificada."
 
-#: src/file-manager/fm-directory-view.c:4129
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Ejecutar «%s» en cualquiera de los elementos seleccionados"
 
-#: src/file-manager/fm-directory-view.c:4346
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Crear un documento nuevo usando la plantilla «%s»"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Todos los archivos ejecutables en esta carpeta aparecerán en el menú "
+"«Guiones». "
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Todos los archivos ejecutables en esta carpeta aparecerán en el menú "
-"«Guiones». Seleccionando un guión desde el menú ejecutará ese guión usando "
-"cualquier elemento seleccionado como argumento de entrada."
+"Seleccionando un script desde el menú ejecutará ese script usando cualquier "
+"elemento seleccionado como argumento de entrada."
 
-#: src/file-manager/fm-directory-view.c:4349
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Acerca de los guiones"
 
-#: src/file-manager/fm-directory-view.c:4350
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -5120,11 +4906,11 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 "Todos los archivos ejecutables en esta carpeta aparecerán en el menú "
-"«Guiones». Seleccionando un guión desde el menú ejecutará ese guión.\n"
+"«Guiones». Seleccionando un script desde el menú ejecutará ese script.\n"
 "\n"
-"Cuando son ejecutados desde la computadora local, los guiones obtendrán como "
+"Cuando son ejecutados desde la equipo local, los guiones obtendrán como "
 "argumentos de entrada los nombres de los archivos seleccionados. Cuando sean "
-"ejecutados desde una computadora remota (ej. una carpeta mostrando contenido "
+"ejecutados desde una equipo remota (ej. una carpeta mostrando contenido "
 "web o ftp), los guiones serán ejecutados sin ningún argumento de entrada.\n"
 "\n"
 "En todos los casos, las siguientes variables de entorno serán establecidas "
@@ -5140,197 +4926,216 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posición y tamaño de la ventana actual"
 
-#: src/file-manager/fm-directory-view.c:4471
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "«%s» sera movido si selecciona el comando «Pegar archivos»"
 
-#: src/file-manager/fm-directory-view.c:4475
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "«%s» será copiado si selecciona la orden «Pegar archivos»"
 
-#: src/file-manager/fm-directory-view.c:4482
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
-msgid ""
-"The %d selected items will be moved if you select the Paste Files command"
+msgid "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "Los %d elementos seleccionados serán movidos si selecciona la orden «Pegar "
 "Archivos»"
 
-#: src/file-manager/fm-directory-view.c:4486
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
-msgid ""
-"The %d selected items will be copied if you select the Paste Files command"
+msgid "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "Los %d elementos seleccionados serán copiados si selecciona la orden «Pegar "
 "Archivos»"
 
-#: src/file-manager/fm-directory-view.c:4565
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "No hay nada en el portapapeles para pegar."
 
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
+msgid "Mount Error"
+msgstr "Error al montar"
+
+# src/file-manager/fm-error-reporting.c:214
+#: src/file-manager/fm-directory-view.c:5221
+msgid "Unmount Error"
+msgstr "Error al desmontar"
+
+#: src/file-manager/fm-directory-view.c:5224
+msgid "Eject Error"
+msgstr "Error al expulsar"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-properties-window.c:1581
+#: src/file-manager/fm-directory-view.c:5449
+msgid "E_ject"
+msgstr "E_xpulsar"
+
+# components/html/gnome-dialogs.c:234
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
+msgid "_Unmount Volume"
+msgstr "_Desmontar el volumen"
+
 # src/file-manager/fm-directory-view.c:2126
-#: src/file-manager/fm-directory-view.c:4842
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
 # src/file-manager/fm-directory-view.c:2128
-#: src/file-manager/fm-directory-view.c:4844
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Abrir en %d ventanas nuevas"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: src/file-manager/fm-directory-view.c:4849
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Explorar carpeta"
 
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: src/file-manager/fm-directory-view.c:4851
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Explorar carpetas"
 
-#: src/file-manager/fm-directory-view.c:4874
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Eliminar de la _papelera"
 
 # src/file-manager/fm-directory-view.c:2678
-#: src/file-manager/fm-directory-view.c:4876
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Elimina permanentemente todos los elementos seleccionados"
 
 # src/file-manager/fm-directory-view.c:2145
-#: src/file-manager/fm-directory-view.c:4879
-#: src/file-manager/fm-directory-view.c:5163
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mo_ver a la papelera"
 
 # src/file-manager/fm-directory-view.c:2669
-#: src/file-manager/fm-directory-view.c:4881
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mueve cada elemento seleccionado a la papelera"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: src/file-manager/fm-directory-view.c:4905
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: src/file-manager/fm-directory-view.c:4925
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Crear enl_aces"
 
-#: src/file-manager/fm-directory-view.c:4926
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Crear un enl_ace"
 
 # src/file-manager/fm-directory-view.c:2154
-#: src/file-manager/fm-directory-view.c:4939
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Vaciar la papelera"
 
 # components/music/nautilus-music-view.c:198
-#: src/file-manager/fm-directory-view.c:4955
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cor_tar el archivo"
 
 # components/music/nautilus-music-view.c:198
-#: src/file-manager/fm-directory-view.c:4956
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cor_tar los archivos"
 
-#: src/file-manager/fm-directory-view.c:4965
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copiar el archivo"
 
 # src/file-manager/dfos-xfer.c:723
-#: src/file-manager/fm-directory-view.c:4966
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copiar los archivos"
 
-#: src/file-manager/fm-directory-view.c:5154
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Este enlace no puede ser utilizado ya que no tiene destino. ¿Desea mover "
-"este enlace a la papelera?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "El enlace está roto, ¿quiere moverlo a la papelera?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Este enlace no puede ser usado, porque no tiene destino."
 
-#: src/file-manager/fm-directory-view.c:5157
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Este enlace no puede ser usado porque su destino «%s» no existe. ¿Quiere "
-"mover este enlace a la papelera?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Este enlace no puede ser usado, porque su destino «%s» no existe."
 
-#: src/file-manager/fm-directory-view.c:5163
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Enlace roto"
 
-#: src/file-manager/fm-directory-view.c:5220
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"«%s» es un archivo de texto ejecutable. ¿Quiere ejecutarlo o ver su "
-"contenido?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "¿Quiere ejecutar «%s» o ver su contenido?"
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "«%s» es un archivo de texto ejecutable."
 
 # libnautilus-private/nautilus-global-preferences.c:149
-#: src/file-manager/fm-directory-view.c:5226
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "¿Ejecutar o ver?"
 
+# src/file-manager/fm-desktop-icon-view.c:222
+#: src/file-manager/fm-directory-view.c:5924
+msgid "Run in _Terminal"
+msgstr "Ejecutar en un _terminal"
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: src/file-manager/fm-directory-view.c:5227
+#: src/file-manager/fm-directory-view.c:5925
 msgid "_Display"
 msgstr "_Mostrar"
 
-# src/file-manager/fm-desktop-icon-view.c:222
-#: src/file-manager/fm-directory-view.c:5228
-msgid "Run in _Terminal"
-msgstr "Ejecutar en una _terminal"
-
-#: src/file-manager/fm-directory-view.c:5231
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "E_jecutar"
 
 # src/file-manager/fm-icon-view.c:1277
-#: src/file-manager/fm-directory-view.c:5436
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Abriendo «%s»"
+msgid "Opening \"%s\"."
+msgstr "Abriendo «%s»."
 
 # src/file-manager/fm-error-reporting.c:226
-#: src/file-manager/fm-directory-view.c:5442
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "¿Cancelar apertura?"
 
 # src/nautilus-window-manage-views.c:648
 #: src/file-manager/fm-error-reporting.c:57
 #, c-format
-msgid ""
-"You do not have the permissions necessary to view the contents of \"%s\"."
+msgid "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "No tiene los permisos suficientes para ver el contenido de «%s»."
 
 #: src/file-manager/fm-error-reporting.c:61
 #, c-format
 msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
-msgstr ""
-"«%s» no ha podido ser encontrado. Quizás haya sido eliminado recientemente."
+msgstr "«%s» no ha podido ser encontrado. Quizás haya sido eliminado recientemente."
 
 # src/file-manager/fm-error-reporting.c:115
 #: src/file-manager/fm-error-reporting.c:68
@@ -5338,35 +5143,38 @@ msgstr ""
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Lo siento, no se ha podido mostrar todo el contenido de «%s»."
 
+# src/file-manager/fm-properties-window.c:1641
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "El contenido de la carpeta no pudo mostrarse."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Error al mostrar la carpeta"
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
-msgid ""
-"The name \"%s\" is already used in this folder. Please use a different name."
+msgid "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "El nombre «%s» ya está siendo usado en esta carpeta. Por favor seleccione un "
 "nombre distinto."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid ""
-"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "No existe un «%s» en esta carpeta. Quizás fue movido o eliminado "
 "recientemente."
 
 # src/file-manager/fm-error-reporting.c:55
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "No tiene los permisos suficientes para cambiar el nombre de «%s»."
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -5376,12 +5184,12 @@ msgstr ""
 "un nombre distinto."
 
 # src/file-manager/fm-error-reporting.c:50
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "El nombre «%s» no es válido. Por favor use un nombre distinto."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
@@ -5389,24 +5197,28 @@ msgstr ""
 "lectura."
 
 # src/file-manager/fm-error-reporting.c:64
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Lo siento, no se ha podido renombrar «%s» por «%s»."
 
+# src/file-manager/fm-properties-window.c:1641
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "El elemento no pudo ser renombrado."
+
 # src/file-manager/fm-error-reporting.c:214
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
-msgstr "Error al cambiar el nombre"
+msgstr "Error al renombrar"
 
 # src/file-manager/fm-error-reporting.c:85
-#: src/file-manager/fm-error-reporting.c:163
+#: src/file-manager/fm-error-reporting.c:165
 #, c-format
-msgid ""
-"You do not have the permissions necessary to change the group of \"%s\"."
+msgid "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "No tiene los permisos suficientes para cambiar el grupo de «%s»."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
@@ -5414,16 +5226,21 @@ msgstr ""
 "lectura"
 
 # src/file-manager/fm-error-reporting.c:93
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Lo siento, no se ha podido cambiar el grupo de «%s»."
 
-#: src/file-manager/fm-error-reporting.c:179
+# src/file-manager/fm-properties-window.c:1641
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "El grupo no pudo cambiarse."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Error al configurar el grupo"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
@@ -5431,43 +5248,52 @@ msgstr ""
 "sólo lectura"
 
 # src/file-manager/fm-error-reporting.c:115
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Lo siento, no se ha podido cambiar el propietario de «%s»."
 
-#: src/file-manager/fm-error-reporting.c:211
+# src/file-manager/fm-properties-window.c:1641
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "El propietario no pudo cambiarse."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
-msgstr "Error al cambiar el propietario"
+msgstr "Error al establecer el propietario"
 
 # src/file-manager/fm-error-reporting.c:137
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
+msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "No se ha podido cambiar los permisos de «%s» porque está en un disco de sólo "
 "lectura"
 
 # src/file-manager/fm-error-reporting.c:137
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Lo siento, no se ha podido cambiar los permisos de «%s»."
 
+# src/file-manager/fm-properties-window.c:1641
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Los permisos no pudieron cambiarse."
+
 # src/file-manager/fm-icon-text-window.c:83
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Error al configurar los permisos"
 
 # src/file-manager/fm-error-reporting.c:214
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
-msgstr "Renombrando  «%s» por «%s»."
+msgstr "Renombrando  «%s» a «%s»."
 
 # src/file-manager/fm-error-reporting.c:226
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "¿Cancelar renombrar?"
 
@@ -5538,25 +5364,28 @@ msgid "Restore Icon's Original Si_ze"
 msgstr "Re_staurar el tamaño normal del icono"
 
 # src/file-manager/fm-icon-view.c:1277
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apuntando hacia «%s»"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr ""
-"Arrastrar y soltar solo está soportado para sistemas de archivos locales."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Arrastrar y soltar no está soportado."
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Arrastrar y soltar sólo está soportado para sistemas de archivos locales."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Error al arrastrar y soltar"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Se ha utilizado un tipo de arrastre inválido."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nombre de archivo"
 
@@ -5564,8 +5393,8 @@ msgstr "Nombre de archivo"
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Tamaño"
 
@@ -5573,116 +5402,114 @@ msgstr "Tamaño"
 # libnautilus-private/nautilus-search-bar-criterion.c:44
 # src/file-manager/fm-list-view.c:1593
 # src/file-manager/fm-search-list-view.c:152
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipo"
 
 # src/file-manager/fm-list-view.c:1599
 # src/file-manager/fm-search-list-view.c:158
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Fecha de modificación"
 
-#: src/file-manager/fm-properties-window.c:460
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
-"¡No puede asignar más de un icono personalizado a la vez! Por favor arrastre "
-"sólo una imagen para usarla como icono personalizado."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "¡No puede asignar más de un icono personalizado a la vez!"
 
-#: src/file-manager/fm-properties-window.c:462
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Por favor arrastre sólo una imagen para usarla como icono personalizado."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
-msgstr "Más de una Imagen"
+msgstr "Más de una imagen"
 
-#: src/file-manager/fm-properties-window.c:471
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"El archivo que ha soltado no es local. Solamente puede usar imágenes locales "
-"como iconos personalizados"
+msgid "The file that you dropped is not local."
+msgstr "El archivo que ha soltado no es local."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Solamente puede usar imágenes locales como iconos personalizados."
 
 # libnautilus-private/nautilus-global-preferences.c:587
-#: src/file-manager/fm-properties-window.c:473
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Sólo imágenes locales"
 
-#: src/file-manager/fm-properties-window.c:478
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"El archivo que a soltado no es una imagen. Sólo use imágenes locales como "
-"iconos personalizados."
+msgid "The file that you dropped is not an image."
+msgstr "El archivo que ha soltado no es una imagen."
 
-#: src/file-manager/fm-properties-window.c:480
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Sólo imágenes"
 
 # src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/fm-properties-window.c:897
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Propiedades"
 
 # src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/fm-properties-window.c:900
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propiedades de %s"
 
 # src/file-manager/fm-properties-window.c:542
-#: src/file-manager/fm-properties-window.c:1361
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "¿Cancelar el cambio de grupo?"
 
 # src/file-manager/fm-properties-window.c:543
-#: src/file-manager/fm-properties-window.c:1362
-msgid "Changing group"
-msgstr "Cambiando el grupo"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Cambiando grupo."
 
 # src/file-manager/fm-properties-window.c:687
-#: src/file-manager/fm-properties-window.c:1523
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "¿Cancelar el cambio de propietario?"
 
 # src/file-manager/fm-properties-window.c:688
-#: src/file-manager/fm-properties-window.c:1524
-msgid "Changing owner"
-msgstr "Cambiando propietario"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Cambiando propietario."
 
 # src/file-manager/fm-properties-window.c:844
-#: src/file-manager/fm-properties-window.c:1729
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nada"
 
 # src/file-manager/fm-properties-window.c:846
-#: src/file-manager/fm-properties-window.c:1731
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ilegible"
 
 # src/file-manager/fm-properties-window.c:856
-#: src/file-manager/fm-properties-window.c:1742
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 elemento, con tamaño %s"
 
 # src/file-manager/fm-properties-window.c:858
-#: src/file-manager/fm-properties-window.c:1745
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementos, en total %s"
 
 # src/file-manager/fm-properties-window.c:864
-#: src/file-manager/fm-properties-window.c:1753
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(algunos contenidos están ilegibles)"
 
@@ -5693,13 +5520,13 @@ msgstr "(algunos contenidos están ilegibles)"
 #. * 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:1770
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Contenidos:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1031
-#: src/file-manager/fm-properties-window.c:2161
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Básico"
 
@@ -5708,7 +5535,7 @@ msgstr "Básico"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: src/file-manager/fm-properties-window.c:2189
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nombres:"
 
@@ -5717,214 +5544,212 @@ msgstr "_Nombres:"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: src/file-manager/fm-properties-window.c:2191
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nombre:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1094
-#: src/file-manager/fm-properties-window.c:2240
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:2242
-#: src/file-manager/fm-properties-window.c:2252
-#: src/file-manager/fm-properties-window.c:2258
 #: src/file-manager/fm-properties-window.c:2265
-#: src/file-manager/fm-properties-window.c:2269
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2283
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
+#: src/file-manager/fm-properties-window.c:2288
 #: src/file-manager/fm-properties-window.c:2292
-#: src/file-manager/fm-properties-window.c:2298
-#: src/file-manager/fm-properties-window.c:2868
-#: src/file-manager/fm-properties-window.c:2889
-#: src/file-manager/fm-properties-window.c:2971
-#: src/file-manager/fm-properties-window.c:2975
-#: src/file-manager/fm-properties-window.c:2979
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1100
-#: src/file-manager/fm-properties-window.c:2250
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Tamaño:"
 
 # src/nautilus-location-bar.c:401
-#: src/file-manager/fm-properties-window.c:2256 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
-msgstr "Dirección:"
+msgstr "Ubicación:"
 
-#: src/file-manager/fm-properties-window.c:2263
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: src/file-manager/fm-properties-window.c:2267
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Espacio libre:"
 
 # src/nautilus-link-set-window.c:185
-#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Destino del enlace:"
 
 # src/file-manager/fm-icon-text-window.c:84
-#: src/file-manager/fm-properties-window.c:2281
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 # src/file-manager/fm-properties-window.c:1103
-#: src/file-manager/fm-properties-window.c:2290
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificado:"
 
 # src/file-manager/fm-properties-window.c:1105
-#: src/file-manager/fm-properties-window.c:2296
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Accedido:"
 
-#: src/file-manager/fm-properties-window.c:2312
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Seleccionar un icono personal..."
 
 # src/file-manager/fm-directory-view.c:2163
-#: src/file-manager/fm-properties-window.c:2318
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Quitar el icono personal"
 
 # src/file-manager/fm-properties-window.c:1573
-#: src/file-manager/fm-properties-window.c:2659
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lectura"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1577
-#: src/file-manager/fm-properties-window.c:2661
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Escritura"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1581
-#: src/file-manager/fm-properties-window.c:2663
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_jecución"
 
 # src/file-manager/fm-properties-window.c:1474
-#: src/file-manager/fm-properties-window.c:2740
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
-msgstr "Colocar el ID del _usuario"
+msgstr "Establecer el ID del _usuario"
 
 # src/file-manager/fm-properties-window.c:1470
-#: src/file-manager/fm-properties-window.c:2745
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Atributos especiales:"
 
 # src/file-manager/fm-properties-window.c:1478
-#: src/file-manager/fm-properties-window.c:2748
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
-msgstr "Colocar el ID del _grupo"
+msgstr "Establecer el ID del _grupo"
 
 # src/file-manager/fm-properties-window.c:1482
-#: src/file-manager/fm-properties-window.c:2750
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
-msgstr "Adhe_sivo"
+msgstr "Per_sistente"
 
 # src/file-manager/fm-properties-window.c:1493
-#: src/file-manager/fm-properties-window.c:2834
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permisos"
 
 # src/file-manager/fm-properties-window.c:1499
-#: src/file-manager/fm-properties-window.c:2844
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Usted no es el propietario, por eso no puede cambiar estos permisos."
 
 # src/file-manager/fm-properties-window.c:1526
-#: src/file-manager/fm-properties-window.c:2857
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "_Propietario del archivo:"
+
+# src/file-manager/fm-properties-window.c:1526
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
-msgstr "Propietario:"
+msgstr "Propietario del archivo:"
 
 # src/file-manager/fm-properties-window.c:1536
-#: src/file-manager/fm-properties-window.c:2874
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
-msgstr "G_rupo del archivo:"
+msgstr "_Grupo del archivo:"
 
 # src/file-manager/fm-properties-window.c:1536
-#: src/file-manager/fm-properties-window.c:2883
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grupo del archivo:"
 
 # src/file-manager/fm-properties-window.c:1554
-#: src/file-manager/fm-properties-window.c:2895
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Propietario:"
 
 # src/file-manager/fm-properties-window.c:1557
-#: src/file-manager/fm-properties-window.c:2896
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupo:"
 
 # src/file-manager/fm-properties-window.c:1560
-#: src/file-manager/fm-properties-window.c:2897
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Otros:"
 
 # src/file-manager/fm-properties-window.c:1563
-#: src/file-manager/fm-properties-window.c:2970
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
-msgstr "Vista texto:"
+msgstr "Vista textual:"
 
 # src/file-manager/fm-properties-window.c:1566
-#: src/file-manager/fm-properties-window.c:2974
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
-msgstr "Vista número:"
+msgstr "Vista numérica:"
 
 # src/file-manager/fm-properties-window.c:1569
-#: src/file-manager/fm-properties-window.c:2978
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
-msgstr "Último cambio:"
+msgstr "Última modificación:"
 
 # src/file-manager/fm-properties-window.c:1641
-#: src/file-manager/fm-properties-window.c:2984
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Los permisos de «%s» no han podido ser determinados."
 
 # src/file-manager/fm-properties-window.c:1641
-#: src/file-manager/fm-properties-window.c:2987
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
-msgstr "Los permisos del archivo seleccionado no han podido ser determinados"
+msgstr "Los permisos del archivo seleccionado no han podido ser determinados."
 
-#: src/file-manager/fm-properties-window.c:3303
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:607
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Hubo un error al mostrar la ayuda: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Hubo un error al mostrar la ayuda."
 
 # components/services/install/lib/eazel-install-protocols.c:116
-#: src/file-manager/fm-properties-window.c:3305
-msgid "Couldn't show help"
-msgstr "No se ha podido mostrar la ayuda"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "No se pudo mostrar la ayuda"
 
 # libnautilus-private/nautilus-global-preferences.c:750
-#: src/file-manager/fm-properties-window.c:3642
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "¿Cancelar la ventana de propiedades?"
 
 # libnautilus-private/nautilus-global-preferences.c:750
-#: src/file-manager/fm-properties-window.c:3643
-msgid "Creating Properties window"
-msgstr "Creando ventana de propiedades"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Creando ventana de propiedades."
 
 # src/nautilus-property-browser.c:1083
-#: src/file-manager/fm-properties-window.c:3769
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Seleccione un icono"
 
@@ -5935,7 +5760,7 @@ msgid ""
 "last indexed."
 msgstr ""
 "Los resultados de la búsqueda deberían no incluir elementos modificados "
-"después del %s, fecha en la que se indexó su disco por última vez."
+"después del %s, fecha en la que se indexó su unidad por última vez."
 
 # libnautilus-private/nautilus-global-preferences.c:277
 #: src/file-manager/fm-search-list-view.c:144
@@ -5943,100 +5768,114 @@ msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Lo siento, pero el servicio de búsqueda Medusa no está disponible porque no "
-"se instaló."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Lo siento, pero el servicio de búsqueda Medusa no está disponible"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa no está instalado."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Servicio de búsqueda no disponible"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+"La búsqueda que ha seleccionado es más nueva que el índice de su sistema. La "
+"búsqueda no devolverá ningún resultado ahora mismo."
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
-"La búsqueda que ha seleccionado es más nueva que el índice en su sistema. La "
-"búsqueda no devolverá resultados en este momento. Puede crear un índice "
-"nuevo ejecutando «medusa-indexd» como root desde la línea de órdenes."
+"Puede crear un índice nuevo ejecutando «medusa-indexd» como root en la línea "
+"de comandos."
 
 # libnautilus-private/nautilus-global-preferences.c:727
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr "Buscar elementos que son demasiado nuevos"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Cada archivo indexado en su equipo coincide con el criterio de búsqueda "
+"seleccionado."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Cada archivo indexado en su computadora coincide con el criterio de "
-"búsqueda. Puede comprobar lo que escribió en sus selecciones o añadir más "
-"criterios para así disminuir los resultados."
+"Puede comprobar la escritura de sus selecciones o añadir más criterios para "
+"acotar sus resultados."
 
 # src/file-manager/dfos-xfer.c:764 src/file-manager/dfos-xfer.c:780
 # src/file-manager/dfos-xfer.c:923 src/file-manager/dfos-xfer.c:933
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Error durante la búsqueda"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Buscar no puede abrir su archivo de índice del sistema. Su índice puede "
-"estar perdido o corrupto. Puede crear un índice nuevo ejecutando «medusa-"
-"indexd» como root desde la línea de órdenes."
+"No se puede abrir el índice de su sistema de archivos. Su índice debe de "
+"haberse perdido o está corrompido."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "Error leyendo el archivo índice"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Error leyendo el índice del archivo"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Ocurrió un error mientras se cargaba el contenido de esta búsqueda: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Ocurrió un error mientras se cargaba el contenido de esta búsqueda."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid "To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Para hacer una búsqueda rápida, se necesita un índice de los archivos en su "
+"sistema."
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid "To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Para hacer una búsqueda de contenido, se requiere un índice de los archivos "
+"de su sistema."
+
+#: src/file-manager/fm-search-list-view.c:245
 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 ""
-"Para hacer una búsqueda rápida, Buscar necesita un índice con los archivos "
-"de su sistema. Buscar no puede acceder a su índice en este momento, por eso "
-"se ejecutará una búsqueda lenta que no utiliza el índice."
+"La búsqueda no puede acceder al índice, así que se efectuará una búsqueda "
+"lenta que no usa el índice."
 
-#: src/file-manager/fm-search-list-view.c:249
-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 ""
-"Para hacer una búsqueda por contenido, Buscar necesita un índice de archivos "
-"en su sistema. Buscar no puede acceder a su índice en este momento."
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "La búsqueda no puede acceder al índice por ahora."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
-msgstr "Las búsquedas rápidas no están disponibles"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Búsqueda rápida no disponible"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr "Las búsquedas de contenido no están disponibles"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -6050,59 +5889,80 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Para hacer una búsqueda rápida, Buscar necesita un índice de los archivos de "
-"su sistema. Su computadora no tiene un índice actualmente. Como Buscar no "
-"puede usar un índice, esta búsqueda tomará varios minutos."
+"Para hacer una búsqueda rápida se requiere que exista un índice de sus "
+"archivos en el sistema. Su equipo está creando ahora dicho índice."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
-"Para hacer una búsqueda por contenidos, Buscar necesita un índice de los "
-"contenidos de su sistema. Su computadora está creando el índice en este "
-"momento. Las búsquedas por contenido estarán disponibles cuando el índice "
-"esté terminado."
+"Para hacer una búsqueda por contenido, se requiere un índice del contenido "
+"en su sistema. Su equipo está creando ahora ese índice."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"Debido a que no hay un índice disponible, esta búsqueda llevará varios "
+"minutos."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+"Las búsquedas por contenido estarán disponibles cuando el índice esté "
+"terminado."
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr "Las búsquedas indexadas no están disponibles"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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 ""
-"Para hacer una búsqueda rápida, Buscar necesita un índice de los archivos en "
-"su sistema. No hay un índice disponible en este momento. Puede crear un "
-"índice ejecutando «medusa-indexd» como root en la línea de órdenes. Hasta "
-"que no haya un índice completo disponible las búsquedas tomarán varios "
-"minutos."
+"index is available right now."
+msgstr ""
+"Para hacer una búsqueda rápida, se requiere un índice de archivos en su "
+"sistema. Por ahora no hay ningún índice disponible."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
-"Para hacer una búsqueda por contenido Buscar necesita un índice de los "
-"contenidos de su sistema. No hay un índice disponible en este momento. Usted "
-"puede crear un índice ejecutando «medusa-indexd» como root desde la línea de "
-"órdenes. Hasta que no esté disponible un índice completo las búsquedas por "
-"contenido no podrán ser ejecutadas."
+"Para hacer una búsqueda por contenido, se requiere un índice del contenido "
+"en su sistema. Por ahora no hay un índice disponible."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Puede crear un índice ejecutando \"medusa-indexd\" como root en la línea de "
+"comandos. Hasta que esté disponible un índice completo, las búsquedas "
+"tomarán varios minutos."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Puede crear un índice ejecutando \"medusa-indexd\" como root en la línea de "
+"comandos.  Hasta que un índice completo esté disponible, las búsquedas de "
+"contenido no pueden hacerse."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "La búsqueda rápida no está activada en su equipo."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -6110,14 +5970,14 @@ msgid ""
 msgstr ""
 "Para hacer una búsqueda rápida Buscar necesita un índice de los archivos de "
 "su sistema. Su Administrador del Sistema ha desactivado la búsqueda rápida "
-"en su computadora y debido a ésto, no hay un índice disponible."
+"en su equipo y debido a ésto, no hay un índice disponible."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Las búsquedas rápidas no están disponibles en su computadora"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Búsqueda rápida no activada"
 
 # src/file-manager/fm-properties-window.c:1092
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Dónde"
 
@@ -6127,7 +5987,7 @@ msgstr "Dónde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Mostrar en una ventana nueva"
@@ -6139,7 +5999,7 @@ msgstr "_Mostrar en una ventana nueva"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Mostrar en %d ventanas _nuevas"
@@ -6148,15 +6008,15 @@ msgstr "Mostrar en %d ventanas _nuevas"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"Nautilus encontró más resultados de los que puede mostrar. Algunos elementos "
-"que coinciden no serán mostrados."
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus encontró más resultados de los que puede mostrar."
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Algunos elementos coincidentes no serán mostrados."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Demasiadas coincidencias"
 
@@ -6173,89 +6033,49 @@ msgstr "Crear un _lanzador"
 
 # src/nautilus-property-browser.c:853
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Crear un lanzador nuevo"
 
 # src/file-manager/fm-directory-view.c:2669
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Eliminar todos los elementos que hay en la papelera"
 
-# src/file-manager/fm-desktop-icon-view.c:234
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
-msgid "Dis_ks"
-msgstr "D_iscos"
-
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
-msgid "Format the selected volume"
-msgstr "Dar formato al volumen seleccionado"
-
-# src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
-msgid "Medi_a Properties"
-msgstr "Propied_ades del soporte"
-
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-msgid "Mount or unmount disks"
-msgstr "Montar o desmontar discos"
-
 # src/file-manager/fm-desktop-icon-view.c:222
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
 msgid "Open T_erminal"
 msgstr "Abrir una t_erminal"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:11
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
 msgid "Open a new GNOME terminal window"
-msgstr "Abre una ventana nueva de la terminal de GNOME"
+msgstr "Abre una ventana nueva de la terminal de Gnome"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:12
-msgid "Prot_ect"
-msgstr "Prot_eger"
-
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:13
-msgid "Protect the selected volume"
-msgstr "Proteger el volumen seleccionado"
-
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:14
-msgid ""
-"Show a window that lets you set your desktop background's pattern or color"
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Muestra una ventana que le deja configurar el patrón del fondo o el color de "
 "su escritorio"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:15
-msgid "Show media properties for the selected volume"
-msgstr "Muestra las propiedades del medio para el volumen seleccionado"
-
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:16
-msgid "Unmount the selected volume"
-msgstr "Desmontar el volumen seleccionado"
-
 # src/nautilus-sidebar.c:424
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:17
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "U_sar el fondo predeterminado"
 
 # src/nautilus-sidebar.c:424
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:18
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
 msgid "Use the default desktop background"
 msgstr "Usar el fondo de escritorio predeterminado"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:19
-msgid "_Format"
-msgstr "_Formato"
-
 # libnautilus-private/nautilus-program-chooser.c:1248
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
 msgid "Choose a program with which to open the selected item"
-msgstr ""
-"Selecciona un programa con el cual poder abrir el elemento seleccionado"
+msgstr "Selecciona un programa con el cual poder abrir el elemento seleccionado"
 
 # libnautilus-private/nautilus-program-chooser.c:1248
 #: src/file-manager/nautilus-directory-view-ui.xml.h:2
@@ -6269,49 +6089,71 @@ msgstr "Selecciona otro visor con la cual ver el elemento seleccionado"
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "Crear un _documento"
+
+# src/file-manager/fm-directory-view.c:2140
+# src/file-manager/fm-directory-view.c:2257
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "C_rear una carpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Crea un documento nuevo vacío dentro de esta carpeta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Crea una carpeta nueva vacía dentro de esta carpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Crea un enlace simbólico para cada elemento seleccionado"
 
 # src/file-manager/fm-directory-view.c:2148
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
 # src/file-manager/fm-directory-view.c:2669
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Elimina cada elemento seleccionado, sin moverlo a la papelera"
 
 # src/file-manager/fm-directory-view.c:2678
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplica cada elemento seleccionado"
 
 # libnautilus-private/nautilus-global-preferences.c:592
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Editar lanzador"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Edita la información del lanzador"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
-msgid ""
-"Move or copy files previously selected by a Cut Files or Copy Files command"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+msgid "Format the selected volume"
+msgstr "Dar formato al volumen seleccionado"
+
+# src/file-manager/fm-directory-view.c:2151
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+msgid "Medi_a Properties"
+msgstr "Propied_ades del soporte"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "Mount the selected volume"
+msgstr "Montar el volumen seleccionado"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Mueve o copia archivos previamente seleccionados por una orden «Cortar» o "
-"«Copiar archivos»"
+"«Copiar» archivos»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -6319,120 +6161,152 @@ msgstr ""
 "Mueve o copia archivos previamente seleccionados por una orden «Cortar» o "
 "«Copiar archivos» dentro de la carpeta seleccionada"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Ninguna plantilla instalada"
+
 # src/file-manager/fm-directory-view.c:2117
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Abrir c_on"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Abre cada elemento seleccionado en una ventana de navegación"
 
 # src/file-manager/fm-directory-view.c:2126
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Abrir en una ventana nueva"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abre el elemento seleccionado en esta ventana"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Prepara los archivos seleccionados para ser copiados con la orden «Pegar "
 "archivos»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Prepara los archivos seleccionados para ser movidos con la orden «Pegar "
 "archivos»"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+msgid "Prot_ect"
+msgstr "Prot_eger"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+msgid "Protect the selected volume"
+msgstr "Proteger el volumen seleccionado"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Renombra el elemento seleccionado"
 
 # src/file-manager/fm-directory-view.c:2403
 # src/file-manager/fm-directory-view.c:2646
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Reiniciar la vista con los valores _predeterminados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
-"Reinicia el método de ordenamiento y el nivel de ampliación para ajustarse a "
+"Restablecer el orden de colocación y el nivel de ampliación para ajustarse a "
 "las preferencias de esta vista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
-msgstr "Ejecuta o administra los guiones de ~/.gnome2/nautilus-scripts"
+msgstr "Ejecuta o administra los scripts de ~/.gnome2/nautilus-scripts"
 
 # src/file-manager/fm-directory-view.c:2157 src/nautilus-window-menus.c:1153
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Seleccionar t_odos los archivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Seleccionar _patrón"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Selecciona todos los elementos que hay en esta ventana"
 
 # libnautilus-private/nautilus-global-preferences.c:622
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr "Selecciona los elementos en esta ventana que coincidan con un patrón dado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+msgid "Show media properties for the selected volume"
+msgstr "Muestra las propiedades del medio para el volumen seleccionado"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Muestra la carpeta que contiene los guiones que aparecen en este menú"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+msgid "Unmount the selected volume"
+msgstr "Desmontar el volumen seleccionado"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Usa el fondo predeterminado para esta dirección"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
-msgstr ""
-"Muestra o permite modificar las propiedades de cada elemento seleccionado"
+msgstr "Muestra o permite modificar las propiedades de cada elemento seleccionado"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "Archivo _vacío"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+msgid "_Format"
+msgstr "_Formato"
+
+# components/html/gnome-dialogs.c:234
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+msgid "_Mount Volume"
+msgstr "_Montar el volumen"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Abrir la carpeta de _scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Pegar los archivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Pegar los archivos en la carpeta"
 
 # src/file-manager/fm-directory-view.c:2151
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Propiedades"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-icon-view.c:328
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -6471,7 +6345,7 @@ msgstr "Re_ordenar por nombre"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:8
 msgid "Compact _Layout"
-msgstr "Disposición a_justada"
+msgstr "_Organización compacta"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:9
 msgid "Display icons in the opposite order"
@@ -6484,7 +6358,7 @@ msgstr "Mantiene los iconos alineados en una rejilla"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Leave icons wherever they are dropped"
-msgstr "Deja los iconos en el lugar donde sean soltados"
+msgstr "Deja los iconos en el lugar donde se suelten"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Make the selected icon stretchable"
@@ -6512,11 +6386,11 @@ msgstr "Re_dimensionar el icono"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:23
 msgid "Toggle using a tighter layout scheme"
-msgstr "Cambia usando un esquema de disposición ajustada"
+msgstr "Conmutar el uso de un esquema de organización más apretado"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "_Keep Aligned"
-msgstr "_Mantener alineado"
+msgstr "_Conservar alineado"
 
 # components/help/hyperbola-filefmt.c:396
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
@@ -6526,9 +6400,14 @@ msgstr "_Manualmente"
 #: src/file-manager/nautilus-indexing-info.c:89
 #, c-format
 msgid "Indexing is %d%% complete."
-msgstr "La indexación está al %d%%"
+msgstr "La indexación está un %d%% terminada."
+
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Sus archivos fueron indexados por última vez a las %s."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -6537,43 +6416,48 @@ msgstr ""
 "búsquedas son rápidas."
 
 # src/nautilus-window-menus.c:1292
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Estado de la indexación"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Sus archivos fueron ordenados por última vez a las %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Sus archivos se están indexando actualmente."
 
-#: src/file-manager/nautilus-indexing-info.c:202
-msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+#: src/file-manager/nautilus-indexing-info.c:198
+msgid "Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Una vez al día sus archivos y textos son indexados, de esa forma las "
-"búsquedas son rápidas. Sus archivos están siendo indexados en este momento."
+"Una vez al día sus archivos y contenido de texto se indexan para que sus "
+"búsquedas sean rápidas."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "No hay un índice de sus archivos en este momento."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
-"Cuando la búsqueda rápida está habilitada, «Buscar» crea un índice para "
-"acelerar las búsquedas. La búsqueda rápida no está habilitada en su "
-"computadora, por eso no tiene un índice en este momento."
+"Cuando la «Búsqueda rápida» está activada, «Buscar» crea un índice para "
+"acelerar las búsquedas. La «Búsqueda rápida» no está activada en su "
+"equipo, por eso no tiene un índice en este momento."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "No hay un índice de sus archivos en este momento."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "No hay índice de archivos"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Lo siento, pero el servicio de búsqueda medusa no está disponible."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Verifique que medusa ha sido configurado correctamente."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -6600,59 +6484,61 @@ msgstr "Mostrar el estado de _indexación"
 msgid "Show status of indexing used when searching"
 msgstr "Mostrar el estado de la indexación usada al buscar"
 
-#: src/nautilus-application.c:233
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "No se ha podido crear la carpeta requerida"
 
-#: src/nautilus-application.c:234
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus no pudo crear la carpeta requerida «%s»."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus no ha podido crear la carpeta solicitada «%s». Antes de ejecutar "
-"Nautilus, por favor, cree esta carpeta o póngale los permisos necesarios "
-"para que Nautilus pueda crearla."
+"Antes de ejecutar Nautilus, debe crear la siguiente carpeta o establecer "
+"permisos para que Nautilus la pueda crear."
 
-#: src/nautilus-application.c:239
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "No se han podido crear las carpetas requeridas"
 
-#: src/nautilus-application.c:240
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus no pudo crear las siguientes carpetas requeridas: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus no ha podido crear las siguientes carpetas requeridas:\n"
-"\n"
-"%s\n"
-"\n"
-"Antes de ejecutar Nautilus, por favor, cree estas carpetas o póngale "
-"permisos de modo tal que Nautilus pueda crearlas."
+"Antes de ejecutar Nautilus, cree estas carpetas, o establezca permisos para "
+"que Nautilus pueda crearlas."
 
-#: src/nautilus-application.c:312
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Enlace al escritorio anterior"
 
-#: src/nautilus-application.c:328
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Un enlace llamado «Enlace al escritorio antiguo» ha sido creado en el "
+"escritorio."
+
+#: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"La ubicación del directorio del escritorio ha cambiado en GNOME 2.4. Se ha "
-"creado un enlace llamado «Enlace al escritorio anterior» en el escritorio. "
-"Puede abrirlo para mover los archivos que desee y luego eliminarlo."
+"La ubicación del directorio del escritorio ha cambiado en Gnome 2.4. Puede "
+"abrir el enlace y mover los archivos que quiera, después borre el enlace."
 
-#: src/nautilus-application.c:331
-msgid "Migrated old desktop"
-msgstr "Escritorio anterior migrado"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "Escritorio antiguo migrado"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6664,7 +6550,7 @@ msgstr "Escritorio anterior migrado"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:499
+#: src/nautilus-application.c:521
 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 "
@@ -6672,11 +6558,11 @@ msgid ""
 msgstr ""
 "Nautilus no puede usarse ahora. Ejecutar el comando «bonobo-slay» desde la "
 "consola debería arreglar el problema. Si no, puede intentar reiniciar la "
-"computadora o instalar Nautilus otra vez."
+"equipo o instalar Nautilus otra vez."
 
 # src/nautilus-application.c:353
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:505
+#: src/nautilus-application.c:527
 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 "
@@ -6698,11 +6584,11 @@ msgid ""
 msgstr ""
 "Nautilus no puede ser utilizado ahora. Ejecutar la orden «bonobo-slay» desde "
 "la consola, podría solucionar el problema. Si no, intente reiniciar la "
-"computadora o instalar Nautilus otra vez.\n"
+"equipo o instalar Nautilus otra vez.\n"
 "\n"
 "Bonobo no ha podido ubicar el archivo Nautilus_shell.server. Una de las "
-"causas de esto parece ser un LD_LIBRARY_PATH que no incluye el directorio de "
-"la biblioteca bonobo-activation. Otra posible causa podría ser una mala "
+"causas de esto parece ser un LD_LIBRARY_PATH que no incluye la carpeta de la "
+"biblioteca bonobo-activation. Otra posible causa podría ser una mala "
 "instalación con un archivo Nautilus_Shell.server perdido.\n"
 "\n"
 "La ejecución «bonobo-slay» eliminará todos los procesos de activación de "
@@ -6723,13 +6609,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:535 src/nautilus-application.c:553
-#: src/nautilus-application.c:560
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus no puede utilizarse ahora debido a un error inesperado."
 
 # src/nautilus-application.c:379
-#: src/nautilus-application.c:536
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6739,7 +6625,7 @@ msgstr ""
 "archivos."
 
 # src/nautilus-application.c:397
-#: src/nautilus-application.c:554
+#: src/nautilus-application.c:576
 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 "
@@ -6750,7 +6636,7 @@ msgstr ""
 "reinicia Nautilus quizá se arregle el problema."
 
 # src/nautilus-application.c:397
-#: src/nautilus-application.c:561
+#: src/nautilus-application.c:583
 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 "
@@ -6760,6 +6646,17 @@ msgstr ""
 "cuando intentaba encontrar el objeto shell. Eliminar bonobo-activation-"
 "server y reiniciar Nautilus quizá ayude a arreglar el problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Hubo un error al mostrar la ayuda: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "No se han definido marcadores"
@@ -6798,6 +6695,48 @@ msgstr "Menos opciones"
 msgid "Find Them!"
 msgstr "¡Encontrarlas!"
 
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Debe introducir un nombre para el servidor."
+
+#: src/nautilus-connect-server-dialog.c:87
+msgid "Please enter a name and try again."
+msgstr "Introduzca un nombre e inténtelo de nuevo."
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "No se puede conectar con el servidor"
+
+# src/nautilus-property-browser.c:826 src/nautilus-property-browser.c:920
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "«%s» no es una dirección válida."
+
+# src/nautilus-window-manage-views.c:1241
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Por favor verifique lo que ha escrito e intente nuevamente."
+
+# libnautilus-private/nautilus-global-preferences.c:592
+#: src/nautilus-connect-server-dialog.c:176
+msgid "Connect to Server"
+msgstr "Conectar con el servidor"
+
+# src/nautilus-location-bar.c:401
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Dirección:"
+
+#: src/nautilus-connect-server-dialog.c:230
+msgid "Connect"
+msgstr "Conectar"
+
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
 msgstr "Escritorio"
@@ -6812,11 +6751,11 @@ msgstr "1 Gb"
 
 #: src/nautilus-file-management-properties.glade.h:5
 msgid "100 KB"
-msgstr "100 Kb"
+msgstr "100 Kib"
 
 #: src/nautilus-file-management-properties.glade.h:21
 msgid "500 KB"
-msgstr "500 Kb"
+msgstr "500 Kib"
 
 #: src/nautilus-file-management-properties.glade.h:24
 msgid "<span weight=\"bold\">Behaviour</span>"
@@ -6840,13 +6779,11 @@ msgstr "<span weight=\"bold\">Descripciones de los iconos</span>"
 
 #: src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon View Defaults</span>"
-msgstr ""
-"<span weight=\"bold\">Valores predeterminados para la vista de iconos</span>"
+msgstr "<span weight=\"bold\">Valores predeterminados para la vista de iconos</span>"
 
 #: src/nautilus-file-management-properties.glade.h:30
 msgid "<span weight=\"bold\">List View Defaults</span>"
-msgstr ""
-"<span weight=\"bold\">Valores predeterminados para la vista de lista</span>"
+msgstr "<span weight=\"bold\">Valores predeterminados para la vista de lista</span>"
 
 #: src/nautilus-file-management-properties.glade.h:31
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
@@ -6866,8 +6803,7 @@ msgstr "<span weight=\"bold\">Papelera</span>"
 
 #: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
-msgstr ""
-"<span weight=\"bold\">Valores predeterminados para la vista de árbol</span>"
+msgstr "<span weight=\"bold\">Valores predeterminados para la vista de árbol</span>"
 
 # libnautilus-private/nautilus-global-preferences.c:582
 #: src/nautilus-file-management-properties.glade.h:36
@@ -6949,7 +6885,7 @@ msgstr "Mostrar te_xto en los iconos:"
 
 #: src/nautilus-file-management-properties.glade.h:61
 msgid "Sort _folders before files"
-msgstr "Poner las carpetas _antes que los archivos"
+msgstr "Colocar las carpetas _antes que los archivos"
 
 #: src/nautilus-file-management-properties.glade.h:62
 msgid "View _new folders using:"
@@ -6979,7 +6915,7 @@ msgstr "Sól_o para archivos menores de:"
 
 #: src/nautilus-file-management-properties.glade.h:69
 msgid "_Run executable text files when they are clicked"
-msgstr "E_jecutar los archivos de texto ejecutables cuando son seleccionados"
+msgstr "E_jecutar los archivos de texto ejecutables al ser pulsados"
 
 #: src/nautilus-file-management-properties.glade.h:70
 msgid "_Single click to activate items"
@@ -6987,15 +6923,15 @@ msgstr "Una _sola pulsación para activar los elementos"
 
 #: src/nautilus-file-management-properties.glade.h:71
 msgid "_Text beside icons"
-msgstr "_Texto a los lados de los iconos"
+msgstr "_Texto al lado de los iconos"
 
 #: src/nautilus-file-management-properties.glade.h:72
 msgid "_Use compact layout"
-msgstr "Usar una disposición a_justada"
+msgstr "_Usar organización compacta"
 
 #: src/nautilus-file-management-properties.glade.h:73
 msgid "_View executable text files when they are clicked"
-msgstr "_Ver los archivos de texto ejecutables cuando son seleccionados"
+msgstr "_Ver los archivos de texto ejecutables cuando se seleccionan"
 
 # src/nautilus-application.c:614
 #: src/nautilus-first-time-druid.c:40
@@ -7006,10 +6942,18 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 "La existencia de este archivo indica que el asistente de configuración de "
-"Nautilus ya ha sido mostrado.\n"
+"Nautilus ya se ha mostrado.\n"
 "\n"
 "Puede borrar manualmente este archivo para mostrar el asistente nuevamente.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "No puede asignar más de un icono personalizado a la vez."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Solamente puede usar imágenes locales como iconos personalizados."
+
 # src/nautilus-sidebar.c:1145
 #: src/nautilus-information-panel.c:882
 #, c-format
@@ -7022,27 +6966,22 @@ msgstr "Abrir con %s"
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"No se puede ejecutar la aplicación de grabación de cd:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "No se puede ejecutar la aplicación de grabación de cd."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr "No se puede ejecutar el grabador de cd"
 
 # src/file-manager/fm-directory-view.c:2154
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Vaciar la _papelera"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "G_rabar los contenidos en un CD"
 
@@ -7051,39 +6990,39 @@ msgid "Go To:"
 msgstr "Ir a:"
 
 # src/nautilus-location-bar.c:127
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "¿Quiere ver las %d direcciones en ventanas diferentes?"
+msgid "Do you want to view %d locations?"
+msgstr "¿Quiere ver %d ubicaciones?"
 
 # src/nautilus-location-bar.c:133
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
-msgstr "¿Ver en múltiples ventanas?"
+msgstr "¿Ver en ventanas múltiples?"
 
 # libnautilus-private/nautilus-global-preferences.c:693
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Abrir ubicación"
 
 # src/nautilus-main.c:63
-#: src/nautilus-main.c:149
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Realiza un conjunto rápido de auto-verificaciones."
 
-#: src/nautilus-main.c:152
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Crea la ventana inicial con la geometría indicada"
 
-#: src/nautilus-main.c:152
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
-msgstr "GEOMETRY"
+msgstr "GEOMETR�A"
 
-#: src/nautilus-main.c:154
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Sólo crear ventanas para las URI explícitamente especificadas."
 
-#: src/nautilus-main.c:156
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -7091,17 +7030,21 @@ msgstr ""
 "No administrar el escritorio (ignorar las preferencias configuradas en el "
 "dialogo preferencias)."
 
+#: src/nautilus-main.c:197
+msgid "open a browser window."
+msgstr "abrir una ventana del navegador."
+
 # src/nautilus-main.c:65
-#: src/nautilus-main.c:158
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Salir de Nautilus."
 
 # src/nautilus-main.c:65
-#: src/nautilus-main.c:160
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reiniciar Nautilus."
 
-#: src/nautilus-main.c:191
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Administrador de archivos"
 
@@ -7110,73 +7053,83 @@ msgstr "Administrador de archivos"
 # src/nautilus-window-manage-views.c:217
 # src/nautilus-window-manage-views.c:218 src/nautilus-window-menus.c:437
 #. Set initial window title
-#: src/nautilus-main.c:197 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:567 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:214
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check no puede ser usado con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:218
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check no se puede usar con otras opciones.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:222
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit no puede ser usado con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:226
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart no se puede usar con URIs.\n"
 
 # src/nautilus-main.c:117
-#: src/nautilus-main.c:230
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry no se puede usar con más de una URI.\n"
 
+# src/file-manager/fm-directory-view.c:1855
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"¿Está seguro de que quiere borrar el historial? Si lo hace tendrá que "
-"visitar las direcciones guardadas nuevamente."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "¿Está seguro que desea eliminar el histórico?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Si lo hace tendrá que visitar las direcciones guardadas nuevamente."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "¿Está seguro de querer borrar la lista de direcciones que ha visitado?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Si limpia la lista de ubicaciones, se borrarán permanentemente."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Borrar histórico"
 
 # src/nautilus-window-menus.c:584
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"La dirección «%s» no existe. ¿Desea quitar los marcadores de su lista que "
-"apuntan a esta dirección?"
+"¿Quiere eliminar todos los marcadores con la dirección no existente de su "
+"lista?"
+
+# src/nautilus-window-menus.c:602
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "La dirección «%s» no existe."
 
 # src/nautilus-window-menus.c:599
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Marcador para una dirección inexistente"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Quitar"
 
@@ -7203,69 +7156,77 @@ msgstr "Cambia la visibilidad de la barra de estado de esta ventana"
 
 #: src/nautilus-navigation-window-ui.xml.h:6
 msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr ""
-"Limpia los contenidos de los menús «Ir a» y listas de «Atrás» y «Adelante»"
+msgstr "Limpia los contenidos de los menús «Ir a» y listas de «Atrás» y «Adelante»"
 
 #: src/nautilus-navigation-window-ui.xml.h:7
 msgid "Close _All Windows"
 msgstr "Cerrar _todas las ventanas"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Cierra todas las ventanas de navegación"
 
-#: src/nautilus-navigation-window-ui.xml.h:9
+#: src/nautilus-navigation-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:4
+msgid "Connect to _Server..."
+msgstr "Conectar con el _servidor..."
+
+#: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr ""
-"Muestra una ventana que permite editar los marcadores que hay en este menú"
+msgstr "Muestra una ventana que permite editar los marcadores que hay en este menú"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-first-time-druid.c:290
-#: src/nautilus-navigation-window-ui.xml.h:10 src/nautilus-shell-ui.xml.h:10
+#: src/nautilus-navigation-window-ui.xml.h:12 src/nautilus-shell-ui.xml.h:10
 msgid "Find"
 msgstr "Buscar"
 
-#: src/nautilus-navigation-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:13
 msgid "Forward"
 msgstr "Adelante"
 
+# libnautilus-private/nautilus-file.c:2586
+#: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Ir a la carpeta de plantillas"
+
 # src/nautilus-window-menus.c:670
-#: src/nautilus-navigation-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Ir a la siguiente dirección visitada"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-navigation-window-ui.xml.h:13
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Ir a la dirección visitada previamente"
 
 # libnautilus-private/nautilus-file.c:2586
-#: src/nautilus-navigation-window-ui.xml.h:14
-#: src/nautilus-spatial-window-ui.xml.h:5
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Ir a la carpeta de la papelera"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Inicio"
 
 # libnautilus-private/nautilus-global-preferences.c:306
-#: src/nautilus-navigation-window-ui.xml.h:16
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Barra de dirección"
 
 # src/file-manager/fm-properties-window.c:1573
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Recargar"
 
-#: src/nautilus-navigation-window-ui.xml.h:18 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
-msgstr "Buscar archivos en esta computadora"
+msgstr "Buscar archivos en esta equipo"
 
 # src/nautilus-window-menus.c:1292
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "B_arra de estado"
 
@@ -7273,77 +7234,89 @@ msgstr "B_arra de estado"
 # components/music/nautilus-music-view.c:1158
 # src/file-manager/dfos-xfer.c:352 src/file-manager/dfos-xfer.c:372
 # src/nautilus-window-toolbars.c:156
-#: src/nautilus-navigation-window-ui.xml.h:20
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Detener"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Subir"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Grabar a un CD"
 
 # src/nautilus-window-menus.c:1235
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Añadir un marcador"
 
 # src/file-manager/fm-properties-window.c:1031
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Atrás"
 
 # src/nautilus-window-menus.c:1235
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Borrar el histórico"
 
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
+msgid "_Computer"
+msgstr "_Equipo"
+
 # src/nautilus-bookmarks-window.c:136
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Editar los marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "Ade_lante"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ir a"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Inicio"
 
 # src/nautilus-bookmarks-window.c:185
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Dirección..."
 
 # libnautilus-private/nautilus-global-preferences.c:165
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:11
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/dfos-xfer.c:419 src/file-manager/dfos-xfer.c:430
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "Plan_tillas"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Papelera"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "S_ubir"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:222
-#: src/nautilus-navigation-window-ui.xml.h:35 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Ver"
 
@@ -7363,31 +7336,35 @@ msgstr "Ver como..."
 msgid "File Browser: %s"
 msgstr "Visualizador de archivos: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr "Uno de los paneles laterales encontró un error y no puede continuar. Desafortunadamente no se ha podido determinar cuál es."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Uno de los paneles laterales encontró un error y no puede continuar."
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Desafortunadamente no puedo decir cual."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr "El panel lateral %s ha producido un error y no puede continuar. Si ésto sigue sucediendo debería desactivar este panel."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "El panel lateral %s ha encontrado un error y no puede continuar."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Si ésto sigue sucediendo debería desactivar este panel."
 
 # libnautilus-private/nautilus-global-preferences.c:165
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "Ha fallado el panel lateral"
 
 # libnautilus-private/nautilus-global-preferences.c:165
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Panel lateral"
 
 # libnautilus-private/nautilus-global-preferences.c:165
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contiene una vista del panel lateral"
 
@@ -7423,176 +7400,205 @@ msgstr "_Añadir nuevo..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Lo siento, pero el patrón %s no ha podido ser eliminado."
 
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Compruebe que tiene permiso para borrar el patrón."
+
 # components/services/install/lib/eazel-install-protocols.c:116
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
-msgstr "No se ha podido eliminar el patrón"
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
+msgstr "No se pudo borrar el patrón"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Lo siento, pero el emblema %s no ha podido ser eliminado."
 
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Compruebe que tiene permiso para borrar el emblema."
+
+# components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "No se pudo borrar el emblema"
+
 # src/nautilus-property-browser.c:853
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Crear un emblema nuevo:"
 
 # src/nautilus-property-browser.c:858
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Palabra clave:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imagen:"
 
 # src/nautilus-property-browser.c:875
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Seleccione un archivo de imagen para el emblema nuevo:"
 
 # src/nautilus-property-browser.c:853
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Crear un color nuevo:"
 
 # libnautilus-private/nautilus-icon-text-item.c:1487
 # src/file-manager/fm-icon-view.c:1105
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Nombre del _color:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valor del color:"
 
 # src/nautilus-property-browser.c:826 src/nautilus-property-browser.c:920
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Lo siento, pero «%s» no es un nombre de archivo válido."
 
 # src/nautilus-property-browser.c:826 src/nautilus-property-browser.c:920
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Lo siento, pero no escribió un archivo de nombre válido."
 
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Inténtelo de nuevo."
+
 # components/services/install/lib/eazel-install-protocols.c:116
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "No se ha podido instalar el patrón"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Lo siento, pero usted no puede cambiar la imagen de reinicio"
 
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Reinicio es una imagen especial que no puede ser borrada."
+
 # libnautilus-private/nautilus-program-chooser.c:216
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "No es una imagen"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Lo siento, pero el patrón %s no ha podido ser instalado."
 
 # src/nautilus-property-browser.c:985
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Seleccione un archivo de imagen para añadirlo como un patrón"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "El color no pudo ser instalado."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Lo siento, pero debe especificar un nombre para el color nuevo."
 
 # components/services/trilobite/libtrilobite/trilobite-core-utils.c:197
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
-msgstr "No se ha podido instalar el color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "No se pudo instalar el color"
 
 # src/nautilus-property-browser.c:1083
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Seleccione un color a añadir"
 
 # src/nautilus-property-browser.c:826 src/nautilus-property-browser.c:920
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Lo siento, pero «%s» no es un archivo de imagen que se pueda usar"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Lo siento, pero «%s» no es un archivo de imagen utilizable."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "El archivo no es una imagen."
 
 # src/nautilus-property-browser.c:263 src/nautilus-property-browser.c:1977
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Seleccione una categoría:"
 
 # src/nautilus-property-browser.c:1985
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_ancelar quitar"
 
 # src/nautilus-property-browser.c:1987
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Añadir un patrón nuevo..."
 
 # src/nautilus-property-browser.c:1987
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Añadir un color nuevo..."
 
 # src/nautilus-property-browser.c:1987
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Añadir un emblema nuevo..."
 
 # src/nautilus-property-browser.c:2002
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Pulse sobre un patrón para quitarlo"
 
 # src/nautilus-property-browser.c:2002
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Pulse en un color para quitarlo"
 
 # src/nautilus-property-browser.c:2002
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Pulse en un emblema para quitarlo"
 
 # src/file-manager/fm-properties-window.c:1560
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patrones:"
 
 # src/nautilus-window.c:1267
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Colores:"
 
 # src/file-manager/fm-properties-window.c:1237
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemas:"
 
 # src/nautilus-sidebar.c:424
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Quitar un patrón..."
 
 # src/nautilus-property-browser.c:2014
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Quitar un color..."
 
 # src/nautilus-property-browser.c:2014
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Quitar un emblema..."
 
@@ -7924,7 +7930,7 @@ msgstr "_Fondos y emblemas"
 
 #: src/nautilus-shell-ui.xml.h:33
 msgid "_CD Creator"
-msgstr "Grabador de _CD"
+msgstr "Grabador de _CDs"
 
 #: src/nautilus-shell-ui.xml.h:34
 msgid "_Close Window"
@@ -7955,7 +7961,7 @@ msgstr "A_yuda"
 
 #: src/nautilus-shell-ui.xml.h:41
 msgid "_Profiler"
-msgstr "_Perfiles"
+msgstr "_Perfilador"
 
 # src/file-manager/fm-properties-window.c:1573
 #: src/nautilus-shell-ui.xml.h:42
@@ -7964,15 +7970,15 @@ msgstr "_Recargar"
 
 #: src/nautilus-shell-ui.xml.h:43
 msgid "_Report Profiling"
-msgstr "In_forme de perfiles"
+msgstr "In_formar de perfiles"
 
 #: src/nautilus-shell-ui.xml.h:44
 msgid "_Reset Profiling"
-msgstr "_Reiniciar perfiles"
+msgstr "_Reiniciar perfilado"
 
 #: src/nautilus-shell-ui.xml.h:45
 msgid "_Start Profiling"
-msgstr "_Iniciar perfiles"
+msgstr "_Iniciar perfilado"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/music/nautilus-music-view.c:1158
@@ -8014,32 +8020,42 @@ msgstr "Mostrar %s"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
 msgid "CD _Creator"
-msgstr "Grabador de _CD"
+msgstr "Grabador de _CDs"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
-msgstr "Cerrar _todas los antecesores"
+msgid "Close P_arent Folders"
+msgstr "Cerrar _todas las carpetas antecesoras"
+
+# libnautilus-private/nautilus-global-preferences.c:165
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Cierra las antecesoras de esta carpeta"
 
 # libnautilus-private/nautilus-file.c:2586
-#: src/nautilus-spatial-window-ui.xml.h:4
+#: src/nautilus-spatial-window-ui.xml.h:5
+msgid "Go to Computer"
+msgstr "Ir al equipo"
+
+# libnautilus-private/nautilus-file.c:2586
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Ir al grabador de CDs"
 
 # src/nautilus-bookmarks-window.c:185
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "Abrir _dirección..."
 
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Abrir _antecesor"
 
 # libnautilus-private/nautilus-file.c:2586
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "Abre la carpeta madre"
+msgstr "Abre la carpeta antecesora"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Lugares"
 
@@ -8055,7 +8071,7 @@ msgstr "un título"
 
 #: src/nautilus-view-frame.c:604
 msgid "the browse history"
-msgstr "el historial de navegación"
+msgstr "el histórico de navegación"
 
 #: src/nautilus-view-frame.c:613
 msgid "the current selection"
@@ -8071,142 +8087,145 @@ msgstr "Ha fallado la vista"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"La vista %s ha encontrado un error y no puede continuar. Puede seleccionar "
-"otra vista o ir a una dirección diferente."
+msgid "The %s view encountered an error and can't continue."
+msgstr "La vista %s ha encontrado un error y no puede continuar."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Puede seleccionar otra vista o ir a una dirección diferente."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "La vista %s ha encontrado un error mientras se iniciaba."
 
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "La ubicación no puede mostrarse con este visor."
+
 # src/file-manager/fm-properties-window.c:878
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Vista del contenido"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
-msgstr "Vista del archivo o directorio actual"
+msgstr "Vista del archivo o carpeta actual"
 
-# src/nautilus-window-manage-views.c:1241
-#: src/nautilus-window-manage-views.c:1239
+# components/services/install/lib/eazel-install-protocols.c:116
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"No se ha podido encontrar «%s». Por favor verifique lo que ha escrito e "
-"intente nuevamente."
+msgid "Couldn't find \"%s\"."
+msgstr "No se pudo encontrar «%s»."
 
-# src/nautilus-window-manage-views.c:1247
-#: src/nautilus-window-manage-views.c:1245
+# src/nautilus-window-manage-views.c:1299
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"«%s» no es una dirección válida. Por favor verifique lo que ha escrito y "
-"pruébelo de nuevo."
+msgid "Couldn't display \"%s\"."
+msgstr "No se pudo mostrar «%s»."
 
 # src/nautilus-window-manage-views.c:1269
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"No se ha podido mostrar «%s», porque Nautilus no puede determinar qué tipo "
-"de archivo es."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus no puede determinar qué tipo de archivo es."
 
 # src/nautilus-window-manage-views.c:1299
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus no ha instalado un visor capaz de mostrar «%s»."
+#: src/nautilus-window-manage-views.c:1279
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "Nautilus no tiene un visor instalado capaz de mostrar el archivo."
 
 # src/nautilus-window-manage-views.c:1281
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr ""
-"No se ha podido mostrar «%s», porque Nautilus no puede manejar direcciones: %"
-"s."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus no puede manejar direcciones %s:"
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "No se ha podido mostrar «%s», porque ha fallado el intento de ingreso."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "El intento de inicio de sesión ha fallado."
 
-# src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "No se ha podido mostrar «%s», porque fue denegado.el acceso."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Acceso denegado."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr ""
-"No se ha podido mostrar «%s» porque la máquina «%s» no ha podido ser "
-"encontrada. Verifique que lo que ha escrito sea correcto y que la "
-"configuración del proxy sea la adecuada."
+"No se pudo mostrar «%s», porque no se pudo encontrar ningún host llamado «%"
+"s»."
 
 # src/nautilus-window-manage-views.c:1287
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1327
+msgid "Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"No se ha podido mostrar «%s» .Verifique que la configuración de su servidor "
-"proxy sea la correcta."
+"Compruebe que lo que escribió es correcto y que su configuración del proxy "
+"es correcta."
 
-# src/nautilus-window-manage-views.c:1269
-#: src/nautilus-window-manage-views.c:1316
+# src/nautilus-window-manage-views.c:1287
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Compruebe que la configuración del proxy es correcta."
+
+# src/nautilus-window-manage-views.c:1281
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"No se ha podido mostrar «%s», porque Nautilus no puede encontrar el "
-"«visualizador maestro SMB».\n"
-"Verifique que exista un servidor SMB en la red de área local y que esté "
-"ejecutándose."
+"No se ha podido mostrar «%s», porque Nautilus no puede contactar con el SMB "
+"maestro."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Compruebe que el servidor SMB está funcionando en la red local."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
-"Buscar, no está disponible ahora, debido a que no tiene un índice o el "
-"servicio de búsqueda no está ejecutándose. Asegúrese que ha inicializado el "
-"servicio Medusa de búsqueda y, en caso de no tener un índice, vea si el "
-"indexador Medusa esté ejecutándose."
+"La búsqueda no está disponible ahora, porque o no tiene  un índice, o el "
+"servicio de búsqueda no está funcionando."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Asegúrese de que ha iniciado el servicio de búsqueda Medusa, y si no tiene "
+"un índice, que el indexador de Medusa está funcionando."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Búsqueda no disponible"
 
 # src/nautilus-window-manage-views.c:1299
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus no puede mostrar «%s»."
 
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Seleccione otro visor e inténtelo de nuevo."
+
 # libnautilus-private/nautilus-global-preferences.c:693
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "No se puede mostrar la dirección"
 
 # src/nautilus-window-menus.c:670
-#: src/nautilus-window-menus.c:212
+#: src/nautilus-window-menus.c:214
 msgid "Go to the location specified by this bookmark"
 msgstr "Ir a la dirección especificada por este marcador"
 
@@ -8214,7 +8233,7 @@ msgstr "Ir a la dirección especificada por este marcador"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:557
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -8222,20 +8241,21 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:564 src/nautilus-window-menus.c:565
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
+"Francisco F. Serrador\n"
 "Pablo Gonzalo del Campo\n"
 "Carlos Perelló Marín\n"
 "Ismael Olea\n"
 "Jorge Carrasquilla Soares"
 
-#: src/nautilus-window-menus.c:570
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
-"Nautilus es un shell gráfico para GNOME que facilita la administración de "
+"Nautilus es un shell gráfico para Gnome que facilita la administración de "
 "sus archivos y el resto de su sistema."
 
 #: src/nautilus-window-toolbars.c:361
@@ -8247,24 +8267,43 @@ msgid "Go forward a number of pages"
 msgstr "Adelantar algunas páginas"
 
 # libnautilus-private/nautilus-global-preferences.c:693
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Mostrar esta dirección con «%s»"
 
-#: src/nautilus-window.c:1596
+# libnautilus-private/nautilus-undo-signal-handlers.c:177
+#: src/nautilus-window.c:1178
+msgid "Network"
+msgstr "Red"
+
+# libnautilus-private/nautilus-global-preferences.c:216
+#: src/nautilus-window.c:1180
+msgid "Fonts"
+msgstr "Tipografías"
+
+# components/music/nautilus-music-view.c:198
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Temas"
+
+#: src/nautilus-window.c:1184
+msgid "CD Creator"
+msgstr "Grabador de CDs"
+
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID de la aplicación"
 
-#: src/nautilus-window.c:1597
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "La ID de la ventana de la aplicación."
 
-#: src/nautilus-window.c:1603
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplicación"
 
-#: src/nautilus-window.c:1604
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "La aplicación Nautilus asociada con esta ventana."
 
@@ -8281,7 +8320,7 @@ msgstr "Reducir"
 # src/file-manager/fm-directory-view.c:2270
 #: src/nautilus-zoom-control.c:85
 msgid "Zoom to Fit"
-msgstr "Ajustar a la ventana"
+msgstr "Ampliar hasta ajustar"
 
 # libnautilus-private/nautilus-global-preferences.c:687
 #: src/nautilus-zoom-control.c:97
@@ -8291,11 +8330,11 @@ msgstr "Intentar ajustar a la ventana"
 # src/file-manager/fm-directory-view.c:2268
 #: src/nautilus-zoom-control.c:796
 msgid "Zoom"
-msgstr "Ampliar"
+msgstr "Ampliación"
 
 #: src/nautilus-zoom-control.c:802
 msgid "Set the zoom level of the current view"
-msgstr "Configura el nivel de ampliación de la vista actual"
+msgstr "Establece el nivel de ampliación de la vista actual"
 
 # libnautilus-private/nautilus-global-preferences.c:592
 #: src/network-scheme.desktop.in.h:1
@@ -8306,6 +8345,325 @@ msgstr "Servidores de red"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
 
+# libnautilus-private/nautilus-global-preferences.c:277
+#~ msgid "Searching Disks"
+#~ msgstr "Buscando discos"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus está buscando carpetas papeleras en los discos."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fábrica para vista de hardware"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visor de hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vista de hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Ver como hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "vista de hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nombre del icono para la vista de hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "resumen de información sobre hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "CPU %s\n"
+#~ "%s MHz\n"
+#~ "%s Kib de memoria caché"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu Gb de RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MiB de RAM"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Gb"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MiB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "El tiempo en funcionamiento es de %d días, %d horas, %d minutos"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Visión general del hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Esto es un contenedor para colocar la página de la CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Esto es un contenedor para colocar la página de RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Esto es un contenedor para la página IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error al copiar hacia «%s».\n"
+#~ "\n"
+#~ "No hay suficiente espacio en el destino."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error al crear un enlace en «%s».\n"
+#~ "\n"
+#~ "No hay suficiente espacio en el destino."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error al mover elementos hacia «%s».\n"
+#~ "\n"
+#~ "No tiene permisos para escribir en esta carpeta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error al mover elementos hacia «%s».\n"
+#~ "\n"
+#~ "El disco de destino es sólo de lectura."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error al crear enlaces en «%s».\n"
+#~ "\n"
+#~ "No tiene permisos para escribir en esta carpeta."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error al crear enlaces en «%s».\n"
+#~ "\n"
+#~ "El disco de destino es de sólo lectura."
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al copiar «%s».\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al mover «%s».\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al borrar «%s».\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al copiar.\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al crear un enlace.\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:342
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error «%s» al borrar.\n"
+#~ "\n"
+#~ "¿Desea continuar?"
+
+# src/file-manager/dfos-xfer.c:763
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "No puede copiar hacia la papelera"
+
+#~ 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 ""
+#~ "La acción predeterminada no puede abrir «%s» porque no puede acceder a "
+#~ "los archivos en la dirección «%s». No hay disponibles otras acciones para "
+#~ "visualizar este archivo. Si copia este archivo en su computadora quizás "
+#~ "pueda abrirlo."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Los %d elementos seleccionados no pueden ser movidos a la papelera. "
+#~ "¿Quiere eliminarlos directamente?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d de los elementos seleccionados no pueden ser movidos a la papelera. "
+#~ "¿Quiere eliminar los %d elementos directamente?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "El archivo que a soltado no es una imagen. Sólo use imágenes locales como "
+#~ "iconos personalizados."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Lo siento, pero el servicio de búsqueda Medusa no está disponible porque "
+#~ "no se instaló."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Una vez al día sus archivos y textos son indexados, de esa forma las "
+#~ "búsquedas son rápidas. Sus archivos están siendo indexados en este "
+#~ "momento."
+
+# src/nautilus-window-manage-views.c:1247
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "«%s» no es una dirección válida. Por favor verifique lo que ha escrito y "
+#~ "pruébelo de nuevo."
+
+# src/nautilus-window-manage-views.c:1269
+#~ 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 ""
+#~ "No se ha podido mostrar «%s», porque Nautilus no puede encontrar el "
+#~ "«visualizador maestro SMB».\n"
+#~ "Verifique que exista un servidor SMB en la red de área local y que esté "
+#~ "ejecutándose."
+
+#~ msgid "file icon"
+#~ msgstr "icono de archivo"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-file.c:2936
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgid "Floppy"
+#~ msgstr "Disquete"
+
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "Zip Drive"
+#~ msgstr "Unidad zip"
+
+#~ msgid "Audio CD"
+#~ msgstr "Disco compacto de audio"
+
+#~ msgid "Root Volume"
+#~ msgstr "Volumen raíz"
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the floppy drive. There is probably no "
+#~ "floppy in the drive."
+#~ msgstr ""
+#~ "Nautilus no pudo montar la disquetera. Probablemente no haya un disquete "
+#~ "colocado en ella."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the volume. There is probably no media in "
+#~ "the device."
+#~ msgstr ""
+#~ "Nautilus no pudo montar el volumen. Probablemente no haya nada en el "
+#~ "dispositivo."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
+#~ "a format that cannot be mounted."
+#~ msgstr ""
+#~ "Nautilus no pudo montar la disquetera. Probablemente el disquete esté "
+#~ "formateado de forma tal que no se puede montar."
+
+#~ msgid ""
+#~ "Nautilus was unable to mount the selected volume. The volume is probably "
+#~ "in a format that cannot be mounted."
+#~ msgstr ""
+#~ "Nautilus no pudo montar el volumen seleccionado. Probablemente el volumen "
+#~ "esté formateado de forma tal que no se pueda montar."
+
+#~ msgid "Nautilus was unable to mount the selected floppy drive."
+#~ msgstr "Nautilus no pudo montar la disquetera seleccionada."
+
+#~ msgid "Nautilus was unable to mount the selected volume."
+#~ msgstr "Nautilus no pudo montar el volumen seleccionado."
+
+#~ msgid "Nautilus was unable to unmount the selected volume."
+#~ msgstr "Nautilus no pudo desmontar el volumen seleccionado."
+
+#~ msgid "ISO 9660 Volume"
+#~ msgstr "Volumen ISO 9660"
+
+#~ msgid "Error executing utility program '%s': %s"
+#~ msgstr "Error al ejecutar el programa utilitario «%s» : %s"
+
+# src/file-manager/fm-desktop-icon-view.c:234
+#~ msgid "Dis_ks"
+#~ msgstr "D_iscos"
+
+#~ msgid "Mount or unmount disks"
+#~ msgstr "Montar o desmontar discos"
+
 # src/file-manager/fm-directory-view.c:2126
 #~ msgid "Open _in This Window"
 #~ msgstr "Abr_ir en esta ventana"
@@ -8340,10 +8698,6 @@ msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Barra de herramien_tas"
 
-# src/nautilus-window-menus.c:602
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "La dirección «%s» ya no existe."
-
 # src/nautilus-window-menus.c:1198
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Ir a la dirección inexistente"
@@ -8405,10 +8759,6 @@ msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
 #~ msgid "You cannot copy the Trash."
 #~ msgstr "No puede copiar la papelera."
 
-# libnautilus-private/nautilus-global-preferences.c:216
-#~ msgid "F_onts"
-#~ msgstr "_Tipografías"
-
 # src/file-manager/dfos-xfer.c:724
 #~ msgid "Lucida"
 #~ msgstr "Lucida"
@@ -8435,9 +8785,6 @@ msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
 #~ msgid "Use the Times Font"
 #~ msgstr "Usar la tipografía Times"
 
-#~ msgid "_Courier"
-#~ msgstr "_Courier"
-
 # components/music/nautilus-music-view.c:198
 #~ msgid "_Fixed"
 #~ msgstr "_Fija"
@@ -8448,6 +8795,3 @@ msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvética"
 
-# components/music/nautilus-music-view.c:198
-#~ msgid "_Times"
-#~ msgstr "_Times"
diff --git a/po/et.po b/po/et.po
index 3311de2cd..e39041d4e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-01-18 21:26+0200\n"
 "Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() ebaõnnestus."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Embleemid"
 
@@ -53,184 +53,117 @@ msgid "Nautilus Emblem view"
 msgstr "Nautiluse emblemivaade"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Ei saa embleemi eemaldada"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Ei saa embleemi eemaldada"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Ei saa embleemi ümber nimetada"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Ei saa embleemi ümber nimetada"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Nimeta embleem ümber"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Sisesta embleemi uus nimi:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Lisa embleemid..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Fail '%s' ei ole korrektne pildifail."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Embleeme ei saa lisada"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Embleemi ei saa lisada"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Fail '%s' ei ole korrektne pildifail."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Kustuta"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory for hardware view"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Riistvara"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Riistvara ülevaade"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Riistvaravaade"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vaata kui riistvara"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "riistvaravaade"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "riistvaravaate ikooni nimi"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "riistvarainfo kokkuvõte"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K puhvri suurus"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Tööaeg on %d päeva, %d tundi, %d minutit"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Riistvara ülevaade"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Kohahoidja protsessori lehele."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Kohahoidja mälu lehele."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Kohahoidja kõvaketaste lehele."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Ajalugu"
@@ -896,6 +829,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Riistvara"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Rahvusvaheline"
@@ -1181,27 +1118,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1214,8 +1151,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1242,10 +1179,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Prügikast peab töölauale jääma."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1278,10 +1216,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Prügikast peab töölauale jääma."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1293,7 +1232,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1310,7 +1249,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1336,7 +1275,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1360,7 +1299,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1378,11 +1317,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1401,8 +1340,9 @@ msgid "Reverse sort order in new windows"
 msgstr "_Ava iga fail ja kaust uues aknas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr ""
+#, fuzzy
+msgid "Show folders first in windows"
+msgstr "_Ava aktiveeritud elemendid uues aknas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1438,7 +1378,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1446,30 +1386,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1514,7 +1454,7 @@ msgstr "Kasuta _käsitsi paigutust"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "_Ava aktiveeritud elemendid uues aknas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1538,7 +1478,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1552,7 +1492,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Kasuta vaikimisi töölaua tausta"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1710,65 +1650,77 @@ msgstr "ennista"
 msgid "on the desktop"
 msgstr ""
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Sa ei saa kataloogi iseendasse liigutada."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr ""
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Prügikast"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Liiguta siia"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopeeri siia"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "L_ingi siia"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Sea _taustapildiks"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Loobu"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Sea taustapildiks _kõikidele kataloogidele"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Sea taustapildiks _sellele kataloogile"
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+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:276
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Embleemi lisamine ebaõnnestus"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1777,18 +1729,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Embleemi lisamine ebaõnnestus"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1807,22 +1765,28 @@ msgstr "Kust:"
 msgid "To:"
 msgstr "Kuhu:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Viga liigutamisel."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Viga liigutamisel.\n"
 "\n"
 "\"%s\" ei saa liigutada kuna asub kirjutuskaitsega kettal."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Viga kustutamisel."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1830,22 +1794,17 @@ msgstr ""
 "\n"
 "\"%s\" ei saa kustutada kuna sul puuduvad vastavad õigused."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Viga kustutamisel.\n"
 "\n"
 "\"%s\" ei saa kustutada kuna asub kirjutuskaitsega kettal."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1853,280 +1812,259 @@ msgstr ""
 "\n"
 "\"%s\" ei saa liigutada kuna sul ei ole vastavaid õigusi."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Viga liigutamisel."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Viga liigutamisel.\n"
 "\n"
 "\"%s\" ei saa liigutada kuna see või ülemkataloog sisalduvad sihtkohas."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
+"Viga liigutamisel.\n"
 "\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+"\"%s\" ei saa liigutada kuna sul ei ole vastavaid õigusi."
+
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Viga kopeerimisel."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Viga kopeerimisel.\n"
 "\n"
 "\"%s\" ei saa kopeerida kuna sul puuduvad lugemisõigused."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Viga sihtkohta \"%s\" kopeerimisel.\n"
-"\n"
-"Sihtkohas ei ole piisavalt vaba ruumi."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Viga kopeerimisel."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Viga sihtkohta \"%s\" liigutamisel.\n"
 "\n"
 "Sihtkohas ei ole piisavalt vaba ruumi."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Viga liigutamisel."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Viga linkimisel."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
+msgstr "Sul ei ole \"%s\" sisu vaatamiseks vajalikke õigusi."
+
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Viga sihtkohta \"%s\" kopeerimisel.\n"
 "\n"
 "Sihtkoha ketas on kirjutuskaitsega."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Viga sihtkohta \"%s\" liigutamisel.\n"
-"\n"
-"Sihtkoha ketas on kirjutuskaitsega."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Viga liigutamisel."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Viga sihtkohta \"%s\" linkide loomisel.\n"
-"\n"
-"Sihtkoha ketas on kirjutuskaitsega."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Viga linkimisel."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Viga kopeerimisel."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Viga liigutamisel."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Viga kustutamisel."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Viga kopeerimisel."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Viga liigutamisel."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Viga linkimisel."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Viga kustutamisel."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Viga kopeerimisel."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Viga liigutamisel."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Viga linkimisel."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Viga kustutamisel."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Jäta vahele"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Korda"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ei ole võimalik uude kohta liigutada, kuna sama nime kasutab "
 "sihtkohas spetsiaalelement, mida ei saa eemaldada ega asendada.\n"
 "\n"
 "Kui ikkagi soovid \"%s\" liigutada, nimeta see teise nimega ja ürita uuesti."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ei ole võimalik uude kohta kopeerida, kuna sama nime kasutab "
 "sihtkohas spetsiaalelement, mida ei saa eemaldada ega asendada.\n"
 "\n"
 "Kui ikkagi soovid \"%s\" kopeerida, nimeta see teise nimega ja ürita uuesti."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Ei saa faili asendada."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Fail \"%s\" on juba olemas.\n"
 "\n"
 "Kas sa soovid seda asendada?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt kopeerimisel"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Asenda"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Asenda kõik"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "lingi %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "lingi %s veelkord"
@@ -2135,25 +2073,25 @@ msgstr "lingi %s veelkord"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. %s link"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. %s link"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. %s link"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. %s link"
@@ -2163,555 +2101,597 @@ msgstr "%d. %s link"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (koopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (veel üks koopia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". koopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". koopia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". koopia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". koopia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (koopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (veel üks koopia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. koopia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. koopia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. koopia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. koopia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Tundmatu GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Failide prügikasti liigutamine"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Faile välja visatud:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Liigutan"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Ettevalmistused prügikasti liigutamiseks..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Failide liigutamine"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Faile liigutatud:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Ettevalmistused liigutamiseks..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Liigutamise lõpetamine..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Failidele linkide loomine"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Faile lingitud:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Linkimisel:"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Ettevalmistused linkide loomiseks..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Linkide loomise lõpetamine..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Failide kopeerimine"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Faile kopeeritud:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopeerimisel:"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Ettevalmistused kopeerimiseks..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Prügikasti ei ole võimalik asju kopeerida."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Prügikasti ei saa kopeerida"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Ei saa prügikasti asukohta muuta"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Ei saa prügikasti kopeerida"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Sa ei saa kataloogi iseendasse liigutada."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Sa ei saa kataloogi iseendasse kopeerida."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Loo selle kataloogi sisse uus tühi kataloog"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Ei saa iseendasse liigutada"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Ei saa iseendasse kopeerida"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Sa ei saa faili iseenda peale kopeerida."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Ei saa iseenda peale kopeerida"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
+msgstr "Sul ei ole \"%s\" sisu vaatamiseks vajalikke õigusi."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
+"Viga sihtkohta \"%s\" liigutamisel.\n"
+"\n"
+"Sihtkohas ei ole piisavalt vaba ruumi."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Viga uue kataloogi loomisel"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Viga uue kataloogi loomisel"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "nimeta kataloog"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Viga uue kataloogi loomisel"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Viga uue kataloogi loomisel"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Viga uue kataloogi loomisel"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fail"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Failide kustutamine"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Faile kustutatud:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Kustutamisel:"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Ettevalmistused failide kustutamiseks..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Prügikasti tühjendamine"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Ettevalmistused prügikasti tühjendamiseks..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tühjenda"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (koopia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (veel üks koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (veel üks koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (veel üks koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (veel üks koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. koopia.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. koopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. koopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. koopia).txt"
 
@@ -2730,64 +2710,64 @@ msgstr "foo (124. koopia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "täna kell 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "täna kell %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "täna kell 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "täna kell %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "täna, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "täna, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "täna"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "eile kell 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "eile kell %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "eile kell 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "eile kell %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "eile, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "eile, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "eile"
 
@@ -2796,151 +2776,151 @@ msgstr "eile"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Kolmapäev, 00. september 0000 kell 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y kell %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "E, 00. okt 0000 kell 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y kell %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "E, 00. okt 0000 kell 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y kell %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00. okt 0000 kell 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y kell %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00. okt 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%d.%m.%y, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementi"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 kataloogi"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 faili"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 kataloog"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fail"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementi"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u kataloogi"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u faili"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementi"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? baiti"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tundmatu tüüp"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tundmatu MIME tüüp"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "tundmatu"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programm"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "link"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "link (katkenud)"
 
@@ -3061,11 +3041,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Otsi faile failinie ja failiomaduste järgi"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikoonivaade"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Nimekirja vaade"
@@ -3209,138 +3191,139 @@ msgstr "%.0s Kodukataloog"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "_Courier"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "faili ikoon"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "redigeeritav tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "redigeeritav silt"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "lisatekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "veel teksti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tume infovärv"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Lülita"
 
@@ -3433,119 +3416,119 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Muuda \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Kasuta ainult \"%s\" vaikeväärtusena"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nimi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Olek"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Vali"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Tehtud"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Muuda..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Failitüübid ja programmid"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Mine sinna"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Ava teise rakendusega"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Vali rakendus \"%s\" avamiseks:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Ava teise vaaturiga"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Vali vaade \"%s\" jaoks:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Ãœhtegi vaaturit pole saadaval"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" pole seotud ühegi rakendusega."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Puuduvad seotud rakendused"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\" pole seotud ühegi rakendusega."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "Puuduvad seotud rakendused"
@@ -3554,145 +3537,166 @@ msgstr "Puuduvad seotud rakendused"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr ""
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
+msgstr "Lemmikrakendused"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" pole seotud ühegi rakendusega."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" pole seotud ühegi rakendusega."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "Puuduvad seotud rakendused"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\" pole seotud ühegi rakendusega."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "Puuduvad seotud rakendused"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Asukohta ei saa avada"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "\"%s\" avamine"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Kauglinki ei saa käivitada"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Rakenduse käivitamisel tekkis viga.\n"
 "\n"
 "Info: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Viga rakenduse käivitamisel"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3938,14 +3942,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Redigeeri"
@@ -4142,96 +4138,106 @@ msgstr "Taust"
 msgid "Empty Trash"
 msgstr "Tühjenda prügikast"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
 #, c-format
-msgid "Open %d Windows?"
+msgid "This will open %d separate windows."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Kustutab kõik elemendid lõplikult"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Kas kustutada?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Vali kategooria:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Mustrid"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 kataloog valitud"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d kataloogi valitud"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (sisaldab 0 elementi)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (sisaldab 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (sisaldab %d elementi)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (neis sisaldub kokku 0 elementi)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (neis sisaldub kokku 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (neis sisaldub kokku %d elementi)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valitud (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -4243,7 +4249,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4252,107 +4258,119 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Liiga palju faile"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr ""
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
+msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Muu _rakendus..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Rakendus..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Muu _vaatur..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Vaatus..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Skriptidest"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4374,179 +4392,183 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Lõikelaualt ei ole midagi asetada."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Ãœhendamise viga"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Lahtiühendamise viga"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Ãœhendamise viga"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Väljasta"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Ãœhenda ketas lahti"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Ava _uues aknas"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Ava %d-s _uues aknas"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Kodukataloog"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Kodukataloog"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Kustuta _prügikastist"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Kustutab kõik elemendid lõplikult"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Tõsta prügikasti"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Liiguta kõik märgitud asjad prügikasti"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Kust_uta"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Tee _lingid"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Tee link"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Lõika fail"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Lõika failid"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopeeri fail"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopeeri failid"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Katkenud link"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" on käivitatav tekstifail. Soovid sa seda käivitada või hoopis sisu "
 "vaadata?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Käivitada või näidata?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Kuva"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Käivita _terminalis"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Kuva"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Käivita"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" avamine"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Katkestada avamine?"
 
@@ -4567,107 +4589,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Vabandust, kogu \"%s\" sisu ei saa kuvada."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Viga kataloogi näitamisel"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Viga ümbernimetamisel"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Katkestada ümbernimetamine?"
 
@@ -4725,123 +4767,133 @@ msgstr "Taasta ikoonide _algsed suurused"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Taasta ikooni algne suurus"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Faili nimi"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Suurus"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tüüp"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Muutmisaeg"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Rohkem kui üks pilt"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Ainult kohalikud pildid"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Ainult pildid"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "_Omadused"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s omadused"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Katkestada grupi muutmine?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Grupi muutmine"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Katkestada omaniku muutmine?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Omaniku muutmine"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ei midagi"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "loetamatu"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element, suurusega %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementi, kokku %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4851,193 +4903,193 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Sisukord:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_Nimi:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Suurus:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "DVD ketas"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Lingi viide:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME tüüp:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Muudetud:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Pöördutud:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Vali kohandatud ikoon..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Eemalda kohandatud ikoon"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lugemine"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Kirjutamine"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "K_äivitamine"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Määra _kasutaja ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Erilipud:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Määra _grupi ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Kleepuv"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Õigused"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Failiõigusi saab määrata ainult faili omanik."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Faili omanik:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Faili omanik:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Faili grupp:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Faili grupp:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Omanik:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupp:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Teised:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstina:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Arvuna:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Viimati muudetud:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Abiinfo kuvamisel tekkis viga:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Viga abiinfo kuvamisel: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Ei saa näidata abiinfot"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr ""
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
+msgstr "Nautiluse pildi omaduste vaade"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Vali ikoon:"
@@ -5054,81 +5106,99 @@ msgid "Search Results"
 msgstr "Otsingu tulemused"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
-msgstr ""
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
+msgstr "Viga kataloogi näitamisel"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
+msgstr "Viga uue kataloogi loomisel"
+
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5137,53 +5207,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Kus"
 
@@ -5192,7 +5282,7 @@ msgstr "Kus"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5203,7 +5293,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5212,13 +5302,15 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Liiga palju vastavusi"
 
@@ -5233,12 +5325,12 @@ msgid "Create L_auncher"
 msgstr "Uus _käivitaja"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Loo uus käivitaja"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Kustuta prügikastist kõik asjad"
 
@@ -5258,7 +5350,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Kasuta _vaikimisi tausta"
@@ -5281,183 +5373,202 @@ msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Kodukataloog"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Kodukataloog"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Loo selle kataloogi sisse uus tühi kataloog"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Loo selle kataloogi sisse uus tühi kataloog"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Loo igale valitud elemendile sümboolne link"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Dubleeri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Kustuta kõik valitud elemendid, ilma prügikasti liigutamata"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Dubleeri kõik valitud elemendid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "_Andmekandja omadused"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ava programmiga..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Ava kõik valitud elemendid uues aknas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Ava _uues aknas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Ava valitud elemendid praeguses aknas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Nimeta valitud element ümber"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Vali _kõik failid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Mustrid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Vali kõik elemendid selles aknas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Vali kõik elemendid selles aknas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopeeri fail"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Vorming"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Ãœhenda ketas lahti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Ava"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Ava skriptide kataloog"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Aseta failid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "Failid ja kataloogid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skriptid"
 
@@ -5542,44 +5653,55 @@ msgstr "_Käsitsi"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indekseerimise olek"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -5603,46 +5725,52 @@ msgstr "Näita _indekseerimise olekut"
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr ""
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr ""
 
 #. Can't register myself due to trouble locating the
@@ -5655,7 +5783,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5663,7 +5791,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5692,31 +5820,42 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Abiinfo kuvamisel tekkis viga:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -5752,34 +5891,44 @@ msgstr "Vähem valikuid"
 msgid "Find Them!"
 msgstr "Leia nad!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Ei saa iseendasse liigutada"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Võrguserverid"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Nimi:"
+msgid "_Location:"
+msgstr "Asukoht:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -5976,6 +6125,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5986,24 +6143,22 @@ msgstr "Ava programmiga %s"
 msgid "Open with..."
 msgstr "Ava programmiga..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Uus _käivitaja"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Tühjenda _prügikast"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6011,117 +6166,129 @@ msgstr ""
 msgid "Go To:"
 msgstr "Mine:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+msgid "Do you want to view %d locations?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Asukohta ei saa avada"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Välju Nautilusest."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Taaskäivita Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "Failihaldus"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Oled sa kindel, et soovid prügikasti sisu jäädavalt kustutada?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Oled sa kindel et tahad oma külastatud asukohtade nimekirja tühjendada?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Puhasta ajalugu"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Asukohta \"%s\" ei ole enam olemas. Soovid sa järjehoidjatest kõik sinna "
 "viitavad järjehoidjad kustutada?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Asukohta \"%s\" ei ole enam olemas."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Järjehodja olematusse asukohta"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Eemalda"
 
@@ -6154,7 +6321,6 @@ msgid "Close _All Windows"
 msgstr "Sulge _kõik aknad"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Sulge kõik Nautiluse aknad"
@@ -6177,107 +6343,118 @@ msgid "Forward"
 msgstr "Edasi"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
+msgid "Go to the next visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
+msgid "Go to the previous visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Kodu"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Asukoha_riba"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Lae uuesti"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Olekuriba"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Peata"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Ãœles"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Lisa järjehoidja"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Tagasi"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Järjehoidjad"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Puhasta ajalugu"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Redigeeri järjehoidjaid"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Edasi"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Liigu"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Koju"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Asukohale..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Külgpaan"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Prügikast"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Ãœles"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vaade"
 
@@ -6295,29 +6472,33 @@ msgstr "Vaata kui..."
 msgid "File Browser: %s"
 msgstr "Faili omanik:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Külgpaan"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Külgpaan"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6351,148 +6532,181 @@ msgstr "_Lisa uus..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
+msgstr "Vali kategooria:"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Ei saa embleemi eemaldada"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Võtmesõna:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Pilt:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Vali uue embleemi pildifail:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Loo uus värv:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Värvi _nimi:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Värvi _väärtus:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
+msgstr "Värvi lisamine ebaõnnestus"
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ei ole pilt"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Vali mustrina lisatav pildifail"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Värvi lisamine ebaõnnestus"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Vali lisatav värv"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Fail '%s' ei ole korrektne pildifail."
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Vali kategooria:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "T_ühista eemaldamine"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Lisa uus muster..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Lisa uus värv..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Lisa uus embleem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Mustri eemaldamiseks klõpsa sellel"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Värvi eemaldamiseks klõpsa sellel"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Embleemi eemaldamiseks klõpsa sellel"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mustrid:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Värvid:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Embleemid:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Eemalda muster..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Eemalda värv..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Eemalda embleem..."
 
@@ -6875,32 +7089,37 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Sulge _kõik aknad"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Sulge külgpaan"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Asukohale..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "_Ava skriptide kataloog"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Mustrid"
@@ -6931,9 +7150,11 @@ msgstr ""
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6941,85 +7162,107 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "\"%s\" pole seotud ühegi rakendusega."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Sisuvaade"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Embleeme ei saa lisada"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus ei saa \"%s\" kuvada."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus ei saa \"%s\" kuvada."
+
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Otsing ei ole saadaval"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ei saa \"%s\" kuvada."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Ei saa asukohta kuvada"
 
@@ -7031,7 +7274,7 @@ msgstr "Liigu järjehoidjaga määratud asukohta"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7039,14 +7282,14 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Tõlge:\n"
 "\tLauri Kasvandik <lauri.kasvandik@mail.ee>, 2002.\n"
 "\tTõivo Leedjärv <toivo@linux.ee>, 2003."
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7062,38 +7305,43 @@ msgstr "Liigu paar lehte tagasi"
 msgid "Go forward a number of pages"
 msgstr "Liigu mõned lehed edasi"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_Kirjatüübid"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr ""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Rakenduse ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Rakendus"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7129,6 +7377,100 @@ msgstr "Võrguserverid"
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory for hardware view"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Riistvara ülevaade"
+
+#~ msgid "Hardware view"
+#~ msgstr "Riistvaravaade"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Vaata kui riistvara"
+
+#~ msgid "hardware view"
+#~ msgstr "riistvaravaade"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "riistvaravaate ikooni nimi"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "riistvarainfo kokkuvõte"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K puhvri suurus"
+
+#~ 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 "Tööaeg on %d päeva, %d tundi, %d minutit"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Riistvara ülevaade"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Kohahoidja protsessori lehele."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Kohahoidja mälu lehele."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Kohahoidja kõvaketaste lehele."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Viga sihtkohta \"%s\" kopeerimisel.\n"
+#~ "\n"
+#~ "Sihtkohas ei ole piisavalt vaba ruumi."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Viga sihtkohta \"%s\" liigutamisel.\n"
+#~ "\n"
+#~ "Sihtkoha ketas on kirjutuskaitsega."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Viga sihtkohta \"%s\" linkide loomisel.\n"
+#~ "\n"
+#~ "Sihtkoha ketas on kirjutuskaitsega."
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Prügikasti ei saa kopeerida"
+
+#~ msgid "file icon"
+#~ msgstr "faili ikoon"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nimi:"
+
 #~ msgid "Unknown"
 #~ msgstr "Tundmatu"
 
@@ -7180,9 +7522,6 @@ msgstr ""
 #~ msgid "_Toolbar"
 #~ msgstr "_Tööriistariba"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Asukohta \"%s\" ei ole enam olemas."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Liigu olematusse asukohta"
 
@@ -7246,9 +7585,6 @@ msgstr ""
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Clear Text"
 #~ msgstr "Kustuta tekst"
 
diff --git a/po/eu.po b/po/eu.po
index 48e38f67a..1e0a09453 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 1.0.6\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Unmantained\n"
 "Language-Team: Euskara\n"
@@ -38,8 +38,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Ikurrak"
 
@@ -54,191 +54,121 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus-eko adibidearen ikuspegia"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Ezin izan da gaia kendu"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
+#: components/emblem/nautilus-emblem-view.c:205
 #, fuzzy
-msgid "Couldn't remove emblem"
+msgid "Couldn't Remove Emblem"
 msgstr "Ezin izan da gaia kendu"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Ezin da ikurra instalatu"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
+#: components/emblem/nautilus-emblem-view.c:241
 #, fuzzy
-msgid "Couldn't rename emblem"
+msgid "Couldn't Rename Emblem"
 msgstr "Ezin da ikurra instalatu"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "Kendu ikur bat..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 #, fuzzy
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Hautatu irudi-fitxategi bat ikur berriarentzat:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Izena aldatu"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "Gehitu ikur berria..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "%s(e)ko irudia ezin izan da ikur gisa instalatu."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
 #, fuzzy
-msgid "Couldn't add emblems"
+msgid "Couldn't Add Emblems"
 msgstr "Ezin izan da gaia gehitu"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
+msgstr "%s(e)ko irudia ezin izan da ikur gisa instalatu."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
 #, fuzzy
-msgid "Couldn't add emblem"
+msgid "Couldn't Add Emblem"
 msgstr "Ezin izan da gaia gehitu"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Borratu"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Hardware ikuspegiaren fabrika"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardwarea"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardwarearen ikustailea"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardwarearen ikuspegia"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Ikusi Hardware gisa"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardwarearen ikuspegia"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "hardware ikuspegiaren ikonoaren izena"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "hardwareari buruzko informazioaren laburpena"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s PUZ\n"
-"%s MHz\n"
-"%s K cache-aren tamaina"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Jardun-denbora: %d egun, %d ordu, %d minutu"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardwarearen informazio orokorra"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "PUZ orrialdearen leku-marka da hau."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "RAM orrialdearen leku-marka da hau."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "IDE orrialdearen leku-marka da hau."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historia"
@@ -925,6 +855,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardwarea"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Nazioartekoa"
@@ -1213,30 +1147,30 @@ msgid "Desktop trash icon name"
 msgstr "Leheneratu izen zaharra"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 #, fuzzy
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Erakutsi bandera bereziak Propietateen leihoan"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1248,8 +1182,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1276,10 +1210,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Zakarrontzia mahaigainean eduki behar da."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1312,10 +1247,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Zakarrontzia mahaigainean eduki behar da."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1327,7 +1263,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1344,7 +1280,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1370,7 +1306,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1394,7 +1330,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1414,11 +1350,11 @@ msgstr "Erabili Nautilus mahaigaina marrazteko"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Erabili etxeko karpeta mahaigain gisa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1438,7 +1374,7 @@ msgstr "Ireki fitxategi edo karpeta bakoitza aparteko leiho batean"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Bistaratu tresna-barra leiho berrietan"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1478,7 +1414,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1486,30 +1422,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1555,7 +1491,7 @@ msgstr "Erabili diseinu estutua"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Ireki hautatutako elementu bakoitza leiho berri batean"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1580,7 +1516,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 #, fuzzy
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Erakutsi karpetetako elementu-kopurua"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1595,7 +1531,7 @@ msgstr "Erakutsi irudi-fitxategien aurrebista txikiak"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Berrezarri mahaigainaren atzeko planoa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1759,72 +1695,85 @@ msgstr "berrezarri"
 msgid "on the desktop"
 msgstr "mahaigainean"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Ezin da uneko gaia ezabatu"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "Ezin da uneko gaia ezabatu"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 #, fuzzy
 msgid "_Move here"
 msgstr "Joan"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 #, fuzzy
 msgid "_Copy here"
 msgstr "_Kopiatu fitxategia"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 #, fuzzy
 msgid "_Link here"
 msgstr "Estekaren helburua:"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Berrezarri atzeko planoa"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Utzi"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 #, fuzzy
 msgid "Set as background for _all folders"
 msgstr "Ez da indizeko terminorik aurkitu hautapen honentzat"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 #, fuzzy
 msgid "Set as background for _this folder"
 msgstr "Ez da indizeko terminorik aurkitu hautapen honentzat"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "\"%s\" gaia ezin izan da instalatu."
+
+#: 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:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Ezin da ikurra instalatu"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1834,18 +1783,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "\"%s\" gako-hitza badago lehendik ere. Aukeratu beste izen bat."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Ezin da ikurra instalatu"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1864,22 +1819,28 @@ msgstr "Nondik:"
 msgid "To:"
 msgstr "Nora:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Errorea lekuz aldatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Errorea lekuz aldatzean.\n"
 " \n"
 "ezin da \"%s\" lekuz aldatu irakurtzeko soilik den disko batean dagoelako. "
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Errorea ezabatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1888,22 +1849,17 @@ msgstr ""
 "ezin da \"%s\" ezabatu karpeta gurasoan aldaketak egiteko baimenik ez "
 "duzulako. "
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Errorea ezabatzean.\n"
 " \n"
 "ezin da \"%s\" ezabatu irakurtzeko soilik den disko batean dagoelako. "
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1912,24 +1868,25 @@ msgstr ""
 "ezin da \"%s\" lekuz aldatu, bera edo bere karpeta gurasoa aldatzeko "
 "baimenik ez duzulako. "
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Errorea lekuz aldatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Errorea lekuz aldatzean.\n"
 " \n"
 "ezin da \"%s\" lekuz aldatu irakurtzeko soilik den disko batean dagoelako. "
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Errorea lekuz aldatzean.\n"
@@ -1937,295 +1894,244 @@ msgstr ""
 "ezin da \"%s\" Zakarrontzira eraman, bera edo bere karpeta gurasoa aldatzeko "
 "baimenik ez duzulako. "
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Errorea kopiatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Errorea kopiatzean.\n"
 " \n"
 "ezin da \"%s\" kopiatu irakurtzeko baimenik ez duzulako. "
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-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. "
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Errorea kopiatzean."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Errorea \"%s\"(e)ra eramatean.\n"
 " \n"
 "Ez dago nahikoa leku helburuan. "
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-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. "
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Errorea lekuz aldatzean."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Errorea esteka sortzean."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Errorea \"%s\"(e)ra kopiatzean.\n"
 " \n"
 "Ez duzu karpeta horretan idazteko baimenik. "
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Errorea \"%s\"(e)ra kopiatzean.\n"
 " \n"
 "Helburuko diskoa irakurtzeko soilik da. "
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-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. "
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-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. "
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-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. "
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Errorea lekuz aldatzean."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-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. "
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea \"%s\" kopiatzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Errorea esteka sortzean."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Errorea kopiatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"\"%s\" errorea \"%s\" lekuz aldatzean.\n"
+"\"%s\" errorea lekuz aldatzean.\n"
 " \n"
 "Jarraitu nahi duzu?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Errorea lekuz aldatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "\"%s\" errorea \"%s\"(e)rako esteka sortzean.\n"
 "\n"
 "Jarraitu nahi duzu?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea \"%s\" ezabatzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
-
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea kopiatzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Errorea ezabatzean."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea lekuz aldatzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Errorea kopiatzean."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea esteka sortzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Errorea lekuz aldatzean."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" errorea ezabatzean.\n"
-" \n"
-"Jarraitu nahi duzu?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Errorea esteka sortzean."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Errorea ezabatzean."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Errorea kopiatzean."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Errorea lekuz aldatzean."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Errorea esteka sortzean."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Errorea ezabatzean."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Saltatu"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Saiatu berriro"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Etxeko helbidera joaten da"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "ezin izan da \"%s\" helbide berrira eraman, bere izena ordeztu edo kendu "
 "ezin den elementu berezi batentzat erabili dugulako.\n"
 " \n"
 "Hala ere, \"%s\" lekuz aldatu nahi baduzu, aldatu izena eta saiatu berriro. "
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Etxeko helbidera joaten da"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "ezin izan da \"%s\" helbide berrira kopiatu, bere izena ordeztu edo kendu "
 "ezin den elementu berezi batentzat erabili dugulako.\n"
 " \n"
 "Hala ere, \"%s\" kopiatu nahi baduzu, aldatu izena eta saiatu berriro. "
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Ezin da fitxategia ordeztu."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "\"%s\" fitxategia badago lehendik ere.\n"
 " \n"
 "Ordeztu nahi duzu?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Gatazka kopiatzean"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Ordeztu"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Ordeztu denak"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s(e)rako esteka"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s(e)rako beste esteka bat"
@@ -2234,25 +2140,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:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, 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:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, 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:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, 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:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s(e)rako %1$d. esteka"
@@ -2262,563 +2168,602 @@ 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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (beste kopia bat)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kopia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (beste kopia bat)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d ezezaguna"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Fitxategiak Zakarrontzira eramaten"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Botatako fitxategiak:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Eramaten:"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Zakarrontzira eramateko prestatzen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Fitxategiak lekuz aldatzen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Lekuz aldatutako fitxategiak:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Lekuz aldatzeko prestatzen..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Lekuz aldatzea bukatzen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Fitxategietarako estekak sortzen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Estekatutako fitxategiak:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Estekatzen:"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Estekak sortzeko prestatzen..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Estekak sortzea amaitzen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Fitxategiak kopiatzen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Kopiatutako fitxategiak:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopiatzen:"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Kopiatzeko prestatzen..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Ezin duzu Zakarrontzian elementurik kopiatu."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Ezin da Zakarrontzian kopiatu"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Ezin duzu zakarrontzi-karpeta lekuz aldatu."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Ezin duzu zakarrontzi-karpeta kopiatu."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Ezin da Zakarrontziaren kokalekua aldatu"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Ezin da Zakarrontzia kopiatu"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Karpeta bat ezin da karpeta beraren barrura eraman."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Karpeta bat ezin da karpeta beraren barruan kopiatu."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Sortu karpeta huts berria karpeta honen barruan"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Ezin da beraren barrura eraman"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Ezin da beraren barruan kopiatu"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Ezin duzu fitxategia bere gainean kopiatu."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Ezin da bere gainean kopiatu"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Errorea karpeta berria sortzean.\n"
 " \n"
 "Ez duzu helburu horretan idazteko baimenik. "
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Errorea karpeta berria sortzean.\n"
 " \n"
 "Ez dago lekurik helburuan. "
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "\"%s\" errorea karpeta berria sortzean."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Errorea karpeta berria sortzean"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Errorea karpeta berria sortzean"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "izen gabeko karpeta"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "\"%s\" errorea karpeta berria sortzean."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Errorea karpeta berria sortzean"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Errorea karpeta berria sortzean"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fitxategi"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Fitxategiak ezabatzen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Ezabatutako fitxategiak:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Ezabatzen:"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Fitxategiak ezabatzeko prestatzen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Zakarrontzia husten"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Zakarrontzia husteko prestatzen..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Ziur zaude Zakarrontziko elementu guztiak betiko ezabatu nahi dituzula?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 #, fuzzy
 msgid "_Empty"
 msgstr "Hustu"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo..(kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo...(kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo.(kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo.(beste kopia bat)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (beste kopia bat)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (beste kopia bat).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (beste kopia bat).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. kopia).txt"
 
@@ -2837,64 +2782,64 @@ msgstr "foo (124. kopia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "gaur, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "gaur, %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "gaur, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "gaur, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "gaur, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "gaur, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "gaur"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "atzo, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "atzo, %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "atzo, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "atzo, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "atzo, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "atzo, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "atzo"
 
@@ -2903,133 +2848,133 @@ msgstr "atzo"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "asteazkena, 0000.eko urtarrila 00, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 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:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "al., 0000 urr 00, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %Y %b %-d, %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "al., 0000 urr 00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %Y %b %-d, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 urr 00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %-d, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 urr 00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y %b %-d, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00-00-00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y-%m-%d, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00-00-00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%y-%m-%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementu"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 karpeta"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fitxategi"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 elementu"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 karpeta"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fitxategi"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementu"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u karpeta"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fitxategi"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementu"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "mota ezezaguna"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3039,7 +2984,7 @@ msgstr ""
 "asko gnome-vfs.keys fitxategia okerreko lekuan izango duzu edo ezingo du "
 "aurkitu beste zerbait dela medio. "
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3048,11 +2993,11 @@ msgstr ""
 "Ez du \"%s\" mime-motaren azalpena aurkitu (fitxategia \"%s\" da), "
 "jakinarazi gnome-vfs posta-zerrendari. "
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "esteka"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "esteka (hautsita)"
 
@@ -3182,11 +3127,13 @@ msgstr ""
 "Bilatu fitxategiak fitxategi-izenaren eta fitxategi-propietateen arabera"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikono-ikuspegia"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Zerrenda-ikuspegia"
@@ -3330,154 +3277,159 @@ msgstr "%s - etxea"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Ordenagailua"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr ""
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 #, fuzzy
 msgid "editable text"
 msgstr "Meditatiboa"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 #, fuzzy
 msgid "The selection rectangle"
 msgstr "Hautatutako ikonoa tiragarri egiten du"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 #, fuzzy
 msgid "Frame Text"
 msgstr "Itsatsi testua"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 #, fuzzy
 msgid "Selection Box Color"
 msgstr "Edukien _fitxako hautapena"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "Etxeko helbidera joaten da"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "Hautatu dena"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 #, fuzzy
 msgid "Dark Info Color"
 msgstr "Artelazki beltza"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Karpeta honek aurkezpen-diseinu automatikoa du.  Nahi duzu eskuzko diseinura "
 "aldatu eta elementu hau jaregin diozun lekuan lagatzea? Ekintza horrek "
 "eskuzko diseinua ezarriko du. "
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Karpeta honek aurkezpen-diseinu automatikoa du.  Nahi duzu eskuzko diseinura "
 "aldatu eta elementu horiek jaregin diezun lekuan lagatzea? Ekintza horrek "
 "eskuzko diseinua ezarriko du. "
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Karpeta honek aurkezpen-diseinu automatikoa du. Nahi duzu eskuzko diseinura "
 "aldatu eta elementu hau jaregin diozun lekuan lagatzea?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Karpeta honek aurkezpen-diseinu automatikoa du. Nahi duzu eskuzko diseinura "
 "aldatu eta elementu hauek jaregin diezun lekuan lagatzea?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Eskuzko diseinura aldatu?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Aldatu"
 
@@ -3587,75 +3539,75 @@ msgstr "\"%s\" elementuentzat lehenetsitakoa da."
 msgid "Is the default for all \"%s\" items."
 msgstr "\"%s\" elementu guztientzat lehenetsitakoa da."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifikatu \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Sartu menuan \"%s\" elementuentzat"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Erabili lehenetsi gisa \"%s\" elementuentzat."
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, fuzzy, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Sartu menuan \"%s\" elementuentzat"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, fuzzy, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Erabili lehenetsi gisa \"%s\" elementuentzat."
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ez sartu menuan \"%s\" elementuentzat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Izena"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Egoera"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 #, fuzzy
 msgid "C_hoose"
 msgstr "Aukeratu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Eginda"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 #, fuzzy
 msgid "_Modify..."
 msgstr "Aldatu..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Fitxategi-motak eta programak"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 #, fuzzy
 msgid "_Go There"
 msgstr "Joan"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -3664,51 +3616,51 @@ msgstr ""
 "Fitxategi-mota bakoitzarentzat zein programa eskaini konfigura dezakezu "
 "GNOMEren kontrol-zentroan. "
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 #, fuzzy
 msgid "Open with Other Application"
 msgstr "Beste aplikazio bat..."
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 #, fuzzy
 msgid "Open with Other Viewer"
 msgstr "Ireki beste batekin"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, fuzzy, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Aukeratu ikuspegi bat \"%s\"(r)entzat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Ez dago ikustaile erabilgarririk \"%s\"(r)entzat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Ikustaile erabilgarririk ez"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, fuzzy, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 #, fuzzy
 msgid "No Application Associated"
 msgstr "Aplikazio erabilgarririk ez"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "Aplikazio erabilgarririk ez"
@@ -3717,162 +3669,192 @@ msgstr "Aplikazio erabilgarririk ez"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
+#: libnautilus-private/nautilus-program-chooser.c:1610
 #, fuzzy
-msgid "Associate Application"
+msgid "_Associate Application"
 msgstr "Gogoko aplikazioak"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "Aplikazio erabilgarririk ez"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "Aplikazio erabilgarririk ez"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "Gogoko aplikazioak"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
+"helbideetako fitxategiak atzitu.  Beste aplikazio bat aukeratu nahi duzu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu.  Beste aplikazio bat aukeratu nahi duzu?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu.  Beste aplikazio bat aukeratu nahi duzu?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ezin da Helbidea ireki"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
+"helbideetako fitxategiak atzitu.  Beste aplikazio bat aukeratu nahi duzu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu.   Ez dago beste aplikaziorik erabilgarri "
 "fitxategi hau ikusteko.   Fitxategia zure ordenagailuan kopiatzen baduzu, "
 "ireki ahal izango duzu. "
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
+"helbideetako fitxategiak atzitu.  Beste aplikazio bat aukeratu nahi duzu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
 "helbideetako fitxategiak atzitu.   Ez dago beste aplikaziorik erabilgarri "
 "fitxategi hau ikusteko.   Fitxategia zure ordenagailuan kopiatzen baduzu, "
 "ireki ahal izango duzu. "
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "\"%s\" irekitzen"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Ezin duzu urruneko gune batetik komandorik exekutatu segurtasun-neurriak "
 "direla eta. "
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Ezin da urruneko estekarik exekutatu"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
 #, fuzzy
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+msgid "There was an error launching the application."
 msgstr "Errorea gertatu da %s irakurtzean."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
 #, fuzzy
-msgid "Error launching application"
+msgid "Error Launching Application"
 msgstr "Gogoko aplikazioak"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr ""
+"Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
 #, fuzzy
-msgid "Drop target only supports local files"
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 "Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4124,14 +4106,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Izenean \"medusa\" dutenak eta karpeta direnak"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Diskoetan bilatzen"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus zure diskoetan ari da zakarrontziko karpetak bilatzen."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Editatu"
@@ -4345,96 +4319,106 @@ msgstr "Atzeko planoa"
 msgid "Empty Trash"
 msgstr "Hustu zakarrontzia"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Honek %d leiho irekiko ditu. Ziur zaude hori egin nahi duzula?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d leiho ireki?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ziur zaude \"%s\" behin betiko ezabatu nahi duzula?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Honek %d leiho irekiko ditu. Ziur zaude hori egin nahi duzula?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, 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:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ziur zaude hautatutako %d elementuak betiko ezabatu nahi dituzula?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+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:909
 msgid "Delete?"
 msgstr "Ezabatu?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Hautatu kategoria bat:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Ereduak"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" hautatuta"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 karpeta hautatuta"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d karpeta hautatuta"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 elementu ditu)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (elementu bat du)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d elementu ditu)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (guztira 0 elementu ditu)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (guztira elementu bat du)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (guztira %d elementu ditu)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" hautatuta (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementu hautatuta (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "beste elementu bat hautatuta (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "beste %d elementu hautatuta (%s)"
@@ -4446,7 +4430,7 @@ msgstr "beste %d elementu hautatuta (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4455,106 +4439,122 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "\"%s\" karpetak Nautilus-ek maneiatzeko baino fitxategi gehiago ditu.  "
 "Fitxategietako batzuk ez dira bistaratuko. "
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Fitxategi gehiegi"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Ezin da \"%s\" Zakarrontzira eraman.Berehala ezabatu nahi duzu?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Hautatutako %d elementuak ezin dira Zakarrontzira eraman.  Berehala ezabatu "
-"nahi dituzu?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Ezin da \"%s\" Zakarrontzira eraman.Berehala ezabatu nahi duzu?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 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 da Zakarrontzira eraman.  %d elementu "
-"horiek berehala ezabatu nahi dituzu?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Ezin da \"%s\" Zakarrontzira eraman.Berehala ezabatu nahi duzu?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Berehala ezabatu?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, 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:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Ziur zaude hautatutako %d elementuak Zakarrontzitik betiko ezabatu nahi "
 "dituzula?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Zakarrontzitik ezabatu?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Erabili \"%s\" hautatutako elementua irekitzeko"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Beste _Aplikazio bat..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Aplikazio bat..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Beste _Ikustaile bat..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Ikustaile bat..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Exekutatu \"%s\" hautatutako elementuetan"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Karpeta honetako fitxategi exekutagarri guztiak agertuko dira Script-en "
+"menuan.  Menuko script bat aukeratzen baduzu, script hori exekutatuko da "
+"hautatutako edozein elementu sarrera moduan erabilita. "
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4562,11 +4562,11 @@ msgstr ""
 "menuan.  Menuko script bat aukeratzen baduzu, script hori exekutatuko da "
 "hautatutako edozein elementu sarrera moduan erabilita. "
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Script-ei buruz"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4608,19 +4608,19 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: uneko leihoaren kokalekua eta tamaina"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 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:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 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:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4628,7 +4628,7 @@ msgstr ""
 "'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d elementuak "
 "lekuz aldatuko dira"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4636,171 +4636,177 @@ msgstr ""
 "'Itsatsi fitxategiak' komandoa hautatzen baduzu, hautatutako %d  elementuak "
 "kopiatu egingo dira"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Arbelean ez dago itsasteko ezer."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Errorea muntatzean"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Errorea desmuntatzean"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Errorea muntatzean"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 #, fuzzy
 msgid "E_ject"
 msgstr "Exekutatu"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 #, fuzzy
 msgid "_Unmount Volume"
 msgstr "Desmuntatu bolumena"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Ireki leiho berrian"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Ireki %d _leiho berritan"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Karpeta berria"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Karpeta berria"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 #, fuzzy
 msgid "_Delete from Trash"
 msgstr "Ezabatu _Zakarrontzitik"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Hautatutako elementu guztiak behin betiko ezabatzen ditu"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Mo_ve to Trash"
 msgstr "Eraman Zakarrontzira"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Hautatutako elementu guztiak Zakarrontzira eramaten ditu"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 #, fuzzy
 msgid "_Delete"
 msgstr "Ezabatu"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 #, fuzzy
 msgid "Ma_ke Links"
 msgstr "Sortu _Estekak"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 #, fuzzy
 msgid "Ma_ke Link"
 msgstr "Sortu esteka"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Hustu zakarrontzia"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Eb_aki fitxategia"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Eb_aki fitxategiak"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopiatu fitxategia"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopiatu fitxategiak"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5848
 #, fuzzy
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Esteka hori ezin da erabili, helbururik ez duelako.  Zakarrontzira eraman "
 "nahi duzu?"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Esteka hori ezin da erabili, helbururik ez duelako.  Zakarrontzira eraman "
+"nahi duzu?"
+
+#: src/file-manager/fm-directory-view.c:5852
 #, fuzzy, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Esteka hori ezin da erabili, bere helburua (\"%s\") ez dagoelako. "
 "Zakarrontzira eraman nahi duzu?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Esteka hautsita"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" testu-fitxategi exekutagarria da.  Exekutatu nahi duzu edo bere "
 "edukia bistaratu?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Testu-fitxategi exekutagarriak"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Exekutatu edo Bistaratu?"
 
-#: src/file-manager/fm-directory-view.c:5430
-#, fuzzy
-msgid "_Display"
-msgstr "Bistaratu"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 #, fuzzy
 msgid "Run in _Terminal"
 msgstr "Terminal berria"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+#, fuzzy
+msgid "_Display"
+msgstr "Bistaratu"
+
+#: src/file-manager/fm-directory-view.c:5928
 #, fuzzy
 msgid "_Run"
 msgstr "Exekutatu"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" irekitzen"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Irekitzea bertan behera utzi?"
 
@@ -4821,10 +4827,15 @@ 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
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Errorea karpeta bistaratzean"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4832,19 +4843,19 @@ msgstr ""
 "\"%s\" izena erabilita dago dagoeneko karpeta honetan.  Erabili beste izen "
 "bat."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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:112
+#: 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 adinako baimenik \"%s\"(r)i izena aldatzeko."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4853,66 +4864,81 @@ msgstr ""
 "\"%s\" izena ez da baliozkoa, \"/\" karakterea duelako.  Erabili beste izen "
 "bat. "
 
-#: src/file-manager/fm-error-reporting.c:121
+#: 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:127
+#: 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:136
+#: 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:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Ezin izan da gai hori kendu!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Errorea izena aldatzean"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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:167
+#: 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:175
+#: 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:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Errorea taldea ezartzean"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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:208
+#: 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:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Errorea jabea ezartzean"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4920,21 +4946,26 @@ msgstr ""
 "Ezin izan dira \"%s\"(r)en baimenak aldatu, irakurtzeko soilik den disko "
 "batean dagoelako"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: 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:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Errorea baimenak ezartzean"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" izenaren ordez \"%s\" ipini."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Izena aldatzea bertan behera utzi?"
 
@@ -4994,131 +5025,154 @@ msgstr "Berrezarri ikonoen jatorrizko tamaina"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Berrezarri iko_noaren jatorrizko tamaina"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" seinalatzen"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Arrastatu eta jaregitea fitxategi-sistema lokalekin bakarrik egin daiteke."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+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-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Errorea arrastatu eta jaregitean"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Arrastatze-mota baliogabea erabili da."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 #, fuzzy
 msgid "File name"
 msgstr "Fitxategi-jabea:"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Tamaina"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Mota"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Aldatze-data"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Ezin duzu ikono pertsonalizatu bat baino gehiago batera esleitu! Arrastatu "
 "irudi bakarra ikono pertsonalizatu bat ezartzeko. "
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Ezin duzu ikono pertsonalizatu bat baino gehiago batera esleitu! Arrastatu "
+"irudi bakarra ikono pertsonalizatu bat ezartzeko. "
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Irudi bat baino gehiago"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Jaregin duzun fitxategia ez da lokala.   Irudi lokalak bakarrik erabil "
 "ditzakezu ikono pertsonal gisa."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Jaregin duzun fitxategia ez da lokala.   Irudi lokalak bakarrik erabil "
+"ditzakezu ikono pertsonal gisa."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Irudi lokalak bakarrik"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Jaregin duzun fitxategia ez da irudia.   Irudi lokalak bakarrik erabil "
-"ditzakezu ikono pertsonal gisa. "
+"Jaregin duzun fitxategia ez da lokala.   Irudi lokalak bakarrik erabil "
+"ditzakezu ikono pertsonal gisa."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Irudiak bakarrik"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "%s - Propietateak"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s - Propietateak"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Talde-aldaketa bertan behera utzi?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Taldea aldatzen"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Jabe-aldaketa bertan behera utzi?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Jabea aldatzen"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ezer ere ez"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "irakurrezina"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "elementu bat, %s tamainakoa"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementu, guztira %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(eduki batzuk irakurrezinak)"
 
@@ -5128,212 +5182,213 @@ msgstr "(eduki batzuk irakurrezinak)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Edukia:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "Izena"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 #, fuzzy
 msgid "_Name:"
 msgstr "Izena"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Mota:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Tamaina:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Helbidea:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "DVD bolumena"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 #, fuzzy
 msgid "Free space:"
 msgstr "Estilo librea"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 #, fuzzy
 msgid "Link target:"
 msgstr "Estekaren helburua:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME mota"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Aldatze-data:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Atzitze-data:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 #, fuzzy
 msgid "_Select Custom Icon..."
 msgstr "Hautatu ikono pertsonalizatua..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 #, fuzzy
 msgid "_Remove Custom Icon"
 msgstr "Kendu ikono pertsonalizatua"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 #, fuzzy
 msgid "_Read"
 msgstr "Irakurri"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 #, fuzzy
 msgid "_Write"
 msgstr "Idatzi"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 #, fuzzy
 msgid "E_xecute"
 msgstr "Exekutatu"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 #, fuzzy
 msgid "Set _user ID"
 msgstr "Ezarri erabiltzailearen IDa"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 #, fuzzy
 msgid "Special flags:"
 msgstr "Bandera bereziak:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 #, fuzzy
 msgid "Set gro_up ID"
 msgstr "Ezarri taldearen IDa"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 #, fuzzy
 msgid "_Sticky"
 msgstr "Itsaskorra"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 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:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Fitxategi-jabea:"
+
+#: src/file-manager/fm-properties-window.c:2900
 #, fuzzy
 msgid "File owner:"
 msgstr "Fitxategi-jabea:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 #, fuzzy
 msgid "_File group:"
 msgstr "Fitxategiaren taldea:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 #, fuzzy
 msgid "File group:"
 msgstr "Fitxategiaren taldea:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Jabea:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Taldea:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Besterik:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 #, fuzzy
 msgid "Text view:"
 msgstr "Testu-ikuspegia"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 #, fuzzy
 msgid "Number view:"
 msgstr "Zenbaki-ikuspegia:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 #, fuzzy
 msgid "Last changed:"
 msgstr "Azken aldaketa:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, 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:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ezin izan dira \"%s\"(r)en baimenak zehaztu."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, fuzzy, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
 msgstr "Errorea gertatu da %s irakurtzean."
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3348
 #, fuzzy
-msgid "Couldn't show help"
+msgid "Couldn't Show Help"
 msgstr "Ezin izan da gaia gehitu"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Propietateen leihoa erakustea bertan behera utzi?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Propietateen leihoa sortzen"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Hautatu ikono bat:"
@@ -5352,70 +5407,110 @@ msgid "Search Results"
 msgstr "Bilaketaren emaitza"
 
 #: src/file-manager/fm-search-list-view.c:166
-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. "
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Medusa bilaketa-zerbitzua ez dago erabilgarri."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Bilaketa-zerbitzua ez dago erabilgarri"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 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 exekutatuz root gisa. "
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"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 exekutatuz root gisa. "
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Bilatu berriegiak diren elementuak"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Zure ordenagailuko fitxategi indexatu guztiek betetzen dituzte hautatu "
+"dituzun irizpideak.  Egiaztatu hautapenen ortografia edo zehaztu irizpide "
+"gehiago emaitzak murrizteko. "
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"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. "
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Errorea bilaketa egitean"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 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 exekutatuz root gisa. "
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Errorea fitxategi-indizea irakurtzean"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Errorea gertatu da bilaketa honen edukia kargatzean: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Edukien bilaketa egiteko, Bilatu-k zure sistemako fitxategien indizea behar "
+"du.  Orain ezin du zure indizea atzitu. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Edukien bilaketa egiteko, Bilatu-k zure sistemako fitxategien indizea behar "
+"du.  Orain ezin du zure indizea atzitu. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5423,25 +5518,23 @@ msgstr ""
 "du.   Orain ezin du zure indizea atzitu, beraz, indizea erabiltzen ez duen "
 "bilaketa motelago bat egingo du. "
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "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. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Bilaketa lasterrak ez daude erabilgarri"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Edukien bilaketak ez daude erabilgarri"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5455,56 +5548,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 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. "
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 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. "
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Bilaketa indexatuak ez daude erabilgarri"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Edukien bilaketa egiteko, Bilatu-k zure sistemako fitxategien indizea behar "
+"du.  Orain ezin du zure indizea atzitu. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Edukien bilaketa egiteko, Bilatu-k zure sistemako fitxategien indizea behar "
+"du.  Orain ezin du zure indizea atzitu. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 exekutatuz root gisa.  Indize osoa "
 "erabilgarri egon arte, minutu batzuk beharko dira bilaketak egiteko."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 exekutatuz root gisa.   Indize osoa erabilgarri "
 "egon arte, ezingo da edukien bilaketarik burutu. "
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Bilaketa lasterrak ez daude gaituta zure ordenagailuan"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5514,11 +5639,12 @@ msgstr ""
 "du. Sistema-administratzaileak zure ordenagailuko bilaketa lasterra desgaitu "
 "du, beraz, ez dago indizerik erabilgarri. "
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Bilaketa lasterrak ez daude gaituta zure ordenagailuan"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Bilaketa lasterrak ez daude erabilgarri"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Non"
 
@@ -5527,7 +5653,7 @@ msgstr "Non"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Erakutsi Leiho berrian"
@@ -5538,7 +5664,7 @@ msgstr "_Erakutsi Leiho berrian"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Erakutsi %d _leiho berritan"
@@ -5547,15 +5673,21 @@ msgstr "Erakutsi %d _leiho berritan"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus-ek bistaratzeko baino bilaketa-emaitza gehiago aurkitu ditu. "
 "Elementu batzuk ez dira bistaratuko. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus-ek bistaratzeko baino bilaketa-emaitza gehiago aurkitu ditu. "
+"Elementu batzuk ez dira bistaratuko. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Emaitza gehiegi"
 
@@ -5571,13 +5703,13 @@ msgid "Create L_auncher"
 msgstr "Berrien panela"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 #, fuzzy
 msgid "Create a new launcher"
 msgstr "Sortu kolore berria:"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Ezabatu Zakarrontziko elementu guztiak"
 
@@ -5599,7 +5731,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 #, fuzzy
 msgid "Use _Default Background"
@@ -5624,62 +5756,72 @@ msgstr "Aukeratu beste ikustaile bat hautatutako elementua ikusteko"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Ezin da karpeta irakurri"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Ezin da karpeta irakurri"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Sortu karpeta huts berria karpeta honen barruan"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Sortu karpeta huts berria karpeta honen barruan"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Sortu esteka sinboliko bat hautatutako elementu bakoitzerako"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 #, fuzzy
 msgid "D_uplicate"
 msgstr "Bikoiztu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Ezabatu hautatutako elementu guztiak Zakarrontzira eraman gabe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Hautatutako elementu guztiak bikoizten ditu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
 msgid "Edit Launcher"
 msgstr "Berrien panela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 #, fuzzy
 msgid "Format the selected volume"
 msgstr "Nautilus-ek ezin izan du hautatutako bolumena muntatu."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Medi_a Properties"
 msgstr "%s - Propietateak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Nautilus-ek ezin izan du hautatutako bolumena muntatu."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 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"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5688,144 +5830,153 @@ msgstr ""
 "Ebaki fitxategiak edo Kopiatu fitxategiak komandoen bidez hautatutako "
 "fitxategiak lekuz aldatu edo kopiatu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ireki _honekin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Ireki hautatutako elementu bakoitza leiho berri batean"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Ireki leiho berrian"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Ireki hautatutako elementua leiho honetan"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Hautatutako fitxategiak Itsatsi fitxategiak komandoaren bidez kopiatzeko "
 "prestatzen ditu "
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Hautatutako fitxategiak Itsatsi fitxategiak komandoaren bidez lekuz "
 "aldatzeko prestatzen ditu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 #, fuzzy
 msgid "Protect the selected volume"
 msgstr "Nautilus-ek ezin izan du hautatutako bolumena muntatu."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 #, fuzzy
 msgid "Rename selected item"
 msgstr "Izena aldatu hautatutako ikonoari"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 #, fuzzy
 msgid "Reset View to _Defaults"
 msgstr "Zerrendaren ikuspegi lehenetsia"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ordenatzeko modua eta zoom-maila berrezartzen du ikuspegi honen hobespenekin "
 "bat etortzeko"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Exekutatu edo kudeatu script-ak ~/Nautilus/scripts-etik"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Hautatu _fitxategi guztiak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Ereduak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Hautatu leiho honetako elementu guztiak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Hautatu leiho honetako elementu guztiak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Show media properties for the selected volume"
 msgstr "Hautatutako elementuen propietateak erakutsi edo aldatzen ditu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Menu honetan agertzen diren script-ak dituen karpeta erakusten du"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 #, fuzzy
 msgid "Unmount the selected volume"
 msgstr "Nautilus-ek ezin izan du hautatutako bolumena muntatu."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Use the default background for this location"
 msgstr "Ez da indizeko terminorik aurkitu hautapen honentzat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Hautatutako elementuen propietateak erakutsi edo aldatzen ditu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopiatu fitxategia"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 #, fuzzy
 msgid "_Format"
 msgstr "Ahaztu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Desmuntatu bolumena"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Ireki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Ireki script-en karpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Itsatsi _fitxategiak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "izen gabeko karpeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 #, fuzzy
 msgid "_Properties"
 msgstr "%s - Propietateak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 #, fuzzy
 msgid "_Rename..."
 msgstr "I_zena aldatu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 #, fuzzy
 msgid "_Scripts"
 msgstr "Script-ak"
@@ -5917,7 +6068,12 @@ msgstr "_Eskuz"
 msgid "Indexing is %d%% complete."
 msgstr "Indexazioaren %%%d osatuta dago."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Zure fitxategien azken indizearen data: %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5925,25 +6081,29 @@ msgstr ""
 "Zure fitxategiak eta testu-edukiak egunero indexatuko dira bilaketa "
 "azkarragoa izan dadin. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexazioaren egoera"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Zure fitxategien azken indizearen data: %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Zure fitxategiak eta testu-edukiak egunero indexatuko dira bilaketa "
-"azkarragoa izan dadin.  Zure fitxategiak indexatzen ari dira une honetan."
+"azkarragoa izan dadin. "
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Orain ez daukazu fitxategien indizerik."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5953,15 +6113,19 @@ msgstr ""
 "Bilatu-k.  Zure ordenagailuak ez du bilaketa lasterra gaituta, beraz orain "
 "ez duzu indizerik. "
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Orain ez daukazu fitxategien indizerik."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Medusa bilaketa-zerbitzua ez dago erabilgarri."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5986,32 +6150,37 @@ msgstr "Erakutsi _indexazioaren egoera"
 msgid "Show status of indexing used when searching"
 msgstr "Bilaketetan erabiltzen den indexazioaren egoera erakusten du"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Ezin izan da beharrezkoa den karpeta sortu"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus-ek ezin izan du %s direktorioa sortu."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus-ek ezin izan du \"%s\" karpeta sortu eta behar du. Nautilus "
 "exekutatu aurretik, sortu karpeta hori edo ezarri Nautilus-ek karpeta sortu "
 "ahal izateko behar diren baimenak."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Ezin izan dira beharrezkoak diren karpetak sortu"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus-ek ezin izan du %s direktorioa sortu."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6021,21 +6190,25 @@ msgstr ""
 "Nautilus exekutatu aurretik, sortu karpeta horiek edo ezarri Nautilus-ek "
 "karpetak sortu ahal izateko behar dituen baimenak."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "Leihoak eta Mahaigaina"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "Leihoak eta Mahaigaina"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6047,7 +6220,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 #, fuzzy
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
@@ -6059,7 +6232,7 @@ msgstr ""
 "ordenagailua berrabiarazita edo Nautilus berriro instalatuta."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 #, fuzzy
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
@@ -6105,12 +6278,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 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:559
+#: src/nautilus-application.c:558
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6120,7 +6293,7 @@ msgstr ""
 "zerbitzaria erregistratzen saiatzean OAFen ustekabeko errorea gertatu "
 "delako. "
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6131,7 +6304,7 @@ msgstr ""
 "errorea gertatu delako; oafd hiltzeak eta Nautilus berrabiarazteak arazoa "
 "konpon dezake. "
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6142,6 +6315,15 @@ msgstr ""
 "ustekabeko errorea gertatu delako.  Oafd hiltzeak eta Nautilus "
 "berrabiarazteak arazoa konpon dezake."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, fuzzy, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr "Errorea gertatu da %s irakurtzean."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -6178,35 +6360,45 @@ msgstr "Aukera gutxiago"
 msgid "Find Them!"
 msgstr "Bilatu!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Ezin da beraren barrura eraman"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "ez da baliozko bloke-gailua"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" ez da baliozko helbidea. Egiaztatu ortografia eta saiatu berriro."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Ezin izan da \"%s\" aurkitu. Egiaztatu ortografia eta saiatu berriro."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Netraverse"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "Izena"
+msgid "_Location:"
+msgstr "Helbidea:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6435,6 +6627,20 @@ msgstr ""
 "\n"
 "Fitxategi hori eskuz ezaba dezakezu laguntzailea berriro aurkezteko.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Ezin duzu ikono pertsonalizatu bat baino gehiago batera esleitu! Arrastatu "
+"irudi bakarra ikono pertsonalizatu bat ezartzeko. "
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Jaregin duzun fitxategia ez da lokala.   Irudi lokalak bakarrik erabil "
+"ditzakezu ikono pertsonal gisa."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6445,25 +6651,23 @@ msgstr "Ireki honekin: %s"
 msgid "Open with..."
 msgstr "Ireki honekin..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Berrien panela"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Hustu zakarrontzia"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6471,37 +6675,37 @@ msgstr ""
 msgid "Go To:"
 msgstr "Joan:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "%d helbide horiek aparteko leihoetan ikusi nahi dituzu?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Leiho anitzetan ikusi?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Ezin da Helbidea ireki"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Burutu auto-egiaztapen proba azkarrak."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Sortu hasierako leihoa emandako geometriarekin."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Zehaztutako URIentzat bakarrik sortu leihoak."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6509,85 +6713,98 @@ msgstr ""
 "Ez kudeatu mahaigaina (ez egin jaramonik hobespenen elkarrizketa-koadroan "
 "ezarritako hobespenei)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Irten Nautilus-etik."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Berrabiarazi Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "Fitxategi-jabea:"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check ezin da URIekin erabili.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ezin da beste aukerekin erabili.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ezin da URIekin erabili.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart ezin da URIekin erabili.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ziur zaude \"%s\" behin betiko ezabatu nahi duzula?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Ziur zaude historia ahaztu nahi duzula? Hala egiten baduzu, errepikatu egin "
 "beharko duzu."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 #, fuzzy
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Ziur zaude Nautilus-ek bisitatu dituzun helbideak ahatz ditzan nahi duzula?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 #, fuzzy
 msgid "Clear History"
 msgstr "Historia ahaztu?"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" helbidea ez da existitzen. Helbide hori duten laster-markak kendu "
 "nahi dituzu zerrendatik?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "\"%s\" helbiderik ez dago orain."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Laster-marka honen helbidea ez dago"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Kendu"
 
@@ -6621,7 +6838,6 @@ msgid "Close _All Windows"
 msgstr "Itxi _leiho guztiak"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Nautilus-en leiho guztiak ixten ditu"
@@ -6644,116 +6860,128 @@ msgid "Forward"
 msgstr "Aurrera"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "'Hasi hemen' karpetara joaten da"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Bisitatutako hurrengo helbidera joaten da"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Bisitatutako aurreko helbidera joaten da"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 #, fuzzy
 msgid "Go to the trash folder"
 msgstr "'Hasi hemen' karpetara joaten da"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Etxera"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 #, fuzzy
 msgid "Location _Bar"
 msgstr "Ezkutatu helbide-_barra"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 #, fuzzy
 msgid "Reload"
 msgstr "Irakurri"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Bilatu fitxategiak ordenagailu honetan"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Ezkutatu _egoera-barra"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Gelditu"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Gora"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Gehitu laster-marka"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Atzera"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "Laster-_markak"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 #, fuzzy
 msgid "_Clear History"
 msgstr "Aha_ztu historia"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Ordenagailua"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 #, fuzzy
 msgid "_Edit Bookmarks"
 msgstr "_Editatu laster-markak..."
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "A_urrera"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Joan"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Etxera"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Helbidea..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Alboko barraren panelak"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 #, fuzzy
 msgid "_Trash"
 msgstr "Zakarrontzia"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 #, fuzzy
 msgid "_Up"
 msgstr "Gora"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Ikusi"
 
@@ -6772,35 +7000,40 @@ msgstr "Ikusi honela..."
 msgid "File Browser: %s"
 msgstr "Fitxategi-jabea:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+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. Tamalez, ezin dut esan zein errore den."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s ikuspegiak errorea aurkitu du abiaraztean."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Alboko barraren %s panelak errorea aurkitu du eta ezin izan du jarraitu. "
 "Gehiagotan gertatzen bada, hobe izango duzu panel hori desaktibatzea."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Alboko barraren panelak huts egin du"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 #, fuzzy
 msgid "Side Pane"
 msgstr "Alboko barraren panelak"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6836,160 +7069,192 @@ msgstr "Gehitu berria..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "%s eredua ezin izan da ezabatu."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Ezin izan da eredua ezabatu"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "%s ikurra ezin izan da ezabatu."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Ezin izan da gaia kendu"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Sortu ikur berria:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 #, fuzzy
 msgid "_Keyword:"
 msgstr "Gako-hitza:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 #, fuzzy
 msgid "_Image:"
 msgstr "Irudia:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Hautatu irudi-fitxategi bat ikur berriarentzat:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Sortu kolore berria:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 #, fuzzy
 msgid "Color _name:"
 msgstr "Kolore-izena:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 #, fuzzy
 msgid "Color _value:"
 msgstr "Kolore-balioa:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ez da baliozko fitxategi-izena."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Eman duzun fitxategi-izena ez da baliozkoa."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Ezin izan da eredua instalatu"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Ezin duzu berrezartzeko irudia ordeztu."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ez da irudia"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "%s eredua ezin izan da instalatu."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 #, fuzzy
 msgid "Select an image file to add as a pattern"
 msgstr "Hautatu eredu gisa gehitu nahi duzun irudi-fitxategia:"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 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:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Ezin da kolorea instalatu"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 #, fuzzy
 msgid "Select a color to add"
 msgstr "Hautatu gehitu nahi duzun kolorea:"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "'%s' ez da irudi-fitxategi erabilgarria."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Hautatu kategoria bat:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 #, fuzzy
 msgid "C_ancel Remove"
 msgstr "Utzi"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 #, fuzzy
 msgid "_Add a New Pattern..."
 msgstr "Gehitu eredu berria..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 #, fuzzy
 msgid "_Add a New Color..."
 msgstr "Gehitu kolore berria..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 #, fuzzy
 msgid "_Add a New Emblem..."
 msgstr "Gehitu ikur berria..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Egin klik kendu nahi duzun ereduan"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Egin klik kendu nahi duzun kolorean"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Egin klik kendu nahi duzun ikurrean"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Ereduak:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Koloreak:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Ikurrak:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 #, fuzzy
 msgid "_Remove a Pattern..."
 msgstr "Kendu eredu bat..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 #, fuzzy
 msgid "_Remove a Color..."
 msgstr "Kendu kolore bat..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 #, fuzzy
 msgid "_Remove an Emblem..."
 msgstr "Kendu ikur bat..."
@@ -7385,34 +7650,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Itxi _leiho guztiak"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Oharren alboko barraren panela"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Ordenagailua"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "'Hasi hemen' karpetara joaten da"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Helbidea..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "Karpetak [diren elementuak ]"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "Ereduak"
@@ -7444,10 +7714,13 @@ msgid "View Failed"
 msgstr "Ikuspegiak huts egin du"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s ikuspegiak errorea aurkitu du abiaraztean."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s ikuspegiak errorea aurkitu du eta ezin izan du jarraitu. Aukeratu beste "
 "ikuspegi bat edo joan beste helbide batera."
@@ -7457,100 +7730,131 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "%s ikuspegiak errorea aurkitu du abiaraztean."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Aukeratu \"%s\" irekitzeko aplikazio bat."
+
+#: src/nautilus-window-manage-views.c:987
 #, fuzzy
 msgid "Content View"
 msgstr "Eduki-galtzailearen ikustailea"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 #, fuzzy
 msgid "View of the current file or folder"
 msgstr "'Hasi hemen' karpetara joaten da"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Ezin izan da \"%s\" aurkitu. Egiaztatu ortografia eta saiatu berriro."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Ezin izan da %s kargatu"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Ezin izan da %s kargatu"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin du zein motatako fitxategia "
 "den zehaztu."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "Nautilus-ek ez du \"%s\" bistaratzeko gauza den ikustailerik instalatuta."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin du %s: helbiderik maneiatu."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Ezin izan da \"%s\" bistaratu, saio-hasierak huts egin duelako."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Ezin izan da \"%s\" bistaratu, atzipena ukatu egin zaiolako."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Ezin izan da \"%s\" bistaratu, ezin izan delako \"%s\" ostalaria aurkitu. "
 "Egiaztatu ortografia eta zure proxy-ezarpenak zuzenak direla."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Ezin izan da \"%s\" bistaratu, ostalari-izena hutsik dagoelako.  Egiaztatu "
 "zure proxy-ezarpenak zuzenak direla."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin du %s: helbiderik maneiatu."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Ezin izan da \"%s\" bistaratu, Nautilus-ek ezin du zein motatako fitxategia "
-"den zehaztu."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Bilaketa ez dago erabilgarri: ez duzu indizerik edo bilaketa-zerbitzua ez "
+"dago martxan.  Egiaztatu Medusa bilaketa-zerbitzua abiarazita duzula, eta "
+"indizerik ez baduzu, Medusa indexatzailea exekutatzen ari dela."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Bilaketa ez dago erabilgarri: ez duzu indizerik edo bilaketa-zerbitzua ez "
 "dago martxan.  Egiaztatu Medusa bilaketa-zerbitzua abiarazita duzula, eta "
 "indizerik ez baduzu, Medusa indexatzailea exekutatzen ari dela."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Bilaketa ez dago erabilgarri"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus-ek ezin du \"%s\" bistaratu."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Ezin da Helbidea bistaratu"
 
@@ -7562,7 +7866,7 @@ msgstr "Laster-marka honek zehaztutako helbidera joaten da"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7570,7 +7874,7 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Euskarazko itzulpena:\n"
@@ -7578,7 +7882,7 @@ msgstr ""
 "  Sailburuordetza\n"
 "  (<hizkpol@ej-gv.es>)"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 #, fuzzy
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
@@ -7597,40 +7901,45 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Bistaratu helbidea honekin: \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "'Hasi hemen' karpetara joaten da"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 #, fuzzy
 msgid "Application ID"
 msgstr "Aplikazioak"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 #, fuzzy
 msgid "Application"
 msgstr "Aplikazioak"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7671,6 +7980,246 @@ msgstr "Netraverse"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 
+#~ 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 cache-aren 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 ""
+#~ "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\" errorea ezabatzean.\n"
+#~ " \n"
+#~ "Jarraitu nahi duzu?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ezin da Zakarrontzian kopiatu"
+
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\"(e)k ezin du \"%s\" ireki, \"%s\"(e)k ezin dituelako \"%s\" "
+#~ "helbideetako fitxategiak atzitu.   Ez dago beste aplikaziorik erabilgarri "
+#~ "fitxategi hau ikusteko.   Fitxategia zure ordenagailuan kopiatzen baduzu, "
+#~ "ireki ahal izango duzu. "
+
+#~ 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 ""
+#~ "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 da Zakarrontzira eraman.  %d elementu "
+#~ "horiek berehala ezabatu nahi dituzu?"
+
+#~ 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 ""
+#~ "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 ""
+#~ "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-edukiak egunero indexatuko dira bilaketa "
+#~ "azkarragoa izan dadin.  Zure fitxategiak indexatzen ari dira une honetan."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" ez da baliozko helbidea. Egiaztatu ortografia eta saiatu berriro."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' ez da irudi-fitxategi erabilgarria!"
+
+#, fuzzy
+#~ 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 du zein motatako "
+#~ "fitxategia den zehaztu."
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Izena"
+
 #~ msgid "Unknown"
 #~ msgstr "Ezezaguna"
 
@@ -7779,9 +8328,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "_Toolbar"
 #~ msgstr "Erakutsi t_resna-barra"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "\"%s\" helbiderik ez dago orain."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Joan Ez dagoen helbidera"
 
@@ -7806,10 +8352,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "Authentication Required"
 #~ msgstr "Autentifikazioa behar da"
 
-#, fuzzy
-#~ msgid "_Location:"
-#~ msgstr "Helbidea:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Zakarrontzia mahaigainean eduki behar da."
 
@@ -7855,9 +8397,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #, fuzzy
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "Exekutatu fitxategiak klik egiten zaienean"
@@ -8021,10 +8560,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgstr "Ez dago \"%s\" gaiaren azalpen erabilgarririk"
 
 #, fuzzy
-#~ msgid "Themes"
-#~ msgstr "_Times"
-
-#, fuzzy
 #~ msgid "New Window Behavior"
 #~ msgstr "Leiho berria"
 
@@ -8059,9 +8594,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "Click Behavior"
 #~ msgstr "Klikaren portaera"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Testu-fitxategi exekutagarriak"
-
 #, fuzzy
 #~ msgid "Show Options"
 #~ msgstr "Erakutsi/Ezkutatu aukerak"
@@ -8223,9 +8755,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Ezin izan da gaia gehitu"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "\"%s\" gaia ezin izan da instalatu."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Ezin da gaia instalatu"
 
@@ -8243,9 +8772,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ "Ezin duzu uneko gaia kendu. Gaia kendu ahal izateko, beste gai batera "
 #~ "aldatu behar duzu."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Ezin izan da gai hori kendu!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Ezin izan da gaia kendu"
 
@@ -8735,9 +9261,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "Set Cover Image"
 #~ msgstr "Ezarri azaleko irudia"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "'%s' ez da irudi-fitxategi erabilgarria."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Hautatu albumaren azalerako irudi-fitxategi bat:"
 
@@ -8793,9 +9316,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "Sorry, but there was an error reading %s."
 #~ msgstr "Errorea gertatu da %s irakurtzean."
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "%s(e)ko irudia ezin izan da ikur gisa instalatu."
-
 #~ msgid "Delete"
 #~ msgstr "Ezabatu"
 
@@ -8837,9 +9357,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Ezin izan da %s kargatu"
-
 #~ msgid "Loading %s"
 #~ msgstr "%s kargatzen"
 
@@ -10186,9 +10703,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "idazketaren kontra babestuta dago, irakurtzeko soilik muntatzen"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "ez da baliozko bloke-gailua"
-
 #~ msgid "No medium found"
 #~ msgstr "Ez da euskarririk aurkitu."
 
@@ -10198,9 +10712,6 @@ msgstr "Nautilus-en shell eta fitxategi-kudeatzaileen fabrika"
 #~ msgid "scripts"
 #~ msgstr "script"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus-ek ezin izan du %s direktorioa sortu."
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "Script-en karpetarik ez"
 
diff --git a/po/fa.po b/po/fa.po
index f2ac20cc0..5f840fbfe 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-02-21 15:48+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -36,8 +36,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr ""
 
@@ -51,178 +51,109 @@ msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+msgid "Couldn't remove emblem with name '%s'."
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:762
-msgid "The dragged text was not a valid file location."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
-#, c-format
-msgid "The file '%s' does not appear to be a valid image."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
-msgid "The dragged file does not appear to be a valid image."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
-msgid "Erase"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
+#: components/emblem/nautilus-emblem-view.c:765
+msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:483
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
+msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
+#: components/emblem/nautilus-emblem-view.c:788
+msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
+msgid "Erase"
 msgstr ""
 
 #: components/history/Nautilus_View_history.server.in.in.h:1
@@ -887,6 +818,10 @@ msgstr ""
 msgid "GNU.org"
 msgstr ""
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr ""
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr ""
@@ -1163,27 +1098,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1196,8 +1131,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1225,8 +1160,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1260,7 +1195,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1274,7 +1209,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1291,7 +1226,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1317,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1341,7 +1276,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1359,11 +1294,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1381,7 +1316,7 @@ msgid "Reverse sort order in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1416,7 +1351,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1424,30 +1359,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1487,7 +1422,7 @@ msgid "Use manual layout in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1510,7 +1445,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1522,7 +1457,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1679,65 +1614,75 @@ msgstr ""
 msgid "on the desktop"
 msgstr "روی رومیزی"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr ""
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr ""
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1746,18 +1691,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1776,282 +1727,254 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while copying to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while moving to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while moving items to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+msgid "Error while creating links in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while deleting \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while linking."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
+msgstr "خواندن"
+
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
+msgstr "انتخاب همه"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -2060,25 +1983,25 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -2088,554 +2011,585 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr ""
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ""
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr ""
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr ""
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr ""
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
 msgstr ""
 
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
+msgstr "پوشه‌ی جدید"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr ""
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr ""
 
@@ -2654,64 +2608,64 @@ msgstr ""
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr ""
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr ""
 
@@ -2720,151 +2674,151 @@ msgstr ""
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr ""
 
@@ -2985,11 +2939,13 @@ msgid "Search for files by file name and file properties"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "نمایش �هرستی"
@@ -3133,137 +3089,138 @@ msgstr "خانه‌ی %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "شمایل پرونده"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "متن قابل ویرایش"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "متن بیشتر"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "متن باز هم بیشتر"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr ""
 
@@ -3356,119 +3313,119 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr ""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "نام"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "وضعیت"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "انتخاب"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "تغییر..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr ""
 
@@ -3476,140 +3433,158 @@ msgstr ""
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr ""
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
+msgstr "برنامه"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3855,14 +3830,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "ویرایش"
@@ -4059,95 +4026,103 @@ msgstr ""
 msgid "Empty Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
 #, c-format
-msgid "Open %d Windows?"
+msgid "This will open %d separate windows."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "شمایل پرونده"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "۱ پوشه انتخاب شد"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d پوشه انتخاب شد"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (شامل ۰ مورد)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (شامل ۱ مورد)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (شامل %d مورد)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -4159,7 +4134,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
@@ -4168,107 +4143,119 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4290,176 +4277,179 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "پنجره‌ی جدید"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "پنجره‌ی جدید"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "پوشه‌ی جدید"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "پوشه‌ی جدید"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "حذ� از زباله"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "خالی کردن زباله"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "اجرا یا نمایش؟"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "نمایش"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "اجرا در پایانه"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "نمایش"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "اجرا"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
+msgid "Opening \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr ""
 
@@ -4480,107 +4470,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr ""
 
@@ -4638,122 +4648,130 @@ msgstr ""
 msgid "Restore Icon's Original Si_ze"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "نام پرونده"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "اندازه"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "نوع"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "تاریخ تغییر"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "بیش از یک تصویر"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "�قط تصاویر"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "هیچ چیز"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "غیر قابل خواندن"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4763,191 +4781,190 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "ابتدایی"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "نام:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "نام:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "نوع:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "اندازه:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "موقعیت:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "بن�ش"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "خواندن"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "نوشتن"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "اجرا"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "اجازه‌ها"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "نام پرونده"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "گروه پرونده:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "گروه پرونده:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "گروه:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "شمایل پرونده"
@@ -4964,81 +4981,97 @@ msgid "Search Results"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr ""
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5047,53 +5080,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr ""
 
@@ -5102,7 +5155,7 @@ msgstr ""
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5113,7 +5166,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5122,13 +5175,15 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr ""
 
@@ -5142,12 +5197,12 @@ msgid "Create L_auncher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr ""
 
@@ -5167,7 +5222,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr ""
@@ -5190,178 +5245,196 @@ msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "پوشه‌ی جدید"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "پوشه‌ی جدید"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
-msgid "Create a symbolic link for each selected item"
+msgid "Create a new empty folder inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:10
-msgid "D_uplicate"
+msgid "Create a symbolic link for each selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:12
+msgid "D_uplicate"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "انتخاب همه‌ی پرونده‌ها"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "شمایل پرونده"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "پرونده"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "باز کردن"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "تغییر نام..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr ""
 
@@ -5446,44 +5519,55 @@ msgstr ""
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -5507,48 +5591,55 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "روی رومیزی"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "روی رومیزی"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5560,7 +5651,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5568,7 +5659,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5597,31 +5688,40 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -5656,33 +5756,44 @@ msgstr ""
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+#, fuzzy
+msgid "Can't Connect to Server"
+msgstr "خادم‌های شبکه"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "خادم‌های شبکه"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "نام:"
+msgid "_Location:"
+msgstr "موقعیت:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "بتون"
@@ -5877,6 +5988,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5887,24 +6006,21 @@ msgstr ""
 msgid "Open with..."
 msgstr ""
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5912,114 +6028,124 @@ msgstr ""
 msgid "Go To:"
 msgstr ""
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+msgid "Do you want to view %d locations?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "موقعیت:"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "مدیریت پرونده"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr ""
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "حذ�"
 
@@ -6052,7 +6178,6 @@ msgid "Close _All Windows"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr ""
 
@@ -6074,106 +6199,116 @@ msgid "Forward"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
+msgid "Go to the next visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
+msgid "Go to the previous visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "خانه"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "بازخوانی"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "توق�"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "بالا"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "خانه"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "زباله"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "بالا"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "نمایش"
 
@@ -6191,28 +6326,32 @@ msgstr ""
 msgid "File Browser: %s"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6246,147 +6385,176 @@ msgstr ""
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
+msgstr "شمایل پرونده"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr ""
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr ""
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "ایجاد رنگ جدید:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "نام رنگ:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "مقدار رنگ:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
-msgid "Select a Category:"
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
 msgstr ""
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "رنگ‌ها:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr ""
 
@@ -6768,31 +6936,36 @@ msgid "CD _Creator"
 msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
+#, fuzzy
+msgid "Close P_arent Folders"
+msgstr "پوشه‌ی جدید"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
 msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "موقعیت:"
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr ""
 
@@ -6822,9 +6995,11 @@ msgstr ""
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6832,85 +7007,106 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
-msgid "Content View"
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:987
+msgid "Content View"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr ""
 
@@ -6922,7 +7118,7 @@ msgstr ""
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -6930,11 +7126,11 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "ترجمه‌ی: روزبه پورنادر"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -6948,38 +7144,42 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "خادم‌های شبکه"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "نقطه‌ها"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr ""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr ""
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "برنامه"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7015,6 +7215,13 @@ msgstr "خادم‌های شبکه"
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#~ msgid "file icon"
+#~ msgstr "شمایل پرونده"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "نام:"
+
 #~ msgid "Unknown"
 #~ msgstr "نامعلوم"
 
diff --git a/po/fi.po b/po/fi.po
index 48ea5655b..925e02da2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 1.1.2\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-16 22:09+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <gnome-fi-laatu@lists."
@@ -58,8 +58,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() epäonnistui."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Tunnusmerkit"
 
@@ -72,48 +72,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautiluksen tunnusmerkkinäkymä"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Tunnusmerkin poisto epäonnistui"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "\"%s\"-nimisen tunnusmerkin poisto epäonnistui. Syynä luultavasti on, että "
 "tunnusmerkki on pysyvä, ei itse lisäämäsi."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Tunnusmerkin poisto epäonnistui"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Tunnusmerkin nimen vaihtaminen epäonnistui"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "\"%s\"-nimisen tunnusmerkin nimen vaihtaminen epäonnistui. Syynä luultavasti "
 "on, että tunnusmerkki on pysyvä, ei itse lisäämäsi."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Tunnusmerkin nimen vaihtaminen epäonnistui"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Vaihda tunnusmerkin nimi"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Anna tälle tunnusmerkille uusi nimi:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Vaihda nimi"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Lisää tunnusmerkkejä..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -121,146 +133,71 @@ msgstr ""
 "Anna joka tunnusmerkille kuvaava nimi. Sen perusteella tunnusmerkit "
 "yksilöityvät."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 "Anna tunnusmerkille kuvaava nimi. Sen perusteella tunnusmerkki yksilöityy."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Joitakin tiedostoista ei voi lisätä tunnusmerkeiksi, koska ne eivät "
 "vaikuttaneet olevan kelvollisia kuvatiedostoja."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Tiedosto \"%s\" ei vaikuta olevan kelvollinen kuvatiedosto."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Tunnusmerkkien lisäys epäonnistui"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Yhtäkään tiedostoista ei voi lisätä tunnusmerkeiksi, koska ne eivät vaikuta "
 "olevan kelvollisia kuvatiedostoja."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Pudotettu teksti ei ollut kelvollinen tiedostosijainti."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Tunnusmerkin lisäys epäonnistui"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Tiedosto \"%s\" ei vaikuta olevan kelvollinen kuvatiedosto."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Pudotettu tiedosto ei vaikuta olevan kelvollinen kuvatiedosto."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Poista"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Tehdas, joka tuottaa laitteistonäkymiä"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Laitteisto"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Laitteistokatselin"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Laitteistonäkymä"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Näytä laitteisto"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "laitteistonäkymä"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "laitteistonäkymän kuvakkeen nimi"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "laitteistotietojen yhteenveto"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s-prosessori\n"
-"%s MHz\n"
-"%s k välimuistia"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Gt RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu Mt RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Gt"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mt"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Käyntiaika on %d päivää, %d tuntia, %d minuuttia"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Laitteisto"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Tämä on prosessorisivun korvike."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Tämä on muistisivun korvike."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Tämä on IDE-sivun korvike."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historiikki"
@@ -927,6 +864,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Laitteisto"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Kansainvälinen"
@@ -1215,30 +1156,19 @@ msgid "Desktop trash icon name"
 msgstr "Roskakori-työpöytäkuvakkeen nimi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Tätä suuremmat hakemistot typistyvät noin tähän kokoon. Tämän tarkoitus on "
-"välttää kasan paisuttamista vahingossa ja Nautiluksen kaatumista suuria "
-"hakemistoja näytettäessä. Negatiivinen arvo tarkoittaa, ettei rajaa ole. "
-"Raja ei ole tarkka, koska hakemistot luetaan lohkoittain."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Näytä \"erityiset\" liput tiedoston asetusikkunassa"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Hakemistojen oletusarvoisen taustan tiedostonimi. Tällä on merkitystä vain, "
 "jos avaimen \"background_set\" arvo on tosi."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1246,6 +1176,19 @@ msgstr ""
 "Sivupaneelin oletusarvoisen taustan tiedostonimi. Tällä on merkitystä vain, "
 "jos avaimen \"side_pane_background_set\" arvo on tosi."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Tätä suuremmat hakemistot typistyvät noin tähän kokoon. Tämän tarkoitus on "
+"välttää kasan paisuttamista vahingossa ja Nautiluksen kaatumista suuria "
+"hakemistoja näytettäessä. Negatiivinen arvo tarkoittaa, ettei rajaa ole. "
+"Raja ei ole tarkka, koska hakemistot luetaan lohkoittain."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Piilota oletusarvoiset kirjanmerkit kirjanmerkkivalikosta"
@@ -1255,9 +1198,10 @@ msgid "Home icon visible on desktop"
 msgstr "Koti-kuvake näkyy työpöydällä"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Jos tosi, Nautilus näyttää vain hakemistot puusivupaneelissa. Muulloin sekä "
 "tiedostot että hakemistot näkyvät."
@@ -1288,9 +1232,10 @@ msgstr ""
 "tiedoston asetusikkunassa."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Jos tosi, Nautilus näyttää hakemistot kuvakenäkymissä ja luetteloissa "
 "tiedostoja ennen."
@@ -1330,8 +1275,9 @@ msgstr ""
 "kirjanmerkkivalikossa."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Jos tosi, Nautilus näyttää käyttäjän kotihakemiston työpöytänä. Jos epätosi, "
@@ -1348,9 +1294,10 @@ msgstr ""
 "varmuuskopioiksi."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Jos tosi, piilotiedostot näkyvät tiedostonhallinassa. Piilotiedostot ovat "
 "joko pisteellä alkavia tai lueteltuna hakemistossa olevassa .hidden-"
@@ -1372,8 +1319,9 @@ msgid ""
 msgstr "Jos tosi, roskakoriin osoittava kuvake tulee työpöydälle."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "Jos tosi, kotihakemistoon osoittava kuvake tulee työpöydälle."
 
@@ -1406,7 +1354,8 @@ msgstr ""
 "tulevat ensimmäisinä pienimpien sijaan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Jos tosi, kuvakkeet asettuvat tiiviimmin kuin oletusarvoisesti uusissa "
 "ikkunoissa."
@@ -1435,7 +1384,8 @@ msgid "List of possible captions on icons"
 msgstr "Luettelo mahdollisista kuvakkeiden teksteistä"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Yläraja käsiteltävien tiedostojen määrälle per hakemisto"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1455,11 +1405,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus piirtää työpöydän"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus käyttää käyttäjän kotihakemistoa työpöytänä"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Näytä vain hakemistot puusivupaneelissa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1479,7 +1431,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Käänteinen järjestys uusissa ikkunoissa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Näytä hakemistot ikkunoissa ensimmäisinä"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1515,10 +1468,11 @@ msgstr ""
 "tiedostot soivat. Jos \"never\", esikuuntelu ei ole käytössä."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1528,12 +1482,13 @@ msgstr ""
 "paikallisilla tiedostojärjestelmillä. Jos \"never\", esikatselu ei näy."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Nopeuskompromissi kuvatiedoston pienoiskuvan näyttämisessä. Jos arvo on "
 "\"always\", pienoiskuva näkyy aina, vaikka hakemisto olisi etäpalvelimella. "
@@ -1542,10 +1497,11 @@ msgstr ""
 "kuvake."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Nopeuskompromissi hakemiston sisältämien kohteiden lukumäärän näyttämisessä. "
@@ -1555,18 +1511,20 @@ msgstr ""
 "lukumäärät eivät näy."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Kuvakenäkymän oletusarvoinen järjestys. Mahdollisia arvoja ovat \"name"
 "\" (nimi), \"size\" (koko), \"type\" (tyyppi), \"modification_date"
 "\" (muokattu viimeksi) ja \"emblems\" (tunnusmerkit)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Luettelonäkymän oletusarvoinen järjestys. Mahdollisia arvoja ovat \"name"
 "\" (nimi), \"size\" (koko), \"type\" (tyyppi), \"modification_date"
@@ -1613,7 +1571,8 @@ msgid "Use manual layout in new windows"
 msgstr "Käytä käsinasettelua uusissa ikkunoissa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Käytä tiivistä asettelua uusissa ikkunoissa"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1643,7 +1602,8 @@ msgstr ""
 "\" (luettelonäkymä) ja \"icon_view\" (kuvakenäkymä)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Milloin hakemiston sisältämien kohteiden määrä näkyy"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1655,7 +1615,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Näkyvätkö kuvatiedostojen pienoiskuvat"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Onko mukautettu oletusarvoinen hakemistojen tausta asetettu."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1812,68 +1773,82 @@ msgstr "palauta"
 msgid "on the desktop"
 msgstr "työpöydällä"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Taltiota ei voi poistaa"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Et voi poistaa taltiokuvaketta. Jos haluat poistaa taltion asemasta, valitse "
 "\"Poista asemasta\" oikealla painikkeella aukeavasta kuvakkeen "
 "kontekstivalikosta."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Taltiota ei voi poistaa"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Roskakori"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Siirrä tähän"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopioi tähän"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Linkitä tähän"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Aseta _taustaksi"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Peru"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Aseta _kaikkien hakemistojen taustaksi"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Aseta _tämän hakemiston taustaksi"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Uudelle tunnusmerkille pitää antaa avainsana."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Tunnusmerkkiä ei voitu asentaa"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1884,18 +1859,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Tunnusmerkki \"%s\" on jo olemassa. Valitse sille jokin toinen nimi."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Tunnusmerkkiä ei voitu asentaa"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Muun tunnusmerkin tallentaminen epäonnistui."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Muun tunnusmerkin nimen tallentaminen epäonnistui."
 
@@ -1914,22 +1895,28 @@ msgstr "Lähde:"
 msgid "To:"
 msgstr "Kohde:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Virhe siirtäessä."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Virhe siirtäessä:\n"
 "\n"
 "Kohdetta \"%s\" ei voi siirtää, koska se on levyllä, jota voi vain lukea."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Virhe poistaessa."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1938,22 +1925,17 @@ msgstr ""
 "Kohdetta \"%s\" ei voi poistaa, koska sinulla ei ole oikeuksia sen "
 "ylähakemiston muuttamiseen."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Virhe poistaessa:\n"
 "\n"
 "Kohdetta \"%s\" ei voi poistaa, koska se on levyllä, jota voi vain lukea."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1962,12 +1944,15 @@ msgstr ""
 "Kohdetta \"%s\" ei voi siirtää, koska sinulla ei ole oikeuksia sen tai sen "
 "ylähakemiston muuttamiseen."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Virhe siirtäessä."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Virhe siirtämisessä:\n"
@@ -1975,12 +1960,10 @@ msgstr ""
 "\"%s\" ei voi siirtyä, koska se tai sen emohakemisto ovat jo siirtymisen "
 "kohteessa."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Virhe siirtäessä:\n"
@@ -1988,239 +1971,179 @@ msgstr ""
 "Kohdetta \"%s\" ei voi siirtää roskakoriin, koska sinulla ei ole oikeuksia "
 "sen tai sen ylähakemiston muuttamiseen."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Virhe kopioidessa."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Virhe kopioidessa:\n"
 "\n"
 "Kohdetta \"%s\" ei voi kopioida, koska sinulla ei ole oikeuksia sen "
 "lukemiseen."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Virhe kopioidessa kohdetta \"%s\":\n"
-"\n"
-"Levytilaa ei ole jäljellä."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Virhe kopioidessa."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Virhe siirtäessä kohdetta \"%s\":\n"
 "\n"
 "Levytilaa ei ole jäljellä."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Virhe linkittäessä kohdetta \"%s\":\n"
-"\n"
-"Levytilaa ei ole jäljellä"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Virhe siirtäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Virhe linkittäessä."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Virhe kopioidessa kohteeseen \"%s\":\n"
 "\n"
 "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Virhe kopioidessa kohteita kohteeseen \"%s\":\n"
 "\n"
 "Kohdelevylle ei voi kirjoittaa."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Virhe siirtäessä kohteeseen \"%s\":\n"
-"\n"
-"Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Virhe siirtäessä kohteeseen \"%s\":\n"
-"\n"
-"Kohdelevylle ei voi kirjoittaa."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Virhe luodessa linkkejä hakemistoon \"%s\":\n"
-"\n"
-"Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Virhe siirtäessä."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Virhe luodessa linkkejä kohteessa \"%s\":\n"
-"\n"
-"Kohdelevylle ei voi kirjoittaa."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" kopioidessa kohdetta \"%s\".\n"
-"\n"
-"Haluatko jatkaa?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Virhe linkittäessä."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Virhe kopioidessa."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Virhe \"%s\" siirtäessä kohdetta \"%s\".\n"
+"Virhe \"%s\" siirtäessä.\n"
 "\n"
 "Haluatko jatkaa?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" luodessa linkkiä kohteeseen \"%s\".\n"
-"\n"
-"Haluatko jatkaa?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Virhe siirtäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Virhe \"%s\" poistaessa kohdetta \"%s\".\n"
+"Virhe \"%s\" luodessa linkkiä kohteeseen \"%s\".\n"
 "\n"
 "Haluatko jatkaa?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" kopioidessa.\n"
-"\n"
-"Haluatko jatkaa?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Virhe poistaessa."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" siirtäessä.\n"
-"\n"
-"Haluatko jatkaa?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Virhe kopioidessa."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" linkittäessä.\n"
-"\n"
-"Haluatko jatkaa?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Virhe siirtäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Virhe \"%s\" poistaessa.\n"
-"\n"
-"Haluatko jatkaa?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Virhe linkittäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Virhe poistaessa."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Virhe kopioidessa."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Virhe siirtäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Virhe linkittäessä."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Virhe poistaessa."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Ohita"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Yritä uudelleen"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Määritellyn toiminnon suorittaminen kokonaan ei onnistunut."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Kohdetta \"%s\" ei voitu siirtää uuteen paikkaan, koska sen nimi on jo "
 "käytössä jonkin erityiskohteen nimenä. Tätä erityiskohdetta ei voi nimetä "
@@ -2228,13 +2151,16 @@ msgstr ""
 "\n"
 "Jos haluat siirtää kohteen \"%s\", nimeä se uudelleen ja yritä uudestaan."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Määritellyn toiminnon suorittaminen kokonaan ei onnistunut."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Kohdetta \"%s\" ei voitu kopioida uuteen paikkaan, koska sen nimi on jo "
 "käytössä jonkin erityiskohteen nimenä. Tätä erityiskohdetta ei voi nimetä "
@@ -2242,46 +2168,52 @@ msgstr ""
 "\n"
 "Jos haluat kopioida kohteen \"%s\", nimeä se uudelleen ja yritä uudestaan."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Ei voi korvata tiedostoa"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Tiedosto \"%s\" on jo olemassa.\n"
 "\n"
 "Haluatko korvata sen?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Ristiriita kopioinnissa"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Korvaa"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Korvaa kaikki"
 
 # This is very hard to do in Finnish...
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "linkki tyyppiin %s"
 
 # Another hard
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "toinen linkki tyyppiin %s"
@@ -2290,25 +2222,25 @@ msgstr "toinen linkki tyyppiin %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. linkki tyyppiin %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. linkki tyyppiin %s"
@@ -2318,562 +2250,601 @@ msgstr "%d. linkki tyyppiin %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopio)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (toinen kopio)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kopio)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopio)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (toinen kopio) %s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopio)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d."
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Tuntematon GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Siirretään tiedostoja roskakoriin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Tiedostoja heitetty pois:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Siirtää"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Valmistellaan roskakoriin siirtämistä..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Siirretään tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Tiedostoja siirtynyt:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Valmistellaan siirtoa..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Viimeistellään siirtoa..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Luodaan linkkejä tiedostoihin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Tiedostoja linkittynyt:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Linkitetään"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Valmistellaan linkkien luontia..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Viimeistellään linkkien luontia..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopioidaan tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Tiedostoja kopioitunut:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Valmistellaan kopiointia"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Et voi kopioida kohteita roskakoriin."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Ei voi kopioida roskakoriin"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Et voi siirtää tätä roskakorihakemistoa."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Et voi kopioida tätä roskakorihakemistoa."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Roskakorin sijaintia ei voi muuttaa"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Roskakoria ei voi kopioida"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Et voi siirtää hakemistoa itseensä."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Et voi kopioida hakemistoa itseensä."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Luo uusi tyhjä hakemisto tähän hakemistoon"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Ei voi siirtää itsensä sisälle"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Ei voi kopioida itseensä"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Et voi kopioida tiedostoa itseensä."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Ei voi kopioida itseensä"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Virhe luodessa uutta hakemistoa:\n"
 "\n"
 "Sinulla ei ole kohteen kirjoitusoikeuksia."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Virhe luodessa uutta hakemistoa:\n"
 "\n"
 "Levytilaa ei ole jäljellä."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Virhe \"%s\" uutta hakemistoa luodessa."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Virhe uuden hakemiston luonnissa"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Virhe uuden hakemiston luonnissa"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "nimetön hakemisto"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Virhe \"%s\" uutta hakemistoa luodessa."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Virhe uuden hakemiston luonnissa"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Virhe uuden hakemiston luonnissa"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 tiedosto"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Poistaa tiedostoja"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Tiedostoja poistettu:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Poistaa"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Valmistellaan tiedostojen poistamista..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tyhjennetään roskakori"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Valmistellaan roskakorin tyhjentämistä..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Oletko varma, että haluat poistaa pysyvästi kaiken roskakorin sisällön?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tyhjennä"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "jokin"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "jokin (kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".jokin.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".jokin (kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "jokin jokin"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "jokin jokin (kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "jokin.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "jokin (kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "jokin jokin.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "jokin jokin (kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "jokin jokin.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "jokin jokin (kopio).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "jokin...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "jokin.. (kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "jokin..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "jokin... (kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "jokin. (kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "jokin. (toinen kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "jokin (toinen kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "jokin (toinen kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "jokin (3. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "jokin (3. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "jokin jokin (toinen kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "jokin jokin (3. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "jokin (13. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "jokin (14. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "jokin (13. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "jokin (14. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "jokin (21. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "jokin (22. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "jokin (21. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "jokin (22. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "jokin (23. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "jokin (23. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "jokin (24. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "jokin (24. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "jokin (25. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "jokin (25. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "jokin jokin (24. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "jokin jokin (25. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "jokin jokin (24. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "jokin jokin (25. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "jokin jokin (100000000000000. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "jokin (10. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "jokin (11. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "jokin (10. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "jokin (11. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "jokin (12. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "jokin (12. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "jokin (110. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "jokin (111. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "jokin (110. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "jokin (111. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "jokin (122. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "jokin (123. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "jokin (122. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "jokin (123. kopio).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "jokin (124. kopio)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "jokin (124. kopio).txt"
 
@@ -2892,64 +2863,64 @@ msgstr "jokin (124. kopio).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "tänään 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "tänään %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "tänään 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "tänään %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "tänään 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "tänään %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "tänään"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "eilen 00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "eilen %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "eilen 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "eilen %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "eilen 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "eilen %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "eilen"
 
@@ -2958,133 +2929,133 @@ msgstr "eilen"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Keskiviikko, syyskuu 00 0000, 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d. %Bta %Y, %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Ma loka 00 0000, 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d. %b %Y, %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Ma loka 00 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d. %b %Y, %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Loka 00 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Loka 00 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 kohdetta"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 hakemistoa"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 tiedostoa"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 kohde"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 hakemisto"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u kohdetta"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u hakemistoa"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u tiedostoa"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? kohdetta"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? tavua"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tuntematon tyyppi"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tuntematon MIME-tyyppi"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "tuntematon"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "ohjelma"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3094,7 +3065,7 @@ msgstr ""
 "tarkoittanee, että tiedosto gnome-vfs.keys on väärässä paikassa tai ei löydy "
 "muusta syystä."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3103,11 +3074,11 @@ msgstr ""
 "Mime-tyypillä \"%s\" (tiedosto on \"%s\") ei ole kuvausta. Ilmoita tästä "
 "gnome-vfs:n postituslistalle."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "linkki"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "linkki (rikki)"
 
@@ -3228,11 +3199,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Etsi tiedostoja nimen ja ominaisuuksien perusteella"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Luettelonäkymä"
@@ -3377,148 +3350,153 @@ msgstr "Kotihakemisto %.0s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Pöydän päällys"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "tiedostokuvake"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "muokattava teksti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "muokattava nimiö"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "lisäteksti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "hieman lisää tekstiä"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "korostettu valittavaksi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "onko korostettu valittavaksi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "korostettu näppäinkohdistuksena"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "onko korostettu piirtämään näppäimistökohdistus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "korostettu pudotusta varten"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "onko korostettu vetämistä ja pudotusta varten"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Valittu suorakulmio"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Kehystä teksti"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Piirrä kehys valitsemattoman tekstin ympärille"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Valintalaatikon väri"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Valintalaatikon väri"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Valintalaatikon peittävyys"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Valintalaatikon värin peittävyys"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Korostuksen peittävyys"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Valittujen kuvakkeiden korostuksen peittävyys"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Vaalea tiedoteväri"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Tummalla taustalla olevan tiedotetekstin väri"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tumma tiedoteväri"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Vaalealla taustalla olevan tiedotetekstin väri"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko siirtyä käsin "
 "asetteluun ja jättää tämän kohteen sinne, minne pudotit sen? Tämä sotkee "
 "tallennetun käsin asettelun."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko siirtyä käsin "
 "asetteluun ja jättää nämä kohteet sinne, minne pudotit ne? Tämä sotkee "
 "tallennetun käsin asettelun."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko siirtyä käsin "
 "asetteluun ja jättää tämän kohteen sinne, minne pudotit sen?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Tämä hakemiston sisältö on aseteltu automaattisesti. Haluatko käyttää käsin "
 "asettelua ja jättää nämä kohteet sinne, minne pudotit ne?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Käytetäänkö käsin asettelua?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Siirry"
 
@@ -3626,72 +3604,72 @@ msgstr "On tiedostotyypin \"%s\" oletus."
 msgid "Is the default for all \"%s\" items."
 msgstr "On kaikkien tiedostotyyppien \"%s\" oletus."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Muokkaa ohjelmalla \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Näytä tiedostotyypin \"%s\" valikossa"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Käytä tiedostotyypin \"%s\" oletuksena"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Näytä tiedostotyypin \"%s\" valikossa"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Käytä tiedostotyypin \"%s\" oletuksena"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Älä näytä tiedostotyypin \"%s\" valikossa"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nimi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Tila"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Valitse"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Valmis"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Muokkaa..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tiedostotyypit ja ohjelmat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Siirry sinne"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3699,48 +3677,48 @@ msgstr ""
 "Voit valita Gnomen hallintakeskuksesta, mitkä ohjelmat kytkeytyvät kuhunkin "
 "tiedostotyyppiin."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Avaa muulla sovelluksella"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Valitse sovellus, jolla tiedosto \"%s\" aukeaa"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Avaa muulla katselimella"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Valitse tiedoston \"%s\" näkymä."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Kohteelle \"%s\" ei ole katselimia"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Katselimia ei ole"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Tiedostoon \"%s\" ei kytkeydy sovellusta."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Kytkeytyviä sovelluksia ei ole"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Tiedostoon \"%s\" ei kytkeydy toimintoa."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Kytkeytyvää toimintoa ei ole"
 
@@ -3748,11 +3726,9 @@ msgstr "Kytkeytyvää toimintoa ei ole"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3761,42 +3737,41 @@ msgstr ""
 "Voit asettaa Gnomen kytkemään sovelluksia tiedostotyyppeihin. Haluatko "
 "kytkeä jonkin sovelluksen tämän tyyppisiin tiedostoihin nyt?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Kytke sovellus"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Tiedostoon \"%s\" kytketty katselin on virheellinen."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Virheellinen katselin kytketty"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Tiedostoon \"%s\" kytketty sovellus on virheellinen."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Virheellinen sovellus kytketty"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Tiedostoon \"%s\" kytketty toiminto on virheellinen."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Virheellinen toiminto kytketty"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3807,93 +3782,133 @@ msgstr ""
 "tiedostotyyppiin. Haluatko kytkeä jonkin sovelluksen tai katselimen tämän "
 "tyyppisiin tiedostoihin nyt?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Kytke toiminto"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" ei voi avata kohdetta \"%s\" koska \"%s\" ei voi koskea tiedostoihin "
+"sijainneissa \"%s\". Haluatko valita toisen ohjelman?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" ei voi avata kohdetta \"%s\" koska \"%s\" ei voi koskea tiedostoihin "
 "sijainneissa \"%s\". Haluatko valita toisen ohjelman?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Oletustoiminto ei voi avata kohdetta \"%s\", koska se ei voi koskea "
 "tiedostoihin sijainneissa \"%s\". Haluatko valita toisen toiminnon?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ei voi avata sijaintia"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" ei voi avata kohdetta \"%s\" koska \"%s\" ei voi koskea tiedostoihin "
+"sijainneissa \"%s\". Haluatko valita toisen ohjelman?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" ei voi avata kohdetta \"%s\", koska \"%s\" ei voi koskea tiedostoihin "
 "\"%s\" sijainneissa.  Muita ohjelmia tämän tiedoston näyttämiseen ei ole. "
 "Jos kopioit tämän tiedoston koneellesi, niin saatat voida avata sen."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Oletustoiminto ei voi avata kohdetta \"%s\", koska se ei voi koskea "
-"tiedostoihin sijainneissa \"%s\".  Muita toimintoja tämän tiedoston "
-"näyttämiseen ei ole. Jos kopioit tämän tiedoston koneellesi, niin saatat "
-"voida avata sen."
+"tiedostoihin sijainneissa \"%s\". Haluatko valita toisen toiminnon?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" ei voi avata kohdetta \"%s\", koska \"%s\" ei voi koskea tiedostoihin "
+"\"%s\" sijainneissa.  Muita ohjelmia tämän tiedoston näyttämiseen ei ole. "
+"Jos kopioit tämän tiedoston koneellesi, niin saatat voida avata sen."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s avautuu"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Valitettavasti et voi turvallisuussyistä suorittaa komentoja etäsivustolta."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Etälinkkejä ei voi suorittaa"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Sovelluksen käynnistäminen epäonnistui.\n"
 "\n"
 "Lisätiedot:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Sovelluksen käynnistämisessä tapahtui virhe"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Kohtaan voi pudottaa vain paikallisia tiedostoja"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Tähän voi pudottaa vain paikallisia tiedostoja.\n"
@@ -3901,15 +3916,15 @@ msgstr ""
 "Avataksesi etätiedostot kopioi ne ensin paikalliseen hakemistoon, ja pudota "
 "ne sieltä tähän."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Kohtaan voi pudottaa vain paikallisia tiedostoja"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4162,14 +4177,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Kohteet, joiden nimessä on \"medusa\" ja jotka ovat hakemistoja."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Etsitään levyiltä"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus etsii roskakorihakemistoja levyasemiltasi."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Muokkaa"
@@ -4375,97 +4382,107 @@ msgstr "Tausta"
 msgid "Empty Trash"
 msgstr "Tyhjennä roskakori"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Tämä avaisi %d eri ikkunaa. Oletko varma, että haluat tehdä tämän?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Avataanko %d ikkunaa?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Tämä avaisi %d eri ikkunaa. Oletko varma, että haluat tehdä tämän?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Oletko varma, että haluat poistaa pysyvästi kaikki %d valittua kohdetta?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Poista kaikki valitut kohteet pysyvästi"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Poistetaanko?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Valitse luokka:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Kuviot"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" valittu"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 hakemisto valittu"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d hakemistoa valittu"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (sisältää 0 kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (sisältää yhden kohteen)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (sisältää %d kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (sisältää yhteensä 0 kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (sisältää yhteensä yhden kohteen)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (sisältää yhteensä %d kohdetta)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d kohdetta on valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 toinen kohde on valittu (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d muuta kohdetta on valittu (%s)"
@@ -4477,7 +4494,7 @@ msgstr "%d muuta kohdetta on valittu (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4486,106 +4503,123 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Hakemisto \"%s\" sisältää enemmän tiedostoja kuin Nautilus voi käsitellä. "
 "Joitakin tiedostoja ei näy."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Liian monta tiedostoa"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Kohdetta \"%s\" ei voi siirtää roskakoriin. Haluatko poistaa sen heti?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Ei voi siirtää %d valittua kohdetta roskakoriin. Haluatko poistaa ne heti?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Kohdetta \"%s\" ei voi siirtää roskakoriin. Haluatko poistaa sen heti?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"On %d valittua kohdetta, joita ei voi siirtää roskakoriin. Haluatko poistaa "
-"nämä %d kohdetta heti?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Kohdetta \"%s\" ei voi siirtää roskakoriin. Haluatko poistaa sen heti?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Poistetaanko heti?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Oletko varma, että haluat poistaa pysyvästi kaikki %d valittua kohdetta "
 "roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Poistetaanko roskakorista?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Käytä ohjelmaa \"%s\" valitun kohteen avaamiseen"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Muu _sovellus..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Sovellus..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Muu _katselin..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Katselin..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Määritellyn toiminnon suorittaminen kokonaan ei onnistunut: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Määritellyn toiminnon suorittaminen kokonaan ei onnistunut."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Aja ohjelma \"%s\" valituilla kohteilla"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Kaikki tässä hakemistossa olevat suoritettavat tiedostot näkyvät myös "
+"skriptivalikossa. Kun skripti käynnistetään tästä valikosta, se saa "
+"syötteenään valitut tiedostot."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4593,11 +4627,11 @@ msgstr ""
 "skriptivalikossa. Kun skripti käynnistetään tästä valikosta, se saa "
 "syötteenään valitut tiedostot."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Tietoja skripteistä"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4638,185 +4672,192 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: nykyisen ikkunan sijainti ja koko"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" siirtyy jos annat \"liitä tiedostoja\"-komennon"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" kopioituu, jos annat \"liitä tiedostoja\"-komennon"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "%d valittua kohdetta siirtyvät, jos annat \"liitä tiedostoja\"-komennon"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d valittua kohdetta kopioituvat, jos annat \"liitä tiedostoja\"-komennon"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Leikepöydällä ei ole mitään liitettävää."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Liittämisvirhe"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Irrottamisvirhe"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Liittämisvirhe"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Poista _asemasta"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Irrota taltio"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Avaa uu_dessa ikkunassa"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Avaa %d uutta _ikkunaa näyttämistä varten"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Kotihakemisto"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Kotihakemisto"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Poista _roskakorista"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Poista kaikki valitut kohteet pysyvästi"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Siirrä _roskakoriin"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Siirrä jokainen valittu kohde roskakoriin"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Poista"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "T_ee linkit"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "T_ee linkki"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Leikkaa tiedosto"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Leikkaa tiedostoja"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopioi tiedosto"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopioi tiedostoja"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Tätä linkkiä ei voi käyttää, koska sillä ei ole kohdetta. Haluatko siirtää "
 "sen roskakoriin?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Tätä linkkiä ei voi käyttää, koska sillä ei ole kohdetta. Haluatko siirtää "
+"sen roskakoriin?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Tätä linkkiä ei voi käyttää, koska sen kohdetta \"%s\" ei ole olemassa. "
 "Haluatko siirtää sen roskakoriin?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Rikkinäinen linkki"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" on suoritettava tekstitiedosto. Haluatko käynnistää sen vai nähdä sen "
 "sisällön?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Käynnistä vai näytä?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Näytä"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Suorita _päätteessä"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Näytä"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Suorita"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Avaa tiedostoa \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Perutaanko avaaminen?"
 
@@ -4838,16 +4879,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Ei voinut näyttää kohteen \"%s\" kaikkea sisältöä."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Virhe näyttäessä hakemistoa"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Nimi \"%s\" on jo käytössä tässä hakemistossa. Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4855,80 +4901,95 @@ msgstr ""
 "Kohdetta \"%s\" ei ole tässä hakemistossa. Ehkä se siirrettiin tai "
 "poistettiin juuri?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 "Sinulla ei ole kohteen \"%s\" nimen muuttamiseen tarvittavia oikeuksia."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "Nimi \"%s\" ei käy, koska siinä on merkki \"/\". Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nimi \"%s.\" ei kelpaa.  Käytä toista nimeä."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Kohteen \"%s\" nimeä ei voitu muuttaa, koska kohde on levyllä, jota voi vain "
 "lukea."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Valitettavasti kohdetta \"%s\" ei voitu nimetä kohteeksi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Uudelleennimeämisvirhe"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Sinulla ei ole kohteen \"%s\" nimen muuttamiseen tarvittavia oikeuksia."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Kohteen \"%s\" ryhmää ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" ryhmää ei voitu vaihtaa."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Virhe ryhmää asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Kohteen \"%s\" omistajaa ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" omistajaa ei voitu vaihtaa."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Virhe omistajaa asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4936,21 +4997,26 @@ msgstr ""
 "Kohteen \"%s\" oikeuksia ei voitu muuttaa, koska kohde on levyllä, jota voi "
 "vain lukea."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Valitettavasti kohteen \"%s\" oikeuksia ei voitu muuttaa."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Virhe oikeuksia asettaessa"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Nimetään kohde \"%s\" kohteeksi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Perutaanko uudelleen nimeäminen?"
 
@@ -5008,128 +5074,150 @@ msgstr "Palauta kuvakkeiden alkuper_äiset koot"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Palauta kuvakkeen alkuper_äinen koko"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "viittaa kohteeseen \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Veto ja pudotus toimii vain paikallisissa tiedostojärjestelmissä."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Veto ja pudotus toimii vain paikallisissa tiedostojärjestelmissä."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Veto- ja pudotusvirhe"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Vetotyyppi oli väärä."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Koko"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Muokattu"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Voit asettaa vain yhden oman kuvakkeen kerrallaan. Vedä yhtä kuvaa "
 "asettaaksesi sen kuvakkeeksi."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Voit asettaa vain yhden oman kuvakkeen kerrallaan. Vedä yhtä kuvaa "
+"asettaaksesi sen kuvakkeeksi."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Useampi kuin yksi kuva"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Pudottamasi tiedosto ei ole paikallinen. Vain paikallisia tiedostoja voi "
+"käyttää omina kuvakkeina."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Pudottamasi tiedosto ei ole paikallinen. Vain paikallisia tiedostoja voi "
 "käyttää omina kuvakkeina."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Vain paikalliset kuvat"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Pudottamasi tiedosto ei ole kuva. Vain paikallisia kuvia voi käyttää omina "
-"kuvakkeina."
+"Pudottamasi tiedosto ei ole paikallinen. Vain paikallisia tiedostoja voi "
+"käyttää omina kuvakkeina."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Vain kuvat"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Kohteen %s ominaisuudet"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Haluatko perua ryhmän vaihdon?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Ryhmän vaihto"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Haluatko perua omistajan vaihdon?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Omistajan vaihto"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ei mitään"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ei luettavissa"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 kohde, jonka koko on %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d kohdetta, yhteensä %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(sisältö ei kokonaan luettavissa) "
 
@@ -5139,191 +5227,191 @@ msgstr "(sisältö ei kokonaan luettavissa) "
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Sisältö:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Perustiedot"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nimet:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Koko:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Taltio:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Tilaa vapaana:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Linkin kohde:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Muokattu:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Käytetty:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Valitse oma kuva..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Poista oma kuva"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Luku"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Kirjoitus"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Suoritus"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Käyttäjän _asettaminen (SUID)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Erikoisliput:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "_Ryhmän asettaminen (SGID)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "\"Sti_cky\""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Et ole tiedoston omistaja, joten et voi muuttaa sen oikeuksia."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Tiedoston omistaja:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Tiedoston omistaja:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Tiedoston ryhmä:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Tiedoston ryhmä:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Omistaja:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Ryhmä:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Muut:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstinäkymä:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Numeronäkymä:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Viimeksi muuttunut:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Kohteen \"%s\" oikeuksia ei saatu selville."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Valitun tiedoston oikeudet eivät selvinneet."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Virhe ohjetta näyttäessä: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Virhe ohjetta näyttäessä: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Ohjetta ei voi näyttää"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Perutaanko ominaisuusikkunan näyttäminen?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Luodaan ominaisuusikkuna"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Valitse kuvake"
 
@@ -5341,94 +5429,133 @@ msgid "Search Results"
 msgstr "Etsintätulokset"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Medusa-etsintäpalvelu ei ole asennettu."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Valitettavasti Medusa-etsintäpalvelu ei ole saatavilla."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Etsintäpalvelu ei ole saatavilla"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Valitsemasi haku on uudempi kuin järjestelmäsi luettelo. Haku ei tuota juuri "
 "nyt tuloksia. Voit luoda uuden luettelon ajamalla komennon \"medusa-indexd\" "
 "pääkäyttäjänä komentoriviltä."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Etsin ei voi avata tiedostojärjestelmäsi luetteloa. Luettelosi voi puuttua "
+"tai olla viallinen. Voit luoda uuden luettelon ajamalla komennon \"medusa-"
+"indexd\" pääkäyttäjänä komentoriviltä."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Etsi kohteita, jotka ovat liian uusia"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Jokainen tietokoneesi luetteloitu tiedosto vastaa antamiasi ehtoja. Voit "
+"tarkistaa valintojesi oikeinkirjoituksen tai lisätä lisää hakuehtoja, jos "
+"haluat tarkemman tuloksen."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Jokainen tietokoneesi luetteloitu tiedosto vastaa antamiasi ehtoja. Voit "
 "tarkistaa valintojesi oikeinkirjoituksen tai lisätä lisää hakuehtoja, jos "
 "haluat tarkemman tuloksen."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Virhe etsiessä"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Etsin ei voi avata tiedostojärjestelmäsi luetteloa. Luettelosi voi puuttua "
 "tai olla viallinen. Voit luoda uuden luettelon ajamalla komennon \"medusa-"
 "indexd\" pääkäyttäjänä komentoriviltä."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Virhe lukiessa luetteloa"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Virhe tapahtui ladatessa tämän haun sisältöä: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
 "Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
-"Etsin ei voi käyttää luetteloasi juuri nyt, mikä tekee siitä hitaan."
+"Etsin ei voi käyttää luetteloasi juuri nyt."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
 "Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
 "Etsin ei voi käyttää luetteloasi juuri nyt."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
+"Etsin ei voi käyttää luetteloasi juuri nyt, mikä tekee siitä hitaan."
+
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Ei voi tehdä nopeita etsintöjä"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Ei voi tehdä sisältöetsintöjä"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5442,56 +5569,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
 "Koneesi on juuri luomassa tätä luetteloa, joten etsin ei voi käyttää sitä. "
 "Etsintä kestänee siis muutamia minuutteja."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Tehdäkseen sisältöetsinnän etsin tarvitsee luettelon järjestelmäsi "
 "sisällöstä. Koneesi on juuri luomassa tätä luetteloa, joten etsin ei voi "
 "käyttää sitä. Voit etsiä sisällön perusteella vasta kun luettelo on valmis."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Ei voi tehdä etsintöjä luettelosta"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
+"Etsin ei voi käyttää luetteloasi juuri nyt."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
+"Etsin ei voi käyttää luetteloasi juuri nyt."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Etsiäkseen nopeasti etsin tarvitsee luettelon järjestelmäsi tiedostoista. "
 "Luetteloa ei ole nyt saatavilla. Voit luoda sen ajamalla komennon \"medusa-"
 "indexd\" pääkäyttäjänä komentoriviltä. Etsinnät kestänevät useita "
 "minuutteja, kunnes luot luettelon."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Tehdäkseen sisältöetsinnän etsin tarvitsee luettelon järjestelmäsi "
 "sisällöstä. Tätä luetteloa ei ole saatavilla. Voit luoda sen ajamalla "
 "komennon \"medusa-indexd\" pääkäyttäjänä komentoriviltä. Et voi etsiä "
 "sisällön perusteella ennen kuin luettelo on luotu."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Nopeat etsinnät eivät ole käytössä koneellasi"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5501,11 +5660,12 @@ msgstr ""
 "Ylläpitäjä on poistanut luetteloinnin käytöstä koneeltasi, joten luetteloa "
 "ei ole."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Nopeat etsinnät eivät ole käytössä koneellasi"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Ei voi tehdä nopeita etsintöjä"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Sijainti"
 
@@ -5514,7 +5674,7 @@ msgstr "Sijainti"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Näytä uudessa ikkunassa"
@@ -5525,7 +5685,7 @@ msgstr "_Näytä uudessa ikkunassa"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "_Avaa %d uutta ikkunaa, ja näytä niissä"
@@ -5534,15 +5694,21 @@ msgstr "_Avaa %d uutta ikkunaa, ja näytä niissä"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus löysi enemmän etsintätuloksia kuin se voi näyttää. Joitkin jäävät "
 "näkymättä."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus löysi enemmän etsintätuloksia kuin se voi näyttää. Joitkin jäävät "
+"näkymättä."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Liian monta sopivaa"
 
@@ -5556,12 +5722,12 @@ msgid "Create L_auncher"
 msgstr "Luo _käynnistin"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Luo uusi käynnistin"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Poista kaikki roskakorin sisältö"
 
@@ -5580,7 +5746,7 @@ msgstr "Näytä ikkuna, josta voit valita työpöydän taustakuvion tai -värin.
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Käytä _oletustaustaa"
@@ -5602,56 +5768,66 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Valitse katselin, jolla valittua kohdetta katsellaan"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Luo _hakemisto"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Luo _hakemisto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Luo uusi tyhjä hakemisto tähän hakemistoon"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Luo uusi tyhjä hakemisto tähän hakemistoon"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Luo symbolinen linkki jokaiselle valitulle kohteelle"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Monista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Poista jokainen valittu kohde siirtämättä roskakoriin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Monista valitut kohteet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Muokkaa käynnistintä"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Muokkaa käynnistintietoja"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Alusta valittu taltio"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Levyn _ominaisuudet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Irrota valittu taltio"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "Siirrä tai kopioi viimeksi leikatut tai kopioidut tiedostot"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5659,131 +5835,140 @@ msgstr ""
 "Siirrä tai kopioi viimeksi leikatut tai kopioidut tiedostot valittuun "
 "hakemistoon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Avaa o_hjelmalla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Avaa jokainen valittu kohde uudessa ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Avaa uu_dessa ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Avaa valittu kohde tässä ikkunassa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Valmistele valittujen tiedostojen kopiointia \"liitä tiedostot\"-komennolla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Valmistele valittujen tiedostojen siirtoa \"liitä tiedostot\"-komennolla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Suojaa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Suojaa valittu taltio"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Nimeä valittu kohta uudelleen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Palauta näky_mään oletukset"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Palauta kohteiden järjestys ja mittakaava tämän näkymän asetusten mukaisiksi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Aja tai muokkaa hakemiston ~/Nautilus/skriptit skriptejä"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Valitse k_aikki tiedostot"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Kuviot"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Valitse tämän ikkunan kaikki kohteet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Valitse tämän ikkunan kaikki kohteet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Näytä valitun taltion levytiedot"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Näytä hakemisto, jossa on tämän valikon skriptit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Irrota valittu taltio"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Käytä tämän sijainnin oletustaustaa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Katsele tai muokkaa jokaisen valitun kohteen ominaisuuksia"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopioi tiedosto"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Alusta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Irrota taltio"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Avaa _skriptihakemisto"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "L_iitä tiedostoja"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "L_iitä tiedostoja hakemistoon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Nimeä uudelleen..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "Sk_riptit"
 
@@ -5870,7 +6055,12 @@ msgstr "_Käsin"
 msgid "Indexing is %d%% complete."
 msgstr "Luettelointi on %d%% valmis."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Tiedostosi luetteloitiin viimeksi %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5878,25 +6068,29 @@ msgstr ""
 "Kerran päivässä tiedostosi ja tekstitiedostojen sisällöt luetteloidaan, "
 "jotta etsintäsi olisivat nopeita."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Luetteloinnin tila"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Tiedostosi luetteloitiin viimeksi %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Kerran päivässä tiedostosi ja tekstitiedostojen sisällöt luetteloidaan, "
-"jotta etsintäsi olisivat nopeita. Tiedostosi luetteloituvat parhaillaan."
+"jotta etsintäsi olisivat nopeita."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Tiedostoistasi ei tällä hetkellä ole luetteloa."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5905,15 +6099,19 @@ msgstr ""
 "Kun nopea etsintä on käytössä, etsin luo luettelon hakuja nopeuttamaan. "
 "Nopea etsintä ei ole käytössä koneellasi, joten luetteloa ei juuri nyt ole."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Tiedostoistasi ei tällä hetkellä ole luetteloa."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Valitettavasti Medusa-etsintäpalvelu ei ole saatavilla."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5937,32 +6135,37 @@ msgstr "Näytä _luetteloinnin tila"
 msgid "Show status of indexing used when searching"
 msgstr "Näytä etsinnässä käytettävän luetteloinnin tila"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Vaadittua hakemistoa ei voitu luoda"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Vaadittuja hakemistoja ei voitu luoda"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus ei voinut luoda tarvittavaa hakemistoa \"%s\". Ennen Nautiluksen "
 "käynnistämistä luo tämä hakemisto tai aseta oikeudet siten, että Nautilus "
 "voi luoda sen."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Vaadittuja hakemistoja ei voitu luoda"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5973,22 +6176,27 @@ msgstr ""
 "Ennen Nautiluksen käynnistämistä luo nämä hakemistot tai aseta oikeudet "
 "siten, että Nautilus voi luoda ne."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Linkki vanhaan työpöytään"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Oletusarvoinen kotihakemiston sijainti on muuttunut Gnome 2.4:ssä. Linkki "
 "nimeltä \"Linkki vanhaan työpöytään\" on nyt työpöydälläsi. Voit avata tämän "
 "linkin, siirtää haluamasi tiedostot ja lopuksi poistaa sen."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Tuotu vanha työpöytä"
 
 #. Can't register myself due to trouble locating the
@@ -6001,7 +6209,7 @@ msgstr "Tuotu vanha työpöytä"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6012,7 +6220,7 @@ msgstr ""
 "käynnistää tietokoneesi uudelleen tai asentaa Nautiluksen uudestaan."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6057,12 +6265,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilusta ei voi käyttää nyt odottamattoman virheen takia."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6070,7 +6278,7 @@ msgstr ""
 "Nautilusta ei voi käyttää nyt, koska Bonobo ilmoitti odottamattomasta "
 "virheestä tiedostonhallintanäkymäpalvelinta rekisteröidessä."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6080,7 +6288,7 @@ msgstr ""
 "virheestä tehdasta paikantaessa. bonobo-activation-server'n sulkeminen ja "
 "Nautiluksen käynnistäminen uudelleen saattaa korjata ongelman."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6090,6 +6298,17 @@ msgstr ""
 "virheestä komentotulkkioliota paikantaessa. bonobo-activation-server'n "
 "sulkeminen ja Nautiluksen käynnistäminen uudelleen saattaa korjata ongelman."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Virhe ohjetta näyttäessä: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Kirjanmerkkejä ei määritetty"
@@ -6123,36 +6342,46 @@ msgstr "Vähemmän valintoja"
 msgid "Find Them!"
 msgstr "Etsi!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Ei voi siirtää itsensä sisälle"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" ei ole kelvollinen tiedoston nimi."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" ei ole kelvollinen sijainti. Tarkasta oikeinkirjoitus ja yritä "
-"uudelleen."
+"Sijaintia \"%s\" ei löytynyt. Tarkasta oikeinkirjoitus ja yritä uudelleen."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Verkkopalvelimet"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Nimi:"
+msgid "_Location:"
+msgstr "Sijainti:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Yhdistä"
@@ -6353,6 +6582,20 @@ msgstr ""
 "\n"
 "Voit poistaa tämän tiedoston, jos haluat käydä velhon läpi uudestaan.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Voit asettaa vain yhden oman kuvakkeen kerrallaan. Vedä yhtä kuvaa "
+"asettaaksesi sen kuvakkeeksi."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Pudottamasi tiedosto ei ole paikallinen. Vain paikallisia tiedostoja voi "
+"käyttää omina kuvakkeina."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6363,26 +6606,25 @@ msgstr "Avaa ohjelmalla %s"
 msgid "Open with..."
 msgstr "Avaa ohjelmalla..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "CD-kirjoitinohjelman käynnistäminen epäonnistui:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "CD-kirjoitinta ei voi käynnistää"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Tyhjennä _roskakori"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Kirjoita sisältö CD:lle"
 
@@ -6390,82 +6632,82 @@ msgstr "_Kirjoita sisältö CD:lle"
 msgid "Go To:"
 msgstr "Siirry:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Haluatko avata %d ikkunaa näiden sijaintien katselua varten?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Haluatko katsella useissa ikkunoissa?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Ei voi avata sijaintia"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Suorita nopeita itsetarkistuksia."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Aseta luotavan ikkunan mitat annetuiksi."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "MITAT"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Luo Nautilus-ikkunoita vain erikseen annetuille URI:lle."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Älä käytä työpöytää (sivuuta asetusikkunassa annettu oletus)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Lopeta nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Käynnistä Nautilus uudelleen."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Tiedostonhallinta"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --check ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: valitsinta --check ei voi käyttää muiden valitsinten kanssa.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --quit ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: valitsinta --restart ei voi käyttää URI:en kanssa.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: valitsinta --geometry ei voi käyttää yhtä useamman URI:n kanssa.\n"
@@ -6473,36 +6715,49 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Oletko varma, että haluat poistaa kohteen \"%s\" pysyvästi?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Oletko varma, että haluat historian unohtuvan? Jos haluat, niin joudut "
 "toistamaan sen itse."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Oletko varma, että haluat tyhjentää käytyjen sijaintien luettelon?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Tyhjennä historiikki"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Sijainti \"%s\" ei ole olemassa. Haluatko, että kaikki siihen viittaavat "
 "kirjanmerkkisi poistetaan?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Sijainti \"%s\" ei ole enää olemassa"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Olemattomaan sijaintiin viittaava kirjanmerkki"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Poista"
 
@@ -6537,7 +6792,6 @@ msgid "Close _All Windows"
 msgstr "Sulje _kaikki ikkunat"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Sulje kaikki Nautiluksen ikkunat"
@@ -6560,107 +6814,118 @@ msgid "Forward"
 msgstr "Eteenpäin"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Siirry roskakorihakemistoon"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Siirry seuraavaan sijaintiin"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Siirry edelliseen sijaintiin"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Siirry roskakorihakemistoon"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Koti"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Sijain_tipalkki"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Päivitä"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Etsi tästä tietokoneesta tiedostoja"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Tila_rivi"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Ylös"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Kirjoita CD:lle"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Lisää kirjanmerkki"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Takaisin"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Kirjanmerkit"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Tyhjennä _historiikki"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Pöydän päällys"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Muokkaa kirjanmerkkejä"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Eteenpäin"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Siirry"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Koti"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Sijainti..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Sivupaneeli"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Roskakori"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Ylös"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Näytä"
 
@@ -6678,34 +6943,39 @@ msgstr "Näytä muodossa..."
 msgid "File Browser: %s"
 msgstr "Tiedoston omistaja:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Jossakin sivupaneelissa tapahtui virhe, joten se ei voi jatkaa. "
 "Valitettavasti ei saatu selville, mikä se niistä oli."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Näkymässä %s tapahtui virhe sen käynnistyessä."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Sivupaneeli %s ei voi jatkaa toimintaansa, koska tapahtui virhe. Jos tätä "
 "ilmenee jatkuvasti, voit poistaa kyseisen paneelin käytöstä."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Virhe sivupaneelissa"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Sivupaneeli"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Sisältää sivupaneelinäkymän"
 
@@ -6739,147 +7009,180 @@ msgstr "_Lisää uusi..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Valitettavasti kuviota %s ei voitu poistaa."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Kuviota ei voitu poistaa"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Valitettavasti tunnusmerkkiä %s ei voitu poistaa."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Tunnusmerkin poisto epäonnistui"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Lisää uusi tunnusmerkki:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Avainsana:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Kuva:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Valitse uuden tunnusmerkin kuva:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Luo uusi väri:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Värin _nimi:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Väriarvo:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ei ole kelvollinen tiedoston nimi."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Et antanut kelvollista tiedoston nimeä."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Kuviota ei voitu asentaa"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Et voi vaihtaa uudelleenasetuskuvaa."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ei ole kuva"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Valitettavasti kuviota %s ei voitu asentaa."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Valitse kuviona lisättävä kuva"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Uudelle värille pitää antaa nimi."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Väriä ei voitu asentaa"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Valitse lisättävä väri"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Valitettavasti '%s' ei ole kelvollinen kuvatiedosto."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Tiedosto \"%s\" ei vaikuta olevan kelvollinen kuvatiedosto."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Valitse luokka:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Pe_ru poisto"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Lisää uusi kuvio..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Lisää uusi väri..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Lisää uusi tunnusmerkki..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Napsauta kuviota poistaaksesi sen."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Napsauta väriä poistaaksesi sen"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Napsauta tunnusmerkkiä poistaaksesi sen"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Kuviot:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Värit:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Tunnusmerkit:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Poista kuvio..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Poista väri..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Poista tunnusmerkki..."
 
@@ -7269,34 +7572,39 @@ msgstr "_CD-kirjoitin"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Sulje _kaikki ikkunat"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Sulje sivupaneeli"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Siirry tyhjä CD -hakemistoon"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Siirry roskakorihakemistoon"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Sijainti..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "hakemistoja"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Kuviot"
@@ -7326,10 +7634,13 @@ msgid "View Failed"
 msgstr "Katselu epäonnistui"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Näkymässä %s tapahtui virhe sen käynnistyessä."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Näkymä %s ei voi jatkaa toimintaansa, koska tapahtui virhe. Voit valita muun "
 "näkymän tai siirtyä toiseen sijaintiin."
@@ -7339,102 +7650,132 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Näkymässä %s tapahtui virhe sen käynnistyessä."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Tähän ikkunaan kytketty NautilusApplication."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Sisältönäkymä"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Nykyisen tiedoston tai hakemiston näkymä"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Sijaintia \"%s\" ei löytynyt. Tarkasta oikeinkirjoitus ja yritä uudelleen."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Tunnusmerkkien lisäys epäonnistui"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus ei voi näyttää sijaintia \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Sijaintia \"%s\" ei voitu näyttää, koska Nautilus ei tiedä sen tyyppiä."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "Nautilukseen ei ole asennettu katselinta, joka voisi näyttää kohteen \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska Nautilus ei voi käsitellä %s: -"
 "sijainteja."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska sisään kirjautuminen epäonnistui."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Ei voitu näyttää kohdetta \"%s\", koska oikeudet eivät riittäneet."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Ei voitu näyttää kohdetta \"%s\", koska sen isäntäkonetta \"%s\" ei "
 "löytynyt. Varmista että se on oikein kirjoitettu ja että "
 "välityspalvelinasetukset ovat kunnossa."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Kohteen \"%s\" näyttäminen ei onnistunut. Varmista, että "
 "välityspalvelinasetukset ovat kunnossa."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"Ei voinut näyttää sijaintia \"%s\", koska Nautilus ei saanut yhteyttä SMB-"
-"pääselaajaan.\n"
-"Tarkista, että lähiverkossasi toimii SMB-palvelin."
+"Ei voitu näyttää kohdetta \"%s\", koska Nautilus ei voi käsitellä %s: -"
+"sijainteja."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Etsintää ei voi käyttää nyt, koska luetteloa ei joko ole, tai etsintäpalvelu "
+"ei ole käynnissä. Varmista, että olet käynnistänyt Medusa-etsintäpalvelun. "
+"Jos sinulla ei ole luetteloa vielä, niin käynnistä myös Medusa-luettelin."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Etsintää ei voi käyttää nyt, koska luetteloa ei joko ole, tai etsintäpalvelu "
 "ei ole käynnissä. Varmista, että olet käynnistänyt Medusa-etsintäpalvelun. "
 "Jos sinulla ei ole luetteloa vielä, niin käynnistä myös Medusa-luettelin."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Etsintäpalvelu ei ole saatavilla"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ei voi näyttää sijaintia \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Sijaintia ei voi näyttää"
 
@@ -7446,7 +7787,7 @@ msgstr "Siirry tämän kirjanmerkin osoittamaan sijaintiin"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7454,14 +7795,14 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Suomennos:\n"
 "GNOME Finnish Translation Team\n"
 "http://gnome-fi.sourceforge.net/"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7477,39 +7818,43 @@ msgstr "Siirry muutama sivu taaksepäin"
 msgid "Go forward a number of pages"
 msgstr "Siirry muutama sivu eteenpäin"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Näytä tämä sijainti katselimella \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat -verkko"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Laikut"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD-kirjoitin"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Sovellus-ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Ikkunan sovellus-ID."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Sovellus"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Tähän ikkunaan kytketty NautilusApplication."
 
@@ -7545,6 +7890,244 @@ msgstr "Verkkopalvelimet"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Katsele verkkopalvelimia Nautilus-tiedostonhallintaohjelmalla"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Tehdas, joka tuottaa laitteistonäkymiä"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Laitteistokatselin"
+
+#~ msgid "Hardware view"
+#~ msgstr "Laitteistonäkymä"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Näytä laitteisto"
+
+#~ msgid "hardware view"
+#~ msgstr "laitteistonäkymä"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "laitteistonäkymän kuvakkeen nimi"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "laitteistotietojen yhteenveto"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s-prosessori\n"
+#~ "%s MHz\n"
+#~ "%s k välimuistia"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu Gt RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu Mt RAM"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Gt"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu Mt"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Käyntiaika on %d päivää, %d tuntia, %d minuuttia"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Laitteisto"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Tämä on prosessorisivun korvike."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Tämä on muistisivun korvike."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Tämä on IDE-sivun korvike."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Virhe kopioidessa kohdetta \"%s\":\n"
+#~ "\n"
+#~ "Levytilaa ei ole jäljellä."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Virhe linkittäessä kohdetta \"%s\":\n"
+#~ "\n"
+#~ "Levytilaa ei ole jäljellä"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Virhe siirtäessä kohteeseen \"%s\":\n"
+#~ "\n"
+#~ "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Virhe siirtäessä kohteeseen \"%s\":\n"
+#~ "\n"
+#~ "Kohdelevylle ei voi kirjoittaa."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Virhe luodessa linkkejä hakemistoon \"%s\":\n"
+#~ "\n"
+#~ "Sinulla ei ole tämän hakemiston kirjoitusoikeutta."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Virhe luodessa linkkejä kohteessa \"%s\":\n"
+#~ "\n"
+#~ "Kohdelevylle ei voi kirjoittaa."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" kopioidessa kohdetta \"%s\".\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" siirtäessä kohdetta \"%s\".\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" poistaessa kohdetta \"%s\".\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" kopioidessa.\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" linkittäessä.\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Virhe \"%s\" poistaessa.\n"
+#~ "\n"
+#~ "Haluatko jatkaa?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ei voi kopioida roskakoriin"
+
+#~ 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 ""
+#~ "Oletustoiminto ei voi avata kohdetta \"%s\", koska se ei voi koskea "
+#~ "tiedostoihin sijainneissa \"%s\".  Muita toimintoja tämän tiedoston "
+#~ "näyttämiseen ei ole. Jos kopioit tämän tiedoston koneellesi, niin saatat "
+#~ "voida avata sen."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Etsitään levyiltä"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus etsii roskakorihakemistoja levyasemiltasi."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Ei voi siirtää %d valittua kohdetta roskakoriin. Haluatko poistaa ne heti?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "On %d valittua kohdetta, joita ei voi siirtää roskakoriin. Haluatko "
+#~ "poistaa nämä %d kohdetta heti?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Pudottamasi tiedosto ei ole kuva. Vain paikallisia kuvia voi käyttää "
+#~ "omina kuvakkeina."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Medusa-etsintäpalvelu ei ole asennettu."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Kerran päivässä tiedostosi ja tekstitiedostojen sisällöt luetteloidaan, "
+#~ "jotta etsintäsi olisivat nopeita. Tiedostosi luetteloituvat parhaillaan."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" ei ole kelvollinen sijainti. Tarkasta oikeinkirjoitus ja yritä "
+#~ "uudelleen."
+
+#~ 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 ""
+#~ "Ei voinut näyttää sijaintia \"%s\", koska Nautilus ei saanut yhteyttä SMB-"
+#~ "pääselaajaan.\n"
+#~ "Tarkista, että lähiverkossasi toimii SMB-palvelin."
+
+#~ msgid "file icon"
+#~ msgstr "tiedostokuvake"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nimi:"
+
 #~ msgid "Unknown"
 #~ msgstr "Tuntematon"
 
@@ -7639,8 +8222,5 @@ msgstr "Katsele verkkopalvelimia Nautilus-tiedostonhallintaohjelmalla"
 #~ msgid "_Toolbar"
 #~ msgstr "Ty_ökalupalkki"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Sijainti \"%s\" ei ole enää olemassa"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Siirry olemattomaan sijaintiin"
diff --git a/po/fr.po b/po/fr.po
index 8417ad7f8..24a3d91bd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 2.3.8\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-17 17:14+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Échec de bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblèmes"
 
@@ -55,50 +55,62 @@ msgid "Nautilus Emblem view"
 msgstr "Vue d'emblème Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Impossible de supprimer l'emblème"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Impossible de supprimer l'emblème avec le nom « %s ». Cela est sûrement du "
 "au fait que c'est un emblème permanent, et non pas un que vous avez joutez "
 "vous-même."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Impossible de supprimer l'emblème"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Impossible de renommer l'emblème"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Impossible de renommer l'emblème avec le nom « %s ». Cela est sûrement du au "
 "fait que c'est un emblème permanent, et non pas un que vous avez joutez vous-"
 "même."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Impossible de renommer l'emblème"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Renommer l'emblème"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Saisissez un nouveau nom pour l'emblème affiché :"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Renommer"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Ajouter des emblèmes..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -106,7 +118,7 @@ msgstr ""
 "Saisissez un nom descriptif pour chaque emblème. Ce nom sera utilisé à tous "
 "les endroits pour identifier l'emblème."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -114,139 +126,62 @@ msgstr ""
 "Saisissez un nom descriptif pour l'emblème. Ce nom sera utilisé à tous les "
 "endroits pour identifier l'emblème."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Certains des fichiers ne peuvent être ajoutés comme emblèmes car ce ne "
-"semble pas être des images valides."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Désolé, mais l'image %s n'a pas pu être installée comme emblème."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Le fichier « %s » ne semble pas être une image valide."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Impossible d'ajouter d'emblèmes"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Aucun des fichiers ne peuvent être ajoutés comme emblèmes car ce ne semble "
 "pas être des images valides."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Le texte déposé n'est pas un emplacement de fichiers valide."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Impossible d'ajouter d'emblèmes"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Le fichier « %s » ne semble pas être une image valide."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Le fichier déposé ne semble pas être une image valide."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "À effacer"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrique pour la vue matériel"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Matériel"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visionneur de matériel"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vue du matériel"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Voir en tant que Matériel"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vue du matériel"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nom de l'icône pour la vue du matériel"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "résumé des informations matérielles"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K taille du cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Go RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu Mo RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Go"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mo"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "L'uptime est de %d jours, %d heures et %d minutes"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Aperçu du matériel"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ceci représente la page CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ceci représente la page RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ceci représente la page IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historique"
@@ -912,6 +847,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Matériel"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "International"
@@ -1199,33 +1138,21 @@ msgid "Desktop trash icon name"
 msgstr "Nom de l'icône de la corbeiile du bureau"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Les répertoires au-dessus de cette taille seront tronqués autour de cette "
-"taille. L'objectif de cela est d'éviter de charger la pile et de tuer "
-"Nautilus sur les grands répertoires. Une valeur négative supprime cette "
-"limite. La limite est approximative à cause de la lecture des chunk-wise de "
-"répertoires."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 "Active des indicateurs « spéciaux » dans la fenêtre de propriétés des "
 "fichiers"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Nom du fichier pour l'arrière-plan par défaut des dossiers. Seulement "
 "utilisé si background_set est vrai."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1233,6 +1160,20 @@ msgstr ""
 "Nom du fichier pour l'arrière-plan par défaut du panneau latéral. Seulement "
 "utilisé si side_pane_background_set est vrai."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Les répertoires au-dessus de cette taille seront tronqués autour de cette "
+"taille. L'objectif de cela est d'éviter de charger la pile et de tuer "
+"Nautilus sur les grands répertoires. Une valeur négative supprime cette "
+"limite. La limite est approximative à cause de la lecture des chunk-wise de "
+"répertoires."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Cacher les signets par défaut dans le menu des signets"
@@ -1242,9 +1183,10 @@ msgid "Home icon visible on desktop"
 msgstr "Icône personnelle visible sur le bureau"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Si défini à vrai, Nautilus n'affichera que les dossiers dans le panneau "
 "latéral.  Sinon il affichera les dossiers et les fichiers."
@@ -1284,9 +1226,10 @@ msgstr ""
 "préférences des fichiers."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Si défini à vrai, alors Nautilus affichera les répertoires avant les "
 "fichiers dans les vues par icônes et par liste."
@@ -1330,8 +1273,9 @@ msgstr ""
 "l'utilisateur dans le menu des signets."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Si défini à vrai, alors Nautilus utilisera le dossier personnel de "
@@ -1349,9 +1293,10 @@ msgstr ""
 "tilde « ~ » sont considérés comme des fichiers de sauvegarde."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Si défini à vrai, alors les fichiers cachés seront affichés dans le "
 "gestionnaire de fichiers. Les fichiers cachés sont soit des fichiers "
@@ -1377,8 +1322,9 @@ msgstr ""
 "bureau."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Si défini à vrai, une icône pointant sur le dossier personnel sera mise sur "
@@ -1416,7 +1362,8 @@ msgstr ""
 "décroissant."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Si vrai, les icônes seront rangées serrés par défaut dans les nouvelles "
 "fenêtres."
@@ -1448,7 +1395,8 @@ msgid "List of possible captions on icons"
 msgstr "Liste des légendes d'icônes possibles"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Nombre maximum de fichiers gérés dans un répertoire"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1468,11 +1416,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus gère l'affichage du bureau"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus utilise le dossier personnel des utilisateurs comme bureau"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "N'afficher que les répertoires dans l'arborescence latérale"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1492,7 +1442,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Inverser l'ordre de tri dans les nouvelles fenêtres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Afficher les répertoires en premier dans les fenêtres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1530,10 +1481,11 @@ msgstr ""
 "jouer le son."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1545,12 +1497,13 @@ msgstr ""
 "données de l'aperçu."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Optimisation de la vitesse pour quand afficher un fichier d'image comme une "
 "vignette. Si définit à « always », alors toujours afficher une vignette, "
@@ -1560,10 +1513,11 @@ msgstr ""
 "vignettes, juste des icônes génériques."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Optimisation de la vitesse pour quand afficher le nombre d'éléments dans un "
@@ -1574,18 +1528,20 @@ msgstr ""
 "nombre d'éléments."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "L'ordre de tri par défaut pour les éléments de la vue par icônes. Les "
 "valeurs possible sont « name », « size », « type », « modification_date » et "
 "« emblems »."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "L'ordre de tri par défaut pour les éléments de la vue par liste. Les valeurs "
 "possible sont « name », « size », « type » et « modification_date »."
@@ -1632,7 +1588,8 @@ msgid "Use manual layout in new windows"
 msgstr "Utiliser l'agencement manuel dans les nouvelles fenêtres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Utiliser un agencement condensé dans les nouvelles fenêtres"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1662,7 +1619,8 @@ msgstr ""
 "possible sont « list_view » et « icon_view »."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Quand afficher le nombre d'éléments dans un répertoire"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1674,7 +1632,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Quand afficher des vignettes pour les fichiers images"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 "Indique si un arrière-plan personnalisé par défaut pour le répertoire a été "
 "défini."
@@ -1839,68 +1798,83 @@ msgstr "r. à z."
 msgid "on the desktop"
 msgstr "sur le bureau"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Impossible de supprimer le volume"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Vous ne pouvez supprimer une icône de volume. Si vous voulez éjecter le "
 "volume, veuillez utiliser Éjecter dans le menu obtenu par un clic droit sur "
 "le volume."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Impossible de supprimer le volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Corbeille"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Déplacer ici"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copier ici"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Lier ici"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Annuler"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Définir comme arrière-plan pour _tous les dossiers"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Définir comme arrière-plan pour _ce dossier"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Désolé, mais le thème « %s » n'a pas pu être installé."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Désolé, mais vous devez spécifier un mot-clé pour le nouvel emblème."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Impossible d'installer d'emblèmes"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1911,20 +1885,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Désolé, mais il y a déjà un emblème nommé « %s ».  Veuillez lui choisir un "
 "nom différent."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Impossible d'installer d'emblèmes"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Désole, impossible d'enregistrer l'emblème personnalisé."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Désolé, impossible d'enregistrer le nom de l'emblème personnalisé."
 
@@ -1943,22 +1923,28 @@ msgstr "De :"
 msgid "To:"
 msgstr "Vers :"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Erreur durant le déplacement."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Erreur lors du déplacement.\n"
 "\n"
 "« %s » ne peut être déplacé car il est sur un disque en lecture seul."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Erreur durant la suppression."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1967,22 +1953,17 @@ msgstr ""
 "« %s » ne peut être supprimé car vous n'avez pas la permission de modifier "
 "son dossier parent."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Erreur lors de la suppression.\n"
 "\n"
 "« %s » ne peut être supprimé car il est sur un disque en lecture seul."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1991,12 +1972,15 @@ msgstr ""
 "« %s » ne peut être déplacé car vous n'avez pas la permission de modifier "
 "son dossier parent."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Erreur durant le déplacement."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Erreur lors du déplacement.\n"
@@ -2004,12 +1988,10 @@ msgstr ""
 "« %s » ne peut être déplacé car lui ou son dossier parent est contenu dans "
 "la destination."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Erreur durant le déplacement.\n"
@@ -2017,295 +1999,244 @@ msgstr ""
 "« %s » ne peut être déplacé vers la corbeille car vous n'avez pas la "
 "permission de le modifier, lui ou son dossier parent."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Erreur durant la copie."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Erreur lors de la copie.\n"
 "\n"
 "« %s » ne peut être copié car vous n'avez pas la permission de le lire."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erreur lors de la copie vers « %s ».\n"
-"\n"
-"La destination n'a plus assez d'espace libre."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Erreur durant la copie."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Erreur lors du déplacement vers « %s ».\n"
 "\n"
 "La destination n'a plus assez d'espace libre."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erreur lors de la création du lien dans « %s ».\n"
-"\n"
-"La destination n'a plus assez d'espace libre."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Erreur durant le déplacement."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Erreur durant la création du lien."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Erreur lors de la copie de « %s ».\n"
 "\n"
 "L'écriture dans ce dossier vous est interdite."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Erreur lors de la copie vers « %s ».\n"
 "\n"
 "Le disque de destination est en lecture seule."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erreur lors du déplacement des éléments vers « %s ».\n"
-"\n"
-"Le dossier de destination est en lecture seule."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erreur lors du déplacement des éléments vers « %s ».\n"
-"\n"
-"Le disque de destination est en lecture seule."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erreur lors de la création de liens dans « %s ».\n"
-"\n"
-"L'écriture dans ce dossier vous est interdite."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Erreur durant le déplacement."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erreur lors de la création des liens dans « %s ».\n"
-"\n"
-"Le disque de destination est en lecture seule."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » lors de la copie de « %s ».\n"
-"\n"
-"Voulez-vous continuer ?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Erreur durant la création du lien."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Erreur durant la copie."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Erreur « %s » lors du déplacement de « %s ».\n"
+"Erreur « %s » durant le déplacement.\n"
 "\n"
 "Voulez-vous continuer ?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » lors de la création du lien vers « %s ».\n"
-"\n"
-"Voulez-vous continuer ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Erreur durant le déplacement."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Erreur « %s » lors de la suppression de « %s ».\n"
+"Erreur « %s » lors de la création du lien vers « %s ».\n"
 "\n"
 "Voulez-vous continuer ?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » durant la copie.\n"
-"\n"
-"Voulez-vous continuer ?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Erreur durant la suppression."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » durant le déplacement.\n"
-"\n"
-"Voulez-vous continuer ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Erreur durant la copie."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » durant la création du lien.\n"
-"\n"
-"Voulez-vous continuer ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Erreur durant le déplacement."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erreur « %s » lors de la suppression.\n"
-"\n"
-"Voulez-vous continuer ?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Erreur durant la création du lien."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Erreur durant la suppression."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Erreur durant la copie."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Erreur durant le déplacement."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Erreur durant la création du lien."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Erreur durant la suppression."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Suivant"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Ré-essayer"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Impossible de compléter l'action spécifié."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "« %s » n'a pas pu être déplacé car ce nom est déjà utilisé pour un élément "
 "spécial qui ne peut être déplacé ou renommé.\n"
 "\n"
 "Si vous voulez quand même déplacer « %s », renommez-le avant de réessayer."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Impossible de compléter l'action spécifié."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "« %s » n'a pas pu être copié car ce nom est déjà utilisé pour un élément "
 "spécial qui ne peut être déplacé ou renommé.\n"
 "\n"
 "Si vous voulez quand même copier « %s », renommez-le avant de réessayer."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Impossible de remplacer le fichier."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "\n"
 "Voulez-vous le remplacer ?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflit lors de la copie"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Remplacer"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Remplacer tout"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "Lien vers %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "un autre lien vers %s"
@@ -2314,25 +2245,25 @@ msgstr "un autre lien vers %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%der lien vers %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd lien vers %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dème lien vers %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dème lien vers %s"
@@ -2342,563 +2273,602 @@ msgstr "%dème lien vers %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (une autre copie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "ième copie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ère copie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nde copie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ième copie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (autre copie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dième copie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dière copie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnde copie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dième copie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d inconnu"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Déplacer des fichiers dans la corbeille"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Fichier à traiter :"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Déplacement"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Préparation du déplacement vers la corbeille..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Déplacement de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Fichiers déplacés :"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Préparation du déplacement..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Déplacement terminé..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Création des liens sur les fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Fichiers liés :"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Liaison"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Préparation de la création de liens..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Création de liens terminée..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copie de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Fichiers copiés :"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copie"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Préparation de la copie..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Vous ne pouvez copier ces éléments dans la corbeille."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Impossible de copier dans la corbeille"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Vous ne pouvez déplacer ce dossier corbeille."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Vous ne pouvez copier ce dossier corbeille."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Impossible de changer l'emplacement de la corbeille"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Impossible de copier la corbeille"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Vous ne pouvez déplacer un dossier sur lui même."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Vous ne pouvez copier un dossier sur lui même."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Crée un nouveau dossier vide dans ce dossier"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Impossible d'être déplacé sur soi-même"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Impossible d'être copier sur soi-même"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Vous ne pouvez copier un fichier sur lui-même."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Impossible d'être copié sur soi-même"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Erreur lors de la création d'un nouveau dossier.\n"
 "\n"
 "Vous n'avez pas la permission d'écrire dans la destination."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Erreur lors de la création d'un nouveau dossier.\n"
 "\n"
 "La destination n'a plus assez d'espace libre."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erreur « %s » lors de la création du nouveau dossier."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Erreur lors de la création du nouveau dossier"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Erreur lors de la création du nouveau dossier"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "nouveau dossier"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Erreur « %s » lors de la création du nouveau dossier."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Erreur lors de la création du nouveau dossier"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Erreur lors de la création du nouveau dossier"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fichier"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Suppression de fichiers"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Fichiers supprimés :"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Suppression"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Préparation de la suppression..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Vider la corbeille"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Préparation de la purge de la corbeille..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement tous les éléments de la "
 "corbeille ?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Vider"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copie).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copie)txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (une autre copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (une autre copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (une autre copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (une autre copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123ème copie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124ème copie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124ème copie).txt"
 
@@ -2917,64 +2887,64 @@ msgstr "foo (124ème copie).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "aujourd'hui à 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "aujourd'hui à %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "aujourd'hui à 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "aujourd'hui à %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "aujourd'hui, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "aujourd'hui, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "aujourd'hui"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "hier à 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "hier à %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "hier à 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "hier à %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "hier, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "hier, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "hier"
 
@@ -2983,133 +2953,133 @@ msgstr "hier"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Vendredi 00 septembre 0000 à 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d %B %Y à %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Lun 00 Oct 0000 à 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y à %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Lun 00 Oct 0000 à 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y à %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Oct 0000 à 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y à %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Oct 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "aucun élément"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "aucun dossier"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "aucun fichier"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 élément"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fichier"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u éléments"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u dossiers"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fichiers"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? éléments"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? octets"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "type MIME inconnu"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "inconnu"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "application"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3119,7 +3089,7 @@ msgstr ""
 "signifie probablement que votre fichier gnome-vfs.keys est à la mauvaise "
 "place ou qu'il n'a pu être trouvé pour une autre raison."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3128,11 +3098,11 @@ msgstr ""
 "Aucune description trouvée pour le type MIME « %s » (le fichier est « %s »), "
 "veuillez avertir la liste de diffusion de gnome-vfs"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "lien"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "lien (rompu)"
 
@@ -3253,11 +3223,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Recherche des fichiers par nom et par propriétés"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vue par icônes"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vue par liste"
@@ -3401,148 +3373,153 @@ msgstr "Dossier personnel de %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Poste de travail"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "fichier d'icône"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "texte éditable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "l'étiquette éditable"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "texte additionnel"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "encore plus de texte"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "Surligné pour sélection"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "Si on est surligné pour une sélection"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "surligné pour le focus clavier"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "si on est surligné pour rendre le focus clavier"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "surligné pour déposer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "si on est surligné pour un déposer de D&D"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "La section rectangle"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Texte du cadre"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Dessine un cadre autour du texte non sélectionné"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Couleur de la boîte de sélection"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Couleur de la boîte de sélection"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Transparence de la boîte de sélection"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacité de la boîte de sélection"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Surbrillance alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacité de la surbrillance pour les icônes sélectionnées"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Couleur claire des infos"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 "Couleur utilisée pour le texte d'information sur un arrière-plan sombre"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Couleur sombre des infos"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Couleur utilisée pour le texte d'information sur un arrière-plan clair"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Ce dossier utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser l'élément à cet endroit ? Ceci changera "
 "le mode de réorganisation en manuel."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Ce dossier utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser les éléments à cet endroit ? Ceci "
 "changera le mode de réorganisation en manuel."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Ce dossier utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser l'élément à cet endroit ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Ce dossier utilise un mode de réorganisation automatique. Voulez-vous "
 "basculer en mode manuel et laisser les éléments à cet endroit ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Basculer en réorganisation manuelle ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Basculer"
 
@@ -3651,72 +3628,72 @@ msgstr "Est utilisé par défaut pour les éléments de type « %s »."
 msgid "Is the default for all \"%s\" items."
 msgstr "Est utilisé par défaut pour les éléments de type « %s »."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifier « %s »"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Inclure dans le menu pour les éléments de type « %s »"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Utiliser par défaut pour les éléments de type « %s »"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Inclure dans le menu uniquement pour « %s »"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Utiliser par défaut pour « %s » uniquement"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne pas inclure dans le menu les éléments de type « %s »"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "État"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Choisir"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Terminer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modifier..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Type de fichiers et de programmes"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Aller à"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3724,48 +3701,48 @@ msgstr ""
 "Vous pouvez configurer les applications proposées pour chaque type de "
 "fichiers dans la boîte de dialogue « Types de fichiers et de programmes »."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Ouvrir avec une autre application"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Choisissez une application pour ouvrir « %s » :"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Ouvrir avec un autre visionneur"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Choisissez une vue pour « %s » :"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Aucun visionneur n'est disponible pour « %s »."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Aucun visionneur disponible"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Il n'y a pas d'application associée avec « %s »."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Aucune application associée"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Il n'y a pas d'action associée avec « %s »."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Aucune action associée"
 
@@ -3773,11 +3750,9 @@ msgstr "Aucune action associée"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3787,42 +3762,41 @@ msgstr ""
 "de fichiers. Voulez-vous associer une application à ce type de fichiers "
 "maintenant ?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Associer à une application"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Le visionneur associé avec « %s » n'est pas valide."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Visionneur associé non valide"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "L'application associée avec « %s » n'est pas valide."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Application associée non valide"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "L'action associée avec « %s » n'est pas valide."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Action associée non valide"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3833,95 +3807,137 @@ msgstr ""
 "différent avec ce type de fichiers. Voulez-vous associer une application ou "
 "un visionneur à ce type de fichiers maintenant ?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Associer à une action"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"« %s » ne peut ouvrir « %s » car « %s » ne peut pas accéder aux fichiers à "
+"l'emplacement « %s ». Voulez-vous choisir une autre application ?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "« %s » ne peut ouvrir « %s » car « %s » ne peut pas accéder aux fichiers à "
 "l'emplacement « %s ». Voulez-vous choisir une autre application ?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "L'action par défaut ne peut ouvrir « %s » car elle ne peut pas accéder aux "
 "fichiers aux emplacements « %s ». Voulez-vous choisir une autre action ?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Impossible d'ouvrir l'emplacement"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"« %s » ne peut ouvrir « %s » car « %s » ne peut pas accéder aux fichiers à "
+"l'emplacement « %s ». Voulez-vous choisir une autre application ?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "« %s » ne peut ouvrir « %s » car « %s » ne peut accéder aux fichiers sur un "
 "emplacement de type « %s ». Aucune autre application disponible ne peut "
 "visionner ce fichier. Si vous copiez ce fichier sur votre ordinateur, vous "
 "pourrez peut-être l'ouvrir."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"L'action par défaut ne peut ouvrir « %s » car elle ne peut accéder aux "
-"fichiers aux emplacements « %s ». Aucune autre action n'est disponible pour "
+"L'action par défaut ne peut ouvrir « %s » car elle ne peut pas accéder aux "
+"fichiers aux emplacements « %s ». Voulez-vous choisir une autre action ?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"« %s » ne peut ouvrir « %s » car « %s » ne peut accéder aux fichiers sur un "
+"emplacement de type « %s ». Aucune autre application disponible ne peut "
 "visionner ce fichier. Si vous copiez ce fichier sur votre ordinateur, vous "
-"pourrez peut être l'ouvrir."
+"pourrez peut-être l'ouvrir."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de « %s »"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Désolé, mais vous ne pouvez pas exécuter des commandes à partir d'un site "
 "distant pour des raisons de sécurité."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Impossible de lancer les liens distants"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+#, fuzzy
+msgid "Details: "
+msgstr "Détails"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Erreur lors du lancement de l'application.\n"
 "\n"
 "Détails :"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Erreur lors du lancement de l'application"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "La cible de glisser/déposer supporte uniquement les fichiers locaux"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Cette cible de glisser/déposer supporte uniquement les fichiers locaux.\n"
@@ -3929,15 +3945,15 @@ msgstr ""
 "Pour ouvrir un fichier non-local, copier le dans un dossier local et faites-"
 "le glisser une nouvelle fois."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "La cible de glisser/déposer supporte uniquement les fichiers locaux"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4196,14 +4212,6 @@ msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 "Éléments qui contiennent « medusa » dans leur nom et sont des dossiers."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Recherche les disques"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus recherche des dossiers corbeille dans vos disques."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Éditer"
@@ -4412,100 +4420,110 @@ msgstr "Arrière-plan"
 msgid "Empty Trash"
 msgstr "Vider la corbeille"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "Ouvrir %d fenêtres ?"
+
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Êtes-vous sûr de vouloir supprimer définitivement « %s » ?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
 msgstr ""
 "Cette opération ouvrira %d fenêtres indépendantes. Êtes-vous sûr de vouloir "
 "faire cela ?"
 
-#: src/file-manager/fm-directory-view.c:499
-#, c-format
-msgid "Open %d Windows?"
-msgstr "Ouvrir %d fenêtres ?"
-
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir supprimer définitivement « %s » ?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement les %d éléments "
 "sélectionnés ?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Supprimer tous les éléments sélectionnés définitivement"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Suppression"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Sélectionner une catégorie :"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Motifs"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "« %s » sélectionné"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 dossier sélectionné"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d dossiers sélectionnés"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (sans élément)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contenant 1 élément)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contenant %d éléments)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contenant 0 élément au total)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contenant 1 élément au total)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contenant %d éléments au total)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "« %s » sélectionné (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d éléments sélectionnés (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 autre élément sélectionné (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d autres éléments sélectionnés (%s)"
@@ -4517,7 +4535,7 @@ msgstr "%d autres éléments sélectionnés (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4526,109 +4544,129 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Le dossier « %s » contient plus de fichiers que Nautilus peut en gérer. "
 "Quelques fichiers ne seront pas affichés."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Beaucoup trop de fichiers"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "« %s » ne peut être déplacé dans la corbeille. Voulez-vous le supprimer "
 "immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Les %d éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
-"Voulez-vous les supprimer immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"« %s » ne peut être déplacé dans la corbeille. Voulez-vous le supprimer "
+"immédiatement ?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d des éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
-"Voulez-vous supprimer ces %d éléments immédiatement ?"
+"« %s » ne peut être déplacé dans la corbeille. Voulez-vous le supprimer "
+"immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Supprimer immédiatement ?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement « %s » de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement les %d éléments "
 "sélectionnés de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Supprimer de la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Utilise « %s » pour ouvrir l'élément sélectionné"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Autre _application..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Une _application..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Autre _visionneur..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Un _visionneur..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Impossible de compléter l'action spécifiée : %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Impossible de compléter l'action spécifié."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Utiliser « %s » sur tous les éléments sélectionnés"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Tous les fichiers exécutables de ce dossier apparaîtront dans le menu "
+"Scripts. Si vous choisissez un script dans ce menu, il sera lancé avec les "
+"éléments sélectionnés en entrée."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4636,11 +4674,11 @@ msgstr ""
 "Scripts. Si vous choisissez un script dans ce menu, il sera lancé avec les "
 "éléments sélectionnés en entrée."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "À propos des scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4683,19 +4721,19 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY : position et taille de la fenêtre courante"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "« %s » va être déplacé si vous choisissez la commande Coller les Fichiers"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 "« %s » va être copié si vous choisissez la commande Coller les Fichiers"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4703,7 +4741,7 @@ msgstr ""
 "Les %d éléments sélectionnés seront déplacés si vous utiliser la commande "
 "Coller les fichiers"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4711,161 +4749,168 @@ msgstr ""
 "Les %d éléments sélectionnés vont être copiés si vous choisissez la commande "
 "Copier les fichiers"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Le presse-papiers est vide."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Erreur de montage"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Erreur de démontage"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Erreur de service"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "É_jecter"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Démonter le volume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Ouvrir dans %d _nouvelles fenêtres"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Dossier personnel"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Dossier personnel"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Supprimer de la corbeille"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Supprimer tous les éléments sélectionnés définitivement"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Mettre dans la corbeille"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Déplace chaque élément sélectionné dans la corbeille"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Créer des _liens"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Créer un _lien"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Co_uper le fichier"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Co_uper les fichiers"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copier le fichier"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copier les fichiers"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Ce lien ne peut être utilisé, car il ne pointe sur rien. Voulez-vous "
 "déplacer ce lien dans la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Ce lien ne peut être utilisé, car il ne pointe sur rien. Voulez-vous "
+"déplacer ce lien dans la corbeille ?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Ce lien ne peut être utilisé, car sa cible « %s » n'existe pas. Voulez-vous "
 "déplacer ce lien dans la corbeille ?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Lien rompu"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "« %s » est un fichier texte exécutable. Voulez-vous le lancer ou afficher "
 "son contenu ?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Fichiers texte exécutables"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Lancer ou afficher ?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Afficher"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Lancer dans un _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Afficher"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Lancer"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Ouverture de « %s »"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Annuler l'ouverture ?"
 
@@ -4887,10 +4932,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Désolé, impossible d'afficher tout le contenu de « %s »."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Impossible de déterminer les permissions de « %s »."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erreur d'affichage du dossier"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4898,7 +4948,7 @@ msgstr ""
 "Le nom « %s » est déjà utilisé dans ce dossier. Veuillez utiliser un nom "
 "différent."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4906,12 +4956,12 @@ msgstr ""
 "Il n'y a pas de « %s » dans ce dossier. Peut-être vient-il juste d'être "
 "déplacé ou supprimé ?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Vous n'avez pas les permissions nécessaires pour renommer « %s »."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4920,66 +4970,81 @@ msgstr ""
 "Le nom « %s » n'est pas valide car il contient le caractère « / ». Veuillez "
 "utiliser un nom différent."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Le nom « %s » n'est pas valide. Veuillez utiliser un nom différent."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Impossible de changer le nom de « %s » car il est sur un disque en lecture "
 "seule"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Désolé, impossible de renommer « %s » en « %s »."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Désolé, mais ce thème n'a pas pu être supprimé !"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Erreur dans le changement de nom"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Vous n'avez pas l'autorisation de changer le groupe de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Impossible de changer le groupe de « %s » car il est sur un disque en "
 "lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Désolé, impossible de changer le groupe de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Impossible de déterminer les permissions de « %s »."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Erreur dans l'attribution du groupe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Impossible de changer le propriétaire de « %s » car il est sur un disque en "
 "lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Désolé, impossible de changer le propriétaire de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Impossible de déterminer les permissions de « %s »."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Erreur dans l'attribution du propriétaire"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4987,21 +5052,26 @@ msgstr ""
 "Impossible de changer les permissions de « %s » car il est sur un disque en "
 "lecture seule"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Désolé, impossible de changer les permissions de « %s »."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Impossible de déterminer les permissions de « %s »."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Erreur dans l'attribution des permissions"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renommage de « %s » vers « %s »."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Annuler le changement de nom ?"
 
@@ -5059,130 +5129,155 @@ msgstr "Restaurer la _taille initiale des icônes"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Restaurer la taille _initiale de l'icône"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pointe sur « %s »"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Le glisser-déposer n'est supporté que sur les systèmes de fichiers locaux."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Le glisser-déposer n'est supporté que sur les systèmes de fichiers locaux."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Erreur de glisser déposer"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Un type de glisser non valide à été utilisé."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Taille"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Date de modification"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Vous ne pouvez pas assigner plus d'un icône à la fois! Sélectionnez juste "
 "une image pour en faire un icône personnalisé."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Vous ne pouvez pas assigner plus d'un icône à la fois! Sélectionnez juste "
+"une image pour en faire un icône personnalisé."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Plus d'une image"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Le fichier que vous avez sélectionné ne se trouve pas sur cet ordinateur. "
+"Vous ne pouvez utiliser que des images en local pour en faire des icônes "
+"personnalisés."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Le fichier que vous avez sélectionné ne se trouve pas sur cet ordinateur. "
 "Vous ne pouvez utiliser que des images en local pour en faire des icônes "
 "personnalisés."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Uniquement les images locales"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Le fichier que vous avez sélectionné n'est pas une image. Vous ne pouvez "
-"utiliser que des images en local pour en faire des icônes personnalisés."
+"Le fichier que vous avez sélectionné ne se trouve pas sur cet ordinateur. "
+"Vous ne pouvez utiliser que des images en local pour en faire des icônes "
+"personnalisés."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Images uniquement"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propriétés de %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Annuler le changement de groupe ?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Changement de groupe"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Annuler le changement de propriétaire ?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Changement de propriétaire"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "rien"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "impossible à lire"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 élément de taille %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d éléments, totalisant %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(quelques éléments sont impossible à lire)"
 
@@ -5192,193 +5287,193 @@ msgstr "(quelques éléments sont impossible à lire)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Contenu :"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Général"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Noms :"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type :"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume :"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Espace libre :"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Cible du lien :"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Type MIME :"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Dernière modification :"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Dernier accès :"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Sélectionner une icône personnalisée..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Enlever l'icône personnalisée"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lecture"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "É_criture"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xécution"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Définir l'ID de l'_utilisateur"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Indicateurs spéciaux :"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Définir l'ID du _groupe"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permissions"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Vous n'êtes pas le propriétaire de cet élément, vous ne pouvez donc pas en "
 "changer les permissions."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Propriétaire du fichier :"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Propriétaire du fichier :"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Groupe du fichier :"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Groupe du fichier :"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Propriétaire :"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Groupe :"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Autres :"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Vue texte :"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Vue numérique :"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Dernier changement :"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Impossible de déterminer les permissions de « %s »."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Les permissions du fichier sélectionné ne peuvent être déterminé."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Il y a eu une erreur lors de l'affichage de l'aide : \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Il y a eu une erreur lors de l'affichage de l'aide : %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Impossible d'afficher l'aide"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Annuler l'affichage de la fenêtre Propriétés ?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Création de la fenêtre Propriétés"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Sélectionnez une icône"
 
@@ -5396,73 +5491,115 @@ msgid "Search Results"
 msgstr "Résultats de la recherche"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Désolé, mais le service de recherche Medusa n'est pas disponible car il "
-"n'est pas installé"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Désolé, mais le service de recherche par medusa n'est pas disponible."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+#, fuzzy
+msgid "Medusa is not installed."
+msgstr "%s est déjà installé"
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Le service de recherche n'est pas disponible"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "La recherche que tentez d'effectuer est plus récente que l'index de votre "
 "système. La recherche ne retournera pas de résultats. Vous pouvez créer un "
 "index en lançant \"medusa-indexd\" en tant que root en ligne de commande."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Rechercher ne peut pas trouver l'index de vos fichiers. Cet index peut être "
+"absent ou corrompu. Vous pouvez en créer un nouveau en exécutant \"medusa-"
+"indexd\" en tant que root en ligne de commande"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Rechercher les éléments les plus récents"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Tous les fichiers indexés de votre ordinateur corresponde au critère que "
+"vous avez choisi. Vous devriez vérifier votre requête ou ajouter plus de "
+"critère afin de restreindre les résultats."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Tous les fichiers indexés de votre ordinateur corresponde au critère que "
 "vous avez choisi. Vous devriez vérifier votre requête ou ajouter plus de "
 "critère afin de restreindre les résultats."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Erreur durant la recherche"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Rechercher ne peut pas trouver l'index de vos fichiers. Cet index peut être "
 "absent ou corrompu. Vous pouvez en créer un nouveau en exécutant \"medusa-"
 "indexd\" en tant que root en ligne de commande"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Erreur lors de la lecture de l'index des fichiers"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 "Une erreur est survenu lors du chargement du contenu de la recherche "
 "suivante : %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Pour faire une recherche sur le contenu, Find a besoin d'un index des "
+"fichiers présents sur votre système.\n"
+"Find ne peut pas accéder à cet index pour le moment."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Pour faire une recherche sur le contenu, Find a besoin d'un index des "
+"fichiers présents sur votre système.\n"
+"Find ne peut pas accéder à cet index pour le moment."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5470,26 +5607,23 @@ msgstr ""
 "présents sur votre système. Find ne peut accéder à cet index, une recherche "
 "plus lente n'utilisant pas cet index va donc être effectuée."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Pour faire une recherche sur le contenu, Find a besoin d'un index des "
-"fichiers présents sur votre système.\n"
-"Find ne peut pas accéder à cet index pour le moment."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "La recherche rapide n'est pas disponible"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "La recherche par contenu n'est pas disponible"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5503,38 +5637,67 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Pour effectuer une recherche rapide, Find nécessite un index des fichiers de "
 "votre système. Votre ordinateur est actuellement en traine de créer cette "
 "index. Comme Find ne peut utiliser d'index, cette recherche peut prendre "
 "plusieurs minutes."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Pour faire une recherche sur le contenu, Find nécessite un index du contenu "
 "de votre système. Votre ordinateur est en train de créer cette index. La "
 "recherche sur le contenu sera disponible lorsque l'index sera complété."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "La recherche indéxée  n'est pas disponible"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Pour faire une recherche sur le contenu, Find a besoin d'un index des "
+"fichiers présents sur votre système.\n"
+"Find ne peut pas accéder à cet index pour le moment."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Pour faire une recherche sur le contenu, Find a besoin d'un index des "
+"fichiers présents sur votre système.\n"
+"Find ne peut pas accéder à cet index pour le moment."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Pour faire une recherche rapide, Find nécessite un index des fichier de "
 "votre système. Aucun index n'est disponible actuellement. Vous pouvez créer "
@@ -5542,12 +5705,12 @@ msgstr ""
 "commande. Tant qu'un index complet ne sera pas disponible, les recherches "
 "prendront plusieurs minutes."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Pour faire une recherche sur le contenu, Find nécessite un index du contenu "
 "des fichier de votre système. Aucun index n'est disponible actuellement. "
@@ -5555,7 +5718,12 @@ msgstr ""
 "depuis la ligne de commande. Tant qu'un index complet ne sera pas "
 "disponible, les recherches sur le contenu ne pourront être effectuées."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "La recherche rapide n'est pas activée sur votre ordinateur"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5565,11 +5733,12 @@ msgstr ""
 "votre système. Votre administrateur système a désactivé la recherche rapide "
 "sur votre ordinateur, aussi, aucun index n'est disponible."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "La recherche rapide n'est pas activée sur votre ordinateur"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "La recherche rapide n'est pas disponible"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Emplacement"
 
@@ -5578,7 +5747,7 @@ msgstr "Emplacement"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Afficher dans une _nouvelle fenêtre"
@@ -5589,7 +5758,7 @@ msgstr "Afficher dans une _nouvelle fenêtre"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Afficher dans %d _nouvelles fenêtres"
@@ -5598,15 +5767,21 @@ msgstr "Afficher dans %d _nouvelles fenêtres"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus ne peut pas afficher tous les résultats qu'il a trouvé. Certains "
 "éléments ne seront pas affichés."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus ne peut pas afficher tous les résultats qu'il a trouvé. Certains "
+"éléments ne seront pas affichés."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Beaucoup trop de correspondances"
 
@@ -5620,12 +5795,12 @@ msgid "Create L_auncher"
 msgstr "Créer un _lanceur"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Créer un nouveau lanceur"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Supprimer tous les éléments de la corbeille"
 
@@ -5646,7 +5821,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Utiliser l'arrière-plan par _défaut"
@@ -5668,59 +5843,69 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Choisit un autre visionneur pour afficher l'élément sélectionné"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Créer un _dossier"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Créer un _dossier"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Crée un nouveau dossier vide dans ce dossier"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Crée un nouveau dossier vide dans ce dossier"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Crée un lien symbolique pour chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Dupliquer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 "Efface tous les éléments sélectionnés, sans les déplacer dans la corbeille"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplique chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Éditer le lanceur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Éditer les informations du lanceur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formater le volume sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Propriétés du _média"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Démonter le volume sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Déplace ou copie un fichier précédemment sélectionné par une commande Couper "
 "Fichiers ou Copier Fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5728,134 +5913,143 @@ msgstr ""
 "Déplace ou copie les fichiers précédemment sélectionné par une commande "
 "Couper Fichiers ou Copier Fichiers dans le dossier sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ouvrir _avec"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Ouvre chaque élément sélectionné dans une nouvelle fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Ouvre l'élément sélectionné dans cette fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Permet de copier les fichiers sélectionner en utilisant la commande Coller "
 "les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Permet de déplacer les fichiers sélectionner en utilisant la commande Coller "
 "les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Protéger"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Protège le volume sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Renomme l'élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Réinitialiser la vue aux valeurs par _défaut"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Applique l'ordre de tri et le niveau de zoom spécifiés dans les préférences "
 "à cette vue"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Exécute ou organise les scripts dans le dossier ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Sélectionner _tous les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Motifs"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Sélectionne tous les éléments de cette fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Sélectionne tous les éléments de cette fenêtre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Affiche les propriétés du média du volume sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Affiche le dossier qui contient les scripts listés dans ce menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Démonter le volume sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Utilise l'arrière-plan par défaut pour cet emplacement"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Affiche ou modifie les propriétés de chaque élément sélectionné"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copier le fichier"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formater"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Démonter le volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Ouvrir le dossier de Scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "C_oller les fichiers"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Coller les fichiers dans le dossier"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5940,7 +6134,12 @@ msgstr "_Manuellement"
 msgid "Indexing is %d%% complete."
 msgstr "L'indexation est %d%% effectuée."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Dernière indexation de vos fichiers à %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5948,26 +6147,29 @@ msgstr ""
 "Une fois par jour, vos fichiers ainsi que leur contenu sont indexés afin de "
 "rendre vos recherches plus rapides."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "État de l'indexation"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Dernière indexation de vos fichiers à %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Une fois par jour, vos fichiers ainsi que leur contenu sont indexés afin de "
-"rendre vos recherches plus rapides. Vos fichiers sont en train d'être "
-"indexés."
+"rendre vos recherches plus rapides."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Actuellement, il n'y a pas d'index de vos fichiers."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5977,15 +6179,19 @@ msgstr ""
 "recherches. La recherche rapide n'est pas activé sur votre ordinateur, ainsi "
 "vous n'avez pas d'index actuellement."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Actuellement, il n'y a pas d'index de vos fichiers."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Désolé, mais le service de recherche par medusa n'est pas disponible."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -6009,32 +6215,37 @@ msgstr "Afficher l'état de l_indexation"
 msgid "Show status of indexing used when searching"
 msgstr "Afficher l'état de l'indexation utilisé durant la recherche"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Impossible de créer le dossier requis"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus est incapable de créer le dossier %s"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus ne peut créer le dossier requis « %s ». Avant d'exécuter Nautilus, "
 "veuillez créer ce dossier, ou définir les permissions de telle sorte que "
 "Nautilus puisse le créer."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Impossible de créer les dossiers requis"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus est incapable de créer le dossier %s"
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6045,23 +6256,28 @@ msgstr ""
 "Avant d'exécuter Nautilus, veuillez créer ces dossiers, ou définir les "
 "permissions de telle sorte que Nautilus puisse les créer."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Lien vers l'ancien bureau"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "L'emplacement du répertoire du bureau a changé dans Gnome 2.4. Un lien "
 "appelé « Lien vers l'ancien bureau » a été crée sur le bureau. Vous pouvez "
 "l'ouvrir pour y enlever les fichiers que vous souhaiter garder et supprimer "
 "le lien."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Ancien bureau migré"
 
 #. Can't register myself due to trouble locating the
@@ -6074,7 +6290,7 @@ msgstr "Ancien bureau migré"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6085,7 +6301,7 @@ msgstr ""
 "de redémarrer l'ordinateur ou d'installer Nautilus de nouveau."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6131,12 +6347,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Arrêt de Nautilus à cause d'une erreur inconnue."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6145,7 +6361,7 @@ msgstr ""
 "provenance de Bonobo lors de la tentative d'enregistrement du serveur de "
 "vues du gestionnaire de fichiers."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6156,7 +6372,7 @@ msgstr ""
 "Tuer bonobo-activation-server et redémarrer Nautilus peut aider à résoudre "
 "le problème."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6167,6 +6383,17 @@ msgstr ""
 "Tuer bonobo-activation-server et redémarrer Nautilus peut aider à résoudre "
 "le problème."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Il y a eu une erreur lors de l'affichage de l'aide : \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Aucun signet n'est défini"
@@ -6200,35 +6427,45 @@ msgstr "Moins d'options"
 msgid "Find Them!"
 msgstr "Lancer recherche !"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Impossible d'être déplacé sur soi-même"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "n'est pas un périphérique bloc valide"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"Emplacement « %s » non valide. Vérifiez l'orthographe et essayez à nouveau."
+"Impossible de trouver « %s ». Vérifiez l'orthographe et essayez à nouveau."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Connexion aux services Eazel..."
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nom :"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Emplacement :"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Connecter"
@@ -6431,6 +6668,21 @@ msgstr ""
 "Vous pouvez effacer manuellement ce fichier pour utiliser de nouveau "
 "l'assistant.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Vous ne pouvez pas assigner plus d'un icône à la fois! Sélectionnez juste "
+"une image pour en faire un icône personnalisé."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Le fichier que vous avez sélectionné ne se trouve pas sur cet ordinateur. "
+"Vous ne pouvez utiliser que des images en local pour en faire des icônes "
+"personnalisés."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6441,26 +6693,25 @@ msgstr "Ouvrir avec %s"
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Impossible de lancer l'application de gravure de CD :\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Impossible de lancer le graveur de CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Graver le contenu sur un CD"
 
@@ -6468,38 +6719,38 @@ msgstr "_Graver le contenu sur un CD"
 msgid "Go To:"
 msgstr "Aller à :"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Voulez-vous voir ces %d emplacements dans des fenêtres différentes?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Voir dans des fenêtres multiples?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Impossible d'ouvrir l'emplacement"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Effectue des rapides tests de cohérence."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Crée la fenêtre initiale avec la géométrie donnée."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GÉOMÉTRIE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 "Ne crée ne nouvelles fenêtres que pour les URIs explicitement spécifiés"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6507,80 +6758,93 @@ msgstr ""
 "Ne pas gérer le bureau (ignore l'option disponible dans le dialogue "
 "Préférences)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Quitte Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Relancer Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus : l'option --check ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus : l'option --check ne peut être utilisée avec d'autres options.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus : l'option --quit ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus : l'option --restart ne peut être utilisée avec les URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus : l'option --restart ne peut être utilisée avec les URIs.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Êtes-vous sûr de vouloir supprimer définitivement « %s » ?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "Voulez-vous réellement oublier tout l'historique ?"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Êtes-vous sûr de vouloir vider la liste des emplacements visités ?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Vider l'historique"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "L'emplacement « %s » n'existe pas. Voulez-vous supprimer tout les signets "
 "pointant sur cet emplacement de votre liste ?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "L'emplacement « %s » n'existe plus."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Signet pour emplacement inexistant"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -6613,7 +6877,6 @@ msgid "Close _All Windows"
 msgstr "Fermer _toutes les fenêtres"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Ferme toutes les fenêtres Nautilus"
@@ -6637,107 +6900,119 @@ msgid "Forward"
 msgstr "Suivant"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Va au dossier corbeille"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Va à l'emplacement suivant"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Va à l'emplacement précédent"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Va au dossier corbeille"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Mon dossier"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Barre d'_emplacement"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Actualiser"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Recherche des fichiers en local"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Barre d'é_tat"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Haut"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Graver sur un CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "A_jouter un signet"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Précédent"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Signets"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Vider l'historique"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Poste de travail"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Éditer les signets"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Suivant"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "A_ller"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Mon dossier"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Emplacement..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Panneau _latéral"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Corbeille"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Haut"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "Afficha_ge"
 
@@ -6755,34 +7030,39 @@ msgstr "Voir en tant que..."
 msgid "File Browser: %s"
 msgstr "Propriétaire du fichier :"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Un des panneaux latéraux a provoqué une erreur et son exécution ne peut pas "
 "continuer. Malheureusement je ne peux pas identifier lequel."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "La vue %s a rencontrée une erreur durant son démarrage."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Le panneau latéral %s a provoqué une erreur et son exécution ne peut pas "
 "continuer. Si cette erreur persiste, vous devrez déselectionner ce panneau."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Echec panneau latéral"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Panneau latéral"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contient une vue de panneau latéral"
 
@@ -6816,147 +7096,181 @@ msgstr "A_jouter un nouveau...  "
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Désolé, mais le motif %s n'a pas pu être supprimé."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Impossible de supprimer le motif"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Désolé, mais l'emblème %s n'a pas pu être supprimé."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Impossible de supprimer l'emblème"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Créer un nouvel emblème :"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Mot-clé :"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Image :"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Sélectionnez un fichier pour créer le nouvel emblème :"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Créer une nouvelle couleur :"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nom de couleur :"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valeur de couleur :"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Désolé, mais « %s » n'est pas un nom de fichiers valide."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Désolé, mais vous n'avez pas fournit de nom de fichiers valide."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Impossible d'installer le motif"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Désolé, mais vous ne pouvez pas remplacer l'image initiale"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Pas une image"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Désolé, mais le motif %s n'a pas pu être installé."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Sélectionnez une image à ajouter comme motif"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+#, fuzzy
+msgid "The color cannot be installed."
+msgstr "Ces paquets sont prêts à être désinstallés :"
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Désolé, mais vous devez spécifier un nom pour la nouvelle couleur."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Impossible d'installer la couleur"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Sélectionnez une couleur à ajouter"
 
-#: 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 "Désolé, mais « %s » n'est pas un fichier image reconnu !"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Désolé, mais « %s » n'est pas un fichier image reconnu."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Le fichier « %s » ne semble pas être une image valide."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Sélectionner une catégorie :"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Annuler la suppression"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "A_jouter un nouveau motif..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "A_jouter une nouvelle couleur..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "A_jouter un nouvel emblème..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Cliquer sur un motif afin de le supprimer"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Cliquer sur une couleur afin de la supprimer"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Cliquer sur un emblème afin de le supprimer"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Motifs :"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Couleurs :"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblèmes :"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Supprimer un motif..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Supprimer une couleur..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Supprimer un emblème..."
 
@@ -7349,34 +7663,39 @@ msgstr "_Créateur de CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Fermer _toutes les fenêtres"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Ferme le panneau latéral"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Poste de travail"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Va au dossier corbeille"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Emplacement..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Éléments qui sont]des dossiers"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Motifs"
@@ -7406,10 +7725,13 @@ msgid "View Failed"
 msgstr "La vue a échoué"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "La vue %s a rencontrée une erreur durant son démarrage."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "La vue %s a rencontré une erreur et son exécution ne peut pas continuer. "
 "Vous pouvez choisir une autre vue ou aller à un un emplacement différent."
@@ -7419,101 +7741,132 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "La vue %s a rencontrée une erreur durant son démarrage."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Le NautilusApplication associé à cette fenêtre."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Vue du contenu"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Vue du fichier ou du dossier courant"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Impossible de trouver « %s ». Vérifiez l'orthographe et essayez à nouveau."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Ne peut charger %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Ne peut charger %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Impossible d'afficher « %s », car Nautilus ne peut déterminer le type du "
 "fichier."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus n'a aucun visionneur installé capable d'afficher « %s »."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Impossible d'afficher « %s », car Nautilus ne reconnaît pas les emplacements "
 "%s."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Impossible d'afficher « %s », car la tentative de connexion a échouée."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Impossible d'afficher « %s », car l'accès n'a pas été autorisé."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Impossible d'afficher « %s », car aucun hôte « %s » n'a pas été trouvé. "
 "Vérifiez que l'orthographe ainsi que vos paramètres de proxy soient corrects."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Impossible d'afficher « %s ».  Vérifiez que vos paramètres de proxy sont "
 "corrects."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Impossible d'afficher « %s », car Nautilus ne reconnaît pas les emplacements "
+"%s."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Impossible d'afficher « %s », car Nautilus ne peut contacter le navigateur "
-"maître SMB.\n"
-"Veuillez vérifier que le serveur SMB fonctionne dans le réseau local."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"La recherche est indisponible pour le moment car vous n'avez pas d'index ou "
+"le service de recherche n'est pas lancé. Assurez vous d'avoir lancé le "
+"service de recherche Medusa, et si vous n'avez pas d'index que l'indexeur "
+"Medusa est en cours."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "La recherche est indisponible pour le moment car vous n'avez pas d'index ou "
 "le service de recherche n'est pas lancé. Assurez vous d'avoir lancé le "
 "service de recherche Medusa, et si vous n'avez pas d'index que l'indexeur "
 "Medusa est en cours."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Recherche indisponible"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ne peut pas afficher « %s »."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Impossible d'afficher l'emplacement"
 
@@ -7525,7 +7878,7 @@ msgstr "Va à l'emplacement spécifié par ce signet"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7533,7 +7886,7 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Mainteneur :\n"
@@ -7543,7 +7896,7 @@ msgstr ""
 "Jean-Michel Ardantz <jmardantz@ifrance.com>\n"
 "Christophe Fergeau <teuf@users.sourceforge.net>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7559,38 +7912,42 @@ msgstr "Revient de quelques pages"
 msgid "Go forward a number of pages"
 msgstr "Avance d'un certain nombre de pages"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Affiche cet emplacement avec « %s »"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Thèmes"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Créateur de CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID Application"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "L'ID de l'application de cette fenêtre."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Application"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Le NautilusApplication associé à cette fenêtre."
 
@@ -7626,6 +7983,258 @@ msgstr "Serveurs réseaux"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Certains des fichiers ne peuvent être ajoutés comme emblèmes car ce ne "
+#~ "semble pas être des images valides."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrique pour la vue matériel"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visionneur de matériel"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vue du matériel"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Voir en tant que Matériel"
+
+#~ msgid "hardware view"
+#~ msgstr "vue du matériel"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nom de l'icône pour la vue du matériel"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "résumé des informations matérielles"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K taille du cache"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu Go RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu Mo RAM"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Go"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu Mo"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "L'uptime est de %d jours, %d heures et %d minutes"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Aperçu du matériel"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ceci représente la page CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ceci représente la page RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ceci représente la page IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erreur lors de la copie vers « %s ».\n"
+#~ "\n"
+#~ "La destination n'a plus assez d'espace libre."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erreur lors de la création du lien dans « %s ».\n"
+#~ "\n"
+#~ "La destination n'a plus assez d'espace libre."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erreur lors du déplacement des éléments vers « %s ».\n"
+#~ "\n"
+#~ "Le dossier de destination est en lecture seule."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erreur lors du déplacement des éléments vers « %s ».\n"
+#~ "\n"
+#~ "Le disque de destination est en lecture seule."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erreur lors de la création de liens dans « %s ».\n"
+#~ "\n"
+#~ "L'écriture dans ce dossier vous est interdite."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erreur lors de la création des liens dans « %s ».\n"
+#~ "\n"
+#~ "Le disque de destination est en lecture seule."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » lors de la copie de « %s ».\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » lors du déplacement de « %s ».\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » lors de la suppression de « %s ».\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » durant la copie.\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » durant la création du lien.\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erreur « %s » lors de la suppression.\n"
+#~ "\n"
+#~ "Voulez-vous continuer ?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Impossible de copier dans la corbeille"
+
+#~ 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 ""
+#~ "L'action par défaut ne peut ouvrir « %s » car elle ne peut accéder aux "
+#~ "fichiers aux emplacements « %s ». Aucune autre action n'est disponible "
+#~ "pour visionner ce fichier. Si vous copiez ce fichier sur votre "
+#~ "ordinateur, vous pourrez peut être l'ouvrir."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Recherche les disques"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus recherche des dossiers corbeille dans vos disques."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Les %d éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
+#~ "Voulez-vous les supprimer immédiatement ?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d des éléments sélectionnés ne peuvent être déplacés dans la corbeille. "
+#~ "Voulez-vous supprimer ces %d éléments immédiatement ?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Le fichier que vous avez sélectionné n'est pas une image. Vous ne pouvez "
+#~ "utiliser que des images en local pour en faire des icônes personnalisés."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Désolé, mais le service de recherche Medusa n'est pas disponible car il "
+#~ "n'est pas installé"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Une fois par jour, vos fichiers ainsi que leur contenu sont indexés afin "
+#~ "de rendre vos recherches plus rapides. Vos fichiers sont en train d'être "
+#~ "indexés."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "Emplacement « %s » non valide. Vérifiez l'orthographe et essayez à "
+#~ "nouveau."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Désolé, mais « %s » n'est pas un fichier image reconnu !"
+
+#~ 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 ""
+#~ "Impossible d'afficher « %s », car Nautilus ne peut contacter le "
+#~ "navigateur maître SMB.\n"
+#~ "Veuillez vérifier que le serveur SMB fonctionne dans le réseau local."
+
+#~ msgid "file icon"
+#~ msgstr "fichier d'icône"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nom :"
+
 #~ msgid "Unknown"
 #~ msgstr "Inconnu"
 
@@ -7721,9 +8330,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Barre d'_outils"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "L'emplacement « %s » n'existe plus."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "va à l'emplacement inexistant"
 
@@ -7766,9 +8372,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Authentication Required"
 #~ msgstr "Authentification requise"
 
-#~ msgid "_Location:"
-#~ msgstr "_Emplacement :"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "La corbeille doit rester sur le bureau."
 
@@ -7814,9 +8417,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "E_xécuter les scripts lorsqu'ils sont cliqués"
 
@@ -8559,9 +9159,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Définir une couverture d'album"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Désolé, mais « %s » n'est pas un fichier image reconnu."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Sélectionnez une image pour la couverture de l'album :"
 
@@ -8679,9 +9276,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "(none)"
 #~ msgstr "(aucun)"
 
-#~ msgid "Themes"
-#~ msgstr "Thèmes"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Nouveau comportement de fenêtre"
 
@@ -8709,9 +9303,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Click Behavior"
 #~ msgstr "Comportement du clic"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Fichiers texte exécutables"
-
 #~ msgid "Show Options"
 #~ msgstr "Options d'affichage"
 
@@ -8873,9 +9464,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Impossible d'ajouter le thème"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Désolé, mais le thème « %s » n'a pas pu être installé."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Impossible d'installer le thème"
 
@@ -8894,9 +9482,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ "Désolé, vous ne pouvez pas supprimer le thème courant. Veuillez changer "
 #~ "de thème avant de le supprimer."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Désolé, mais ce thème n'a pas pu être supprimé !"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Ne peut supprimer le thème"
 
@@ -8924,9 +9509,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "No description available for the \"%s\" theme"
 #~ msgstr "Aucune information de disponible pour le theme « %s »"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Désolé, mais l'image %s n'a pas pu être installée comme emblème."
-
 #~ msgid "Delete"
 #~ msgstr "Supprimer"
 
@@ -8981,9 +9563,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%H:%M"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Ne peut charger %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Chargement de %s"
 
@@ -10250,9 +10829,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "est protégé en écriture, montage en lecture seule"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "n'est pas un périphérique bloc valide"
-
 #~ msgid "No medium found"
 #~ msgstr "Aucun média trouvé"
 
@@ -10266,9 +10842,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Root"
 #~ msgstr "Racine"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus est incapable de créer le dossier %s"
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "Pas de dossier Scripts"
 
@@ -10693,9 +11266,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "%s could not be found on the server"
 #~ msgstr "%s ne peut être trouvé sur le serveur"
 
-#~ msgid "%s is already installed"
-#~ msgstr "%s est déjà installé"
-
 #~ msgid "%s, which is newer, needs downgrade and downgrade is not enabled"
 #~ msgstr ""
 #~ "Je dois installer une ancienne version de %s mais ceci n'est pas autorisé"
@@ -10974,9 +11544,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ "Si vous voulez télécharger et installer ces paquets, cliquez sur "
 #~ "Continuer."
 
-#~ msgid "These packages are ready to be uninstalled:"
-#~ msgstr "Ces paquets sont prêts à être désinstallés :"
-
 #~ msgid "If you wish to uninstall these packages, click Continue."
 #~ msgstr "Si vous voulez désinstaller ces paquets, cliquez sur Continuer."
 
@@ -11473,9 +12040,6 @@ msgstr "Affiche vos serveurs réseaux dans le gestionnaire de fichiers Nautilus"
 #~ msgid "Prefs Box"
 #~ msgstr "Préférences"
 
-#~ msgid "Details"
-#~ msgstr "Détails"
-
 #~ msgid "Warning"
 #~ msgstr "Attention"
 
diff --git a/po/ga.po b/po/ga.po
index 6c69284f4..6435a1ddb 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-05-05 14:32+0100\n"
 "Last-Translator: Paul Duffy <dubhthach@frink.nuigalway.ie>\n"
 "Language-Team: Irish\n"
@@ -37,8 +37,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr ""
 
@@ -54,185 +54,117 @@ msgstr "Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+msgid "Couldn't remove emblem with name '%s'."
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
+msgstr "Scríos"
+
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
-msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+msgid "Couldn't rename emblem with name '%s'."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:240
+msgid ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
+msgstr "Scríos"
+
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "Scríos"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Ainm-Nua"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "Scríos"
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
+msgstr "Scríos"
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-msgid "The dragged text was not a valid file location."
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
+msgstr "Scríos"
+
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Glan amach"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Iarnra"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Radharc an Iarnra"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Féach mar Iarnra"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "radharc an iarnra"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K meid cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Suas le haighaidh %d lá, %d uair agus %d noimead"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Stair"
@@ -902,6 +834,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Iarnra"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr ""
@@ -1180,27 +1116,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1213,8 +1149,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1242,8 +1178,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1277,7 +1213,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1291,7 +1227,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1308,7 +1244,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1334,7 +1270,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1358,7 +1294,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1376,11 +1312,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1399,8 +1335,9 @@ msgid "Reverse sort order in new windows"
 msgstr "Oscáil ins an Fuinneog _Nua"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr ""
+#, fuzzy
+msgid "Show folders first in windows"
+msgstr "Oscáil ins an Fuinneog _Nua"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1436,7 +1373,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1444,30 +1381,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1508,8 +1445,9 @@ msgid "Use manual layout in new windows"
 msgstr "Dún gach fhuinneoga Nautilus"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr ""
+#, fuzzy
+msgid "Use tighter layout in new windows"
+msgstr "Dún gach fhuinneoga Nautilus"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1531,7 +1469,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1544,7 +1482,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1701,65 +1639,75 @@ msgstr ""
 msgid "on the desktop"
 msgstr "ar an deasc"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr ""
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr ""
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Bosca Bruscair"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Bog anseo"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Cóipeáil anseo"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Ceangall go dtí anseo"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Cuir mar an _Cúlra"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Cuir mar an cúlra le haighaidh g_ach comhadlann "
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Cuir mar an cúlra le haighaidh an comhadlann _seo"
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1768,18 +1716,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1798,282 +1752,255 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while copying to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while moving to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while moving items to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+msgid "Error while creating links in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Feadbh \"%s\" ag cruthaigh comhadlann nua"
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while deleting \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while linking."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Foléim"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Athchuir"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Athchuir gach rud"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "cengall go %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "cengall eile go %s"
@@ -2082,25 +2009,25 @@ msgstr "cengall eile go %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -2110,555 +2037,590 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr ""
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ""
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (cóip)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (cóip eile)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr ""
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Na Comhad cengalaite:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "ag Ceangall"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Feadbh \"%s\" ag cruthaigh comhadlann nua"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Feadbh ag cruthaigh comhadlann nua"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Feadbh ag cruthaigh comhadlann nua"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "comhadlann gan ainm"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Feadbh \"%s\" ag cruthaigh comhadlann nua"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Feadbh ag cruthaigh comhadlann nua"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Feadbh ag cruthaigh comhadlann nua"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "comhad amhain"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Ag Scríos comhadaí"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Na Comhad a scríos tú:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 #, fuzzy
 msgid "Deleting"
 msgstr "Scríos"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Ag ullamhaigh chun na comhad a scíos"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Glan an Bosca Bruscair"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Ag ullmhaigh chun an Bosca Bruscair a glanadh..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Folamh"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (cóip)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (cóip)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (cóip).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (cóip)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (cóip).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (cóip).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (cóip).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (cóip).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (cóip)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (cóip)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (cóip eile)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (cóip eile)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (cóip eile).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (cóip uimhir a 3)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (cóip uimhir a 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (cóip eile).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (cóip uimhir a 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (cóip uimhir a 13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (cóip uimhir a 14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (cóip uimhir a 13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (cóip uimhir a 14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (cóip uimhir a 21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (cóip uimhir a 22)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (cóip uimhir a 21).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (cóip uimhir a 22).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (cóip uimhir a 23)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (cóip uimhir a 23).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (cóip uimhir a 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (cóip uimhir a 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (cóip uimhir a 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (cóip uimhir a 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (cóip uimhir a 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (cóip uimhir a 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (cóip uimhir a 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (cóip uimhir a 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (cóip uimhir a 100000000000000).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (cóip uimhir a 10)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (cóip uimhir a 11)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (cóip uimhir a 10).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (cóip uimhir a 11).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (cóip uimhir a 10)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (cóip uimhir a 12).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (cóip uimhir a 110)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (cóip uimhir a 111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (cóip uimhir a 110).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (cóip uimhir a 111).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (cóip uimhir a 122)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (cóip uimhir a 123)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (cóip uimhir a 122).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (cóip uimhir a 123).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (cóip uimhir a 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (cóip uimhir a 124).txt"
 
@@ -2677,64 +2639,64 @@ msgstr "foo (cóip uimhir a 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "inniu ag 00:00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "inniu ag %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "Inniu ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "inniu ag %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "inniu, 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "inniu, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "inniu"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "inné ag 00:00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "inné ag %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "inné ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "inné ag %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "inné ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "inné, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "inné"
 
@@ -2743,151 +2705,151 @@ msgstr "inné"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Dé Ceadaoin, M.Fómhair 00 0000 ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Dé Luin, D.Fómhair 00 0000 ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Dé Luin, D.Fómhair 00 0000 ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "D.Fómhair 00 0000 ag 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "D.Fómhair 00 0000, 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 IN"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 mír"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 comhadlann"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 comhad"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "mír amhain"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "comhadlann amhain"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "comhad amhain"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u mír"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u comhadlann"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u comhad"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "saghas gan aithne"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "saghas MIME gan aithne"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "gan aithne"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "ríomhchlár"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "ceangall"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "ceangall (briste)"
 
@@ -3009,11 +2971,13 @@ msgid "Search for files by file name and file properties"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Radharc na Dealbhanna"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr ""
@@ -3157,139 +3121,140 @@ msgstr "Baile do %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Barr an Cuntar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "dealbh an comhad"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "Tóg gach rud"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr ""
 
@@ -3382,120 +3347,120 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr ""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Ainm"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stádas"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "P_ioc"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Críochnaithe"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr ""
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Oscail le Clár eile"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Pioc Clár chun oscaul \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Oscail le Radharceoí eile"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Pioc radharc le haighaidh \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 #, fuzzy
 msgid "No Application Associated"
 msgstr "ÃÂ�it"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "ÃÂ�it"
@@ -3504,144 +3469,163 @@ msgstr "ÃÂ�it"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
+#: libnautilus-private/nautilus-program-chooser.c:1610
 #, fuzzy
-msgid "Associate Application"
+msgid "_Associate Application"
 msgstr "ÃÂ�it"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "ÃÂ�it"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "ÃÂ�it"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "ÃÂ�it"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Ag Oscail \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
+msgstr "Feadbh ag rith an Clár"
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Feadbh ag rith an Clár"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3887,14 +3871,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Eagar"
@@ -4093,95 +4069,103 @@ msgstr "Cúlra"
 msgid "Empty Trash"
 msgstr "Glan an Bosca Bruscair"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "Oscáil %d Fhuinneoga?"
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
 #, c-format
-msgid "Open %d Windows?"
-msgstr "Oscáil %d Fhuinneoga?"
+msgid "This will open %d separate windows."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Scríos?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "dealbh an comhad"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "comhadlann amhain roghnó"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, fuzzy, c-format
 msgid "%d folders selected"
 msgstr "Roghnóir Dathanna"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" roghnaithe (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -4193,7 +4177,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4202,107 +4186,119 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Scríos Anois?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Scríos ó Bosca Bruscair? "
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Rith \"%s\" ar aon ceann de na rud atá roghnach"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Faoi na Script"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4324,176 +4320,179 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Dí_chuir"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Oscáil i Fhuinneog Nua"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Oscáil %d i Fhuinneoga Nua"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Comhadlann Baile"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Comhadlann Baile"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Scríos as an Bosca Bruscair "
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "C_uir sa Bosca Bruscair"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Scríos"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Dé_an Ceangallaí"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Dé_an Ceangall"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Folmhaigh an Bruscar"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Gea_rr Comhad"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Gea_rr Comhadaí"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Ceangall atá briste"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Rith nó Taispeántas?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Taispeántas"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Rith i _Teirminéal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Taispeántas"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Rith"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Ag Oscail \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Cealaigh an Oscailte?"
 
@@ -4514,107 +4513,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Feadbh ag Taispeántas an Comhadlann"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 #, fuzzy
 msgid "Cancel Rename?"
 msgstr "Cealaigh"
@@ -4675,122 +4694,130 @@ msgstr ""
 msgid "Restore Icon's Original Si_ze"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Ainm an Comhad"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Meid"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Saghas"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "tada"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "mír amhain, le meid %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4800,189 +4827,189 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Bunúsach"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "na Ai_nm:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "Ai_nm"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Saghas:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Meid:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "�it:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "saghas MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Léigh"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "Sc_ríobh"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Rith"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "úinear na Comhad:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "úinear na Comhad:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "grupa _Comhad"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "grupa Comhad:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "úinear:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupa:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Radharc Téasc:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr ""
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
+msgstr "Nautilus"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "dealbh an comhad"
@@ -5000,81 +5027,99 @@ msgid "Search Results"
 msgstr "Cuardaigh"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Feadbh ar rith an Cuardach"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
+msgstr "Feadbh ag cruthaigh comhadlann nua"
+
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5083,53 +5128,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Cén h'�it"
 
@@ -5138,7 +5203,7 @@ msgstr "Cén h'�it"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Foilsigh i Fuinneog _Nua"
@@ -5149,7 +5214,7 @@ msgstr "_Foilsigh i Fuinneog _Nua"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, fuzzy, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Foilsigh i %d Fuinneoga _Nua"
@@ -5158,13 +5223,15 @@ msgstr "Foilsigh i %d Fuinneoga _Nua"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr ""
 
@@ -5178,12 +5245,12 @@ msgid "Create L_auncher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr ""
 
@@ -5202,7 +5269,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr ""
@@ -5225,179 +5292,197 @@ msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Comhadlann Baile"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Comhadlann Baile"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
-msgid "Create a symbolic link for each selected item"
+msgid "Create a new empty folder inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:10
-msgid "D_uplicate"
+msgid "Create a symbolic link for each selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:12
+msgid "D_uplicate"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Oscail l_e"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Oscáil i Fhuinneog Nua"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Roghnaigh g_ach Comhad"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "dealbh an comhad"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Folamh"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formaid"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Oscáil"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Ainm N_ua"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr ""
 
@@ -5485,44 +5570,55 @@ msgstr ""
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -5547,47 +5643,54 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Ceangall go dtí an Séan Deasc"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "Ceangall go dtí an Séan Deasc"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5599,7 +5702,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5607,7 +5710,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5636,31 +5739,40 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -5694,32 +5806,42 @@ msgstr ""
 msgid "Find Them!"
 msgstr "Cuardaigh iad!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "Ai_nm"
+msgid "_Location:"
+msgstr "�it:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -5919,6 +6041,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5929,24 +6059,21 @@ msgstr "Oscail le %s"
 msgid "Open with..."
 msgstr "Oscail le..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5954,114 +6081,124 @@ msgstr ""
 msgid "Go To:"
 msgstr ""
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+msgid "Do you want to view %d locations?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�it:"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Ealu as Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Thosnú Nautilus arís."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "úinear"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Glan an Stair"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Scríos"
 
@@ -6094,7 +6231,6 @@ msgid "Close _All Windows"
 msgstr "Dún g_ach Fhuinneoga"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Dún gach fhuinneoga Nautilus"
@@ -6117,110 +6253,120 @@ msgid "Forward"
 msgstr "Chun Cionn"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
+msgid "Go to the next visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
+msgid "Go to the previous visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Baile"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 #, fuzzy
 msgid "Location _Bar"
 msgstr "ÃÂ�it"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 #, fuzzy
 msgid "Reload"
 msgstr "Athlód"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stad"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Suas"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Leabharmarc Nu_a"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Riomh"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Leabharmarcanna"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Glan an Stair"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Barr an Cuntar"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Eagar na Leabharmarcanna"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "Chun C_ionn"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Téigh"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Baile"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "ÃÂ�_it"
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Pána ar an _Thaobh"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Bosca Bruscair"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "S_uas"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Féach"
 
@@ -6238,29 +6384,33 @@ msgstr "Féach mar..."
 msgid "File Browser: %s"
 msgstr "úinear na Comhad:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Theip ag an Pána atá ag an Barra-Thaobh"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Pána ar an Thaobh"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6294,153 +6444,182 @@ msgstr ""
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
+msgstr "dealbh an comhad"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr ""
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr ""
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr ""
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 #, fuzzy
 msgid "Color _name:"
 msgstr "Roghnóir Dathanna"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 #, fuzzy
 msgid "Color _value:"
 msgstr "Roghnóir Dathanna"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
-msgid "Select a Category:"
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
 msgstr ""
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2059
 #, fuzzy
 msgid "C_ancel Remove"
 msgstr "Cealaigh"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 #, fuzzy
 msgid "Colors:"
 msgstr "Dún"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 #, fuzzy
 msgid "_Remove a Pattern..."
 msgstr "Scríos"
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 #, fuzzy
 msgid "_Remove a Color..."
 msgstr "Scríos"
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 #, fuzzy
 msgid "_Remove an Emblem..."
 msgstr "Scríos"
@@ -6827,32 +7006,37 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Dún g_ach Fhuinneoga"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr " Dún an Pána ar an Thaobh"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "ÃÂ�_it"
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "Radharc an comhad nó an comhadlann láithreach"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr ""
 
@@ -6882,9 +7066,11 @@ msgstr "Theip ar an Radharc"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6892,85 +7078,106 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
-msgid "Content View"
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:987
+msgid "Content View"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Radharc an comhad nó an comhadlann láithreach"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr ""
 
@@ -6982,7 +7189,7 @@ msgstr ""
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Cópceart (C) 1999-2001 Eazel, Teo."
 
@@ -6990,11 +7197,11 @@ msgstr "Cópceart (C) 1999-2001 Eazel, Teo."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Pól Ó Dubhthaigh (dubhthach@frink.nuigalway.ie)"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7008,39 +7215,43 @@ msgstr "Dul ar ais cupla leathnach"
 msgid "Go forward a number of pages"
 msgstr "Dul chun cinn cupla leathnach"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 msgid "Network"
 msgstr ""
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Ponca"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr ""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 #, fuzzy
 msgid "Application ID"
 msgstr "ÃÂ�it"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 #, fuzzy
 msgid "Application"
 msgstr "ÃÂ�it"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7076,6 +7287,46 @@ msgstr ""
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#~ msgid "Hardware view"
+#~ msgstr "Radharc an Iarnra"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Féach mar Iarnra"
+
+#~ msgid "hardware view"
+#~ msgstr "radharc an iarnra"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K meid cache"
+
+#~ 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 "Suas le haighaidh %d lá, %d uair agus %d noimead"
+
+#~ msgid "file icon"
+#~ msgstr "dealbh an comhad"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Ai_nm"
+
 #~ msgid "Unknown"
 #~ msgstr "Gan aithne"
 
diff --git a/po/gl.po b/po/gl.po
index 14a8cacf1..cc0e11b90 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2000-10-07 19:16+0200\n"
 "Last-Translator: Jesús Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -57,191 +57,121 @@ msgid "Nautilus Emblem view"
 msgstr "Vista de árbore do Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Non foi posible eliminar o tema"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
+#: components/emblem/nautilus-emblem-view.c:205
 #, fuzzy
-msgid "Couldn't remove emblem"
+msgid "Couldn't Remove Emblem"
 msgstr "Non foi posible eliminar o tema"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Non foi posible instalar o emblema"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
+#: components/emblem/nautilus-emblem-view.c:241
 #, fuzzy
-msgid "Couldn't rename emblem"
+msgid "Couldn't Rename Emblem"
 msgstr "Non foi posible instalar o emblema"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "Eliminar un emblema..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 #, fuzzy
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Seleccione unha imaxe para o novo emblema:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Renomear"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "Engadir un novo emblema..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Non foi posible instalar a imaxe %s como un emblema."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
 #, fuzzy
-msgid "Couldn't add emblems"
+msgid "Couldn't Add Emblems"
 msgstr "Non foi posible engadir o tema"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
+msgstr "Non foi posible instalar a imaxe %s como un emblema."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
 #, fuzzy
-msgid "Couldn't add emblem"
+msgid "Couldn't Add Emblem"
 msgstr "Non foi posible engadir o tema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Harddware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visualizador do hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vista do hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Ver como hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vista de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nome da icona para a vista de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "resume da información do hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, fuzzy, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s tamaño de caché"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "O tempo activo é %d días, %d horas, %d minutos"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Resume do hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historia"
@@ -933,6 +863,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Harddware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacional"
@@ -1223,30 +1157,30 @@ msgid "Desktop trash icon name"
 msgstr "Restaurar nome anterior"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 #, fuzzy
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Creando a fiestra de propiedades"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr ""
@@ -1257,8 +1191,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1285,10 +1219,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "O lixo ten que ficar no escritorio."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1321,10 +1256,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "O lixo ten que ficar no escritorio."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1336,7 +1272,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1353,7 +1289,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1379,7 +1315,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1403,7 +1339,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1423,11 +1359,11 @@ msgstr "Usar o Nautilus para debuxar o escritorio"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Usar o seu cartafol persoal como o escritorio"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1447,7 +1383,7 @@ msgstr "Abrir cada ficheiro ou cartafol nunha fiestra distinta"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Amosar a barra de ferramentas nas novas fiestras"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1487,7 +1423,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1495,30 +1431,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1564,7 +1500,7 @@ msgstr "Pechar tódalas fiestras do Nautilus"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Abrir cada elemento seleccionado nunha nova fiestra"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1589,7 +1525,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 #, fuzzy
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Mostrar a conta dos elementos nos cartafoles"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1604,7 +1540,7 @@ msgstr "Mostrar unha reducción para os ficheiros de imaxe"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Restablecer o fondo do escritorio"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1769,73 +1705,86 @@ msgstr ""
 msgid "on the desktop"
 msgstr "no escritorio"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Non se pode borrar o tema actual"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "Non se pode borrar o tema actual"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Lixo"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 #, fuzzy
 msgid "_Move here"
 msgstr "Ir para alí"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 #, fuzzy
 msgid "_Copy here"
 msgstr "Ir para alí"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 #, fuzzy
 msgid "_Link here"
 msgstr "Ir para alí"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Restablecer o fondo"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 #, fuzzy
 msgid "Set as background for _all folders"
 msgstr "Abrir outra fiestra do Nautilus para a localización amosada"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 #, fuzzy
 msgid "Set as background for _this folder"
 msgstr "Abrir outra fiestra do Nautilus para a localización amosada"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Non foi posible instalar o tema \"%s\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Ten que especificar unha palabra chave non baleira para o novo emblema."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Non foi posible instalar o emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1845,18 +1794,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "\"%s\" é unha palabra chave xa existente. Escolla un nome diferente."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Non foi posible instalar o emblema"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1875,22 +1830,28 @@ msgstr "De:"
 msgid "To:"
 msgstr "A:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Erro ó mover."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Erro ó mover.\n"
 "\n"
 "Non é posible mover \"%s\" porque está nun disco de só lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Erro ó borrar."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1899,22 +1860,17 @@ msgstr ""
 "Non é posible borrar \"%s\" porque non ten permisos para modificar o "
 "cartafol do nivel superior."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Erro ó borrar.\n"
 "\n"
 "Non é posible borrar \"%s\" porque está nun disco de só lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1923,24 +1879,25 @@ msgstr ""
 "Non é posible mover \"%s\" porque non ten permisos para modificar o cartafol "
 "do nivel superior."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Erro ó mover."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Erro ó mover.\n"
 "\n"
 "Non é posible mover \"%s\" porque está nun disco de só lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Erro ó mover.\n"
@@ -1948,287 +1905,234 @@ msgstr ""
 "Non é posible mover \"%s\" ó lixo porque non ten permisos para modificar o "
 "cartafol do nivel superior."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Erro ó copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Erro ó copiar.\n"
 "\n"
 "Non é posible copiar \"%s\" porque non ten permisos para lelo."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ó copiar a \"%s\".\n"
-"\n"
-"Non hai espacio dabondo no destino."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Erro ó copiar."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Erro ó mover a \"%s\".\n"
 "\n"
 "Non hai espacio dabondo no destino."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro creando a ligazón en \"%s\".\n"
-"\n"
-"Non espacio dabondo no destino."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Erro ó mover."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Erro ó ligar."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Erro ó copiar a \"%s\".\n"
 "\n"
 "Non ten permisos para escribir neste cartafol."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Erro ó copiar a \"%s\".\n"
 "\n"
 "O disco de destino é de só lectura."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ó mover elementos a \"%s\".\n"
-"\n"
-"Non ten permisos para escribir neste cartafol."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ó mover elementos a \"%s\".\n"
-"\n"
-"O disco de destino é de só lectura."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ó crear as ligazóns en \"%s\".\n"
-"\n"
-"Non ten permisos para escribir neste cartafol."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Erro ó mover."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ó crear as ligazóns en \"%s\".\n"
-"\n"
-"O disco de destino é de só lectura."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó copiar \"%s\".\n"
-"\n"
-"¿Desexa continuar?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Erro ó ligar."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Erro ó copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Erro \"%s\" ó mover \"%s\".\n"
+"Erro \"%s\" ó mover.\n"
 "\n"
 "¿Desexa continuar?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó crear unha ligazón a \"%s\".\n"
-"\n"
-"¿Desexa continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Erro ó mover."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Erro \"%s\" ó borrar \"%s\".\n"
+"Erro \"%s\" ó crear unha ligazón a \"%s\".\n"
 "\n"
 "¿Desexa continuar?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó copiar.\n"
-"\n"
-"¿Desexa continuar?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Erro ó borrar."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó mover.\n"
-"\n"
-"¿Desexa continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Erro ó copiar."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó ligar.\n"
-"\n"
-"¿Desexa continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Erro ó mover."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ó borrar.\n"
-"\n"
-"¿Desexa continuar?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Erro ó ligar."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Erro ó borrar."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Erro ó copiar."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Erro ó mover."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Erro ó ligar."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Erro ó borrar."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Omitir"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Retentar"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Ir á localización inicial"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Ir á localización inicial"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Non se pode substituír o ficheiro."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "O ficheiro \"%s\" xa existe.\n"
 "\n"
 "¿Desexa sobrescribilo?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflicto ao copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Substituír"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Substituír todos"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "outra ligazón a %s"
@@ -2237,25 +2141,25 @@ msgstr "outra ligazón a %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dª ligazón a %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dª ligazón a %s"
@@ -2265,571 +2169,610 @@ msgstr "%dª ligazón a %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (outra copia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ª copia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ª copia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (outra copia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dª copia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d descoñecido"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Movendo ficheiros ó lixo"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Ficheiros eliminados:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Movendo"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para mover ó lixo..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Movendo ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Ficheiros movidos:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Preparando para mover..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Acabando de mover..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Creando ligazóns ós ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Ficheiros ligados:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Ligando"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Preparando para crear ligazóns..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Acabando de crear ligazóns..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copiando ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Ficheiros copiados:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copiando"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Preparando para copiar..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Non pode copiar elementos ó lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Non se pode copiar ó lixo"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Non pode mover este cartafol do lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Non pode copiar este cartafol de lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Non se pode alterar a localización do lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Non se pode copiar o lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Crear un novo cartafol baleiro dentro deste cartafol"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Non se pode mover a si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Non se pode copiar a si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Non pode copiar un ficheiro sobre si mesmo."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Non se pode copiar sobre si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Erro creando o novo cartafol.\n"
 "\n"
 "Non ten permisos para escribir no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Erro creando o novo cartafol.\n"
 "\n"
 "Non hai espacio no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erro \"%s\" creando o novo cartafol."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Erro creando o novo cartafol"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Erro creando o novo cartafol"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "cartafol sen título"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Erro \"%s\" creando o novo cartafol."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Erro creando o novo cartafol"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Erro creando o novo cartafol"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 ficheiro"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Borrando ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Ficheiros borrados:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Borrando"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Preparando para borrar ficheiros..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Baleirando o lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparando para baleirar o lixo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "¿Está seguro de que quere borrar permanentemente os elementos do lixo?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 #, fuzzy
 msgid "_Empty"
 msgstr "Baleiro"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "chou"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "chou (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".chou.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".chou (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "chou chou"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "chou chou (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "chou.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "chou (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "chou chou.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "chou chou (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "chou chou.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "chou chou (copia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "chou...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "chou.. (copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "chou..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "chou... (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "chou. (copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "chou. (outra copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "chou (outra copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "chou (outra copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "chou (3ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "chou (3ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "chou chou (outra copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "chou chou (3ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "chou (13ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "chou (14ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "chou (13ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "chou (14ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "chou (21ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "chou (22ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "chou (21ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "chou (22ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "chou (23ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "chou (23ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "chou (24ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "chou (24ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "chou (25ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "chou (25ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "chou chou (24ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "chou chou (25ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "chou chou (24ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "chou chou (25ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "chou chou (100000000000000ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "chou (10ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "chou (11ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "chou (10ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "chou (11ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "chou (12ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "chou (12ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 #, fuzzy
 msgid "foo (110th copy)"
 msgstr "chou (10ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 #, fuzzy
 msgid "foo (111th copy)"
 msgstr "chou (11ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 #, fuzzy
 msgid "foo (110th copy).txt"
 msgstr "chou (11ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 #, fuzzy
 msgid "foo (111th copy).txt"
 msgstr "chou (11ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 #, fuzzy
 msgid "foo (122nd copy)"
 msgstr "chou (22ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 #, fuzzy
 msgid "foo (123rd copy)"
 msgstr "chou (23ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 #, fuzzy
 msgid "foo (122nd copy).txt"
 msgstr "chou (12ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 #, fuzzy
 msgid "foo (123rd copy).txt"
 msgstr "chou (13ª copia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 #, fuzzy
 msgid "foo (124th copy)"
 msgstr "chou (14ª copia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 #, fuzzy
 msgid "foo (124th copy).txt"
 msgstr "chou (12ª copia).txt"
@@ -2849,64 +2792,64 @@ msgstr "chou (12ª copia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hoxe ás 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hoxe ás %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hoxe ás 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hoxe ás %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hoxe, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hoxe, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hoxe"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "onte ás 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "onte ás %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "onte ás 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "onte ás %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "onte, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "onte,s %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "onte"
 
@@ -2915,133 +2858,133 @@ msgstr "onte"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Mércores, 00 de setembro de 0000 ás 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %d de %B de %Y ás %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Lun, 00 out 0000 ás 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %d %b %Y ás %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Lun, 00 out 0000 ás 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y ás %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Out 0000 ás 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y ás %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 out 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%d/%-m/%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementos"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 cartafoles"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 ficheiros"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 elemento"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementos"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u cartafoles"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u ficheiros"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementos"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipo descoñecido"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tipo MIME descoñecido"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "descoñecido"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3051,7 +2994,7 @@ msgstr ""
 "probablemente signifique que o ficheiro gnome-vfs.keys non está no lugar "
 "correcto ou que non se atopa por algunha outra razón."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3060,11 +3003,11 @@ msgstr ""
 "Non se atopou a descrición do tipo mime \"%s\" (o ficheiro é \"%s\"), por "
 "favor, informe na lista de correo de gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "ligazón"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "ligazón (estragada)"
 
@@ -3193,11 +3136,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Buscar ficheiros polo seu nome e as súas propiedades"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vista de iconas"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vista de lista"
@@ -3341,155 +3286,160 @@ msgstr "Persoal de %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Ordenador"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr ""
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 #, fuzzy
 msgid "editable text"
 msgstr "Meditación"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 #, fuzzy
 msgid "highlighted for selection"
 msgstr "a sección"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 #, fuzzy
 msgid "The selection rectangle"
 msgstr "Facer que a icona seleccionada sexa alongable"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 #, fuzzy
 msgid "Frame Text"
 msgstr "Pegar texto"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 #, fuzzy
 msgid "Selection Box Color"
 msgstr "Seleccione unha cor para engadir:"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "Ir á localización inicial"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "Seleccionar Todo"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Opacity of the highlight for selected icons"
 msgstr "a sección"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar este elemento onde o deixou? Isto estragará a disposición manual "
 "almacenada."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar estes elementos onde os deixou? Isto estragará a disposición manual "
 "almacenada."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar este elemento onde o deixou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Esta carpeta usa colocación automática. ¿Quere trocar a colocación manual e "
 "deixar estes elementos onde os deixou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "¿Trocar a Colocación Manual?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Trocar"
 
@@ -3582,75 +3532,75 @@ msgstr "É o predeterminado para os elementos \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "É o predeterminado para tódolos elementos \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modificar \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Incluír no menú para os elementos \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Usar como predeterminado para os elementos \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, fuzzy, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Incluír no menú para os elementos \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, fuzzy, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Usar como predeterminado para os elementos \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Non incluír no menú para os elementos \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nome"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 #, fuzzy
 msgid "C_hoose"
 msgstr "Pechar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Feito"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 #, fuzzy
 msgid "_Modify..."
 msgstr "Modificar..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipos de ficheiros e programas"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 #, fuzzy
 msgid "_Go There"
 msgstr "Ir para alí"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -3659,51 +3609,51 @@ msgstr ""
 "Pode configurar que programas se ofrecen para cada tipo de ficheiro no "
 "centro de control de GNOME."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 #, fuzzy
 msgid "Open with Other Application"
 msgstr "Outras aplicacións..."
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 #, fuzzy
 msgid "Open with Other Viewer"
 msgstr "Abrir con outro"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, fuzzy, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Escolla unha vista para \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Non hai ningún visualizador dispoñible para \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Sen visualizador dispoñible"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, fuzzy, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 #, fuzzy
 msgid "No Application Associated"
 msgstr "Sen aplicacións dispoñibles"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "Sen aplicacións dispoñibles"
@@ -3712,147 +3662,171 @@ msgstr "Sen aplicacións dispoñibles"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
+#: libnautilus-private/nautilus-program-chooser.c:1610
 #, fuzzy
-msgid "Associate Application"
+msgid "_Associate Application"
 msgstr "[O tipo do ficheiro é] unha aplicación"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "Sen aplicacións dispoñibles"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Escolla unha aplicación coa que abrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "Sen aplicacións dispoñibles"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "[O tipo do ficheiro é] unha aplicación"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
+"Non foi posible mostrar \"%s\", xa que Nautilus non pode manexar "
+"localizacións do tipo %s:."
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Non se pode abrir a localización"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
+"Non foi posible mostrar \"%s\", xa que Nautilus non pode manexar "
+"localizacións do tipo %s:."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrindo \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Non pode executar comandos nun sitio remoto por consideracións de seguridade."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Non é posible executar ligazóns remotas"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
 #, fuzzy
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+msgid "There was an error launching the application."
 msgstr "Desculpe, pero houbo un erro lendo %s."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
 #, fuzzy
-msgid "Error launching application"
+msgid "Error Launching Application"
 msgstr "[O tipo do ficheiro é] unha aplicación"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Mostrar texto nas iconas"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4103,14 +4077,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementos que teñen \"medusa\" no nome e son cartafoles"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Buscando nos discos"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus está buscando nos discos os cartafoles de lixo."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Editar"
@@ -4313,99 +4279,109 @@ msgstr "Fondo"
 msgid "Empty Trash"
 msgstr "Baleirar o lixo"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Isto abrirá %d fiestras separadas. ¿Está seguro de que quere facer isto?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "¿Abrir %d fiestras?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "¿Está seguro de que quere borrar permanentemente \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Isto abrirá %d fiestras separadas. ¿Está seguro de que quere facer isto?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "¿Está seguro de que quere borrar permanentemente \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "¿Está seguro de que quere eliminar permanentemente os %d elementos "
 "seleccionados?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Borrar permanentemente tódolos elementos seleccionados"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "¿Borrar?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Seleccionar unha categoría:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Patróns"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionado"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 cartafol seleccionado"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d cartafoles seleccionados"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (contendo 0 elementos)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contendo 1 elemento)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contendo %d elementos)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contendo un total de 0 elementos)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contendo un total de 1 elemento)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contendo un total de %d elementos)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementos seleccionados (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "outro elemento seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d outros elementos seleccionados (%s)"
@@ -4417,7 +4393,7 @@ msgstr "%d outros elementos seleccionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4426,115 +4402,126 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "O cartafol \"%s\" contén máis ficheiros dos que pode manexar o Nautilus. "
 "Algúns deles non serán mostrados."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Demasiados ficheiros"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Non é posible mover \"%s\" ó lixo. ¿Quere borralo inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Non é posible mover ó lixo os %d elementos seleccionados. ¿Quere borralos "
-"inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Non é posible mover \"%s\" ó lixo. ¿Quere borralo inmediatamente?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"Non é posible mover ó lixo %d dos elementos seleccionados. ¿Quere borrar "
-"eses %d elementos inmediatamente?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Non é posible mover \"%s\" ó lixo. ¿Quere borralo inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "¿Borrar inmediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "¿Está seguro de que quere borrar \"%s\" permanentemente do lixo?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "¿Está seguro de que quere eliminar permanentemente do lixo os %d elementos "
 "seleccionados?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "¿Borrar do lixo"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar \"%s\" para abrir o elemento seleccionado"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Outras _aplicacións..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Unha _aplicación..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Outro _visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Un _visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4556,17 +4543,17 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4574,7 +4561,7 @@ msgstr ""
 "Os %d elementos seleccionados serán movidos cando seleccione o comando de "
 "pegar ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4582,171 +4569,177 @@ msgstr ""
 "Os %d elementos seleccionados serán copiados cando seleccione o comando de "
 "pegar ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Non hai nada no portarretallos para pegar."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Erro ó montar"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Erro ó desmontar"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Erro ó montar"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 #, fuzzy
 msgid "E_ject"
 msgstr "Execución"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 #, fuzzy
 msgid "_Unmount Volume"
 msgstr "Desmontar volume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Abrir nunha nova fiestra"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Abrir en %d nova_s fiestras"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Novo cartafol"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Novo cartafol"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 #, fuzzy
 msgid "_Delete from Trash"
 msgstr "Borrar do _lixo"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Borrar permanentemente tódolos elementos seleccionados"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Mo_ve to Trash"
 msgstr "Mover ao lixo"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mover tódolos elementos seleccionados ó Lixo"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 #, fuzzy
 msgid "_Delete"
 msgstr "Borrar"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 #, fuzzy
 msgid "Ma_ke Links"
 msgstr "Crear _ligazóns"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 #, fuzzy
 msgid "Ma_ke Link"
 msgstr "Crear ligazón"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Co_rtar ficheiro"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Co_rtar ficheiros"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Co_piar ficheiro"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Co_piar ficheiros"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5848
 #, fuzzy
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr ""
+"Non se pode usar esta ligazón, xa que non ten destino. ¿Quere pór esta "
+"ligazón no lixo?"
+
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
 msgstr ""
 "Non se pode usar esta ligazón, xa que non ten destino. ¿Quere pór esta "
 "ligazón no lixo?"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, fuzzy, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Non se pode usar esta ligazón, xa que o seu destino \"%s\" non existe. "
 "¿Quere pórr esta ligazón no lixo?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Ligazón estragada"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" é un ficheiro de texto executable. ¿Desexa executalo, ou visualizar "
 "os seus contidos"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Ficheiros de texto executables"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "¿Executar ou visualizar?"
 
-#: src/file-manager/fm-directory-view.c:5430
-#, fuzzy
-msgid "_Display"
-msgstr "Visualizar"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 #, fuzzy
 msgid "Run in _Terminal"
 msgstr "Novo terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+#, fuzzy
+msgid "_Display"
+msgstr "Visualizar"
+
+#: src/file-manager/fm-directory-view.c:5928
 #, fuzzy
 msgid "_Run"
 msgstr "Executar"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Abrindo \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "¿Cancelar a apertura?"
 
@@ -4767,28 +4760,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Non foi posible visualizar tódolos contidos de \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Non foi posible determinar os permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erro visualizando o cartafol"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "O nome \"%s\" xa está a ser usado neste cartafol. Utilice un nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "Non existe \"%s\" neste cartafol. ¿Se cadra foi movido ou borrado?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Non ten os permisos necesarios para renomear \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4797,63 +4795,78 @@ msgstr ""
 "O nome \"%s\" non é válido porque contén o carácter \"/\". Utilice un nome "
 "diferente."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "O nome \"%s\" non é válido. Utilice un nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Non foi posible mudar o nome de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Non foi posible renomear \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Non foi posible eliminar ese tema"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Erro ó renomear"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Non ten os permisos necesarios para mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Non foi posible mudar o grupo de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Non foi posible mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Non foi posible determinar os permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Erro establecendo o grupo"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Non foi posible mudar o dono de \"%s\" porque está nun disco de só lectura"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Non foi posible mudar o dono de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Non foi posible determinar os permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Erro establecendo o dono"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4861,21 +4874,26 @@ msgstr ""
 "Non foi posible mudar os permisos de \"%s\" porque está nun disco de só "
 "lectura"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Non foi posible mudar os permisos de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Non foi posible determinar os permisos de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Erro establecendo os permisos"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renomeando \"%s\" a \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "¿Cancelar o renomeamento?"
 
@@ -4935,126 +4953,143 @@ msgstr "Restaurar os tamaños orixinais das iconas"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Restaurar o tamaño orixinal da icona"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apuntando a \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 #, fuzzy
 msgid "File name"
 msgstr "Dono do ficheiro:"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data de modificación"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Máis dunha imaxe"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
+"O ficheiro que soltou non é unha imaxe.  Só pode usar imaxes locais para as "
+"iconas personalizadas"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"O ficheiro que soltou non é unha imaxe.  Só pode usar imaxes locais para as "
+"iconas personalizadas"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Só imaxes locais"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
 "O ficheiro que soltou non é unha imaxe.  Só pode usar imaxes locais para as "
 "iconas personalizadas"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Só imaxes"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "Propiedades de %s"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propiedades de %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "¿Cancelar a mudanza do grupo?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Mudando o grupo"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "¿Cancelar a mudanza do dono?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Mudando o dono"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nada"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ilexible"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 elemento, con tamaño %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementos, cun total de %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(algúns contidos son ilexibles)"
 
@@ -5064,212 +5099,213 @@ msgstr "(algúns contidos son ilexibles)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Contidos:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Básica"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "Nome"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lugar:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "Volume de DVD"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 #, fuzzy
 msgid "Free space:"
 msgstr "Freestyle"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 #, fuzzy
 msgid "Link target:"
 msgstr "Ir para alí"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 #, fuzzy
 msgid "MIME type:"
 msgstr "Tipo MIME"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Accedido:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 #, fuzzy
 msgid "_Select Custom Icon..."
 msgstr "Seleccionar unha icona personalizada..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 #, fuzzy
 msgid "_Remove Custom Icon"
 msgstr "Quitar a icona personalizada"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 #, fuzzy
 msgid "_Read"
 msgstr "Lectura"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 #, fuzzy
 msgid "_Write"
 msgstr "Escritura"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 #, fuzzy
 msgid "E_xecute"
 msgstr "Execución"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 #, fuzzy
 msgid "Set _user ID"
 msgstr "Establecer o ID de usuario"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 #, fuzzy
 msgid "Special flags:"
 msgstr "Flags especiais:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 #, fuzzy
 msgid "Set gro_up ID"
 msgstr "Establecer o ID de grupo"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 #, fuzzy
 msgid "_Sticky"
 msgstr "Pegañento"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permisos"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Vostede non é o dono, polo que non pode cambiar estes permisos."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Dono do ficheiro:"
+
+#: src/file-manager/fm-properties-window.c:2900
 #, fuzzy
 msgid "File owner:"
 msgstr "Dono do ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 #, fuzzy
 msgid "_File group:"
 msgstr "Grupo do ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 #, fuzzy
 msgid "File group:"
 msgstr "Grupo do ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 #, fuzzy
 msgid "Text view:"
 msgstr "Vista de texto"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 #, fuzzy
 msgid "Number view:"
 msgstr "Números"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 #, fuzzy
 msgid "Last changed:"
 msgstr "Última modificación:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Non foi posible determinar os permisos de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "Non foi posible determinar os permisos de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, fuzzy, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
 msgstr "Desculpe, pero houbo un erro lendo %s."
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3348
 #, fuzzy
-msgid "Couldn't show help"
+msgid "Couldn't Show Help"
 msgstr "Non foi posible engadir o tema"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Creando a fiestra de propiedades"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Seleccione unha icona:"
@@ -5288,67 +5324,102 @@ msgid "Search Results"
 msgstr "Resultados da busca"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"O servicio de busca Medusa non está dispoñible porque non está instalado."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "O servicio de busca Medusa non está dispoñible."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Servicio de busca non dispoñible"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "A busca seleccionada é posterior ao índice do seu sistema. A procura non "
 "devolverá resultados.  Pode crear un novo índice executando \"medusa-indexd"
 "\" como root na liña de comandos."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Busca de elementos demasiado novos"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Tódolos ficheiros indexados no ordenador coinciden cos criterios "
+"seleccionados. Pode revisar as escollas ou engadir máis criterios para "
+"reducir os resultados."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Tódolos ficheiros indexados no ordenador coinciden cos criterios "
 "seleccionados. Pode revisar as escollas ou engadir máis criterios para "
 "reducir os resultados."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Erro realizando a busca"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Erro ao ler o índice de ficheiros"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Ocorreu un erro cargando os contidos desta busca: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5356,25 +5427,23 @@ msgstr ""
 "Non é posible acceder neste intre a ese índice, polo que se realizará unha "
 "busca máis lenta que non o necesita."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
-"sistema. Non é posible acceder a ese índice neste intre."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Buscas rápidas non dispoñibles"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Buscas de contidos non dispoñibles"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5383,57 +5452,98 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Buscas indexadas non dispoñibles"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Para facer unha busca de contidos, requírese un índice dos ficheiros do "
+"sistema. Non é posible acceder a ese índice neste intre."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Para facer unha busca rápida, requírese un índice dos ficheiros do sistema. "
 "Este índice non está dispoñible neste momento. Pode crear un novo executando "
 "\"medusa-indexd\" como root na liña de comandos.  Ata que o índice completo "
 "estea dispoñible, as procuras levarán varios minutos."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
+"Para facer unha busca rápida, requírese un índice dos ficheiros do sistema. "
+"Este índice non está dispoñible neste momento. Pode crear un novo executando "
+"\"medusa-indexd\" como root na liña de comandos.  Ata que o índice completo "
+"estea dispoñible, as procuras levarán varios minutos."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "As buscas rápidas non están dispoñibles no seu ordenador"
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "As buscas rápidas non están dispoñibles no seu ordenador"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Buscas rápidas non dispoñibles"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Onde"
 
@@ -5442,7 +5552,7 @@ msgstr "Onde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5453,7 +5563,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5462,15 +5572,21 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "O Nautilus atopou máis resultados de busca dos que pode mostrar. Algúns "
 "elementos coincidentes non aparecerán."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"O Nautilus atopou máis resultados de busca dos que pode mostrar. Algúns "
+"elementos coincidentes non aparecerán."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Demasiadas coincidencias"
 
@@ -5486,13 +5602,13 @@ msgid "Create L_auncher"
 msgstr "Panel de novas"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 #, fuzzy
 msgid "Create a new launcher"
 msgstr "Crear unha nova cor:"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Borrar tódolos elementos do lixo"
 
@@ -5514,7 +5630,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 #, fuzzy
 msgid "Use _Default Background"
@@ -5539,62 +5655,72 @@ msgstr "Escolla outro visualizador para ver o elemento seleccionado"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Non é posible ler o cartafol"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Non é posible ler o cartafol"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Crear un novo cartafol baleiro dentro deste cartafol"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Crear un novo cartafol baleiro dentro deste cartafol"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Crear unha ligazón simbólica para cada elemento seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 #, fuzzy
 msgid "D_uplicate"
 msgstr "Duplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Borrar tódolos elementos seleccionados, sen movelos ao lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada elemento seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
 msgid "Edit Launcher"
 msgstr "Panel de novas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 #, fuzzy
 msgid "Format the selected volume"
 msgstr "O Nautilus non puido montar o volume seleccionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Medi_a Properties"
 msgstr "Propiedades de %s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "O Nautilus non puido montar o volume seleccionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Mover ou copiar os ficheiros seleccionados previamente por un comando de "
 "cortar ou copiar ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5603,140 +5729,149 @@ msgstr ""
 "Mover ou copiar os ficheiros seleccionados previamente por un comando de "
 "cortar ou copiar ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Abrir _con"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Abrir cada elemento seleccionado nunha nova fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Abrir nunha nova fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir o elemento seleccionado nesta fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Preparar os ficheiros seleccionados para seren copiados cun comando de pegar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Preparar os ficheiros seleccionados para seren movidos cun comando de pegar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 #, fuzzy
 msgid "Protect the selected volume"
 msgstr "O Nautilus non puido montar o volume seleccionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 #, fuzzy
 msgid "Rename selected item"
 msgstr "Renomear a icona seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 #, fuzzy
 msgid "Reset View to _Defaults"
 msgstr "Predeterminado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Executar ou xestionar os scripts de ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Seleccionar _tódolos ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Patróns"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Seleccionar tódolos elementos desta fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Seleccionar tódolos elementos desta fiestra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Show media properties for the selected volume"
 msgstr "Ver ou modificar as propiedades dos elementos seleccionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 #, fuzzy
 msgid "Unmount the selected volume"
 msgstr "O Nautilus non puido montar o volume seleccionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Use the default background for this location"
 msgstr "Abrir outra fiestra do Nautilus para a localización amosada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Ver ou modificar as propiedades dos elementos seleccionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Co_piar ficheiro"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 #, fuzzy
 msgid "_Format"
 msgstr "Esquecer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Desmontar volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Abrir o cartafol de scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Pegar ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "cartafol sen título"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 #, fuzzy
 msgid "_Properties"
 msgstr "Propiedades de %s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renomear"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 #, fuzzy
 msgid "_Scripts"
 msgstr "Scripts"
@@ -5824,7 +5959,12 @@ msgstr "_Manualmente"
 msgid "Indexing is %d%% complete."
 msgstr "O indexado está completo ó %d%%."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Os ficheiros foron indexados por última vez o %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5832,41 +5972,48 @@ msgstr ""
 "Unha vez cada día, os ficheiros e os contidos textuais son indexados, de "
 "xeito que as buscas sexan máis rápidas."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Estado da indexación"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Os ficheiros foron indexados por última vez o %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Unha vez cada día, os ficheiros e os contidos textuais son indexados, de "
-"xeito que as buscas sexan máis rápidas. Neste intre os ficheiros están a ser "
-"indexados."
+"xeito que as buscas sexan máis rápidas."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Non hai un índice dos ficheiros neste momento."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Non hai un índice dos ficheiros neste momento."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "O servicio de busca Medusa non está dispoñible."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5890,32 +6037,37 @@ msgstr "Amosar o estado da _indexación"
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Non foi posible crear o cartafol necesario"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "O Nautilus non puido crear o directorio %s."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus non puido crear o cartafol necesario \"%s\". Antes de executar o "
 "Nautilus, cree este cartafol, ou modifique os permisos de xeito que o "
 "Nautilus poida crealo."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Non foi posible crear os cartafoles necesarios"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "O Nautilus non puido crear o directorio %s."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5926,21 +6078,25 @@ msgstr ""
 "Antes de executar o Nautilus, cre estes cartafoles, ou modifique os permisos "
 "de xeito que o Nautilus poida crealos."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "Fiestras e escritorio"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "Fiestras e escritorio"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5952,7 +6108,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5960,7 +6116,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5989,12 +6145,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Non é posible usar agora o Nautilus, por mor dun erro inesperado."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6003,7 +6159,7 @@ msgstr ""
 "Non é posible usar agora o Nautilus, por mor dun erro inesperado do OAF ó "
 "tentar rexistrar o servidor de vistas do xestor de ficheiros."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6014,7 +6170,7 @@ msgstr ""
 "tentar localizar a fábrica. Pode que o problema se resolva matando o oafd e "
 "reiniciando o Nautilus."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6025,6 +6181,15 @@ msgstr ""
 "tentar localizar un obxecto da shell. Se mata o oafd e reinicia o Nautilus, "
 "podería arranxar o problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, fuzzy, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr "Desculpe, pero houbo un erro lendo %s."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -6061,35 +6226,45 @@ msgstr "Menos opcións"
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Non se pode mover a si mesmo"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "non é un dispositivo de bloques válido"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" non é unha localización válida. Comprobe a escrita e probe de novo."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Non se atopou \"%s\". Comprobe a ortografía e tente de novo."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Netraverse"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "Nome"
+msgid "_Location:"
+msgstr "Lugar:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6310,6 +6485,17 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"O ficheiro que soltou non é unha imaxe.  Só pode usar imaxes locais para as "
+"iconas personalizadas"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6320,25 +6506,23 @@ msgstr "Abrir con %s"
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Panel de novas"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Baleirar o lixo"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6346,116 +6530,127 @@ msgstr ""
 msgid "Go To:"
 msgstr "Ir a:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "¿Desexa ver estes %d lugares en fiestras separadas?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "¿Ver en múltiples fiestras?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Non se pode abrir a localización"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Facer unha serie rápida de auto-comprobacións."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Crear a fiestra inicial coa xeometría indicada."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "XEOMETR�A"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Saír do Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reiniciar o Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "Dono do ficheiro:"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check non se pode usar con outras opcións.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart non se pode usar con URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry non se pode usar con máis dun URI.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "¿Está seguro de que quere borrar permanentemente \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 #, fuzzy
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "¿Está seguro de que quere que o Nautilus esqueza os lugares visitados?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 #, fuzzy
 msgid "Clear History"
 msgstr "¿Esquecer a historia?"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "A localización \"%s\" xa non existe."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -6489,7 +6684,6 @@ msgid "Close _All Windows"
 msgstr "Pechar _tódalas fiestras"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Pechar tódalas fiestras do Nautilus"
@@ -6512,116 +6706,128 @@ msgid "Forward"
 msgstr "Adiante"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "[Elementos que son ]cartafoles"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Ir á seguinte localización visitada"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Ir á anterior localización visitada"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 #, fuzzy
 msgid "Go to the trash folder"
 msgstr "[Elementos que son ]cartafoles"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Inicio"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 #, fuzzy
 msgid "Location _Bar"
 msgstr "Agochar a barra de _localización"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 #, fuzzy
 msgid "Reload"
 msgstr "Lectura"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Buscar ficheiros neste ordenador"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Agochar barra de e_stado"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Parar"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Arriba"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Engadir marcador"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "A_trás"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 #, fuzzy
 msgid "_Clear History"
 msgstr "_Esquecer a historia"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Ordenador"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 #, fuzzy
 msgid "_Edit Bookmarks"
 msgstr "_Editar os marcadores..."
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "A_diante"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ir"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Inicio"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lugar..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Paneis laterais"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 #, fuzzy
 msgid "_Trash"
 msgstr "Lixo"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 #, fuzzy
 msgid "_Up"
 msgstr "Arriba"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vista"
 
@@ -6640,30 +6846,34 @@ msgstr "Ver como..."
 msgid "File Browser: %s"
 msgstr "Dono do ficheiro:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "O panel lateral fallou"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 #, fuzzy
 msgid "Side Pane"
 msgstr "Paneis laterais"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6701,160 +6911,192 @@ msgstr "Engadir novo... "
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Non foi posible borrar o patrón %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Non foi posible borrar o patrón"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Non foi posible borrar o emblema %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Non foi posible eliminar o tema"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Crear un novo emblema:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 #, fuzzy
 msgid "_Keyword:"
 msgstr "Palabra chave:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 #, fuzzy
 msgid "_Image:"
 msgstr "Imaxe:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Seleccione unha imaxe para o novo emblema:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Crear unha nova cor:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 #, fuzzy
 msgid "Color _name:"
 msgstr "Nome da cor:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 #, fuzzy
 msgid "Color _value:"
 msgstr "Valor da cor:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" non é un nome de ficheiro válido."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Non indicou un nome de ficheiro válido."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Non foi posible instalar o patrón"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Non é unha Imaxe"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Non foi posible instalar o patrón %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 #, fuzzy
 msgid "Select an image file to add as a pattern"
 msgstr "Seleccione unha imaxe para engadir como patrón:"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Ten que especificar un nome non baleiro para a nova cor."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Non foi posible instalar a cor"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 #, fuzzy
 msgid "Select a color to add"
 msgstr "Seleccione unha cor para engadir:"
 
-#: 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' non é un ficheiro de imaxe usable."
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Desculpe, mais '%s' non é un ficheiro de imaxe usable."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr ""
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Seleccionar unha categoría:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 #, fuzzy
 msgid "C_ancel Remove"
 msgstr "Cancelar a eliminación"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 #, fuzzy
 msgid "_Add a New Pattern..."
 msgstr "Engadir un novo patrón..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 #, fuzzy
 msgid "_Add a New Color..."
 msgstr "Engadir unha nova cor..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 #, fuzzy
 msgid "_Add a New Emblem..."
 msgstr "Engadir un novo emblema..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Prema nun patrón para eliminalo"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Prema nunha cor para eliminala"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Prema nun emblema para eliminalo"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patróns:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Cores:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemas:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 #, fuzzy
 msgid "_Remove a Pattern..."
 msgstr "Eliminar un patrón..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 #, fuzzy
 msgid "_Remove a Color..."
 msgstr "Eliminar unha cor..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 #, fuzzy
 msgid "_Remove an Emblem..."
 msgstr "Eliminar un emblema..."
@@ -7251,34 +7493,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Pechar _tódalas fiestras"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Panel lateral de notas"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Ordenador"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "[Elementos que son ]cartafoles"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lugar..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Elementos que son ]cartafoles"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "Patróns"
@@ -7311,9 +7558,11 @@ msgstr ""
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -7321,93 +7570,120 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Escolla unha aplicación coa que abrir \"%s\"."
+
+#: src/nautilus-window-manage-views.c:987
 #, fuzzy
 msgid "Content View"
 msgstr "Contidos:"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 #, fuzzy
 msgid "View of the current file or folder"
 msgstr "[Elementos que son ]cartafoles"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Non se atopou \"%s\". Comprobe a ortografía e tente de novo."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Non foi posible cargar %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Non foi posible cargar %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Non foi posible amosar \"%s\", xa que o Nautilus non pode determinar que "
 "tipo de ficheiro é."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus non instalou un visualizador capaz de mostrar \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Non foi posible mostrar \"%s\", xa que Nautilus non pode manexar "
 "localizacións do tipo %s:."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Non foi posible mostrar \"%s\", porque fallou a autenticación."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Non foi posible mostrar \"%s\", porque o acceso foi denegado."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr "Non foi posible mostrar \"%s\", porque fallou a autenticación."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "Non foi posible mostrar \"%s\", porque fallou a autenticación."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Non foi posible mostrar \"%s\", xa que Nautilus non pode manexar "
+"localizacións do tipo %s:."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Non foi posible amosar \"%s\", xa que o Nautilus non pode determinar que "
-"tipo de ficheiro é."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Busca non dispoñible"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus non pode amosar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Non se pode amosar a localización"
 
@@ -7419,7 +7695,7 @@ msgstr "Ir para o lugar indicado por este marcador"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7427,11 +7703,11 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Créditos da traducción"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 #, fuzzy
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
@@ -7450,40 +7726,45 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Visualizar esta localización con \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "[Elementos que son ]cartafoles"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 #, fuzzy
 msgid "Application ID"
 msgstr "Aplicacións"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 #, fuzzy
 msgid "Application"
 msgstr "Aplicacións"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7524,6 +7805,218 @@ msgstr "Netraverse"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visualizador do hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vista do hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Ver como hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "vista de hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nome da icona para a vista de hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "resume da información do hardware"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s tamaño de caché"
+
+#~ 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 "O tempo activo é %d días, %d horas, %d minutos"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Resume do hardware"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro ó copiar a \"%s\".\n"
+#~ "\n"
+#~ "Non hai espacio dabondo no destino."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro creando a ligazón en \"%s\".\n"
+#~ "\n"
+#~ "Non espacio dabondo no destino."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ó mover elementos a \"%s\".\n"
+#~ "\n"
+#~ "Non ten permisos para escribir neste cartafol."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ó mover elementos a \"%s\".\n"
+#~ "\n"
+#~ "O disco de destino é de só lectura."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ó crear as ligazóns en \"%s\".\n"
+#~ "\n"
+#~ "Non ten permisos para escribir neste cartafol."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ó crear as ligazóns en \"%s\".\n"
+#~ "\n"
+#~ "O disco de destino é de só lectura."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó copiar \"%s\".\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó mover \"%s\".\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó borrar \"%s\".\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó copiar.\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó ligar.\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ó borrar.\n"
+#~ "\n"
+#~ "¿Desexa continuar?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Non se pode copiar ó lixo"
+
+#~ msgid "Searching Disks"
+#~ msgstr "Buscando nos discos"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus está buscando nos discos os cartafoles de lixo."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Non é posible mover ó lixo os %d elementos seleccionados. ¿Quere borralos "
+#~ "inmediatamente?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Non é posible mover ó lixo %d dos elementos seleccionados. ¿Quere borrar "
+#~ "eses %d elementos inmediatamente?"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "O servicio de busca Medusa non está dispoñible porque non está instalado."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Unha vez cada día, os ficheiros e os contidos textuais son indexados, de "
+#~ "xeito que as buscas sexan máis rápidas. Neste intre os ficheiros están a "
+#~ "ser indexados."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" non é unha localización válida. Comprobe a escrita e probe de novo."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' non é un ficheiro de imaxe usable."
+
+#, fuzzy
+#~ 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 ""
+#~ "Non foi posible amosar \"%s\", xa que o Nautilus non pode determinar que "
+#~ "tipo de ficheiro é."
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Nome"
+
 #~ msgid "Unknown"
 #~ msgstr "Descoñecido"
 
@@ -7630,13 +8123,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Amosar a barra de _ferramentas"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "A localización \"%s\" xa non existe."
-
-#, fuzzy
-#~ msgid "_Location:"
-#~ msgstr "Lugar:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "O lixo ten que ficar no escritorio."
 
@@ -7682,9 +8168,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #, fuzzy
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "Executar os ficheiros ó premelos"
@@ -7749,10 +8232,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgstr "Non hai unha descrición dispoñible para o tema \"%s\""
 
 #, fuzzy
-#~ msgid "Themes"
-#~ msgstr "_Times"
-
-#, fuzzy
 #~ msgid "New Window Behavior"
 #~ msgstr "Nova fiestra"
 
@@ -7783,9 +8262,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "Click Behavior"
 #~ msgstr "Comportamento do clic"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Ficheiros de texto executables"
-
 #, fuzzy
 #~ msgid "Show Options"
 #~ msgstr "Amosar/Agochar opcións"
@@ -7832,10 +8308,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgstr "Mostrar texto nas iconas"
 
 #, fuzzy
-#~ msgid "Show text in icons for local files"
-#~ msgstr "Mostrar texto nas iconas"
-
-#, fuzzy
 #~ msgid "Always show the number of items in folders"
 #~ msgstr "Mostrar a conta dos elementos nos cartafoles"
 
@@ -7922,9 +8394,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Non foi posible engadir o tema"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Non foi posible instalar o tema \"%s\"."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Non foi posible instalar o tema"
 
@@ -7941,9 +8410,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgstr ""
 #~ "Non pode eliminar o tema actual. Mude a outro tema antes de eliminar este."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Non foi posible eliminar ese tema"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Non foi posible eliminar o tema"
 
@@ -8433,9 +8899,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Definir Carátula"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Desculpe, mais '%s' non é un ficheiro de imaxe usable."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Seleccione unha imaxe para a carátula do álbum:"
 
@@ -8472,9 +8935,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "Sorry, but there was an error reading %s."
 #~ msgstr "Desculpe, pero houbo un erro lendo %s."
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Non foi posible instalar a imaxe %s como un emblema."
-
 #~ msgid "Delete"
 #~ msgstr "Borrar"
 
@@ -8513,9 +8973,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%H:%M, %x"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Non foi posible cargar %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Cargando %s"
 
@@ -9525,9 +9982,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "está protexido para escritura, montando só para lectura"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "non é un dispositivo de bloques válido"
-
 #~ msgid "No medium found"
 #~ msgstr "Non se atopou o medio"
 
@@ -9539,9 +9993,6 @@ msgstr "Fábrica para a shell e o xestor de ficheiros Nautilus"
 #~ msgid "scripts"
 #~ msgstr "scripts"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "O Nautilus non puido crear o directorio %s."
-
 #~ msgid "Software _Catalog"
 #~ msgstr "_Catálogo de software"
 
diff --git a/po/he.po b/po/he.po
index 27a456fae..83e4e7288 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus.HEAD.he\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-09 12:42+0300\n"
 "Last-Translator: Gil 'Dolfin' Osher <dolfin@rpg.org.il>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() נכשל."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "סמלי�"
 
@@ -55,188 +55,125 @@ msgid "Nautilus Emblem view"
 msgstr "תצוגת סמלי נ�וטילוס"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "ל� ניתן להסיר סמל"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "ל� ניתן להסיר �ת הסמל ע� הש� '%s'.  זה כנר�ה כיוון שזהו סמל קבוע, ול� �חד "
 "שהוספת בעצמך."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "ל� ניתן להסיר סמל"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "ל� ניתן לשנות ש� סמל"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "ל� ניתן לשנות �ת ש� הסמל ע� הש� '%s'.  זה כנר�ה כיוון שזהו סמל קבוע, ול� �חד "
 "שהוספת בעצמך."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "ל� ניתן לשנות ש� סמל"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "שינוי ש� סמל"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "הכנס ש� חדש לסמל המוצג:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "שנה ש�"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "הוסף סמלי�..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "הכנס ש� מת�ר ליד כל סמל.  ש� זה יופיע במקומות שוני� כדי לזהות �ת הסמל."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "הכנס ש� מת�ר ליד הסמל.  ש� זה יופיע במקומות שוני� כדי לזהות �ת הסמל."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr "חלק מהקבצי� ל� התוספו לסמלי�, כיוון שה� ל� נר�ו כתמונות תקניות."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "מצטער, �ך התמונה %s ל� יכולה להיות מותקנת כסמל."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "הקובץ '%s' �יננו תמונה תקנית."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "ל� ניתן להוסיף סמלי�"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "�ף �חת מהתמונות ל� נוספה כסמל, כיוון שהן ל� נר�ו כתמונות תקניות."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "הטקסט הנגרר �יננו מיקו� קובץ תקין."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "ל� ניתן להוסיף סמל"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "הקובץ '%s' �יננו תמונה תקנית."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "הקובץ הנגרר �יננו תמונה תקנית."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "מחק"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "יצרן לתצוגת החומרה"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "חומרה"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "מציג חומרה"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "תצוגת חומרה"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "הצג כחומרה"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "תצוגת חומרה"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ש� של סמל לתצוגת החומרה"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "סיכו� של המידע על החומרה"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"מעבד %s\n"
-"%s MHz\n"
-"זיכרון מטמון %s K"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "זיכרון פנימי %lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "זיכרון פנימי %lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "זמן הריצה הו� %d ימי�, %d שעות ו %d דקות"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "סקירת חומרה"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "זהו שומר מקו� לעמוד המעבד."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "זהו שומר מקו� לעמוד הזיכרון הפנימי."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "זהו שומר מקו� לעמוד ה IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "היסטוריה"
@@ -902,6 +839,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "חומרה"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "בין ל�ומי"
@@ -1186,28 +1127,18 @@ msgid "Desktop trash icon name"
 msgstr "ש� הסמל ל�שפה על שולחן העבודה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"ספריות מעל לגודל זה יקוצצו לסביבות הגודל הזה. המטרה של זה, הי� להימנע מהעמסת "
-"הזיכרון והריגת נ�וטילוס ל� במכוון ע� ספריות כבדות. ערך שלילי מציין ש�ין "
-"גבול. הגבול משוער בהת�� לקרי�ה של נתחי הספריות."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "�פשר דגלי� 'מיוחדי�' בתיבת דו-השיח העדפות הקובץ"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "ש� הקובץ לרקע הספרייה ברירת המחדל. בשימוש רק �� background_set הו� �מת."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1215,6 +1146,18 @@ msgstr ""
 "ש� הקובץ לרקע חלונית הצד ברירת המחדל. בשימוש רק �� side_pane_background_set "
 "הו� �מת."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"ספריות מעל לגודל זה יקוצצו לסביבות הגודל הזה. המטרה של זה, הי� להימנע מהעמסת "
+"הזיכרון והריגת נ�וטילוס ל� במכוון ע� ספריות כבדות. ערך שלילי מציין ש�ין "
+"גבול. הגבול משוער בהת�� לקרי�ה של נתחי הספריות."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "הסתר סימניות ברירת מחדל בתפריט הסימניות"
@@ -1224,9 +1167,10 @@ msgid "Home icon visible on desktop"
 msgstr "סמל בית נר�ה על שולחן העבודה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "�� נקבע כ�מת, נ�וטילוס יר�ה רק ספריות בחלונית הצד עץ. �חרת הו� יר�ה ג� "
 "ספריות וג� קבצי�."
@@ -1257,9 +1201,10 @@ msgstr ""
 "בתיבת הד-שיח העדפות קובץ."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "�� נקבע כ�מת, �זי נ�וטילוס יציג ספריות לפני הצגת קבצי� בתצוגת הסמלי� והרשימה."
 
@@ -1298,8 +1243,9 @@ msgstr ""
 "�� נקבע כ�מת, �זי נ�וטילוס יר�ה רק �ת הסימניות של המשתמש בתפריט הסימניות."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "�� נקבע כ�מת, �זי נ�וטילוס ישתמש בספריית הבית של המשתמש כשולחן העבודה. �� "
@@ -1315,9 +1261,10 @@ msgstr ""
 "קבצי� המסתיימי� בטילדה (~) נחשבי� כקבצי גיבוי."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "�� נקבע כ�מת, �זי קבצי� נסתרי� יוצגו במנהל הקבצי�. קבצי� נסתרי� ה� �ו קבצי "
 "נקודה �ו שה� רשומי� בקובץ .hidden של הספרייה."
@@ -1338,8 +1285,9 @@ msgid ""
 msgstr "�� נקבע כ�מת, �זי סמל המקשר ל�שפה יוש� על שולחן העבודה."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "�� זה נקבע כ�מת, סמל המקשר לספריית הבית יוש� על שולחן העבודה."
 
@@ -1370,7 +1318,8 @@ msgstr ""
 "ממויני� לפי גודל, במקו� להיות ממויני� בסדר עולה ה� יומינו בסדר יורד."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "�� �מת, הסמלי� יסודרו צפוף יותר כברירת מחדל בחלונות חדשי�."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1397,7 +1346,8 @@ msgid "List of possible captions on icons"
 msgstr "רשימה של כותרות �פשריי� לסמלי�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "מספר קבצי� מקסימלי המטופלי� בספרייה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1417,11 +1367,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "נ�וטילוס מטפל בציור שולחן העבודה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "נ�וטילוס משתמש בתיקיית הבית של המשתמש כשולחן העבודה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "הצג רק ספריות בסרגל הצד עץ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1441,7 +1393,8 @@ msgid "Reverse sort order in new windows"
 msgstr "הפוך �ת סדר המיון בחלונות חדשי�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "הצג ספריות קוד� בחלונות"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1477,10 +1430,11 @@ msgstr ""
 "�זי לעול� ל� תנוגן תצוגה מקדימה."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1490,12 +1444,13 @@ msgstr ""
 "\"never\" �זי לעול� �ין לטרוח לקרו� �ת תוכן התצוגה המקדימה."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "מתי להציג תמונות כדוגמיות. �� נקבע כ \"always\" �זי תמיד יווצרו תצוגות "
 "מקדימות, ג� �� הספרייה הי� על שרת מרוחק. �� נקבע כ \"local_only\" �זי יוצגו "
@@ -1503,10 +1458,11 @@ msgstr ""
 "דוגמיות לתמונות, רק יוצגו סמלי� כללי�."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "מתי להציג מספר פריטי� בספרייה. �� נקבע כ \"always\" �זי תמיד תציג ספירת "
@@ -1515,17 +1471,19 @@ msgstr ""
 "�ת ספירת הפריטי�."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "סדר ברירת המחדל של מיון הפריטי� בתצוגת הסמלי�. ערכי� �פשריי� ה� \"name\", "
 "\"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "סדר ברירת המחדל של מיון הפריטי� בתצוגת הרשימה. ערכי� �פשריי� ה� name, size, "
 "type, וג� modification_date."
@@ -1569,7 +1527,8 @@ msgid "Use manual layout in new windows"
 msgstr "השתמש בסידור ידני בחלונות חדשי�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "השתמש בסידור צמוד בחלונות חדשי�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1598,7 +1557,8 @@ msgstr ""
 "סמלי�)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "מתי להציג מספר פריטי� בספרייה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1610,7 +1570,8 @@ msgid "When to show thumbnails of image files"
 msgstr "מתי להציג תמונה מוקטנת של קבצי תמונה"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "ה�� רקע מות�� �ישית ברירת מחדל לספרייה נקבע."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1767,67 +1728,82 @@ msgstr "הפעל מחדש"
 msgid "on the desktop"
 msgstr "על שולחן העבודה"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "ל� ניתן למחוק כרך"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "ל� ניתן למחוק כרך"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "�שפה"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "ה_עבר לכ�ן"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "ה_עתק לכ�ן"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_קשר לכ�ן"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "קבע כ_רקע"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "ביטול"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "קבע כרקע ל_כל התיקיות"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "מצטער, �ך ל� ניתן להתקין �ת ערכת הנוש� \"%s\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "מצטער, �ך �תה חייב לציין ש� ל� ריק לסמל החדש."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "ל� הצליח להתקין סמל"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "מצטער, �ך ש� הסמל יכול להכיל רק �ותיות רווחי� ומספרי�."
@@ -1836,18 +1812,24 @@ msgstr "מצטער, ×�ך ש×� הסמל יכול להכיל רק ×�ותיות ר×
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "מצטער, �ך כבר קיי� סמל בש� \"%s\".  �נ� בחר עבורו ש� �חר."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "ל� הצליח להתקין סמל"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "מצטער, ל� ניתן לשמור סמל מות�� �ישית."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "מצטער, ל� ניתן לשמור ש� סמל מות�� �ישית."
 
@@ -1866,22 +1848,28 @@ msgstr "מ:"
 msgid "To:"
 msgstr "ל:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "שגי�ה במהלך הזזה."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "שגי�ה בהעברה.\n"
 "\n"
 "\"%s\" ל� ניתן להזזה כיוון שזהו דיסק לקרי�ה בלבד."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "שגי�ה במהלך מחיקה."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1889,22 +1877,17 @@ msgstr ""
 "\n"
 "\"%s\" ל� ניתן למחיקה כיוון ש�ין לך הרש�ות לערוך �ותו �ת תיקיית ההורה שלו."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "שגי�ה במחיקה.\n"
 "\n"
 "\"%s\" ל� ניתן למחיקה כיוון שזהו דיסק לקרי�ה בלבד."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1912,24 +1895,25 @@ msgstr ""
 "\n"
 "\"%s\" ל� ניתן להזזה כיוון ש�ין לך הרש�ות לערוך �ותו �ו �ת תיקיית ההורה שלו."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "שגי�ה במהלך הזזה."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "שגי�ה בזמן העברה.\n"
 "\n"
 "\"%s\" ל� ניתן להזזה כיוון שהו� �ו תיקיית ההורה נמצ�י� ביעד."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "שגי�ה בהעברה.\n"
@@ -1937,295 +1921,244 @@ msgstr ""
 "\"%s\" ל� ניתן להזזה ל�שפה כיוון ש�ין לך הרש�ות לערוך �ותו �ו �ת תיקיית "
 "ההורה שלו."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "שגי�ה במהלך העתקה."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "שגי�ה בהעתקה.\n"
 "\n"
 "\"%s\" ל� יכול להיות מועתק כיוון ש�ין לך הרש�ות לקרו� �ותו."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"שגי�ה בהעתקה �ל \"%s\".\n"
-"\n"
-"�ין מספיק מקו� פנוי ביעד."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "שגי�ה במהלך העתקה."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "שגי�ה בהזזה �ל \"%s\".\n"
 "\n"
 "�ין מספיק מקו� פנוי ביעד."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"שגי�ה ביצירת קישור ב \"%s\".\n"
-"\n"
-"�ין מספיק מקו� פנוי ביעד."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "שגי�ה במהלך הזזה."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "שגי�ה במהלך קישור."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "שגי�ה בהעתקה �ל \"%s\".\n"
 "\n"
 "�ין לך הרש�ות לכתוב לתיקייה זו."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "שגי�ה בהעתקה �ל \"%s\".\n"
 "\n"
 "דיסק היעד הו� לקרי�ה בלבד."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"שגי�ה בהזזת פריטי� �ל \"%s\".\n"
-"\n"
-"�ין לך הרש�ות לכתוב לתיקייה זו."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"שגי�ה בהזזת פריטי� �ל \"%s\".\n"
-"\n"
-"דיסק היעד הו� לקרי�ה בלבד."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"שגי�ה ביצירת קישורי� ב \"%s\".\n"
-"\n"
-"�ין לך הרש�ות לכתוב לתיקייה זו."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "שגי�ה במהלך הזזה."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"שגי�ה ביצירת קישורי� ב \"%s\".\n"
-"\n"
-"דיסק היעד הו� לקרי�ה בלבד."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך העתקת \"%s\".\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "שגי�ה במהלך קישור."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "שגי�ה במהלך העתקה."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"שגי�ה \"%s\" במהלך הזזת \"%s\".\n"
+"שגי�ה \"%s\" במהלך הזזה\n"
 "\n"
 "ה�� ברצונך להמשיך?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך יצירת קישור ל \"%s\".\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "שגי�ה במהלך הזזה."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"שגי�ה \"%s\" במהלך מחיקת \"%s\".\n"
+"שגי�ה \"%s\" במהלך יצירת קישור ל \"%s\".\n"
 "\n"
 "ה�� ברצונך להמשיך?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך העתקה\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "שגי�ה במהלך מחיקה."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך הזזה\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "שגי�ה במהלך העתקה."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך קישור\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "שגי�ה במהלך הזזה."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"שגי�ה \"%s\" במהלך מחיקה\n"
-"\n"
-"ה�� ברצונך להמשיך?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "שגי�ה במהלך קישור."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "שגי�ה במהלך מחיקה."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "שגי�ה במהלך העתקה."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "שגי�ה במהלך הזזה."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "שגי�ה במהלך קישור."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "שגי�ה במהלך מחיקה."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "דלג"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "נסה שנית"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "ל� ניתן להשלי� �ת הפעולה המצוינת."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ל� יכול לעבור למיקו� החדש, כיוון שהש� כבר בשימוש פריט מיוחד של� יכול "
 "להתחלף �ו להימחק.\n"
 "\n"
 "�� עדיין ברצונך להעביר �ת \"%s\", שנה �ת שמו ונסה שנית."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "ל� ניתן להשלי� �ת הפעולה המצוינת."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ל� יכול להיות מועתק למיקו� החדש, כיוון שהש� כבר בשימוש פריט מיוחד של� "
 "יכול להתחלף �ו להימחק.\n"
 "\n"
 "�� עדיין ברצונך להעתיק �ת \"%s\", שנה �ת שמו ונסה שנית."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "ל� ניתן להחליף קובץ."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "הקובץ \"%s\" כבר קיי�.\n"
 "\n"
 "ה�� ברצונך להחליפו?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "התנגשות בזמן העתקה"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "החלף"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "החלף הכל"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "קישור ל %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "קישור נוסף ל %s"
@@ -2234,25 +2167,25 @@ msgstr "קישור נוסף ל %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "קישור מספר %d ל %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "קישור מספר %d ל %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "קישור מספר %d ל %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "קישור מספר %d ל %s"
@@ -2262,561 +2195,600 @@ msgstr "קישור מספר %d ל %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (העתק)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (העתק נוסף)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ")"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (העתק)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (העתק נוסף)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (העתק מספר %d)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (העתק מספר %d)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (העתק מספר %d)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " (העתק מספר"
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (העתק מספר %d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus ל� ידוע %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "זורק קבצי� ל�שפה"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "קבצי� שנזרקו החוצה:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "מעביר"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "מתכונן לזריקה ל�שפה..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "מעביר קבצי�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "קבצי� שהועברו:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "מתכונן להעברה..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "מסיי� העברה..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "יוצר קישורי� לקבצי�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "קבצי� קושרו:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "מקשר"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "מתכונן ליצירת קישורי�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "מסיי� יצירת קישורי�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "מעתיק קבצי�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "קבצי� שהועתקו:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "מעתיק"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "מתכונן להעתקה..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "ל� ניתן להעתיק פריטי� ל�שפה."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "ל� ניתן להעתיק ל�שפה"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "ל� ניתן להעביר �ת תיקיית ה�שפה הזו."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "�תה ל� יכול להעתיק �ת תיקיית ה�שפה הזו."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "ל� ניתן לשנות �ת מיקו� ה�שפה"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ל� ניתן להעתיק �שפה"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "�תה ל� יכול להעביר תיקייה לתוך עצמה."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "�תה ל� יכול להעתיק תיקייה לתוך עצמה."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "יוצר תיקייה חדשה וריקה בתוך תיקייה זו"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "ל� יכול לעבור לעצמו"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "ל� יכול להיות מועתק לעצמו"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "�תה �ל יכול להעתיק קובץ על עצמו."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "ל� יכול להיות מועתק על עצמו"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "שגי�ה ביצירת תיקייה חדשה.\n"
 "\n"
 "�ין לך הרש�ות לכתיבה ליעד."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "שגי�ה ביצירת תיקייה חדשה.\n"
 "\n"
 "�ין מספיק מקו� פנוי ביעד."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "שגי�ה \"%s\" ביצירת תיקייה חדשה."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "שגי�ה ביצירת תיקייה חדשה"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "שגי�ה ביצירת תיקייה חדשה"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "תיקייה לל� ש�"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "שגי�ה \"%s\" ביצירת תיקייה חדשה."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "שגי�ה ביצירת תיקייה חדשה"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "שגי�ה ביצירת תיקייה חדשה"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "קובץ �חד"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "מוחק קבצי�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "קבצי� נמחקו:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "מוחק"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "מתכונן למחיקת קבצי�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "מרוקן �ת ה�שפה"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "מתכונן לרוקן �ת ה�שפה..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "�תה בטוח שברצונך למחוק לצמיתות �ת כל הפריטי� ב�שפה?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_רוקן"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "ניסיון"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "ניסיון (העתק)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (העתק)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".ניסיון.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".ניסיון (העתק).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "ניסיון ניסיון"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "ניסיון ניסיון (העתק)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "ניסיון.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "ניסיון (העתק).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "ניסיון ניסיון.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "ניסיון ניסיון (העתק).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "ניסיון ניסיון. txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "ניסיון ניסיון (העתק).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "ניסיון...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "ניסיון.. (העתק).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "ניסיון..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "ניסיון... (העתק)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "ניסיון. (העתק)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "ניסיון. (העתק נוסף)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "ניסיון (העתק נוסף)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "ניסיון (העתק נוסף).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "ניסיון (העתק מספר 3)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "ניסיון (העתק מספר 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "ניסיון ניסיון (העתק נוסף).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "ניסיון ניסיון (העתק מספר 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "ניסיון (העתק מספר 13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "ניסיון (העתק מספר 14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "ניסיון (העתק מספר 13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "ניסיון (העתק מספר 14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "ניסיון (העתק מספר 21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "ניסיון (העתק מספר 22)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "ניסיון (העתק מספר 21).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "ניסיון (העתק מספר 22).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "ניסיון (העתק מספר 23)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "ניסיון (העתק מספר 23).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "ניסיון (העתק מספר 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "ניסיון (העתק מספר 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "ניסיון (העתק מספר 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "ניסיון (העתק מספר 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "ניסיון ניסיון (העתק מספר 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "ניסיון ניסיון (העתק מספר 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "ניסיון ניסיון (העתק מספר 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "ניסיון ניסיון (העתק מספר 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "ניסיון ניסיון (העתק מספר 100000000000000).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "ניסיון (העתק מספר 10)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "ניסיון (העתק מספר 11)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "ניסיון (העתק מספר 10).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "ניסיון (העתק מספר 11).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "ניסיון (העתק מספר 12)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "ניסיון (העתק מספר 12).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "ניסיון (העתק מספר 110)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "ניסיון (העתק מספר 111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "ניסיון (העתק מספר 110).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "ניסיון (העתק מספר 111).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "ניסיון (העתק מספר 122)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "ניסיון (העתק מספר 123)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "ניסיון (העתק מספר 122).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "ניסיון (העתק מספר 123).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "ניסיון (העתק מספר 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "ניסיון (העתק מספר 124).txt"
 
@@ -2835,64 +2807,64 @@ msgstr "ניסיון (העתק מספר 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "היו� ב 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "היו� ב %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "היו� ב 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "היו� ב %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "היו�, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "היו�, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "היו�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "�תמול ב 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "�תמול ב %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "�תמול ב 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "�תמול ב %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "�תמול, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "�תמול, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "�תמול"
 
@@ -2901,133 +2873,133 @@ msgstr "�תמול"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "רביעי, ספטמבר 00 0000 ב 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y ב %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "ב', �וק' 00 0000 ב 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y ב %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "ב', �וק' 00 0000 ב 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y ב %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "�וק' 00 0000 ב 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y ב %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "�וק' 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 פריטי�"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 תיקיות"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 קבצי�"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "פריט �חד"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "תיקייה �חת"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "קובץ �חד"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u פריטי�"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u תיקיות"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u קבצי�"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? פריטי�"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? בתי�"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "סוג ל� ידוע"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ל� ידוע"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "תוכנית"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3036,7 +3008,7 @@ msgstr ""
 "ל� הצלחתי למצו� הגדרה �פילו עבור \"x-directory/normal\". זה ככל הנר�ה �ומר "
 "שהקובץ gnome-vfs.keys נמצ� במקו� הל� נכון �ו ל� נמצ� בכלל מסיבה �חרת."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3045,11 +3017,11 @@ msgstr ""
 "ל� נמצ� תי�ור לטיפוס ה MIME \"%s\" (הקובץ הו� \"%s\"), �נ� הודע לרשימת "
 "הדיוור של gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "קישור"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "קישור (שבור)"
 
@@ -3170,11 +3142,13 @@ msgid "Search for files by file name and file properties"
 msgstr "חפש קבצי� לפי ש� הקובץ ומ�פייניו"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "תצוגת סמל"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "תצוגת רשימה"
@@ -3318,146 +3292,151 @@ msgstr "הבית של %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "צורות"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "סמל-קובץ"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "טקסט לעריכה"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "התווית לעריכה"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "טקסט נוסף"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ועוד טקסט"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "סומן לבחירה"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "מה ש�נו מסמני� לבחירה"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "מודגש כמוקד מקלדת"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "ה�� �נו מדגישי� כדי לחולל מוקד מקלדת"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "הדגשה לזריקה"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "ה�� �נו מדגישי� לזריקת גרור וזרוק"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "ריבוע הבחירה"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "מסגרת טקסט"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "צייר מסגרת סביב טקסט של� נבחר"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "צבע תיבת הבחירה"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "צבע תיבת הבחירה"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "�לפ� תיבת הבחירה"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "שקיפות תיבת הבחירה"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "�לפ� ההדגשה"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "שקיפות להדגשה של סמלי� נבחרי�"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "צבע מידע בהיר"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "הצבע המשמש לטקסט המידע מול רקע כהה"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "צבע מידע כהה"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "הצבע המשמש לטקסט המידע מול רקע בהיר"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "תיקייה זו משתמשת בסידור �וטומטי. �תה רוצה להחליף לסידור ידני ולהש�יר �ת "
 "הפריט במקו� שזרקת �ותו?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "תיקייה זו משתמשת בסידור �וטומטי. �תה רוצה להחליף לסידור ידני ולהש�יר �ת "
 "הפריטי� במקו� שזרקת �ות�?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "להחליף לסידור ידני?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "החלף"
 
@@ -3564,120 +3543,120 @@ msgstr "ברירת מחדל עבור הפריטי� \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "ברירת מחדל עבור כל הפריטי� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "ערוך \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "כולל בתפריט עבור הפריטי� \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "השתמש כברירת מחדל עבור הפריטי� \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "כלול בתפריט עבור \"%s\" בלבד"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "קבע כברירת מחדל עבור \"%s\" בלבד"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�ל תכלול בתפריט עבור הפריטי� \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "ש�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "מצב"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_בחר"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "סיי�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_ערוך..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "סוגי קובץ ותוכניות"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_לך לש�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 "ניתן לקבוע �יזה תוכניות מוצעות ל�ילו קבצי� בתיבת הדו-שיח סוגי קבצי� ותוכניות."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "פתח ב�מצעות יישו� �חר"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "בחר יישו� ש�יתו \"%s\" יפתח."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "פתח ב�מצעות מציג �חר"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "בחר מציג עבור \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "�ין מציגי� זמיני� עבור \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "�ין מציגי� זמיני�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "�ף יישו� ל� משויך ע� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�ף יישו� ל� משויך"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "�ין פעולה המשויכת ל \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "�ין פעולה משויכת"
 
@@ -3685,11 +3664,9 @@ msgstr "�ין פעולה משויכת"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3698,42 +3675,41 @@ msgstr ""
 "ניתן להגדיר �ת GNOME לשייך יישומי� לסוגי קבצי�.  ה�� ברצונך לשייך יישו� לסוג "
 "קובץ זה עכשיו?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "שייך יישו�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "המציג המשויך ל \"%s\" �ינו תקני."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "מציג ל� תקני שויך"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "היישו� המשויך ל \"%s\" �ינו תקני."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "יישו� ל� תקני משויך"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "הפעולה המשויכת ל \"%s\" �ינה תקינה."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "פעולה ל� תקנית משויכת"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3743,106 +3719,147 @@ msgstr ""
 "ניתן להגדיר �ת GNOME לשייך יישו� שונה �ו מציג לסוג קובץ זה. ה�� ברצונך לשייך "
 "יישו� �ו מציג לסוג קובץ זה עכשיו?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "שייך פעולה"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" ל� יכול לפתוח �ת \"%s\" כיוון ש \"%s\" ל� יכול לגשת לקבצי� במיקומי� "
+"\"%s\".  ה�� ברצונך לבחור יישו� �חר?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" ל� יכול לפתוח �ת \"%s\" כיוון ש \"%s\" ל� יכול לגשת לקבצי� במיקומי� "
 "\"%s\".  ה�� ברצונך לבחור יישו� �חר?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "הפעולה ברירת המחדל ל� יכולה לפתוח �ת \"%s\" כיוון שהי� �ינה יכולה לקשת "
 "לקבצי� במיקומי� \"%s\".  ה�� ברצונך לבחור פעולה �חרת?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "ל� ניתן לפתוח מיקו�"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" ל� יכול לפתוח �ת \"%s\" כיוון ש \"%s\" ל� יכול לגשת לקבצי� במיקומי� "
+"\"%s\".  ה�� ברצונך לבחור יישו� �חר?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" ל� יכול לפתוח �ת \"%s\" כיוון ש \"%s\" ל� יכול לגשת לקבצי� במיקומי� "
 "\"%s\". �ין יישו� �חר הזמין להצגת קובץ זה.  �� תעתיק קובץ זה למחשב שלך, "
 "ייתכן ותוכל לפתוח �ותו."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"הפעולה ברירת המחדל ל� יכולה לפתוח �ת \"%s\" כיוון שהי� ל� יכולה לגשת לקבצי� "
-"במיקומי� \"%s\". �ין פעולות �חרות הזמינות להצגת קובץ זה.  �� תעתיק קובץ זה "
-"למחשב שלך, ייתכן ותוכל לפתוח �ותו."
+"הפעולה ברירת המחדל ל� יכולה לפתוח �ת \"%s\" כיוון שהי� �ינה יכולה לקשת "
+"לקבצי� במיקומי� \"%s\".  ה�� ברצונך לבחור פעולה �חרת?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" ל� יכול לפתוח �ת \"%s\" כיוון ש \"%s\" ל� יכול לגשת לקבצי� במיקומי� "
+"\"%s\". �ין יישו� �חר הזמין להצגת קובץ זה.  �� תעתיק קובץ זה למחשב שלך, "
+"ייתכן ותוכל לפתוח �ותו."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "פותח %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "מצטער, �ך �ינך יכול לבצע פקודות מ�תר מרוחק מטעמי ביטחון."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "ל� ניתן להפעיל קישורי� מרוחקי�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "�רעה שגי�ה בהפעלת היישו�.\n"
 "\n"
 "פרטי�: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "שגי�ה בהפעלת יישו�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "מטרת הזריקה תומכת רק קבצי� מקומיי�"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "מטרת הזריקה הזו תומכת רק קבצי� מקומיי�\n"
 "\n"
 "כדי לפתוח קבצי� ל� מקומיי� העתק �ות� לתיקייה מקומית ו�ז זרוק �ות� שוב"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "מטרת הזריקה תומכת רק קבצי� מקומיי�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4093,14 +4110,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "פריטי� המכילי� \"מדוזה\" בשמותיה� וג� ה� תיקיות"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "מחפש בדיסקי�"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "נ�וטילוס מחפש בדיסקי� שלך עבור תיקיות �שפה."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "ערוך"
@@ -4297,96 +4306,106 @@ msgstr "רקע"
 msgid "Empty Trash"
 msgstr "רוקן �שפה"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "זה יפתח %d חלונות שוני�. �תה בטוח שברצונך לעשות ז�ת?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "לפתוח %d חלונות?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "�תה בטוח שברצונך למחוק לצמיתות �ת \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "זה יפתח %d חלונות שוני�. �תה בטוח שברצונך לעשות ז�ת?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "�תה בטוח שברצונך למחוק לצמיתות �ת \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "�תה בטוח שברצונך למחוק לצמיתות �ת %d הפריטי� שנבחרו?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "מחק �ת כל הפריטי� הנבחרי� לצמיתות"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "מחק?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "בחר קטגוריה:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_דוגמ�ות"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" נבחר"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "תיקייה �חת נבחרה"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d תיקיות נבחרו"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (מכיל 0 פריטי�)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (מכיל פריט �חד)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (מכיל %d פריטי�)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (מכיל סך-הכל 0 פריטי�)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (מכיל סך-הכל פריט �חד)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (מכיל סך-הכל %d פריטי�)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" נבחר (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d פריטי� נבחרו (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "פריט �חד �חר נבחר (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d פריטי� �חרי� נבחרו (%s)"
@@ -4398,7 +4417,7 @@ msgstr "%d פריטי� �חרי� נבחרו (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4407,113 +4426,130 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "התיקייה \"%s\" מכילה יותר פריטי� ממה שנ�וטילוס יכולה להתמודד �יתו. חלק "
 "מהקבצי� ל� יוצגו."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "יותר מידי קבצי�"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" ל� יכול להזרק ל�שפה. ה�� ברצונך למחוק �ותו מיידית?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr "%d הפריטי� שנבחרו ל� יכולי� להזרק ל�שפה. ה�� ברצונך למחוק �ות� מיידית?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" ל� יכול להזרק ל�שפה. ה�� ברצונך למחוק �ותו מיידית?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d מהפריטי� שנבחרו ל� יכולי� להזרק ל�שפה. ה�� ברצונך למחוק �ת %d הפריטי� "
-"ה�לו מיידית?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" ל� יכול להזרק ל�שפה. ה�� ברצונך למחוק �ותו מיידית?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "למחוק מיידית?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "ה�� �תה בטוח שברצונך למחוק לצמיתות �ת \"%s\" מה�שפה?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "ה�� �תה בטוח שברצונך למחוק לצמיתות �ת %d הפריטי� שנבחרו מה�שפה?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "למחוק מה�שפה?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "השתמש ב \"%s\" כדי לפתוח �ת הקובץ הנבחר"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_יישו� �חר..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_יישו�..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "_מציג �חר..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_מציג..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "ל� ניתן להשלי� �ת הפעולה המצוינת:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "ל� ניתן להשלי� �ת הפעולה המצוינת."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "הפעל \"%s\" על כל הפריטי� שנבחרו"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"כל קבצי ההפעלה בתיקייה זו יופיעו בתפריט התסריטי�. בחירת תסריט מהתפריט תפעיל "
+"�ת התסריט ע� כל קובץ נבחר כקלט."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "כל קבצי ההפעלה בתיקייה זו יופיעו בתפריט התסריטי�. בחירת תסריט מהתפריט תפעיל "
 "�ת התסריט ע� כל קובץ נבחר כקלט."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "�ודות התסריטי�"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4553,182 +4589,189 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: מיקו� וגודל של החלון הנוכחי"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" יועבר �� תבחר בפקודת הדבק קבצי�"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" יועתק �� תבחר בפקודת הדבק קבצי�"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d הפריטי� הנבחרי� יועברו �� תבחר בפקודת הדבק קבצי�"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d הפריטי� הנבחרי� יועתקו �� תבחר בפקודת הדבק קבצי�"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "�ין שו� דבר בלוח כדי להדביק."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "שגי�ת Mount"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "שגי�ת Unmount"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "שגי�ת Mount"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "הו_צ�"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_נתק כרך"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "פתח _בחלון חדש"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "פתח _ב %d חלונות"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "תיקיית בית"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "תיקיית בית"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_מחק מה�שפה"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "מחק �ת כל הפריטי� הנבחרי� לצמיתות"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ה_זז ל�שפה"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "זרוק כל �חד מהפריטי� הנבחרי� ל�שפה"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_מחק"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_צור קישורי�"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_צור קישור"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_רוקן �שפה"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_גזור קובץ"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_גזור קבצי�"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "ה_עתק קובץ"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "ה_עתק קבצי�"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "ל� ניתן להשתמש בקישור זה, כיוון ש�ין לו מטרה. ה�� ברצונך לזרוק קישור זה "
 "ל�שפה?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"ל� ניתן להשתמש בקישור זה, כיוון ש�ין לו מטרה. ה�� ברצונך לזרוק קישור זה "
+"ל�שפה?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "קישור שבור"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" הו� קובץ טקסט הניתן להפעלה. ה�� ברצונך להפעיל �ותו, �ו להציג �ת תוכנו?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "הפעל �ו הצג?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_הצג"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "הפעל ב_מסוף"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_הצג"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_הפעל"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "פותח \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "בטל פתיחה?"
 
@@ -4749,107 +4792,132 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "מצטער, ל� ניתן להציג �ת התוכן של \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "ל� ניתן לזהות �ת ההרש�ות של \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "שגי�ה בהצגת תיקייה"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "הש� \"%s\" כבר בשימוש בתיקייה הזו. �נ� בחר ש� �חר."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "�ין \"%s\" בתיקייה הזו. �ולי הו� הועבר �ו נמחק?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "�ין לך �ת ההרש�ות הדרושות לשינוי הש� של \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "הש� \"%s\" �ינו תיקני כיוון שהו� מכיל �ת התו \"/\". �נ� השתמש בש� �חר."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "הש� \"%s\" �ינו תקני. �נ� השתמש בש� �חר."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "ל� ניתן לשנות �ת הש� של \"%s\" כיוון שזהו דיסק לקרי�ה בלבד"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "מצטער, ל� ניתן לשנות �ת הש� של \"%s\" ל \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "מצטער, �ך ל� ניתן להסיר �ת ערכת הנוש� הזו!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "שגי�ת שינוי-ש�"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "�ין לך �ת ההרש�ות הדרושות לשינוי הקבוצה של \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "ל� ניתן לשנות �ת הקבוצה של \"%s\" כיוון שזהו דיסק לקרי�ה בלבד"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "מצטער, ל� ניתן לשנות �ת הקבוצה של \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "ל� ניתן לזהות �ת ההרש�ות של \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "שגי�ה בקביעת קבוצה"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "ל� ניתן לשנות �ת הבעלי� של \"%s\" כיוון שזהו דיסק לקרי�ה בלבד"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "מצטער, ל� ניתן לשנות �ת הבעלי� של \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "ל� ניתן לזהות �ת ההרש�ות של \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "שגי�ה בקביעת בעלי�"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "ל� ניתן לשנות �ת ההרש�ות של \"%s\" כיוון שזהו דיסק לקרי�ה בלבד."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "מצטער, ל� ניתן לשנות �ת ההרש�ות של \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "ל� ניתן לזהות �ת ההרש�ות של \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "שגי�ה בקביעת הרש�ות"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "משנה ש� מ \"%s\" ל \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "בטל שינוי ש�?"
 
@@ -4907,126 +4975,147 @@ msgstr "החזר �ת ה_גדלי� הרגילי� של הסמלי�"
 msgid "Restore Icon's Original Si_ze"
 msgstr "החזר �ת ה_גודל הרגיל של הסמל"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "מצביע ל \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "גרור וזרוק תומך רק במערכות קבצי� מקומיות."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "גרור וזרוק תומך רק במערכות קבצי� מקומיות."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "שגי�ת גרור וזרוק"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "שימוש בסוג גרירה ל� תקני."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "ש� קובץ"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "גודל"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "סוג"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "ת�ריך שינוי"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"ל� ניתן לשייך יותר מסמל מות�� �ישית �חד בכל זמן! �נ� גרור רק תמונה �חת כדי "
+"לקבוע סמל מות�� �ישית."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "ל� ניתן לשייך יותר מסמל מות�� �ישית �חד בכל זמן! �נ� גרור רק תמונה �חת כדי "
 "לקבוע סמל מות�� �ישית."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "יותר מתמונה �חת"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"הקובץ שזרקת �ינו מקומי.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� �ישית."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "הקובץ שזרקת �ינו מקומי.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� �ישית."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "תמונות מקומיות בלבד"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"הקובץ שזרקת �ינו תמונה.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� �ישית."
+"הקובץ שזרקת �ינו מקומי.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� �ישית."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "תמונות בלבד"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "מ�פייני�"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "מ�פייני %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "בטל שינוי קבוצה?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "משנה קבוצה"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "בטל שינוי בעלי�?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "משנה בעלי�"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "כלו�"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "בלתי קרי�"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "פריט �חד, ע� גודל %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d פריטי�, סך הכל %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(חלק מהתוכן �ינו קרי�)"
 
@@ -5036,191 +5125,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "תכני�:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "בסיסי"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_שמות:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_ש�:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "סוג:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "גודל:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "מיקו�:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "כרך:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "מקו� פנוי:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "מקור קישור:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "סוג MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "שונה:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "ניגש:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_בחר סמל מות�� �ישית..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_הסר סמל מות�� �ישית"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_קרי�ה"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_כתיבה"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_הפעלה"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "קבע ID _משתמש"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "דגלי� מיוחדי�:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "קבע ID ק_בוצה"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_דביק"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "הרש�ות"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "�ינך הבעלי�, לכן �ינך יכול לשנות �ת ההרש�ות."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "בעל הקובץ:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "בעל הקובץ:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_קבוצת הקובץ:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "קבוצת הקובץ:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "בעלי�:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "קבוצה:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "�חרי�:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "תצוגת טקסט:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "תצוגת מספר:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "שונה ל�חרונה:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "ל� ניתן לזהות �ת ההרש�ות של \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "ל� ניתן לזהות �ת ההרש�ות של הקובץ הנבחר."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"�רעה שגי�ה בהצגת העזרה: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "�רעה שגי�ה בעת הצגת העזרה: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "ל� ניתן להציג עזרה"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "בטל הצגת חלון מ�פייני�?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "יוצר חלון מ�פייני�"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "בחר סמל"
 
@@ -5238,92 +5327,129 @@ msgid "Search Results"
 msgstr "תוצ�ות החיפוש"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "מצטער, �ך שירות החיפוש של מדוזה �ינו זמין כיוון שהו� �ינו מותקן."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "מצטער, �ך שירות החיפוש של מדוזה ל� זמין כרגע."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "שירות החיפוש �ינו זמין"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "החיפוש שבחרת חדש מה�ינדקס במערכת שלך.  החיפוש ל� יחזיר תוצ�ות כרגע.  ניתן "
 "ליצור �ינדקס חדש על-ידי הפעלת הפקודה \"medusa-indexd\" בתור root משורת "
 "הפקודה."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"החיפוש ל� יכול לפתוח �ת �ינדקס מערכת הקבצי�.  ה�ינדקס שלך חסר �ו פגו�.  �תה "
+"יכול ליצור �ינדקס חדש על-ידי הפעלת \"medusa-indexd\" בתור root בשורת הפקודה."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "חיפוש עבור פריטי� חדשי� מידי"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"כל קובץ במחשב שלך תו�� לקריטריוני� שבחרת. �תה יכול לבדוק �ת ה�יות בבחירות "
+"שלך �ו להוסיף עוד קריטריוני� כדי לדלל �ת התוצ�ות."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "כל קובץ במחשב שלך תו�� לקריטריוני� שבחרת. �תה יכול לבדוק �ת ה�יות בבחירות "
 "שלך �ו להוסיף עוד קריטריוני� כדי לדלל �ת התוצ�ות."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "שגי�ה במהלך החיפוש"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "החיפוש ל� יכול לפתוח �ת �ינדקס מערכת הקבצי�.  ה�ינדקס שלך חסר �ו פגו�.  �תה "
 "יכול ליצור �ינדקס חדש על-ידי הפעלת \"medusa-indexd\" בתור root בשורת הפקודה."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "שגי�ה בקרי�ת קובץ ה�ינדקס"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "�רעה שגי�ה בזמן טעינת תוכן החיפוש: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  החיפוש ל� "
+"יכול לגשת ל�ינדקס שלך כרגע. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  החיפוש ל� "
+"יכול לגשת ל�ינדקס שלך כרגע. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "כדי לערוך חיפוש מהיר, החיפוש דורש �ינדקס של הקבצי� במערכת שלך.  החיפוש ל� "
 "יכול לגשת ל�ינדקס שלך כרגע ולכן יתבצע חיפוש �יטי יותר ש�ינו משתמש ב�ינדקס."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  החיפוש ל� "
-"יכול לגשת ל�ינדקס שלך כרגע. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "חיפושי� מהירי� �ינ� זמיני�"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "חיפושי תוכן �ינ� זמיני�"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5337,53 +5463,85 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "כדי לערוך חיפוש מהיר, החיפוש דורש �ינדקס של הקבצי� במערכת שלך.  המחשב שלך "
 "יוצר כרגע �ת ה�ינדקס הזה.  כיוון שהחיפוש ל� יכול להשתמש ב�ינדקס, החיפוש הזה "
 "עשוי לקחת מספר דקות."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  המחשב שלך "
 "יוצר כרגע �ת ה�ינדקס הזה.  חיפושי תוכן יהיו זמיני� כ�שר ה�ינדקס יהיה מוכן."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "חיפוש בעזרת �ינדקס ל� זמין"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  החיפוש ל� "
+"יכול לגשת ל�ינדקס שלך כרגע. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  החיפוש ל� "
+"יכול לגשת ל�ינדקס שלך כרגע. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "כדי לערוך חיפוש מהיר, החיפוש דורש �ינדקס של הקבצי� במערכת שלך.  �ף �ינדקס ל� "
 "זמין כרגע. ניתן ליצור �ינדקס על-ידי הפעלת \"medusa-indexd\" בתור root בשורת "
 "הפקודה.  עד ש�ינדקס של� ל� יהיה זמין, החיפושי� יערכו מספר דקות."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "כדי לערוך חיפוש תוכן, החיפוש דורש �ינדקס של התוכן במערכת שלך.  �ף �ינדקס ל� "
 "זמין כרגע.  �תה יכול ליצור �ינדקס על-ידי הפעלת \"medusa-indexd\" בתור root "
 "בשורת הפקודה.  עד ש�ינדקס של� ל� יהיה זמין, ל� ניתן יהיה לערוך חיפושי תוכן."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "חיפושי� מהירי� ל� מ�ופשרי� במחשבך"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5392,11 +5550,12 @@ msgstr ""
 "כדי לערוך חיפוש מהיר, החיפוש דורש �ינדקס לקבצי� במערכת שלך. מנהל המערכת שלך "
 "ביטל �ת �פשרות החיפוש המהיר במחשב שלך, ולכן �ינדקס �ינו זמין."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "חיפושי� מהירי� ל� מ�ופשרי� במחשבך"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "חיפושי� מהירי� �ינ� זמיני�"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "�יפה"
 
@@ -5405,7 +5564,7 @@ msgstr "�יפה"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_חשוף בחלון חדש"
@@ -5416,7 +5575,7 @@ msgstr "_חשוף בחלון חדש"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "חשוף ב %d חלונות ח_דשי�"
@@ -5425,13 +5584,17 @@ msgstr "חשוף ב %d חלונות ח_דשי�"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr "נ�וטילוס מצ� יותר תוצ�ות מ�שר הו� יכול להציג. חלק מהתוצ�ות ל� יוצגו. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr "נ�וטילוס מצ� יותר תוצ�ות מ�שר הו� יכול להציג. חלק מהתוצ�ות ל� יוצגו. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "יותר מידי תוצ�ות"
 
@@ -5445,12 +5608,12 @@ msgid "Create L_auncher"
 msgstr "צור מ_שגר"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "צור משגר חדש"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "מחק �ת כל הפריטי� ב�שפה"
 
@@ -5469,7 +5632,7 @@ msgstr "מציג חלון המ�פשר לך לקבוע �ת דוגמת רקע ש
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "השתמש ברקע _ברירת מחדל"
@@ -5491,58 +5654,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "בחירת מציג �חר �יתו להציג �ת הפריט הנבחר"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "צור _תיקייה"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "צור _תיקייה"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "יוצר תיקייה חדשה וריקה בתוך תיקייה זו"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "יוצר תיקייה חדשה וריקה בתוך תיקייה זו"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "יוצר קישור לכל פריט נבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "שכ_פל"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "מוחק כל פריט נבחר, מבלי לזרוק �ותו ל�שפה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "משכפל כל פריט נבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "ערוך משגר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "ערוך �ת מידע המשגר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "�תחל �ת הכרך הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "מ�פייני _מדיה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "נתק �ת הכרך הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "מעביר �ו מעתיק קבצי� שנבחרו מוקד� יותר על-ידי הפקודות גזור קבצי� �ו העתק "
 "קבצי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5550,128 +5723,137 @@ msgstr ""
 "מעביר �ו מעתיק קבצי� שנבחרו מוקד� יותר על-ידי הפקודות גזור קבצי� �ו העתק "
 "קבצי� לתיקייה הנבחרת"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "פתיחה ב_�מצעות"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "פותח �ת הפריט הנבחר בחלון חדש"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "פתח _בחלון חדש"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "פותח �ת הפריט הנבחר בחלון הזה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "מכין �ת הקבצי� שנבחרו להעתקה ע� פקודת הדבק קבצי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "מכין �ת הקבצי� שנבחרו להעברה ע� פקודת הדבק קבצי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "ה_גן"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "הגן על הכרך הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "שינוי ש� הפריט הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "החזר תצוגה _לברירת המחדל"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "קבע מחדש �ת סדר המיון ורמת הקירוב בחלון זה כדי להת�י� להעדפות"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "הפעלה �ו ניהול של תסריטי� מ ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "בחר �ת _כל הקבצי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_דוגמ�ות"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "בחר �ת כל הקבצי� בחלון זה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "בחר �ת כל הקבצי� בחלון זה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "מציג מ�פייני מדיה עבור הכרך הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "מציג �ת התיקייה שמכילה �ת התסריטי� שמופיעי� בתפריט זה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "נתק �ת הכרך הנבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "השתמש ברקע ברירת המחדל במיקו� זה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "הצגה �ו עריכה של המ�פייני� לכל פריט נבחר"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "ה_עתק קובץ"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_�תחל"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_נתק כרך"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_פתח"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_פתח �ת תיקיית התסריטי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "ה_דבק קבצי�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "ה_דבק קבצי� לתוך התיקייה"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_מ�פייני�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_שנה ש�..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_תסריטי�"
 
@@ -5756,7 +5938,12 @@ msgstr "_ידנית"
 msgid "Indexing is %d%% complete."
 msgstr "יצירת �ינדקס %d%% מושלמת."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "הקבצי� שלך נכנסו ל�ינדקס ל�חרונה ב %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5764,25 +5951,29 @@ msgstr ""
 "פע� ביו� הקבצי� שלך ותכני הטקסט שלך נכנסי� ל�ינדקס, כדי שהחיפוש שלך יהיה "
 "מהיר."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "מצב יצירת �ינדקס"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "הקבצי� שלך נכנסו ל�ינדקס ל�חרונה ב %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "פע� ביו� הקבצי� שלך ותכני הטקסט שלך נכנסי� ל�ינדקס, כדי שהחיפוש שלך יהיה "
-"מהיר.  הקבצי� שלך כרגע נכנסי� ל�ינדקס."
+"מהיר."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "�ין כרגע �ינדקס לקבצי� שלך."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5791,15 +5982,19 @@ msgstr ""
 "כשחיפוש מהיר מופעל, החיפוש יוצר �ינדקס כדי לעשות �ת חיפושך מהירי� יותר.  "
 "חיפוש מהיר ל� מופעל על המחשב שלך, �ז �ין לך �ינדקס כרגע."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "�ין כרגע �ינדקס לקבצי� שלך."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "מצטער, �ך שירות החיפוש של מדוזה ל� זמין כרגע."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5823,31 +6018,36 @@ msgstr "הצג מצב יצירת _�ינדקס"
 msgid "Show status of indexing used when searching"
 msgstr "הצג �ת מצב ה�ינדקס בזמן החיפוש"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "ל� יכל ליצור �ת התיקייה הנדרשת"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "ל� הצליח ליצור תיקיות נדרשות"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "נ�וטילוס ל� הצליח ליצור �ת התיקייה הנדרשת \"%s\". לפני הפעלת נ�וטילוס, �נ� "
 "צור תיקייה זו, �ו שנה �ת ההרש�ות כך שנ�וטילוס תוכל ליצור �ותה."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "ל� הצליח ליצור תיקיות נדרשות"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5858,22 +6058,27 @@ msgstr ""
 "לפני הפעלת נ�וטילוס, �נ� צור תיקיות �לו, �ו שנה �ת ההרש�ות כך שנ�וטילוס תוכל "
 "ליצור �ותן."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "קישור לשולחן העבודה הישן"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "המיקו� של ספריית שולחן העבודה השתנה ב GNOME 2.4. קישור הנקר� \"קישור לשולחן "
 "העבודה הישן\" נוצר על שולחן העבודה. �תה יכול לפתוח �ותו כדי להעביר �ת הקבצי� "
 "ש�תה רוצה, ול�חר-מכן למחוק �ת הקישור."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "שולחן עבודה ישן נודד"
 
 #. Can't register myself due to trouble locating the
@@ -5886,7 +6091,7 @@ msgstr "שולחן עבודה ישן נודד"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5897,7 +6102,7 @@ msgstr ""
 "שוב."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5940,12 +6145,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "נ�וטילוס ל� יכול לפעול כרגע, בגלל שגי�ה ל� צפויה."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5953,7 +6158,7 @@ msgstr ""
 "ל� ניתן להשתמש בנ�וטילוס כרגע, עקב שגי�ה ל� צפויה מ Bonobo בניסיון לרשו� �ת "
 "שרת תצוגת מנהל הקבצי�."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -5962,7 +6167,7 @@ msgstr ""
 "ל� ניתן להשתמש בנ�וטילוס כרגע, עקב שגי�ה ל� צפויה מ Bonobo בניסיון ל�תר �ת "
 "המפעל. הריגת שרת bonobo-activation והפעלת נ�וטילוס מחדש עשויי� לתקן �ת הבעיה."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -5972,6 +6177,17 @@ msgstr ""
 "�ובייקט המעטפת. הריגת שרת bonobo-activation והפעלת נ�וטילוס מחדש עשויי� לתקן "
 "�ת הבעיה."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"�רעה שגי�ה בהצגת העזרה: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "ל� הוגדרו סימניות"
@@ -6005,34 +6221,45 @@ msgstr "פחות �פשרויות"
 msgid "Find Them!"
 msgstr "מצ� �ות�!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "ל� יכול לעבור לעצמו"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "מצטער, �ך \"%s\" �ינו ש� תקני."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" �יננו מקו� תיקני. �נ� בדוק �ת ה�יות ונסה שוב."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "ל� ניתן למצו� �ת \"%s\". �נ� בדוק �ת ה�יות ונסה שנית."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "שרתי רשת"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_ש�:"
+msgid "_Location:"
+msgstr "מיקו�:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "ה_תחבר"
@@ -6233,6 +6460,19 @@ msgstr ""
 "\n"
 "�תה יכול למחוק קובץ זה ידנית כדי להציג �ת ה�שף שוב.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"ל� ניתן לשייך יותר מסמל מות�� �ישית �חד בכל זמן! �נ� גרור רק תמונה �חת כדי "
+"לקבוע סמל מות�� �ישית."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"הקובץ שזרקת �ינו מקומי.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� �ישית."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6243,26 +6483,25 @@ msgstr "פתיחה ב�מצעות %s"
 msgid "Open with..."
 msgstr "פתיחה ב�מצעות..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "ל� ניתן להפעיל �ת יישו� צורב התקליטורי�:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "ל� ניתן להפעיל �ת צורב התקליטורי�"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "רוקן _�שפה"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_כתוב תכני� לתקליטור"
 
@@ -6270,114 +6509,127 @@ msgstr "_כתוב תכני� לתקליטור"
 msgid "Go To:"
 msgstr "לך �ל:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "ה�� ברצונך לר�ות �ת %d המיקומי� ה�לו במספר חלונות?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "הצג במספר חלונות?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "ל� ניתן לפתוח מיקו�"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "בצע מספר בדיקות עצמיות מהירות."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "צור �ת החלון הפנימי בג�ומטריה הנתונה."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ג�ומטריה"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "צור חלונות רק לכתובות שצוינו במיוחד."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "�ל תנהל �ת שולחן העבודה (התעל� מהעדפות שהוגדרו בחלון ההעדפות)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "צ� מנ�וטילוס."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "הפעל מחדש �ת נ�וטילוס."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "מנהל קבצי�"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "נ�וטילוס"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "נ�וטילוס: ל� ניתן להשתמש בבדיקה ע� כתובת.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "נ�וטילוס: ל� ניתן להשתמש בבדיקה ע� יישומי� �חרי�.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "נ�וטילוס: ל� ניתן להשתמש ביצי�ה ע� כתובת.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "נ�וטילוס: ל� ניתן להשתמש בהתחלה מחדש ע� כתובת.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "נ�וטילוס: ל� ניתן להשתמש בג�ומטריה ביותר מכתובת �חת.\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "�תה בטוח שברצונך למחוק לצמיתות �ת \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "ה�� �תה בטוח שברצונך לשכוח �ת ההיסטוריה? �� כן, �תה תינדן לחזור עליה."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "ה�� �תה בטוח שברצונך לנקות �ת הרשימה של המקומות בה� ביקרת?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "נקה היסטוריה"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "המיקו� \"%s\" ל� קיי�. ה�� ברצונך להסיר כל סימנייה ע� המיקו� הזה מהרשימה שלך?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "המיקו� \"%s\" ל� קיי� יותר."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "סימנייה ל� מיקו� ל� קיי�"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "הסר"
 
@@ -6410,7 +6662,6 @@ msgid "Close _All Windows"
 msgstr "סגור �ת _כל החלונות"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "סוגר �ת כל חלונות נ�וטילוס"
@@ -6433,107 +6684,119 @@ msgid "Forward"
 msgstr "קדימה"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "מעבר לתיקיית ה�שפה"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "מעבר למקו� הב� שביקרת בו"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "מעבר למקו� הקוד� שביקרת בו"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "מעבר לתיקיית ה�שפה"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "בית"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "שדה _מיקו�"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "רענן"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "חפש במחשב זה עבור קבצי�"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "סרגל _מצב"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "עצור"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "מעלה"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "כתוב לתקליטור"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_הוסף סימנייה"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_�חורה"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_סימניות"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_נקה היסטוריה"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_ערוך סימניות"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_קדימה"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_מעבר"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_בית"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_מיקו�..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_חלונית צד"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_�שפה"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "מ_עלה"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_תצוגה"
 
@@ -6551,34 +6814,39 @@ msgstr "הצג כ..."
 msgid "File Browser: %s"
 msgstr "בעל הקובץ:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "�חד מלוחות הצד שלך נתקל בשגי�ה ול� יכול להמשיך. לצערי, ל� יכולתי להגיד �יזה "
 "מה�."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "תצוגת ה%s נתקלה בשגי�ה בזמן הטעינה."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "לוח הצד %s נתקל בשגי�ה ול� יכול להמשיך. �� זה ממשיך לקרות, ייתכן ותרצה לכבות "
 "�ת הלוח הזה."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "לוח צד נכשל"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "חלונית צד"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "מכיל תצוגת חלונית צד"
 
@@ -6612,147 +6880,180 @@ msgstr "_הוסף חדש..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "מצטער, �ך הדוגמה %s ל� יכולה להימחק."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "ל� יכול למחוק דוגמה"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "מצטער, �ך הסמל %s ל� יכול להימחק."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "ל� ניתן להסיר סמל"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "צור סמל חדש:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_מילת מפתח:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_תמונה:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "בחר קובץ תמונה לסמל החדש:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "צור צבע חדש:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_ש� הצבע:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_ערך הצבע:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "מצטער, �ך \"%s\" �ינו ש� תקני."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "מצטער, �ך ל� סיפקת ש� תקני."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "ל� יכול להתקין דוגמה"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "מצטער, �ך �ינך יכול להחליף �ת תמונת ה�יפוס."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "ל� תמונה"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "מצטער, �ך הדוגמה %s ל� יכולה להיות מותקנת."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "בחר תמונה להוספה כדוגמה"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "מצטער, �ך �תה חייב לציין ש� ל� ריק לצבע החדש."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "ל� הצליח להתקין צבע"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "בחר צבע להוספה"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "מצטער, �ך '%s' �ינו קובץ תמונה שימושי."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "הקובץ '%s' �יננו תמונה תקנית."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "בחר קטגוריה:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_בטל הסרה"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_הוסף דוגמה חדשה..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_הוסף צבע חדש..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_הוסף סמל חדש..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "לחץ על דוגמה כדי להסירה"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "לחץ על צבע כדי להסירו"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "לחץ על סמל כדי להסירו"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "דוגמ�ות:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "צבעי�:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "סמלי�:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_הסר דוגמה..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_הסר צבע..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_הסר סמל..."
 
@@ -7140,34 +7441,39 @@ msgstr "יוצר _תקליטורי�"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "סגור �ת _כל החלונות"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "סגור �ת חלונית הצד"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "מעבר לתיקיית תקליטור ריק"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "מעבר לתיקיית ה�שפה"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_מיקו�..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]תיקיות"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_דוגמ�ות"
@@ -7197,10 +7503,13 @@ msgid "View Failed"
 msgstr "תצוגה נכשלה"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "תצוגת ה%s נתקלה בשגי�ה בזמן הטעינה."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "תצוגת ה%s נתקלה בשגי�ה ול� יכולה להמשיך. �תה יכול לבחור תצוגה �חרת �ו ללכת "
 "למיקו� �חר."
@@ -7210,95 +7519,125 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "תצוגת ה%s נתקלה בשגי�ה בזמן הטעינה."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "יישו� הנ�וטילוס משויך לחלון זה."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "תצוגה נוכחית"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "תצוגה של הקובץ הנוכחי �ו התיקייה"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "ל� ניתן למצו� �ת \"%s\". �נ� בדוק �ת ה�יות ונסה שנית."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "ל� ניתן להוסיף סמלי�"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "נ�וטילוס ל� יכול להציג �ת \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "ל� יכול להציג �ת \"%s\", כיוון שנ�וטילוס ל� הצליח לזהות �יזה סוג קובץ זה."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "לנ�וטילוס �ין מציד מותקן המסוגל להציג �ת \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "ל� יכול להציג �ת \"%s\", כיוון שנ�וטילוס ל� יכולה להתמודד ע� מיקומי� %s:"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "ל� יכול להציג �ת \"%s\", כיוון שהניסיון להתחבר נכשל."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "ל� יכול להציג �ת \"%s\", כיוון שהגישה נדחתה."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "ל� יכול להציג �ת \"%s\", כיוון שהמ�רח \"%s\" ל� נמצ�. בדוק שה�יות נכון "
 "ושהגדרות המתווך נכונות."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "ל� יכול להציג �ת \"%s\". בדוק שהגדרות המתווך נכונות."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"ל� יכול להציג �ת \"%s\", כיוון שנ�וטילוס ל� יכולה להתמודד ע� מיקומי� %s:"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"ל� יכול להציג �ת \"%s\", כיוון שנ�וטילוס ל� יכול ליצור קשר ע� הדפדפן הר�שי "
-"של SMB.\n"
-"בדוק ששרת SMB מופעל ברשת המקומית."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"החיפוש �ינו זמין כרגע, כיוון ש�ין לך �ינדקס �ו ששירות החיפוש �ינו מופעל. �נ� "
+"ווד� שהפעלת �ת שירות החיפוש מדוזה, ו�� �ין לך �ינדקס, שבונה ה�ינדקסי� של "
+"מדוזה מופעל."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "החיפוש �ינו זמין כרגע, כיוון ש�ין לך �ינדקס �ו ששירות החיפוש �ינו מופעל. �נ� "
 "ווד� שהפעלת �ת שירות החיפוש מדוזה, ו�� �ין לך �ינדקס, שבונה ה�ינדקסי� של "
 "מדוזה מופעל."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "חיפוש �ינו זמין"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "נ�וטילוס ל� יכול להציג �ת \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "ל� ניתן להציג מיקו�"
 
@@ -7310,7 +7649,7 @@ msgstr "לך למיקו� המצוין על-ידי הסימנייה"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "כל הזכויות שמורות (C) 1999-2001 Eazel, Inc."
 
@@ -7318,7 +7657,7 @@ msgstr "כל הזכויות שמורות (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "גיל �שר\n"
@@ -7327,7 +7666,7 @@ msgstr ""
 "פרויקט linBrew\n"
 "http://linbrew.sourceforge.net"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7341,39 +7680,43 @@ msgstr "לך �חורה מספר עמודי�"
 msgid "Go forward a number of pages"
 msgstr "לך קדימה מספר עמודי�"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "הצג �ת מיקו� זה ע� \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_גופני�"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "ערכות נוש�"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "יוצר _תקליטורי�"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "זיהוי יישו�"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "זיהוי היישו� של חלון זה."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "יישו�"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "יישו� הנ�וטילוס משויך לחלון זה."
 
@@ -7409,6 +7752,249 @@ msgstr "שרתי רשת"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�וטילוס"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr "חלק מהקבצי� ל� התוספו לסמלי�, כיוון שה� ל� נר�ו כתמונות תקניות."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "יצרן לתצוגת החומרה"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "מציג חומרה"
+
+#~ msgid "Hardware view"
+#~ msgstr "תצוגת חומרה"
+
+#~ msgid "View as Hardware"
+#~ msgstr "הצג כחומרה"
+
+#~ msgid "hardware view"
+#~ msgstr "תצוגת חומרה"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ש� של סמל לתצוגת החומרה"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "סיכו� של המידע על החומרה"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "מעבד %s\n"
+#~ "%s MHz\n"
+#~ "זיכרון מטמון %s K"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "זיכרון פנימי %lu GB"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "זיכרון פנימי %lu MB"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "זמן הריצה הו� %d ימי�, %d שעות ו %d דקות"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "סקירת חומרה"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "זהו שומר מקו� לעמוד המעבד."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "זהו שומר מקו� לעמוד הזיכרון הפנימי."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "זהו שומר מקו� לעמוד ה IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "שגי�ה בהעתקה �ל \"%s\".\n"
+#~ "\n"
+#~ "�ין מספיק מקו� פנוי ביעד."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "שגי�ה ביצירת קישור ב \"%s\".\n"
+#~ "\n"
+#~ "�ין מספיק מקו� פנוי ביעד."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "שגי�ה בהזזת פריטי� �ל \"%s\".\n"
+#~ "\n"
+#~ "�ין לך הרש�ות לכתוב לתיקייה זו."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "שגי�ה בהזזת פריטי� �ל \"%s\".\n"
+#~ "\n"
+#~ "דיסק היעד הו� לקרי�ה בלבד."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "שגי�ה ביצירת קישורי� ב \"%s\".\n"
+#~ "\n"
+#~ "�ין לך הרש�ות לכתוב לתיקייה זו."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "שגי�ה ביצירת קישורי� ב \"%s\".\n"
+#~ "\n"
+#~ "דיסק היעד הו� לקרי�ה בלבד."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך העתקת \"%s\".\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך הזזת \"%s\".\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך מחיקת \"%s\".\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך העתקה\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך קישור\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "שגי�ה \"%s\" במהלך מחיקה\n"
+#~ "\n"
+#~ "ה�� ברצונך להמשיך?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "ל� ניתן להעתיק ל�שפה"
+
+#~ 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 ""
+#~ "הפעולה ברירת המחדל ל� יכולה לפתוח �ת \"%s\" כיוון שהי� ל� יכולה לגשת "
+#~ "לקבצי� במיקומי� \"%s\". �ין פעולות �חרות הזמינות להצגת קובץ זה.  �� תעתיק "
+#~ "קובץ זה למחשב שלך, ייתכן ותוכל לפתוח �ותו."
+
+#~ msgid "Searching Disks"
+#~ msgstr "מחפש בדיסקי�"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "נ�וטילוס מחפש בדיסקי� שלך עבור תיקיות �שפה."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d הפריטי� שנבחרו ל� יכולי� להזרק ל�שפה. ה�� ברצונך למחוק �ות� מיידית?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d מהפריטי� שנבחרו ל� יכולי� להזרק ל�שפה. ה�� ברצונך למחוק �ת %d הפריטי� "
+#~ "ה�לו מיידית?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "הקובץ שזרקת �ינו תמונה.  ניתן להשתמש רק בתמונות מקומיות כסמלי� מות�מי� "
+#~ "�ישית."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "מצטער, �ך שירות החיפוש של מדוזה �ינו זמין כיוון שהו� �ינו מותקן."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "פע� ביו� הקבצי� שלך ותכני הטקסט שלך נכנסי� ל�ינדקס, כדי שהחיפוש שלך יהיה "
+#~ "מהיר.  הקבצי� שלך כרגע נכנסי� ל�ינדקס."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" �יננו מקו� תיקני. �נ� בדוק �ת ה�יות ונסה שוב."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "מצטער, �ך '%s' הו� �ינו קובץ תמונה שימושי."
+
+#~ 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 ""
+#~ "ל� יכול להציג �ת \"%s\", כיוון שנ�וטילוס ל� יכול ליצור קשר ע� הדפדפן "
+#~ "הר�שי של SMB.\n"
+#~ "בדוק ששרת SMB מופעל ברשת המקומית."
+
+#~ msgid "file icon"
+#~ msgstr "סמל-קובץ"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_ש�:"
+
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
 
@@ -7498,9 +8084,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "_Toolbar"
 #~ msgstr "סרגל _כלי�"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "המיקו� \"%s\" ל� קיי� יותר."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "לך למיקו� ל� קיי�"
 
@@ -7593,9 +8176,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "ה_פעל תסריטי� כשלוחצי� עליה�"
 
@@ -8013,9 +8593,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "Set Cover Image"
 #~ msgstr "קבע תמונת עטיפה"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "מצטער, �ך '%s' �ינו קובץ תמונה שימושי."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "בחר קובץ תמונה לעטיפת ה�לבו�:"
 
@@ -8136,9 +8713,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "Remove any custom images from selected icons"
 #~ msgstr "מסיר כל תמונה מות�מת �ישת מהסמלי� שנבחרו"
 
-#~ msgid "Themes"
-#~ msgstr "ערכות נוש�"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "התנהגות חלון חדש"
 
@@ -8232,9 +8806,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "Preferences"
 #~ msgstr "העדפות"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "מצטער, �ך התמונה %s ל� יכולה להיות מותקנת כסמל."
-
 #~ msgid "Click on a theme to remove it."
 #~ msgstr "לחץ על ערכת הנוש� כדי להסירה."
 
@@ -8244,9 +8815,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "מצטער, �ך \"%s\" �ינה תיקיית ערכת נוש� תיקנית."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "מצטער, �ך ל� ניתן להתקין �ת ערכת הנוש� \"%s\"."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "ל� ניתן להתקין ערכת נוש�"
 
@@ -8263,9 +8831,6 @@ msgstr "ר�ה �ת שרתי הרשת שלך במנהל הקבצי� של נ�ו
 #~ "מצטער, �ך ל� ניתן להסיר �ת הערכת הנוש� הנוכחית. �נ� שנה לערכת נוש� �חרת "
 #~ "לפי שתסיר �ת זו."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "מצטער, �ך ל� ניתן להסיר �ת ערכת הנוש� הזו!"
-
 #~ msgid "_Add Theme..."
 #~ msgstr "_הוסף ערכת נוש�..."
 
diff --git a/po/hi.po b/po/hi.po
index 8b351905f..4b4164eed 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.x\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-01-03 18:29+0530\n"
 "Last-Translator: Bhopal Team  <anuragseetha@yahoo.com>\n"
 "Language-Team: Gnome Hindi Team <indlinux-hindi-gnome@lists.sourceforge."
@@ -38,8 +38,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "बानोबो यूआई इनिट() असफल रहा"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "चिन�ह"
 
@@ -54,192 +54,122 @@ msgid "Nautilus Emblem view"
 msgstr "नॉटििलस नमूना दश�य"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "थीम हटाया नहीं जा सका"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
+#: components/emblem/nautilus-emblem-view.c:205
 #, fuzzy
-msgid "Couldn't remove emblem"
+msgid "Couldn't Remove Emblem"
 msgstr "थीम हटाया नहीं जा सका"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "चिन�ह इन�सटाल नहीं हो सका"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
+#: components/emblem/nautilus-emblem-view.c:241
 #, fuzzy
-msgid "Couldn't rename emblem"
+msgid "Couldn't Rename Emblem"
 msgstr "चिन�ह इन�सटाल नहीं हो सका"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "चिन�ह हटा��"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 #, fuzzy
 msgid "Enter a new name for the displayed emblem:"
 msgstr "न� चिन�ह के लि� छवि फाईल निश�चित करें"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 #, fuzzy
 msgid "Rename"
 msgstr "प�न नाम दें"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "नया चिन�ह जोड़ें"
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "माफ करें पर छवि %s चिन�ह की तरह इन�स�टाल नहीं हो सकती"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
 #, fuzzy
-msgid "Couldn't add emblems"
+msgid "Couldn't Add Emblems"
 msgstr "थीम ज�ड़ नहीं सका"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
+msgstr "माफ करें पर छवि %s चिन�ह की तरह इन�स�टाल नहीं हो सकती"
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
 #, fuzzy
-msgid "Couldn't add emblem"
+msgid "Couldn't Add Emblem"
 msgstr "थीम ज�ड़ नहीं सका"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "मिटाना"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "हार�डवेयर दश�य के लि� कारखाना"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "हार�डवेयर"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "हार�डवेयर दश�य दिखाने वाला"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "हार�डवेयर दश�य दिखाने वाला"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "हार�डवेयर की दरह देखो"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "हार�डवेयर दश�य"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "हार�डवेयर दश�य के लि� आइकन का नाम"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "हार�डवेयर जानकारी का सारांश"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s सीपीयू \n"
-"%s MHz \n"
-" %s K कैश साइज"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu जीबी रेम"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu �म बी रेम"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu जीबी"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu �मबी"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "अपटाईम है %d दिन, %d घंटे, %d मिनिट"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "यह CPU पृष�ठ के लि� प�लेसहोल�डर है"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "यह RAM पृष�ठ के लि� प�लेसहोल�डर है"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "यह IDE पृष�ठ के लि� प�लेसहोल�डर है"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "इतिहास"
@@ -908,6 +838,10 @@ msgstr "जीनोम.ओआरजी"
 msgid "GNU.org"
 msgstr "जी�नयू.ओआरजी"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "हार�डवेयर"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "अंतर�राष�ट�रीय"
@@ -1195,30 +1129,30 @@ msgid "Desktop trash icon name"
 msgstr "डेस�कटाप और ट�रेश"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 #, fuzzy
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "खास चिन�ह विशेषता डायलाग में"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1230,8 +1164,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1258,10 +1192,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "ट�रेश को डेस�कटाप पर ही रहना चाहि�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1294,10 +1229,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "ट�रेश को डेस�कटाप पर ही रहना चाहि�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1309,7 +1245,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1326,7 +1262,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1352,7 +1288,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1376,7 +1312,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1396,11 +1332,11 @@ msgstr "डेस�कटाप बनाने में नॉटिलस�
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "अपने होम फोल�डर का डेस�कटाप की तरह उपयोग करें (h)"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1420,7 +1356,7 @@ msgstr "हर फाईल या फोल�डर को नई विन�
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "विन�डो के लि� उचित बनाने की कोशिश"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1458,7 +1394,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1466,30 +1402,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1534,7 +1470,7 @@ msgstr "सभी नॉटिलसà¥� विनà¥�डो बनà¥�द करà¥
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "हर निश�चित वस�त� को नई खिड़की में खोलें"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1559,7 +1495,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 #, fuzzy
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "फोल�डर के वस�त�ओं की संख�या दिखा��"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1574,7 +1510,7 @@ msgstr "छवि फाइलों के लिà¤� थमà¥�बनेलà¥�à¤
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "पूर�व निर�धारित डेस�कटाप बैकग�राउण�ड का उपयोग करें"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1733,67 +1669,80 @@ msgstr "फिर से श�रू करें"
 msgid "on the desktop"
 msgstr "डेस�क टाप"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "वर�तमान थीम मिट नहीं सका"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "वर�तमान थीम मिट नहीं सका"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "ट�रेश"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "यहा� लाओ"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "यहां कापी करो"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "यहा� कड़ी में जोड़ो"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "निरस�त"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 #, fuzzy
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "माफ करें, पर \"%s\" थीम इन�सटाल नहीं हो सका"
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "माफ करें, परन�त� न� चिन�ह के लि� बिना ब�लैंक (खाली स�थान) वाला नाम देना होगा"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "चिन�ह इन�सटाल नहीं हो सका"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "माफ करें, परन�त� चिन�ह कीवर�ड में केवल लेटर, खाली स�थान अंक ही हो सकता है"
@@ -1802,18 +1751,24 @@ msgstr "माफ करें, परनà¥�तà¥� चिनà¥�ह कीवरà
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "माफ करें पर %s �क �क�जिस�टिंग की वर�ड है कपया दूसरा नाम निश�चित करें इसके लि�"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "चिन�ह इन�सटाल नहीं हो सका"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1832,302 +1787,282 @@ msgstr "द�वारा:"
 msgid "To:"
 msgstr "प�रति:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "हटाते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "डिलीट करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr "\"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "डीलीट करते ह�� गलती \n"
 " \"%s\" नहीं डिलीट कर सका क�योंकि आपके पास इसे बदलने की आग�या नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
+"\n"
+"\"%s\" हटाते ह�� गलती "
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "हटाते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "\n"
 "\"%s\" हटाते ह�� गलती "
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "कापी करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, fuzzy, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr "%sकापी नहीं हो सकता क�योंकि आपके पास उसे पढने की आग�या नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" पर कापी करते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "कापी करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, fuzzy, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "%s पर लिंक बनाते ह�� गलती \n"
 "\n"
 "गन�तव�य पर जगह नहीं"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" पर लिंक बनाते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, fuzzy, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
+msgstr "लिंक करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr "इस फोल�ड पर लिखे की आपको आग�या नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, fuzzy, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr "%s पर कापी करते ह�� गलती गंतव�य सिर�फ पढ़ने के लि� है"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "हटाते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "लिंक करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "कापी करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "नया फोल�डर बनाने ें %s गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "डिलीट करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "कापी करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "लिंक करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "डिलीट करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "कापी करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "लिंक करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "डिलीट करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "छोड़ दो"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "फिर कोशिश करें"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "जा�� घर की स�थिति पर"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "जा�� घर की स�थिति पर"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "फाइल को बदलने में असमर�थ"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "फाइल \"%s\" पहले से है\n"
 "\n"
 "क�या आप बदलना चाहते हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "कापी करते ह�� संघर�ष"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "बदलना"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "सभी बलदना"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s के लि� कड़ी"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s के लि� �क और कड़ी"
@@ -2136,25 +2071,25 @@ msgstr "%s के लि� �क और कड़ी"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst कड़ी %s के लि� "
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd कड़ी %s के लि� "
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd कड़ी %s के लि� "
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth कड़ी %s के लि�"
@@ -2164,555 +2099,594 @@ msgstr "%dth कड़ी %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr "कापी"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr "�क ओर कापी"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "th कापी"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st कापी"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd कापी"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd कापी"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s कापी %s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (�क और कापी) %s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth कापी) %s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst कापी) %s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd कापी) %s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd कापी) %s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr "%s (% डीआरडी कापी) %s"
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "अग�यात जीनोम वी�फ �स �क�स प�रगति स�वर %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "फाइल�स को ट�रेश में भेज रहा है"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "फाइल बाहर फेंक दी"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "भेज रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "ट�रेश में भेजने की तैयारी"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "फाइल�स भेज रहे हैं"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "फाइल�स भेज दी"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "भेजने की तैयारी"
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "भेजना समाप�त"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "फाइल�स के लि� कड़ी तैयार हो रही है"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "फाइल�स ज�ड़ गई"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "जोड़ रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "लिंक बनाने की तैयारी हो रही है"
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "लिंक�स बनाना समाप�त"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "फाइल�स कापी हो रही है"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "फाइल�स कापी हो गई"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "कापी हो रही है"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "कापी करने की तैयारी हो रही है"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "आप आयटम�स को ट�रेश में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "ट�रेश में कापी नहीं कर सकता"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "आप इस ट�रेश फोल�डर को नहीं हटा सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "आप इस ट�रेश फोल�डर को कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "ट�रेश का स�थान परिवर�तन संभव नहीं"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ट�रेश को कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "आप �क फोल�डर को स�वयं उसमें ही भेज नहीं सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "आप �क फोल�डर को उसी में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "न� खाली फोल�डर को इस फोल�डर में बना��"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "स�वयं में नहीं भेज सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "स�वयं में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "आप �क फाइल को उसी में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "स�वयं में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr "नया फोल�डर बनाने में गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr "स�थान पर कोई स�थान नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "नया फोल�डर बनाने ें %s गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "नया फोल�डर बनाने में गलती"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "बिना शीर�षक का फोल�डर"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "नया फोल�डर बनाने ें %s गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 फाइल"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "फाइल�स डिलीट कर रहा है"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "फाइल�स डिलीट कर दी"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "डिलीट कर रहा है"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "फाइल�स को डिलीट करने की तैयारी"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "ट�रेश को खाली कर रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "ट�रेश को खाली करने की तैयारी"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "क�या आप निश�चित है कि आप ट�रेश की सभी आयटम�स हमेशा के लि� डिलीट करना चाहते हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "खाली"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "फू"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "फू (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr "बास �चआरसी (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr "फू.टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr "फू (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "फू फू"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "फू फू (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "फू.टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "फू (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "फू फू.टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "फू फू (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "फू फू.टी�क�सटी टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "फू फू (कापी).txt टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "फू...(टी�क�सटी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "फू.. (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "फू..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "फू... (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "फू. (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "फू. (अन�य प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "फू. (अन�य प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "फू. (अन�य प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "फू. (तीसरी कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "फू. (तीसरी कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "फू फू (अन�य कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "फू फू (तीसरी कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "फू (तेरहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "फू (चौदहवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "फू (तेरहवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "फू (चौदहवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "फू (इक�कीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "फू (बाईसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "फू (इक�कीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "फू (बाईसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "फू (तेईसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "फू (तेईसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "फू (चौबीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "फू (चौबीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "फू (पच�चीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "फू (पच�चीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "फू फू (चौबीस प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "फू फू (पच�चीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "फू फू (चौबीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "फू फू (पच�चीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "फू फू (100000000000000) कापी.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "फू (दसवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "फू (ग�यारहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "फू (दसवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "फू (ग�यारहवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "फू (बारहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "फू (बारहवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "फू (110बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "फू (111बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "फू (110बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "फू (111बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "फू (122बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "फू (123बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "फू (122बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "फू (123बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "फू (124बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "फू (124बीं कापी).txt"
 
@@ -2731,64 +2705,64 @@ msgstr "फू (124बीं कापी).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "आज अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "आज %-l:%M:%S %p बजे"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "आज अपरान�ह 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "आज %-l :%M %p बजे"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "आज अपरान�ह 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "आज %-l:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "आज"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "बीते ह�� कल को अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "बीता ह�आ कल %-l:%M:%S%p पर"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "बीता ह�आ कल अपरान�ह 00:00 पर"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "बीते ह�� कल %-l:%M%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "बीता ह�आ कल, अपरान�ह 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "बीता ह�आ कल, %l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "बीता ह�आ कल"
 
@@ -2797,133 +2771,133 @@ msgstr "बीता ह�आ कल"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "ब�धवार, सितम�बर 00 0000 अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A,%B%-d%Y को %-l:%M%S%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "सोमवार, अक�टूबर 00 0000 को अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a,%b%-d%Y %-l:%M%S%p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "सोमवार, अक�टूबर 00 0000 को अपरान�ह 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a,%b%-d%Y को %-l:%M%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "अक�टूबर 00 0000 को अपरान�ह 00:00 पर"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b,%-d%Y %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "अक�टूबर 00 0000, 00:00 अपरान�ह"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b,%-d%Y, %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 अपरान�ह"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m,%-d%y, %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 आयटम�स"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 फोल�डर�स"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 फाइल�स"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 आयटम�स"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 फोल�डर"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 फाइल"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u आयटम�स"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u फोल�डर�स"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u फाइल�स"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? आयटम�स"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? बाइट�स"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "अन�जाना प�रकार"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "अंजान"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "प�रोग�राम"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -2932,7 +2906,7 @@ msgstr ""
 "�क�स-डायरेक�टरी/नारमलका भी विवरण नहीं मिल पा रहा। शायद इसका मतलब है कि आपकी जीनोम "
 "बी �फ �स की फाइल गलत जगह पर है या किसी अन�य कारण से नहीं मिल रही"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2941,11 +2915,11 @@ msgstr ""
 "�म आई �म ई प�रकार \"%s\" (फाइल है\"%s\") का विवरण नहीं मिल रहा। कपया जीनोम "
 "वी�फ�स मेलिंग लिस�ट से बता�ं।)"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "कड़ी"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "कड़ी (टूट गई)"
 
@@ -3066,11 +3040,13 @@ msgid "Search for files by file name and file properties"
 msgstr "फाइल को उनके नाम व विशेषताओं से खोजें"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "आयकान दिखा�ं"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "सूची दिखा�ं"
@@ -3214,151 +3190,156 @@ msgstr "%s का होम"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "काउण�टरटाप"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "फाइल आयकान"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "�डीटेबल टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "द �डीटेबल लेबल"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "�ड़ीशनल टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "क�छ और टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "सिलेक�शन के लि� हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "क�या च�नने के लि� हमने हाइलाइटेड किया है"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "की-बोर�ड फोकस के हमने हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "क�या रेंडर की-बोर�ड फोकस को लमने हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "ड�राव के लि� हाइलाइट करें"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "क�या हमने डी और डी ड�राप को हाइलाइट किया है"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "सिलेक�शन आयत"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "फ�रेम टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "अच�नित टेक�स�ट के चारों ओर फ�रेंम खींचें"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 #, fuzzy
 msgid "Selection Box Color"
 msgstr "जोड़ने के लि� रंग निश�चित करें"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "जा�� घर की स�थिति पर"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "सभी को च�नें"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Opacity of the highlight for selected icons"
 msgstr "सिलेक�शन के लि� हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 #, fuzzy
 msgid "Dark Info Color"
 msgstr "डार�क कार�क"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "यह फोल�डर आटोमेटिक लेआउट उपयोग करता है। क�या आप मेन�अल पर जाना चाहते हैं तथा इस आयटम "
 "को वहां छोड़ें जहां आपने उसे ड�राप किया था"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "यह फोल�डर आटोमेटिक लेआउट उपयोग करता है। क�या आप मेन�अल लेआउट पर जाना चाहती है तथा अन�य "
 "आयटम को वहां छोड़ना चाहते हैं जहां आपने उन�हें ड�राप किया है।"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "मेन�अल लेआउट पर जा�"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "स�विच"
 
@@ -3461,120 +3442,120 @@ msgstr "\"%s\" आयटमों के लिà¤� पूरà¥�वनिरà¥�à¤
 msgid "Is the default for all \"%s\" items."
 msgstr "सभी \"%s\" आयटमों के लि� पूर�वनिर�धारित"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "स�धारें \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" आयटम�स को मेन�यू में शामिल करें"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" आयटम�स के लि� पूर�वनिर�धारित का उपयोग करें"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "\"%s\" के लि� मेन�यू में शामिल करें"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "केवल \"%s\" के लि� पूर�वनिर�धारित का उपयोग करें"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" आयटम�स के लि� मेन�यू में शामिल न करें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "नाम"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "स�तर"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "च�नें (_h)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "हो गया"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "स�धारें...(_M)"
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "प�रकार का प�रकार �वं प�रोग�राम�स"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "वहां जा�ं(_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr "अन�य �प�लीकेशन�स से खोलें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "�प�लीकेशन च�नें जिससे खोलना है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "अन�य वीवर से खोलें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "अन�य वीवर से खोलें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\" के लि� व�य�व च�नें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" के लि� वीवर उपलब�ध नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "कोई वीवर उपलब�ध नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "कोई �प�लीकेशन संबंधित नहीं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "कोई �प�लीकेशन संबंधित नहीं"
@@ -3583,11 +3564,9 @@ msgstr "कोई �प�लीकेशन संबंधित नहीं
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3595,44 +3574,43 @@ msgstr ""
 "\n"
 "फाइल के प�रकार से �प�लीकेशन को संबंधित करने के लि� आप गनोम को कानफिगर कर सकते हैं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "संबंधित �प�लीकेशन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "कोई �प�लीकेशन संबंधित नहीं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "कोई �प�लीकेशन संबंधित नहीं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3641,95 +3619,126 @@ msgstr ""
 "\n"
 "फाइल के प�रकार से �प�लीकेशन को संबंधित करने के लि� आप गनोम को कानफिगर कर सकते हैं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "संबंधित �प�लीकेशन"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr "\"%s\" नहीं दिखा सके क�योंकि नॉटिलस� %s स�थिति को संभाल नहीं सकता"
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 "%s ख�ल नहीं सकता %s क�योंकि %s फाइल�स को %s स�थान से �क�सेस नहीं कर सकते क�या आप कोई अन�य "
 "�प�लीकेशन च�नना चाहते हैं"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr "\"%s\" नहीं दिखा सके क�योंकि नॉटिलस� %s स�थिति को संभाल नहीं सकता"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "\"%s\" ख�ल रहा है"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "आप स�रछा के कारणों रिमोट साइट से कमांड नहीं चला सकते"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "रिमोट कड़ियों को नहीं चला सकता"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr "�प�लीकेशन को लांच करने में गलती विवरण"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "�प�लीकेशन लांच करने में गलती"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "ड�राप टारगेट केवल स�थानीय फाइल�स को सपोर�ट करता है"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "अस�थानीय फाइल�स को खोलने के लि� पहले इन�हें स�थायी फोल�डर में कापी करे फिर उन�हें फिर से ड�राप "
 "करें"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "ड�राप टारगेट केवल स�थानीय फाइल�स को सपोर�ट करता है"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3978,14 +3987,6 @@ msgstr "आयटमà¥�स जिसके नाम में सà¥�टफ आà
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "आयटम�स जिसके नाम में मोड�यूल आ� तथा जो फोल�डर हैं।"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "नोटिलस ट�रेश फोल�डर के लि� आपके डिस�क को खोज रहा है"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "बदलाव"
@@ -4187,96 +4188,106 @@ msgstr "बेकग�राउण�ड"
 msgid "Empty Trash"
 msgstr "खाली ट�रेश"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "यह %d अलग विंडो खोलेगा क�या आप निश�चित हैं कि आप �सा करना चाहते हैं"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d विंडो को खोलें"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "क�या आप निश�चित हैं कि आप %s को स�थायी तौर पर डिलीट करना चाहते हैं"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "यह %d अलग विंडो खोलेगा क�या आप निश�चित हैं कि आप �सा करना चाहते हैं"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "क�या आप निश�चित हैं कि आप %s को स�थायी तौर पर डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "%d च�ने ह�� आयटम�स को हमेशा के लि� डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "च�ने ह�� आयटम�स को स�थायी रूप से हटा दें"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "डिलीट"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "�क समूह निश�चित करें"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "पैटर�न"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" च�ना गया"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "�क फोल�डर च�ना गया"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d फोल�डर च�ने ग�"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "(0 आयटम है)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr "(1 आयटम है)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr "(%d आयटम�स है)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr "(क�ल 0 आयटम�स है)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr "(क�ल 1 आयटम�स है)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr "(क�ल %d आयटम है)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "क�ल \"%s\" च�ने ग� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d अन�य आयटम च�ने ग� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "�क अन�य आयटम च�ना गया (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d अन�य आयटम च�ने ग� (%s)"
@@ -4288,7 +4299,7 @@ msgstr "%d अन�य आयटम च�ने ग� (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4297,115 +4308,131 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, fuzzy, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "फोल�डर %s जितनी नॉटििलस हेण�डल कर सकता है उससे अधिक फाइल है क�छ फाइल नहीं दिखेंगी"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "बह�त सारी फाइल�स"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" ट�रेश मूव नहीं हो सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d च�ने ह�� आइटम�स को ट�रेश में नहीं भेजा जा सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" ट�रेश मूव नहीं हो सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d च�ने ह�� आयटम�स ट�रेश में नहीं भेजा जा सकता क�या आप उन %d आयटम�स को त�रंत डिलीट करना "
-"चाहते हैं"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" ट�रेश मूव नहीं हो सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "त�रंत डिलीट करें"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "क�या आप निश�चित ही \"%s\" को ट�रेश से स�थायी तौर पर डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "क�या आप निश�चित ही %d च�ने ह�� आयटम को स�थायी तौर पर ट�रेश से डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "ट�रेश से डिलीट करें"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "च�ने ह�� आयटम को खोलने के लि� \"%s\" का उपयोग करें"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "अन�य �प�लीकेशन�स"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "�क �प�लीकेशन"
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 #, fuzzy
 msgid "Other _Viewer..."
 msgstr "अन�य वीवर...(V)"
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 #, fuzzy
 msgid "A _Viewer..."
 msgstr "�क वीवर(V)"
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "\"%s\" को किसी च�ने ह�� आयटम�स पर चला�ं"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"इस फोल�डर की सभी �क�जीक�यूटेबल फाइल स�क�रिप�ट मेन�य� में दिखाई देंगी। मेन�य� से किसी स�क�रिप�ट को "
+"च�नने पर वह स�क�रिप�ट च�ने ह�� आयटम�स के साथ इनप�ट के रूप में चलेगी"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "इस फोल�डर की सभी �क�जीक�यूटेबल फाइल स�क�रिप�ट मेन�य� में दिखाई देंगी। मेन�य� से किसी स�क�रिप�ट को "
 "च�नने पर वह स�क�रिप�ट च�ने ह�� आयटम�स के साथ इनप�ट के रूप में चलेगी"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "स�क�रिप�ट के बारे में"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4436,183 +4463,189 @@ msgstr ""
 "यू आर आई नॉटििलस स�क�रिप�ट करेंट यू आर आई करेंट लोकेश के लि� यू आर आई नॉटििलस स�क�रिप�ट "
 "विंडो जियोमेंट�री करेंट विंडो की स�थान तथा आकार"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल निर�देश च�नें तो \"%s\" फाइल मूव हो जा�गी"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल निर�देश च�नें तो \"%s\" कापी हो जा�गा"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल निर�देश च�नें तो %d च�ने ह�� आयटम�स मूव हो जा�ंगे।"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल�स निर�देश च�नें तो %d च�ने ह�� आयटम�स कापी हो जा�ंगे"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "क�लिप बोर�ड पर पेस�ट करने के लि� क�छ भी नहीं है"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "गल�ती माउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "गलती अनमाउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "गल�ती माउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "इजेक�ट"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "अनमाउण�ट वाल�यूम"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "नयी विंडो में खोलें"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "%d को नयी विंडो में खोलें"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "होम फोल�डर"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "होम फोल�डर"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "ट�रेश से हटा�ं"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "च�ने ह�� आयटम�स को स�थायी रूप से हटा दें"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ट�रेश में भेजें"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "सभी च�ने ह�� आयटम�स के ट�रेश में भेजें"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "डिलीट"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "कड़ी बना�ं"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "कड़ी बना�ं"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "ट�रेश खाली करें"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "फाइल काटें"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "फाइल काटें"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "फाइल कापी करें"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "फाइल�स कापी करें"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5848
 #, fuzzy
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "यह कड़ी उपयोग नहीं की जा सकती क�योंकि इसका कोई टारगेट नहीं या आप इस कड़ी को ट�रेश में "
 "रखना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"यह कड़ी उपयोग नहीं की जा सकती क�योंकि इसका कोई टारगेट नहीं या आप इस कड़ी को ट�रेश में "
+"रखना चाहते हैं"
+
+#: src/file-manager/fm-directory-view.c:5852
 #, fuzzy, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "इस कड़ी को उपयोग नहीं किया जा सकता इसका टारगेट \"%s\" अस�तित�व में नहीं है। क�या आप इस "
 "कड़ी को ट�रेश में रखना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "कड़ी तोड़ें"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" �क �क�सक�यूटेबल टेक�स�ट फाइल है क�या आप इसे चलाना चाहते हैं क�या दिखाना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "चला�ं या प�रदर�शित करें?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "प�रदर�शित करें"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "टर�मिनल में चला�ं"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "प�रदर�शित करें"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "चला�ं"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" ख�ल रहा है"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "खोलने को निरस�त करें"
 
@@ -4633,108 +4666,133 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "छमा करें \"%s\" के सभी सामान को प�रदर�शित नहीं कर सकते"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "फोल�डर के प�रदर�शन में गलती"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "इस फोल�डर में नाम \"%s\" पहले से उपयोग हो रहा है। कपया दूसरा नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "इस फोल�डर में कोई \"%s\" नहीं शायद यह वहां से हटा दी गई है या डिलीट कर दी गई है"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\" का नाम बदलने के लि� जरूरी अन�मति आपके पास नहीं"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "\"%s\" नाम योग�य नहीं क�योंकि इसमें \"/\"अक�षर है कपया अलग नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" का नाम योग�य नहीं कपया अलग नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" का नाम नहीं बदल सकते क�योंकि यह केवल पढ़ने वाली डिस�क पर है"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "छमा करें, \"%s\" का नाम \"%s\" में नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "माफ करें, पर वो थीम हटाया न जा सक"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "नाम परिवर�तन में गलती"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "\"%s\" का समूह नहीं बदल सकते इसके लि� जरूरी अन�मति आपके पास नहीं है"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\" का समूह नहीं बदल सकते क�योंकि यह केवल पढ़ने वाली डिस�क पर है"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "छमा करें \"%s\" का ग�र�प नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "ग�र�प सेट करने में गलती"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "\"%s\" का स�वामी नहीं बदल सकते क�योंकि यह केवल पढ़ने वाली डिस�क पर है। "
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "छमा करें \"%s\" का स�वामी नहीं बदला जा सकता"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "ओनर सेट करने में गलती"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: src/file-manager/fm-error-reporting.c:235
 #, fuzzy, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" की अन�मतियां नहीं पढ़ने वाली डिस�क पर हैं"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "छमा करें %s की अन�मतियां नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "गलती सेट करने की अन�मतियां"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" को \"%s\" नाम से बदलें"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "नाम परिवर�तन निरस�त करें"
 
@@ -4792,130 +4850,152 @@ msgstr "आईकनà¥�स का असली आकारों में बà
 msgid "Restore Icon's Original Si_ze"
 msgstr "आईकन�स को असली आकार में बहाल करें"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "इंगित करें \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "स�थानीय फाईल सिस�टम में ही ड�रैग और ड�राप की स�विधा उपलब�ध है"
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "स�थानीय फाईल सिस�टम में ही ड�रैग और ड�राप की स�विधा उपलब�ध है"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "ड�रैग और ड�राप त�र�टि"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "अमान�य ड�रैग प�रकार प�रयोग किया गया है"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "फाईल नाम"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "आकार"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "प�रकार"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "तारीख में बदलाव"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
 "कस�टम आईकन के लि� छवि निश�चित करें"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
+"कस�टम आईकन के लि� छवि निश�चित करें"
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "�क से ज�यादा छवि"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
 "आईकन�स"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "सिर�फ स�थानीय छविया�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"जो फाईल आपने छोड़ी है वह छवि नहीं है। आप सिर�फ स�थानीय छवि ही उपयोग कर सकते हैं कस�टम "
-"आईकन�स की तरह"
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "सिर�फ छवियां"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "विशेषता��"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s विशेषता�ं"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "सम�दाय को बदलाओ को निरस�त करें?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "सम�दाय में बदलाव कि� जा रहे हैं"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "मालिक के बदलाओ निरस�त करें"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "मालिक बदले जा रहे हैं"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "क�छ नहीं"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "पढ़ने में असमर�थ"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 वस�त�, %s आकार के साथ"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d वस�त��ं, क�ल %s"
 
 # src/file-manager/fm-properties-window.c:1174

-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "क�छ अंश पढ़ने में असमर�थ"
 
@@ -4925,196 +5005,195 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "अंश"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "ब�नियादी"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "नाम"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "नाम"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "प�रकार"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "आकार"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "लोकेशन"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "डीवीडी वोल�यूम"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 #, fuzzy
 msgid "Free space:"
 msgstr "फ�री स�टाइल"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "सम�बन�ध करें लछ�य"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "�मआई�मई प�रकार"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "बदलाव किया गया"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "पह�ंच गया"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "कस�टम आईकन च�नें"
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "कस�टम आईकन हटा��"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "पढ़ें"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "लिखें"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "चला��"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "उपयोगकर�ता पहचान निर�धारित करे"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "विशेष चिन�ह"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "समूह पहचान निर�धारित करें"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "चिपचिपा"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "अन�मति"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "आप मालिक नहीं हैं, कारणवश आप इन अन�मतियों को बदल नहीं सकते"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "फाइल का मालिक"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "फाइल का मालिक"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "फाइल समूह"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "फाईल समूह"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "मालिक"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "समूह"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "अन�य"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "पाठ�य का दश�य"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "अंक का दश�य"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "आखिरी बार बदला गया"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"मदद दर�शाने में त�र�टि: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "सहायता दिखाने में कोई गलती है : %s"
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3348
 #, fuzzy
-msgid "Couldn't show help"
+msgid "Couldn't Show Help"
 msgstr "थीम हटाया नहीं जा सका"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "विशेषताओं वाली खिड़की दिखाना निरस�त करें"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "विशेषताओं वाली खिड़की बन रही है"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "�क आईकन च�नें"
@@ -5132,91 +5211,128 @@ msgid "Search Results"
 msgstr "खोज के परिणाम"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "माफ कीजि�गा परन�त� मिडेस�वा खोज सेवा उपलब�ध नहीं है क�योंकि ये इंस�टाल नहीं की गई है"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "माफ करें, पर मेड�य�सा खोज स�विधा उपलब�ध नहीं है"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "खोज स�विधा उपलब�ध नहीं है"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "जो खोज आपने च�नी है वो आपके सिस�टम के इन�डेक�स से नई है खोज अभी कोई परिणाम नहीं दे सकेगी "
 "आप नया इन�डेक�स बना सकते हैं मिडेस�य�आ इन�डेक�स�ड को कमान�ड हाईन पर रूट की तरह चला सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"आप अपनी फाईल सिस�टम का इन�डेक�स नहीं खोल सकते। आपका इन�डेक�स उपस�थित नहीं है या खराब है। "
+"आप नया इन�डेक�स बना सकते हैं। मिडेउसा इन�डेक�स को कमांड लाईन पर रूट की तरह चला सकते हैं"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "उन वस�त�ओं को खोजें जो बह�त नये हैं"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"कम�प�यूटर पर सभी सूचीबद�ध फाइलें आपके द�वारा दिये गये मापदण�डों के अन�सार हैं, आप अपने च�नावों "
+"की मात�राओं को जा�च सकते हैं, या और मापदण�डों को दे सकते हैं। अपनी खोज को और अधिक कम कर "
+"सकते हैं"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "कम�प�यूटर पर सभी सूचीबद�ध फाइलें आपके द�वारा दिये गये मापदण�डों के अन�सार हैं, आप अपने च�नावों "
 "की मात�राओं को जा�च सकते हैं, या और मापदण�डों को दे सकते हैं। अपनी खोज को और अधिक कम कर "
 "सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "खोज के समय त�र�टि"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "आप अपनी फाईल सिस�टम का इन�डेक�स नहीं खोल सकते। आपका इन�डेक�स उपस�थित नहीं है या खराब है। "
 "आप नया इन�डेक�स बना सकते हैं। मिडेउसा इन�डेक�स को कमांड लाईन पर रूट की तरह चला सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "फाईल इन�डेक�स बनाने में त�र�टि"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "खोज की सामग�री लोड करने में त�र�टि हो गई है: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "खोज शीघ�र ही इसके लि� फाईलों की सूची सिस�टम पर उपस�थित होना अनिवार�य है फाईन�ड इस समय "
 "खोज सूची ढूंढने में असमर�थ है कारणवश धीमी खोज होगी जो सूची का उपयोग न करे"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "तेज खोज उपलब�ध नहीं"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "अंश खोज उपलब�ध नहीं"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5228,55 +5344,85 @@ msgstr ""
 "रहा है। इसे चलाने के लि� रूट में लाग इन करें और इस कमाण�ड को कमाण�ड हाईन पर �न�टर करें "
 "मेड�यूसा सर�चड"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "जल�दी खोज के लि� खोज को फाईलों की सूची चालि�। आपका कम�प�यूटर अभी सूची बना रहा है "
 "क�योंकि खोज सूची का उपयोग नहीं ककर सकता, इस में कई मिनट लग सकते हैं."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "सूचीबद�ध खोज उपलब�ध नहीं है"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
 msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
 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."
+"system.  No index is available right now."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "तेज खोज आपके सिस�टम पर उपलब�ध नहीं है"
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "तेज खोज आपके सिस�टम पर उपलब�ध नहीं है"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "तेज खोज उपलब�ध नहीं"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "कहा�"
 
@@ -5285,7 +5431,7 @@ msgstr "कहा�"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "नई विन�डो में दर�शा��"
@@ -5296,7 +5442,7 @@ msgstr "नई विन�डो में दर�शा��"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d में दिखा�ं नई विन�डो"
@@ -5305,15 +5451,21 @@ msgstr "%d में दिखा�ं नई विन�डो"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"जितने परिणाम दिखा� जा सकते हैं। उससे अधिक खोज परिणाम आ ग� हैं क�छ खोज परिणाम नहीं "
+"दिखा� जा�ंगे।"
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "जितने परिणाम दिखा� जा सकते हैं। उससे अधिक खोज परिणाम आ ग� हैं क�छ खोज परिणाम नहीं "
 "दिखा� जा�ंगे।"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "काफी अधिक मिलान"
 
@@ -5328,12 +5480,12 @@ msgid "Create L_auncher"
 msgstr "नया लान�चर"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "नया लान�चर बना��"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "कचरे से सारी बस�त��ं हटा��"
 
@@ -5353,7 +5505,7 @@ msgstr "à¤�क खिड़की दिखाà¤�à¤� जो डेसà¥�कटà¤
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "पूर�वनिर�धारित बैकग�राउण�ड का उपयोग करें"
@@ -5376,187 +5528,206 @@ msgstr "अनà¥�य वà¥�यूवर निशà¥�चित करें जà¥
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "फोल�डर नहीं पढ़ सकता"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "फोल�डर नहीं पढ़ सकता"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "न� खाली फोल�डर को इस फोल�डर में बना��"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "न� खाली फोल�डर को इस फोल�डर में बना��"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "हर निश�चित वस�त� के लि� लाछणिक लिंक बना��"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "नकल"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "हर निश�चित वस�त� को मिटा�� कचरे में डाले बिना"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "हर निश�चित वस�त� की नकल बना��"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "सम�पादक लान�चर"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "लान�चर सूचना का सम�पादन करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "खोजें सन�सकरण को फारमेट करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "मीडिया ग�ण"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "निर�धारित संस�करण अनमाउण�ट करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "हटा�� या कापी करें पहले निश�चित की गई कट फाईल या कापी फाईल कमान�ड द�वारा"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr "हटा�� या कापी करें पहले निश�चित की गई कट फाईल या कापी फाईल कमान�ड द�वारा"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "इससे खोलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "हर निश�चित वस�त� को नई खिड़की में खोलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "नयी विंडो में खोलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "निश�चित वस�त� को इस खिड़की में खोलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "निश�चित फाईलों को तैयार करें पेस�ट फाईल कमान�ड द�वारा कापी के लि� तैयार करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "निश�चित फाईलों को पेस�ट फाईल कमान�ड से हटाने के लि� तैयार करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "बचाव करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "निर�धारित संस�करण को बचा��"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "फिर नाम दें निश�चित वस�त� को"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "व�यू को पूर�वनिर�धारित जैसा तैयार करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "सार�टिंग क�रम और जूम लेवल को इस व�यू की प�राथमिकता�� के अन�सार चला�ं या प�रबंध करें स�क�रिप�ट से "
 "सभी फाइल निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "सभी फाइलें निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "इस खिड़की की सारी वस�त�ओं को निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "�क समूह निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "उस फोल�डर को दिखा�� जो उन सभी स�क�रिप�टों को रखता है जो इस मीनू में दिखाई गई है"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "उस फोल�डर को दिखा�� जो उन सभी स�क�रिप�टों को रखता है जो इस मीनू में दिखाई गई है"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "निर�धारित संस�करण की मीडिया विशेषता�� दिखा��।"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "इस स�थान के बैक ग�राउण�ड के लि� पूर�वनिर�धारित उफयोग करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "निर�धारित संस�करण अनमाउण�ट करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "सभी निश�चित वस�त�ओं को देखें या बदलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "नया फोल�डर"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "फाइल कापी करें"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "फारमेट"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "अनमाउण�ट वाल�यूम"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "खोलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "खोलें स�क�रिप�ट फोल�डर"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "चिपका�� फाईलों को"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "चिपका�� फाईलों को"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "विशेषता��"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "प�न नाम दें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "स�क�रिप�ट"
 
@@ -5642,44 +5813,57 @@ msgstr "मानवकत"
 msgid "Indexing is %d%% complete."
 msgstr "%d%% सूचीबद�ध पूर�ण ह�ई"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "आपकी फाईलें आखिरी बार %s पर सूचीबद�ध की गई है"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "दिन में �क बार फाईल �वं पाठ�य सामग�री सूचीबद�ध की जाती है जिससे खोज तेज हो"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "सूचीबद�ध करने का स�तर"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "आपकी फाईलें आखिरी बार %s पर सूचीबद�ध की गई है"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
-msgstr ""
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr "दिन में �क बार फाईल �वं पाठ�य सामग�री सूचीबद�ध की जाती है जिससे खोज तेज हो"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "आपकी फाईलों की सूची अभी नहीं है"
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "आपकी फाईलों की सूची अभी नहीं है"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "माफ करें, पर मेड�य�सा खोज स�विधा उपलब�ध नहीं है"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%आई:%�म %पी, %�क�स"
 
@@ -5703,48 +5887,55 @@ msgstr "दिखाà¤�à¤� सूचीबदà¥�ध करने का सà¥�à¤
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "डेस�क टाप"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "डेस�क टाप"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5756,7 +5947,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5764,7 +5955,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5793,12 +5984,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "असंभावित त�र�टि के कारण नोटिल�य का उपयोग अभी नहीं हो सकेगा"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5806,20 +5997,31 @@ msgstr ""
 "जब फाईल मैनेजर व�यू सर�वर को रजिस�टर किया जा रहा तब ह�ई असंभावित त�र�टि के कारण नॉटिलस "
 "का उपयोग अब नहीं हो सकता"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr "�क अनअपेछित त�र�टि के कारण जब फैक�टरी स�थित करने की कोशिश हो रही थी"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"मदद दर�शाने में त�र�टि: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "ब�क मार�कस डिफाइन�ड नहीं है"
@@ -5855,34 +6057,45 @@ msgstr "कम विकल�प"
 msgid "Find Them!"
 msgstr "खोजें उन�हें"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "स�वयं में नहीं भेज सकते"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "माफ करें, पर \"%s\" वैध फाईल का नाम"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" वैध स�थिति नहीं है कपया मात�रा�� प�न जा�च लें और कोशिश करें"
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "\"%s\" नहीं ढूंढ सके, कपया मात�रा�� जा�च लें"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "नेट�रावर�स"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "नाम"
+msgid "_Location:"
+msgstr "लोकेशन"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "कनेक�टिवा"
@@ -6104,6 +6317,20 @@ msgstr ""
 "इन फाईलों की उपस�थिति दर�शाती है कि नॉटिलस कन�फिगरेशन डूईड प�रेजेन�ट किया गया है। आप ख�द "
 "इन फाइलों को मिटा सकते हैं फिर दिखाने के लि�\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
+"कस�टम आईकन के लि� छवि निश�चित करें"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6114,25 +6341,23 @@ msgstr "%s के साथ खोलें"
 msgid "Open with..."
 msgstr "इसके साथ खोलें..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "नया लान�चर"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "खाली ट�रेश"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6140,121 +6365,134 @@ msgstr ""
 msgid "Go To:"
 msgstr "जा�� इधर"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "क�या आप इन %d स�थानों को अलग खिड़की में देखना चाहते हैं"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "कई खिड़कियों में देखें"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr ""
 "%s ख�ल नहीं सकता %s क�योंकि %s फाइल�स को %s स�थान से �क�सेस नहीं कर सकते क�या आप कोई अन�य "
 "�प�लीकेशन च�नना चाहते हैं"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "ख�द जा�चने वाले परीछणों के समूह को करें"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "श�र�आती खिड़की को दी गई रेखागणित के अन�सार बना��"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "रेखागणित"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "सिर�फ खिड़की बना�� अलग से दर�शा�� यू आर �ल के लि�"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "डेस�कटाप का प�रबंधन न करें (प�रिफरेन�सेज डायलाग के प�रिफरेन�सेस पर ध�यान न दें)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "नॉटिलस से बाहर जा��"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "प�न श�रू करें नॉटिलस"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "फाईल नाम"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "नॉटिलस"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "नॉटिलस� - जा�चना यू आर �ल के साथ संभव नहीं\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "नॉटिलस� जा�चना दूसरे विकल�पों के साथ सम�भव नहीं\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "नॉटिलस� - बाहर जाना यूआर�ल के साथ उपयोग नहीं हो सकता\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "नॉटिलस� - प�न श�र�आत यू आर �ल के साथ नहीं उपयोग हो सकती\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "नॉटिलस� - रेखागणित ईस यूआर �ल के साथ उपयोग नहीं हो सकता\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "क�या आप निश�चित हैं कि आप %s को स�थायी तौर पर डिलीट करना चाहते हैं"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "क�या आप निश�चित रूप से कह सकते हैं कि आप इतिहास भूलना चाहते हैं, अगर आप कह सकते हैं तो ये "
 "फिर कहा जा सकता है।"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "क�या आप निश�चित तौर से कह सकते हैं कि आप सूची को हटाना चाहते हैंम जिसमें आपके द�वारा लाई "
 "गई स�थानों की सूचना है"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "इतिहास मिटा��"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" स�थिति उपस�थित नहीं है। क�या आप अपनी सूची से किसी ब�कमार�क को हटाना चाहते हैं"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "स�थिति %s अब उपस�थित नहीं है"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "ब�कमार�क अन�पस�थित स�थल के लि�"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "हटा��"
 
@@ -6287,7 +6525,6 @@ msgid "Close _All Windows"
 msgstr "सभी विन�डो बन�द करें"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "सभी नॉटिलस� विन�डो बन�द करें"
@@ -6310,107 +6547,119 @@ msgid "Forward"
 msgstr "आगे करें"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "कचरे वाले फोल�डर में जा��"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "जा�� अगली स�थिति पर जहां पहले जा च�के हैं"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "जा�� पिछली स�थिति पर"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "घर"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "स�थिति बार"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "प�न लोड करें"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "इस कम�प�यूटर में फाईलें खोजें"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "स�टेटस बार"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "र�को"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "ऊपर"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "ब�कमार�क जोड़ें (A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "पीछे (B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "ब�कमार�क�स"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "इतिहास साफ करें (C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "क�रियर"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "ब�कमार�क�स का सम�पादन करें (E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "आगे बड़ा�� (F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "जा�ं (G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "घर (H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "स�थान... (L)"
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "�क तरफ के पट (पेन) (S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "टाइम�स"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "कचरा (T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "ऊपर (U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "देखें (V)"
 
@@ -6429,34 +6678,39 @@ msgstr "�से देखें..."
 msgid "File Browser: %s"
 msgstr "फाइल का मालिक"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "साईडबार के �क पैनल में त�र�टि है कारणवश आगे नहीं बड़ सके। द�र�भाग�यवश कौन सा मैं बता नहीं "
 "सकता।"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s साइडबार पैनल में त�र�टि मिली है कारणवश आगे नहीं बड़ सके। अगर �सा आगे  भी होता है तो "
 "आप इस पैनल को बन�द करना चाहेंगे"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "साइडबार पैनल असफल"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "किनारे का पैन"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "प�रस�त�त है किनारे के पैन का व�यू"
 
@@ -6490,148 +6744,180 @@ msgstr "नया जोड़ें"
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "माफ करें, पर %s प�रकार मिटाया न जा सका"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "प�रकार (पैटर�न) मिटाया नहीं जा सका"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "माफ करें, पर चिन�ह %s मिटाया नहीं जा सका"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "थीम हटाया नहीं जा सका"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "नया चिन�ह बना��"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "कीवर�ड"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "छवि"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "न� चिन�ह के लि� छवि फाईल निश�चित करें"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "नया रंग बना��"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "रंग का नाम"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "रंग का मूल�य"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "माफ करें, पर \"%s\" वैध फाईल का नाम"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "माफ करें, पर अपने वैध फाईल का नाम नहीं दिया है"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "पैटर�न, इन�सटाल नहीं हो सका"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "माफ करें, पर आप बदली गई छवि को फिर नहीं बदल सकते"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "चित�र नहीं है"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "माफ करें, पर पैटर�न %s इन�सटाल नहीं हो सका"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "पैटर�न की तरह जोड़ने के लि� छवि फाईल निश�चित करें"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "माफ करें, परन�त� न� रंग के लि� �क �सा नाम देना होगा जिसमें ब�लैंक (खाली स�थान) नहीं"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "नया रंग इन�सटाल नहीं हो सका"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "जोड़ने के लि� रंग निश�चित करें"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "माफ कीजि�, परंत� %s �क उपयोग चित�र फाइल नहीं है"
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr ""
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "�क समूह निश�चित करें"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "हटाना निरस�त करें"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "�क नया पैटर�न जोड़ें"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "नया रंग जोड़ें"
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "नया चिन�ह जोड़ें"
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "हटाने के लि� पैटर�न पर क�लिक करें"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "हटाने के लि� रंग पर क�लिक करें"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "हटाने के लि� चिन�ह पर क�लिक करें"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "पैटर�न"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "रंग"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "चिन�ह"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "पैटर�न हटा��"
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "रंग हटा��"
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "चिन�ह हटा��"
 
@@ -7017,34 +7303,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "सभी विन�डो बन�द करें"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "प�रस�त�त है किनारे के पैन का व�यू"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "स�थान... (L)"
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "आयटम�स जो कि फोल�डर हैं"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr ""
 
@@ -7073,10 +7364,13 @@ msgid "View Failed"
 msgstr "देखना संभव नहीं"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s व�यू में त�र�टि है और आगे नहीं बढ़ सकता। आप अन�य व�यू निश�चित करें या दूसरे स�थान पर जा सकते हैं"
 
@@ -7085,94 +7379,124 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "इस विन�डो के साथ निर�धारित करें नॉटिलस� उफयोग के योग�य"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "अंश व�यू"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "वर�तमान फाईल या फोल�डर का व�यू"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "\"%s\" नहीं ढूंढ सके, कपया मात�रा�� जा�च लें"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "थीम ज�ड़ नहीं सका"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "नॉटिलस� \"%s\" नहीं दिखा सका"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "\"%s\" दिखाया न जा सका, क�योंकि नॉटिलस� फाइल का प�रकार बताने में असमर�थ था"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "\"%s\" दिखाने की शक�ति रखने वाला कोई व�यूवर नॉटिलस� के पास नहीं है"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "\"%s\" नहीं दिखा सके क�योंकि नॉटिलस� %s स�थिति को संभाल नहीं सकता"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\" दिखाने में असमर�थ, क�योंकि लाग इन करने का प�रयास असफल रहा"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" दिखाने में असमर�थ, क�योंकि प�रवेश की अन�मति नहीं है"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" दिखाने में असमर�थ क�योंकि कोई भी \"%s\" होस�ट नहीं मिला। जांच लें कि मात�रा�� सही "
 "हैं और प�राक�सी सर�वर सेटिंग�स ठीक है कि नहीं"
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "\"%s\" दिखाया नहीं जा सका क�योंकि होस�ट का नाम खाली था। जा�च लें कि आपकी प�राक�सी "
 "सर�वर सेटिंग�स सही है या नहीं"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "\"%s\" नहीं दिखा सके क�योंकि नॉटिलस� %s स�थिति को संभाल नहीं सकता"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"\"%s\" दिखाने में असमर�थ क�योंकि नॉटिलस� �स�मबी मालिक ब�राउजर से सम�पर�क नहीं कर सका। "
-"जांच लें कि �स�मबी सर�वर लोकल नेटवर�क में चल रहा है"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"अभी खोज नहीं हो सकती क�योंकि या तो इन�डेक�स नहीं है, या खोज स�विधा उपलब�ध नहीं है। ये "
+"पक�का कर लें कि आपने मेड�यूसा खोज स�विधा श�रू की या नहीं। और यदि इन�डेक�स नहीं है तो मेड�य�सा "
+"इन�डेक�सर चल रहा है या नहीं।"
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "अभी खोज नहीं हो सकती क�योंकि या तो इन�डेक�स नहीं है, या खोज स�विधा उपलब�ध नहीं है। ये "
 "पक�का कर लें कि आपने मेड�यूसा खोज स�विधा श�रू की या नहीं। और यदि इन�डेक�स नहीं है तो मेड�य�सा "
 "इन�डेक�सर चल रहा है या नहीं।"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "खोज स�विधा उपलब�ध नहीं"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "नॉटिलस� \"%s\" नहीं दिखा सका"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "स�थिति नहीं दिखा सके"
 
@@ -7184,7 +7508,7 @@ msgstr "उस स�थल पर जा�� जो इस ब�कमार
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "कापीराइट (c) 1999-2001Eazel, inc"
 
@@ -7192,11 +7516,11 @@ msgstr "कापीराइट (c) 1999-2001Eazel, inc"
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "अन�वादक को श�रेय"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7211,39 +7535,43 @@ msgstr "क�छ पन�ने पीछे जा��"
 msgid "Go forward a number of pages"
 msgstr "कई पन�ने आगे जा��"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "इस स�थल को %s के साथ दर�शा��"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "रेडहेट नेटवर�क"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "बिन�द���"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "थीम�स"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "उपयोग के योग�य आईडी"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "विन�डो की उपयोग के योग�य आई डी"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "उपयोग के लि�"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "इस विन�डो के साथ निर�धारित करें नॉटिलस� उफयोग के योग�य"
 
@@ -7281,6 +7609,132 @@ msgstr "नेट�रावर�स"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "अपने होम फोल�डर को नॉटििलस फाइल मैनेजर में देखें"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "हार�डवेयर दश�य के लि� कारखाना"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "हार�डवेयर दश�य दिखाने वाला"
+
+#~ msgid "Hardware view"
+#~ msgstr "हार�डवेयर दश�य दिखाने वाला"
+
+#~ msgid "View as Hardware"
+#~ msgstr "हार�डवेयर की दरह देखो"
+
+#~ msgid "hardware view"
+#~ msgstr "हार�डवेयर दश�य"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "हार�डवेयर दश�य के लि� आइकन का नाम"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "हार�डवेयर जानकारी का सारांश"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s सीपीयू \n"
+#~ "%s MHz \n"
+#~ " %s K कैश साइज"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu जीबी रेम"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu �म बी रेम"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu जीबी"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu �मबी"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "अपटाईम है %d दिन, %d घंटे, %d मिनिट"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "यह CPU पृष�ठ के लि� प�लेसहोल�डर है"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "यह RAM पृष�ठ के लि� प�लेसहोल�डर है"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "यह IDE पृष�ठ के लि� प�लेसहोल�डर है"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" पर कापी करते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" पर लिंक बनाते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "ट�रेश में कापी नहीं कर सकता"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "नोटिलस ट�रेश फोल�डर के लि� आपके डिस�क को खोज रहा है"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d च�ने ह�� आइटम�स को ट�रेश में नहीं भेजा जा सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d च�ने ह�� आयटम�स ट�रेश में नहीं भेजा जा सकता क�या आप उन %d आयटम�स को त�रंत डिलीट करना "
+#~ "चाहते हैं"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "जो फाईल आपने छोड़ी है वह छवि नहीं है। आप सिर�फ स�थानीय छवि ही उपयोग कर सकते हैं "
+#~ "कस�टम आईकन�स की तरह"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "माफ कीजि�गा परन�त� मिडेस�वा खोज सेवा उपलब�ध नहीं है क�योंकि ये इंस�टाल नहीं की गई है"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" वैध स�थिति नहीं है कपया मात�रा�� प�न जा�च लें और कोशिश करें"
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "माफ करें, परन�त� %s उपयोग करने योग�य छवि फाईल नहीं है"
+
+#~ 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 ""
+#~ "\"%s\" दिखाने में असमर�थ क�योंकि नॉटिलस� �स�मबी मालिक ब�राउजर से सम�पर�क नहीं कर सका। "
+#~ "जांच लें कि �स�मबी सर�वर लोकल नेटवर�क में चल रहा है"
+
+#~ msgid "file icon"
+#~ msgstr "फाइल आयकान"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "नाम"
+
 #~ msgid "Unknown"
 #~ msgstr "अग�यात"
 
@@ -7386,9 +7840,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "_Toolbar"
 #~ msgstr "टूलबार (T)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "स�थिति %s अब उपस�थित नहीं है"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "अन�पस�थित स�थल पर जा��"
 
@@ -7446,9 +7897,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "_Helvetica"
 #~ msgstr "हेलवेटिका"
 
-#~ msgid "_Times"
-#~ msgstr "टाइम�स"
-
 #~ msgid "Content Loser"
 #~ msgstr "विषय सामग�री खोने वाला"
 
@@ -7980,9 +8428,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "Set Cover Image"
 #~ msgstr "कवर इमेज को सेट करो"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "माफ कीजि�, परंत� %s �क उपयोग चित�र फाइल नहीं है"
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "�ल�बम के कवर के लि� चित�र फाइल च�नें"
 
@@ -8098,9 +8543,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "Remove any custom images from selected icons"
 #~ msgstr "किसी भी कस�टम छवि को निश�चित आईकन�स से हटा��"
 
-#~ msgid "Themes"
-#~ msgstr "थीम�स"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "नया विन�डो व�यवहार"
 
@@ -8191,9 +8633,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "Preferences"
 #~ msgstr "प�राथमिकता��"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "माफ करें पर छवि %s चिन�ह की तरह इन�स�टाल नहीं हो सकती"
-
 #~ msgid "Click on a theme to remove it."
 #~ msgstr "किसी थीम को हटाने के लि� उस�पर क�लिक करें"
 
@@ -8203,9 +8642,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "माफ करें, पर \"%s\" �क वैध थीम फोल�डर नहीं है"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "माफ करें, पर \"%s\" थीम इन�सटाल नहीं हो सका"
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "थीम इन�स�टाल नहीं हो सका"
 
@@ -8220,9 +8656,6 @@ msgstr "अपने होम फोलà¥�डर को नॉटििलस à
 #~ "theme before removing this one."
 #~ msgstr "माफ करें, पर आप वर�तमान थीम हटा नहीं सकते। कपया ये थीम बदल हें मिटाने से पहले।"
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "माफ करें, पर वो थीम हटाया न जा सक"
-
 #~ msgid "_Add Theme..."
 #~ msgstr "जोड़ें थीम... (A)"
 
diff --git a/po/hr.po b/po/hr.po
index a3a772b4e..25dba5a10 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,11 +1,11 @@
 # Translation of nautilus to Croatian
 # Copyright (C) Croatian team
-# Translators: Automatski Prijevod <>,Denis Lackovic <delacko@fly.srk.fer.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,Robert Sedak <robert.sedak@sk.tel.hr>,Sinisa Habek <sinisa_habek@inet.hr>,pr pr <delacko@192.168.0.1>,
+# Translators: Automatski Prijevod <>,Denis Lackovic <delacko@fly.srk.fer.hr>,Mato Kutlić <mate@iskraemeco.hr>,Nikola Planinac <>,Robert Sedak <robert.sedak@sk.tel.hr>,Robert Vuković <robi@surfer.hr>,Sinisa Habek <sinisa_habek@inet.hr>,pr pr <delacko@192.168.0.1>,
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 0\n"
 "POT-Creation-Date: 2003-11-06 18:13+0100\n"
-"PO-Revision-Date: 2003-11-10 16:54+CET\n"
+"PO-Revision-Date: 2003-12-30 20:47+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
@@ -268,47 +268,47 @@ msgstr "Nautilusov pregled osobina slike"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
 msgid "Camera Brand"
-msgstr ""
+msgstr "Proizvođa� foto aparata"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
 msgid "Camera Model"
-msgstr ""
+msgstr "Model foto aparata"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Datum snimke"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Dužina ekspozicije"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
 msgid "Exposure Program"
-msgstr ""
+msgstr "Program ekspozicije"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Vrijednost otvora"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Na�in mjerenja"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Bljeskalica je korištena"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Žarišna daljina"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Brzina zatvara�a"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO klasa brzine"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -6310,7 +6310,7 @@ msgstr "Pogledaj u više prozora?"
 
 #: src/nautilus-location-dialog.c:138
 msgid "Open Location"
-msgstr ""
+msgstr "Otvori lokaciju"
 
 #: src/nautilus-main.c:149
 msgid "Perform a quick set of self-check tests."
diff --git a/po/hu.po b/po/hu.po
index 035d7c5c5..e6edc8a7d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus.gnome-2-4.hu\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-10-14 21:51+0200\n"
 "Last-Translator: Gabor Sari <saga@chello.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -49,8 +49,8 @@ msgstr "bonobo_ui_init() sikertelen."
 
 # data/browser.xml.h:31 src/file-manager/fm-properties-window.c:1592
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Matricák"
 
@@ -64,56 +64,71 @@ msgstr "Nautilus matrica-oldalpanel"
 msgid "Nautilus Emblem view"
 msgstr "Nautilus matricanézet"
 
+# src/nautilus-theme-selector.c:606
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Matrica törlése sikertelen."
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nem sikerült eltávolítani a következő matricát: '%s'. Ez talán azért lehet, "
 "mert a matrica állandó, és nem olyan, amit te hoztál létre."
 
 # src/nautilus-theme-selector.c:606
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Matrica törlése sikertelen."
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+# src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
+# src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Matrica átnevezése sikertelen."
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nem sikerült átnevezni a(z) '%s' nevű matricát. Ez talán azért lehet, mert a "
 "matrica állandó, és nem olyan, amit te hoztál létre."
 
 # src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
 # src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Matrica átnevezése sikertelen."
 
 # src/nautilus-property-browser.c:2098
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Matrica átnevezése"
 
 # src/nautilus-property-browser.c:961
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Add meg a matrica új nevét:"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:38
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "�tnevezés"
 
 # src/nautilus-property-browser.c:2030
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Matricák hozzáadása..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -121,7 +136,7 @@ msgstr ""
 "�rd be minden matrica mellé a magyarázó szövegét. Ez a név lesz használva a "
 "matrica azonosítására a többi helyen."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -129,159 +144,66 @@ msgstr ""
 "�rd be a matrica mellé a magyarázó szövegét. Ez a név lesz használva a "
 "matrica azonosítására a többi helyen."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Bizonyos fájlok nem adhatóak hozzá matricaként, mert nem tűnnek érvényes "
 "képeknek."
 
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "A(z) '%s' fájl nem tűnik érvényes képnek."
+
 # src/nautilus-theme-selector.c:398
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Matricák hozzáadása sikertelen"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Egyik fájl sem adható hozzá matricaként, mert nem tűnnek érvényes képeknek."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Az áthúzott szöveg nem érvényes fájlhely."
 
 # src/nautilus-theme-selector.c:398
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Matrica hozzáadása sikertelen"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "A(z) '%s' fájl nem tűnik érvényes képnek."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Az áthúzott fájl nem tűnik érvényes képnek."
 
 # data/browser.xml.h:33
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Törlés"
 
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory a hardvernézetekhez"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:2
-# components/hardware/nautilus-hardware-view.c:631
-# data/static_bookmarks.xml.h:13
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardver"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:3
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardvermegjelenítő"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:3
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardvernézet"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:2
-# components/hardware/nautilus-hardware-view.c:631
-# data/static_bookmarks.xml.h:13
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Hardverként"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:4
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardvernézet"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ikonnév a hardvernézethez"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "összefoglaló a hardverinfóhoz"
-
-# components/hardware/nautilus-hardware-view.c:230
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K gyorstár"
-
-# components/hardware/nautilus-hardware-view.c:264
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-# components/hardware/nautilus-hardware-view.c:266
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-# components/hardware/nautilus-hardware-view.c:324
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-# components/hardware/nautilus-hardware-view.c:326
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "A gép %d napja, %d órája és %d perce működik"
-
-# components/hardware/nautilus-hardware-view.c:407
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardver áttekintés"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ez távtartó a CPU-oldalhoz."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ez távtartó a RAM-oldalhoz."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ez távtartó az IDE-oldalhoz."
-
 # components/history/Nautilus_View_history.oaf.in.h:2
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
@@ -1097,6 +1019,13 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+# components/hardware/Nautilus_View_hardware.oaf.in.h:2
+# components/hardware/nautilus-hardware-view.c:631
+# data/static_bookmarks.xml.h:13
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardver"
+
 # components/help/Nautilus_View_help.oaf.in.h:8
 #: data/static_bookmarks.xml.h:16
 msgid "International"
@@ -1417,27 +1346,27 @@ msgid "Desktop trash icon name"
 msgstr "A munkaasztal Kuka ikonja"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1450,8 +1379,8 @@ msgstr "A Saját könyvtár ikon látható a munkaasztalon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1477,11 +1406,15 @@ msgid ""
 "options of a file in the file preferences dialog."
 msgstr ""
 
+# libnautilus-private/nautilus-file-operations.c:1899
+# libnautilus-private/nautilus-file-operations.c:2157
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
+"Ha be van állítva, akkor a Nautilus rajzolja ki a munkaasztal ikonjait."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1515,11 +1448,15 @@ msgid ""
 "bookmark menu."
 msgstr ""
 
+# libnautilus-private/nautilus-file-operations.c:1899
+# libnautilus-private/nautilus-file-operations.c:2157
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+"Ha be van állítva, akkor a Nautilus rajzolja ki a munkaasztal ikonjait."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1531,7 +1468,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1548,7 +1485,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1574,7 +1511,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1598,7 +1535,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1616,12 +1553,14 @@ msgstr ""
 msgid "Nautilus handles drawing the desktop"
 msgstr "A Nautilus felelős a munkaasztal megjelenítéséért"
 
+# src/Nautilus_shell.oaf.in.h:9
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "A Nautilus felelős a munkaasztal megjelenítéséért"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1641,7 +1580,8 @@ msgstr "Fordított sorrend az új ablakokban"
 
 # libnautilus-private/nautilus-global-preferences.c:155
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Könyvtárak megjelenítése a fájlok előtt az ablakokban"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1677,7 +1617,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1685,30 +1625,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1756,7 +1696,8 @@ msgstr "Kézi elrendezés használata"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "_Aktivált elem megnyitása új ablakban"
 
 # libnautilus-private/nautilus-global-preferences.c:113
@@ -1780,7 +1721,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 # libnautilus-private/nautilus-global-preferences.c:133
@@ -1795,7 +1736,8 @@ msgstr ""
 
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Az alapértelmezett munkaasztalháttér használata"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1981,82 +1923,97 @@ msgstr "visszaállítás"
 msgid "on the desktop"
 msgstr "a munkaasztalon"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+# components/rpmview/nautilus-rpm-view.c:362
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "A kötet nem törölhető"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "A kötet ikonja nem törölhető. Ha szeretnéd kivenni az adathordozót, használd "
 "a jobbgombos menü Kiadás menüparancsát."
 
 # components/rpmview/nautilus-rpm-view.c:362
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "A kötet nem törölhető"
 
 # data/linksets/desktop.xml.h:2 libnautilus-private/nautilus-file.c:4751
 # libnautilus-private/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:65
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Kuka"
 
 # libnautilus-private/nautilus-program-chooser.c:1338
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "�_thelyezés ide"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Másolás ide"
 
 # src/nautilus-link-set-window.c:189
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Kapcsolás ide"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:30
 # src/nautilus-sidebar.c:490
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Beállítás _háttérként"
 
 # src/file-manager/fm-directory-view.c:3494
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Beállítás _háttérként az összes mappához"
 
 # src/nautilus-shell-ui.xml.h:40
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Beállítás háttérként _ehhez a mappához"
 
-# src/nautilus-property-browser.c:1324
 #: 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 ""
+
+# src/nautilus-property-browser.c:1324
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Sajnálom, de a matrica kulcsszava nem lehet üres."
 
 # src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
 # src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Matrica telepítése sikertelen."
 
 # src/nautilus-property-browser.c:1327
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -2067,20 +2024,28 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Sajnálom, de a már létezik ilyen nevű matrica: %s.\n"
 "Válassz másik nevet."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+# src/nautilus-property-browser.c:1325 src/nautilus-property-browser.c:1328
+# src/nautilus-property-browser.c:1332 src/nautilus-property-browser.c:1361
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Matrica telepítése sikertelen."
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Sajnos nem lehet menteni az egyéni matricát."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Sajnos nem lehet menteni az egyéni matrica nevét."
 
@@ -2102,24 +2067,32 @@ msgstr "Forrás:"
 msgid "To:"
 msgstr "Cél:"
 
+# libnautilus-private/nautilus-file-operations.c:927
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Hiba áthelyezéskor."
+
 # libnautilus-private/nautilus-file-operations.c:588
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Hiba áthelyezés közben.\n"
 "\n"
 "\"%s\" nem helyezhető át, mert csak olvasható lemezen van."
 
+# libnautilus-private/nautilus-file-operations.c:935
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Hiba törléskor."
+
 # libnautilus-private/nautilus-file-operations.c:599
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -2128,23 +2101,18 @@ msgstr ""
 "\"%s\" nem törölhető, mert nincs jogod a szülőkönyvtárat módosítani."
 
 # libnautilus-private/nautilus-file-operations.c:605
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Hiba törlés közben.\n"
 "\n"
 "\"%s\" nem törölhető, mert csak olvasható lemezen van."
 
 # libnautilus-private/nautilus-file-operations.c:636
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -2153,13 +2121,17 @@ msgstr ""
 "\"%s\" nem helyezhető át, mert nincs jogod módosítani a fájl vagy a "
 "szülőkönyvtárát."
 
+# libnautilus-private/nautilus-file-operations.c:927
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Hiba áthelyezéskor."
+
 # libnautilus-private/nautilus-file-operations.c:588
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Hiba áthelyezés közben.\n"
@@ -2167,12 +2139,10 @@ msgstr ""
 "\"%s\" nem helyezhető át, mert az vagy a szülőkönyvtára a cél része."
 
 # libnautilus-private/nautilus-file-operations.c:636
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Hiba áthelyezés közben.\n"
@@ -2180,266 +2150,207 @@ msgstr ""
 "\"%s\" nem helyezhető át a Kukába, mert nincs jogod módosítani a fájl vagy a "
 "szülőkönyvtárát."
 
+# libnautilus-private/nautilus-file-operations.c:924
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Hiba másoláskor."
+
 # libnautilus-private/nautilus-file-operations.c:667
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Hiba másolás közben.\n"
 "\n"
 "\"%s\" nem másolható, mert nincs rá olvasási jogod."
 
-# libnautilus-private/nautilus-file-operations.c:689
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Hiba másolás közben. A célfájl: \"%s\".\n"
-"\n"
-"A célfájl lemezén nincs elég hely."
+# libnautilus-private/nautilus-file-operations.c:924
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Hiba másoláskor."
 
 # libnautilus-private/nautilus-file-operations.c:694
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Hiba áthelyezés közben. A célfájl: \"%s\".\n"
 "\n"
 "A célfájl lemezén nincs elég hely."
 
-# libnautilus-private/nautilus-file-operations.c:698
+# libnautilus-private/nautilus-file-operations.c:927
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Hiba a kapocs létrehozásakor. A hely: \"%s\".\n"
-"\n"
-"A célterületen nincs elég hely."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Hiba áthelyezéskor."
+
+# libnautilus-private/nautilus-file-operations.c:930
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Hiba kapocs létrehozásakor."
 
 # libnautilus-private/nautilus-file-operations.c:710
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Hiba másolás közben. A célfájl: \"%s\".\n"
 "\n"
 "Lehet, hogy nincs jogod írni ebbe a mappába."
 
 # libnautilus-private/nautilus-file-operations.c:714
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Hiba másolás közben. A célfájl: \"%s\".\n"
 "\n"
 "A céllemez írásvédett."
 
-# libnautilus-private/nautilus-file-operations.c:721
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Hiba áthelyezés közben. A célfájl: \"%s\".\n"
-"\n"
-"Lehet, hogy nincs jogod írni ebbe a mappába."
-
-# libnautilus-private/nautilus-file-operations.c:725
+# libnautilus-private/nautilus-file-operations.c:927
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Hiba áthelyezés közben. A célfájl: \"%s\".\n"
-"\n"
-"A céllemez csak olvasható."
-
-# libnautilus-private/nautilus-file-operations.c:732
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Hiba a kapocs létrehozása közben. A mappa: \"%s\".\n"
-"\n"
-"Nincs jogod írni ebbe a mappába."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Hiba áthelyezéskor."
 
-# libnautilus-private/nautilus-file-operations.c:736
+# libnautilus-private/nautilus-file-operations.c:930
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Hiba a kapocs létrehozása közben. A mappa: \"%s\".\n"
-"\n"
-"A céllemez csak olvasható."
-
-# libnautilus-private/nautilus-file-operations.c:765
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" hiba, a következő másolásakor: \"%s\".\n"
-"\n"
-"Mégis folytatod?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Hiba kapocs létrehozásakor."
 
-# libnautilus-private/nautilus-file-operations.c:769
+# libnautilus-private/nautilus-file-operations.c:924
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Hiba másoláskor."
+
+# libnautilus-private/nautilus-file-operations.c:798
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"\"%s\" hiba, a következő áthelyezésekor: \"%s\".\n"
+"�thelyezés közben \"%s\" hiba lépett fel.\n"
 "\n"
 "Mégis folytatod?"
 
-# libnautilus-private/nautilus-file-operations.c:773
+# libnautilus-private/nautilus-file-operations.c:927
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" hiba, a következő kapocs létrehozásakor: \"%s\".\n"
-"\n"
-"Mégis folytatod?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Hiba áthelyezéskor."
 
-# libnautilus-private/nautilus-file-operations.c:779
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+# libnautilus-private/nautilus-file-operations.c:773
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"\"%2$s\" törlése közben \"%1$s\" hiba lépett fel.\n"
+"\"%s\" hiba, a következő kapocs létrehozásakor: \"%s\".\n"
 "\n"
 "Mégis folytatod?"
 
-# libnautilus-private/nautilus-file-operations.c:794
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Másolás közben \"%s\" hiba lépett fel.\n"
-"\n"
-"Mégis folytatod?"
+# libnautilus-private/nautilus-file-operations.c:935
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Hiba törléskor."
 
-# libnautilus-private/nautilus-file-operations.c:798
+# libnautilus-private/nautilus-file-operations.c:924
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"�thelyezés közben \"%s\" hiba lépett fel.\n"
-"\n"
-"Mégis folytatod?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Hiba másoláskor."
 
-# libnautilus-private/nautilus-file-operations.c:802
+# libnautilus-private/nautilus-file-operations.c:927
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kapocs létrehozása közben \"%s\" hiba lépett fel.\n"
-"\n"
-"Mégis folytatod?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Hiba áthelyezéskor."
 
-# libnautilus-private/nautilus-file-operations.c:808
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Törlés közben \"%s\" hiba lépett fel.\n"
-"\n"
-"Mégis folytatod?"
+# libnautilus-private/nautilus-file-operations.c:930
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Hiba kapocs létrehozásakor."
+
+# libnautilus-private/nautilus-file-operations.c:935
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Hiba törléskor."
 
 # libnautilus-private/nautilus-file-operations.c:924
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Hiba másoláskor."
 
 # libnautilus-private/nautilus-file-operations.c:927
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Hiba áthelyezéskor."
 
 # libnautilus-private/nautilus-file-operations.c:930
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Hiba kapocs létrehozásakor."
 
 # libnautilus-private/nautilus-file-operations.c:935
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Hiba törléskor."
 
 # libnautilus-private/nautilus-file-operations.c:960
 # libnautilus-private/nautilus-file-operations.c:979
 # libnautilus-private/nautilus-file-operations.c:1093
 # libnautilus-private/nautilus-file-operations.c:1107
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Mellőz"
 
 # libnautilus-private/nautilus-file-operations.c:979
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Újra"
 
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nem sikerült befejezni a megadott műveletet."
+
 # libnautilus-private/nautilus-file-operations.c:1057
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "A \"%s\" nevű elemet nem lehet az új helyre áthelyezni, mert ott már van egy "
 "különleges elem, aminek ugyanez a neve és amelyet nem lehet eltávolítani, "
@@ -2448,14 +2359,17 @@ msgstr ""
 "Ha még mindig át akarod helyezni \"%s\"-t, nevezd először át, és próbáld "
 "újra."
 
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nem sikerült befejezni a megadott műveletet."
+
 # libnautilus-private/nautilus-file-operations.c:1063
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "A \"%s\" nevű elemet nem lehet az új helyre másolni, mert ott már van egy "
 "különleges elem, aminek ugyanez a neve és amelyet nem lehet eltávolítani, "
@@ -2464,53 +2378,59 @@ msgstr ""
 "Ha még mindig át akarod másolni \"%s\"-t, nevezd először át, és próbáld újra."
 
 # libnautilus-private/nautilus-file-operations.c:1071
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "A fájl helyettesítése sikertelen."
 
 # libnautilus-private/nautilus-file-operations.c:1081
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "A következő fájl már létezik: \"%s\"\n"
 "\n"
 "Felülírod?"
 
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1092
 # libnautilus-private/nautilus-file-operations.c:1106
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Ütközés másoláskor"
 
 # libnautilus-private/nautilus-file-operations.c:1093
 # libnautilus-private/nautilus-file-operations.c:1107
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Csere"
 
 # libnautilus-private/nautilus-file-operations.c:1107
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Mindet cseréli"
 
 # libnautilus-private/nautilus-file-operations.c:1156
 # libnautilus-private/nautilus-file.c:3803
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "link erre: %s"
 
 # libnautilus-private/nautilus-file-operations.c:1160
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "még egy kapocs ehhez: %s"
@@ -2520,28 +2440,28 @@ msgstr "még egy kapocs ehhez: %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-private/nautilus-file-operations.c:1180
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-private/nautilus-file-operations.c:1184
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. kapocs ehhez: %s"
 
 # libnautilus-private/nautilus-file-operations.c:1188
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. kapocs ehhez: %s"
@@ -2553,108 +2473,109 @@ msgstr "%d. kapocs ehhez: %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1210
 # libnautilus-private/nautilus-file-operations.c:2351
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (még egy másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1218
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1212
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1214
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1216
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:1228
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1230
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (még egy másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1238
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1232
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1234
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1236
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. másolat)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1322
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 # libnautilus-private/nautilus-file-operations.c:1330
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # libnautilus-private/nautilus-file-operations.c:1487
 # libnautilus-private/nautilus-file-operations.c:2066
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ismeretlen GnomeVFSXferProgressStatus %d"
@@ -2662,14 +2583,14 @@ msgstr "Ismeretlen GnomeVFSXferProgressStatus %d"
 # libnautilus-private/nautilus-file-operations.c:1802
 # libnautilus-private/nautilus-file-operations.c:2195
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Fájlok áthelyezése a kukába"
 
 # libnautilus-private/nautilus-file-operations.c:1804
 # libnautilus-private/nautilus-file-operations.c:2197
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Kidobott fájlok:"
 
@@ -2677,584 +2598,627 @@ msgstr "Kidobott fájlok:"
 # libnautilus-private/nautilus-file-operations.c:1821
 # libnautilus-private/nautilus-file-operations.c:2199
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "�thelyezés"
 
 # libnautilus-private/nautilus-file-operations.c:1807
 # libnautilus-private/nautilus-file-operations.c:2200
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Felkészülés a kukába való áthelyezésre..."
 
 # libnautilus-private/nautilus-file-operations.c:1817
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Fájlok áthelyezése"
 
 # libnautilus-private/nautilus-file-operations.c:1819
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "�thelyezett fájlok:"
 
 # libnautilus-private/nautilus-file-operations.c:1822
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Felkészülés áthelyezésre..."
 
 # libnautilus-private/nautilus-file-operations.c:1823
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "�thelyezés befejezése..."
 
 # libnautilus-private/nautilus-file-operations.c:1835
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Kapcsok létrehozása"
 
 # libnautilus-private/nautilus-file-operations.c:1837
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Kapcsolt fájlok:"
 
 # libnautilus-private/nautilus-file-operations.c:1839
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Kapcsok létrehozása:"
 
 # libnautilus-private/nautilus-file-operations.c:1840
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Kapcsok létrehozásának előkészítése..."
 
 # libnautilus-private/nautilus-file-operations.c:1841
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Kapcsok létrehozásának befejezése..."
 
 # libnautilus-private/nautilus-file-operations.c:1848
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Fájlok másolása"
 
 # libnautilus-private/nautilus-file-operations.c:1850
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "�tmásolt fájlok:"
 
 # libnautilus-private/nautilus-file-operations.c:1852
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Másolás alatt"
 
 # libnautilus-private/nautilus-file-operations.c:1853
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Felkészülés a másolásra..."
 
 # libnautilus-private/nautilus-file-operations.c:1871
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Nem lehet elemeket a Kukába másolni."
 
-# libnautilus-private/nautilus-file-operations.c:1872
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nem lehet a Kukába másolni"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:1900
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Nem lehet áthelyezni ezt a Kuka mappát."
 
 # libnautilus-private/nautilus-file-operations.c:1903
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Nem lehet másolni ezt a Kuka mappát."
 
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1905
 # libnautilus-private/nautilus-file-operations.c:2158
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Nem lehet a Kuka helyét megváltoztatni"
 
 # libnautilus-private/nautilus-file-operations.c:1906
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Nem lehet a Kukát másolni"
 
 # libnautilus-private/nautilus-file-operations.c:1923
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Nem lehet egy mappát önmagába áthelyezni."
 
 # libnautilus-private/nautilus-file-operations.c:1924
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Nem lehet egy mappát önmagára másolni."
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Új üres mappa létrehozása ebbe a mappába"
+
 # libnautilus-private/nautilus-file-operations.c:1926
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Nem lehet a Sajátba átmozgatni"
 
 # libnautilus-private/nautilus-file-operations.c:1927
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Nem lehet a Sajátba másolni"
 
 # libnautilus-private/nautilus-file-operations.c:1941
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Nem lehet a fájlt saját magára másolni."
 
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1944
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Nem lehet az objektumot saját magára másolni"
 
 # libnautilus-private/nautilus-file-operations.c:1995
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Hiba új mappa létrehozása közben.\n"
 "\n"
 "Nincs jogod írni a célterületre."
 
 # libnautilus-private/nautilus-file-operations.c:1998
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Hiba az új mappa létrehozásakor.\n"
 "\n"
 "Nincs hely a célmeghajtón."
 
 # libnautilus-private/nautilus-file-operations.c:2001
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Új mappa létrehozása közben \"%s\" hiba lépett fel."
 
 # libnautilus-private/nautilus-file-operations.c:2005
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Hiba új mappa létrehozása közben"
+
+# libnautilus-private/nautilus-file-operations.c:2005
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Hiba új mappa létrehozása közben"
 
 # libnautilus-private/nautilus-file-operations.c:2092
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "névtelen mappa"
 
+# libnautilus-private/nautilus-file-operations.c:2001
+#: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Új mappa létrehozása közben \"%s\" hiba lépett fel."
+
+# libnautilus-private/nautilus-file-operations.c:2005
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Hiba új mappa létrehozása közben"
+
+# libnautilus-private/nautilus-file-operations.c:2005
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Hiba új mappa létrehozása közben"
+
+# libnautilus-private/nautilus-file.c:3398
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fájl"
+
 # libnautilus-private/nautilus-file-operations.c:2240
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Fájlok törlése folyamatban"
 
 # libnautilus-private/nautilus-file-operations.c:2242
 # libnautilus-private/nautilus-file-operations.c:2277
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Törölt fájlok:"
 
 # libnautilus-private/nautilus-file-operations.c:2244
 # libnautilus-private/nautilus-file-operations.c:2279
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Törlés folyamatban"
 
 # libnautilus-private/nautilus-file-operations.c:2245
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Felkészülés a fájlok törlésére..."
 
 # libnautilus-private/nautilus-file-operations.c:2275
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Kuka ürítése folyamatban"
 
 # libnautilus-private/nautilus-file-operations.c:2280
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Felkészülés a kuka ürítésére..."
 
 # libnautilus-private/nautilus-file-operations.c:2311
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Tényleg véglegesen törölni akarod a Kukában található elemeket?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:2314
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Ü_rítés"
 
 # libnautilus-private/nautilus-file-operations.c:2352
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
 # libnautilus-private/nautilus-file-operations.c:2352
 # libnautilus-private/nautilus-file-operations.c:2362
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2353
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
 # libnautilus-private/nautilus-file-operations.c:2353
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2354
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2354
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2355
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
 # libnautilus-private/nautilus-file-operations.c:2355
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2356
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2356
 # libnautilus-private/nautilus-file-operations.c:2363
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2357
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2357
 # libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2358
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
 # libnautilus-private/nautilus-file-operations.c:2358
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (másolat).txt txt"
 
 # libnautilus-private/nautilus-file-operations.c:2359
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
 # libnautilus-private/nautilus-file-operations.c:2359
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2360
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
 # libnautilus-private/nautilus-file-operations.c:2360
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2361
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2361
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (még egy másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2362
 # libnautilus-private/nautilus-file-operations.c:2364
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (még egy másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2363
 # libnautilus-private/nautilus-file-operations.c:2365
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (még egy másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2364
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2365
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (még egy másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2371
 # libnautilus-private/nautilus-file-operations.c:2373
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2372
 # libnautilus-private/nautilus-file-operations.c:2374
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2367
 # libnautilus-private/nautilus-file-operations.c:2369
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2368
 # libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2369
 # libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
 # libnautilus-private/nautilus-file-operations.c:2370
 # libnautilus-private/nautilus-file-operations.c:2372
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2371
 # libnautilus-private/nautilus-file-operations.c:2373
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
 # libnautilus-private/nautilus-file-operations.c:2372
 # libnautilus-private/nautilus-file-operations.c:2374
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2373
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
 # libnautilus-private/nautilus-file-operations.c:2374
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2375
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
 # libnautilus-private/nautilus-file-operations.c:2375
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
 # libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2371
 # libnautilus-private/nautilus-file-operations.c:2373
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2372
 # libnautilus-private/nautilus-file-operations.c:2374
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2367
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2368
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2367
 # libnautilus-private/nautilus-file-operations.c:2369
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2369
 # libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2368
 # libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2365
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. másolat).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2371
 # libnautilus-private/nautilus-file-operations.c:2373
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. másolat)"
 
 # libnautilus-private/nautilus-file-operations.c:2372
 # libnautilus-private/nautilus-file-operations.c:2374
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. másolat).txt"
 
@@ -3273,36 +3237,36 @@ msgstr "foo (124. másolat).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "ma, 00.00.00 du."
 
 # libnautilus-private/nautilus-file.c:2246
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "ma, %-I.%M.%S %p"
 
 # libnautilus-private/nautilus-file.c:2246
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "ma 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2246
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "ma, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "ma, 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2246
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "ma, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "ma"
 
@@ -3310,37 +3274,37 @@ msgstr "ma"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "tegnap, 00.00.00 du."
 
 # libnautilus-private/nautilus-file.c:2251
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "tegnap, %-I.%M.%S %p"
 
 # libnautilus-private/nautilus-file.c:2251
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "tegnap, 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2251
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "tegnap, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "tegnap, 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2251
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "tegnap, %-I.%M %p"
 
 # components/mozilla/nautilus-mozilla-embed-extensions.cpp:329
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "tegnap"
 
@@ -3349,114 +3313,114 @@ msgstr "tegnap"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000. szeptember 00., szerda, 00.00.00 du."
 
 # libnautilus-private/nautilus-file.c:2256
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Y. %B %-d., %A, %-I.%M.%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000. okt. 00., h, 00.00.00 du."
 
 # libnautilus-private/nautilus-file.c:2256
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y. %b. %d., %a, %-I.%M.%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000. okt. 00., h, 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2256
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y. %b. %d., %a, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000. okt. 00., 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2261
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y. %b. %d., %-I.%M %p"
 
 # libnautilus-private/nautilus-glib-extensions.c:1221
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000. okt. 00., 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2261
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y. %b. %-d., %-I.%M %p"
 
 # libnautilus-private/nautilus-glib-extensions.c:1221
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00.00 du."
 
 # libnautilus-private/nautilus-file.c:2261
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%m/%-d, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
 # libnautilus-private/nautilus-file.c:3392
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elem"
 
 # libnautilus-private/nautilus-file.c:3392
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mappa"
 
 # libnautilus-private/nautilus-file.c:3393
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fájl"
 
 # libnautilus-private/nautilus-file.c:3397
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 elem"
 
 # libnautilus-private/nautilus-file.c:3397
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mappa"
 
 # libnautilus-private/nautilus-file.c:3398
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fájl"
 
 # libnautilus-private/nautilus-file.c:3401
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elem"
 
 # libnautilus-private/nautilus-file.c:3401
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mappa"
 
 # libnautilus-private/nautilus-file.c:3402
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fájl"
@@ -3464,24 +3428,24 @@ msgstr "%u fájl"
 # libnautilus-private/nautilus-file.c:3705
 # libnautilus-private/nautilus-file.c:3720
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elem"
 
 # libnautilus-private/nautilus-file.c:3711
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
 # libnautilus-private/nautilus-file.c:3724
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ismeretlen típus"
 
 # libnautilus-private/nautilus-file.c:3726
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "ismeretlen MIME-típus"
 
@@ -3489,18 +3453,18 @@ msgstr "ismeretlen MIME-típus"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ismeretlen"
 
 # libnautilus-private/nautilus-file.c:3767
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
 # libnautilus-private/nautilus-file.c:3779
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3511,7 +3475,7 @@ msgstr ""
 "Nautilus nem találja meg."
 
 # libnautilus-private/nautilus-file.c:3783
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3521,12 +3485,12 @@ msgstr ""
 "mindenképpen jelentsd a gnome-vfs listán."
 
 # libnautilus-private/nautilus-file.c:3797
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "link"
 
 # libnautilus-private/nautilus-file.c:3817
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "link (törött)"
 
@@ -3658,12 +3622,14 @@ msgstr "Fájlok keresése fájlnév és tulajdonságok alapján"
 
 # src/file-manager/fm-directory-view.c:2959
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonnézet"
 
 # src/file-manager/fm-directory-view.c:2959
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listanézet"
@@ -3826,162 +3792,167 @@ msgstr "%s mappája"
 # data/browser.xml.h:18
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "fájl ikon"
-
 # components/music/mpg123.c:40
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "szerkeszthető szöveg"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "a szerkeszthető címke"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "további szöveg"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "még egy kis szöveg"
 
 # components/help/converters/gnome-db2html2/sect-elements.c:1030
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "kijelöléshez kivilágítva"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "kijelölés miatt vagyunk-e kivilágítva"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "kivilágítva billentyűzet-fókusznál"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "billentyűzet-fókusz miatt vagyunk-e kivilágítva"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "drag'n'drop célpontjaként kivilágítva"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "D&D célpontjaként vagyunk-e kivilágítva"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:22
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "A kijelölés téglalapja"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Szöveg bekeretezése"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Keret rajzolása a ki nem jelölt szöveg köré"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Kijelölődoboz színe"
 
 # src/nautilus-shell-ui.xml.h:28
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "A kijelölődoboz színe"
 
 # src/nautilus-shell-ui.xml.h:92
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "A kijelölődoboz alfa csatornája"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "A kijelölődoboz átlátszósága"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Kivilágítás alfája"
 
 # components/help/converters/gnome-db2html2/sect-elements.c:1030
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "A kijelölt ikonok kivilágításának átlátszósága"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Világos információszín"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Sötét háttér előtt használt szín az információs üzenetekhez"
 
 # data/browser.xml.h:21
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Sötét információszín"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Világos háttér előtt használt szín az információs üzenetekhez"
 
 # libnautilus-private/nautilus-icon-dnd.c:733
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Ez a mappa automatikus elrendezést használ. �t akarsz váltani kézi "
 "elrendezés, és otthagyni ezt az elemet, ahova letetted? Ez felülírja a "
 "korábban elmentett kézi beállításokat."
 
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
 # libnautilus-private/nautilus-icon-dnd.c:737
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Ez a mappa automatikus elrendezést használ. �t akarsz váltani kézi "
 "elrendezés, és otthagyni ezeket az elemeket, ahova letetted őket? Ez "
 "felülírja a korábban elmentett kézi beállításokat."
 
 # libnautilus-private/nautilus-icon-dnd.c:743
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Ez a mappa automatikus elrendezést használ. �t akarsz váltani kézi "
 "elrendezés, és otthagyni ezt az elemet, ahova letetted?"
 
 # libnautilus-private/nautilus-icon-dnd.c:746
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Ez a mappa automatikus elrendezést használ. �t akarsz váltani kézi "
 "elrendezésre és otthagyni ezeket az elemeket, ahova letetted őket?"
 
 # libnautilus-private/nautilus-icon-dnd.c:751
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "�tváltás kézi elrendezésre?"
 
 # libnautilus-private/nautilus-icon-dnd.c:752
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "�tváltás"
 
@@ -4108,42 +4079,42 @@ msgid "Is the default for all \"%s\" items."
 msgstr "Alapértelmezett minden \"%s\" elemhez."
 
 # libnautilus-private/nautilus-program-chooser.c:970
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\" módosítása"
 
 # libnautilus-private/nautilus-program-chooser.c:995
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" elemek esetén vegye bele a menübe"
 
 # libnautilus-private/nautilus-program-chooser.c:1002
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Legyen alapértelmezett \"%s\" elemekhez"
 
 # libnautilus-private/nautilus-program-chooser.c:995
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Csak \"%s\" elemek esetén vegye bele a menübe"
 
 # libnautilus-private/nautilus-program-chooser.c:1002
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Csak \"%s\" elemekhez legyen alapértelmezett"
 
 # libnautilus-private/nautilus-program-chooser.c:1022
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne vegye bele a menübe \"%s\" elemekhez"
@@ -4152,44 +4123,44 @@ msgstr "Ne vegye bele a menübe \"%s\" elemekhez"
 # src/file-manager/fm-list-view.c:1970
 # src/file-manager/fm-search-list-view.c:549
 # src/nautilus-bookmarks-window.c:164
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Név"
 
 # libnautilus-private/nautilus-program-chooser.c:1189
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "�llapot"
 
 # libnautilus-private/nautilus-program-chooser.c:1250
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Ki_választás"
 
 # libnautilus-private/nautilus-program-chooser.c:1252
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Kész"
 
 # libnautilus-private/nautilus-program-chooser.c:1315
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Módosítás..."
 
 # libnautilus-private/nautilus-program-chooser.c:1326
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Fájltípusok és programok"
 
 # libnautilus-private/nautilus-program-chooser.c:1338
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ugrás ide"
 
 # libnautilus-private/nautilus-program-chooser.c:1347
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -4198,58 +4169,58 @@ msgstr ""
 "fájltípushoz mely programok tartozzanak."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:22
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Megnyitás más alkalmazással..."
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Válassz ki egy alkalmazást \"%s\" megnyitásához: "
 
 # libnautilus-private/nautilus-program-chooser.c:1237
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Megnyitás más megjelenítővel"
 
 # libnautilus-private/nautilus-program-chooser.c:1243
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Válassz \"%s\" elemhez nézetet:"
 
 # src/nautilus-theme-selector.c:709
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Nincs megjelenítő ehhez: %s"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nincs megjelenítő"
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "A következőhöz nincs alkalmazás társítva: \"%s\"."
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nincs társított alkalmazás"
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "A következőhöz nincs művelet társítva: \"%s\"."
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nincs társított művelet"
 
@@ -4257,11 +4228,9 @@ msgstr "Nincs társított művelet"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -4271,49 +4240,48 @@ msgstr ""
 "rendeljen. Akarsz most ehhez a fájltípushoz alkalmazást rendelni?"
 
 # src/nautilus-search-bar-criterion.c:112
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Alkalmazás hozzárendelése"
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "A következőhöz társított nézőprogram érvénytelen: \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Érvénytelen társított nézőprogram"
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "A következőhöz társított alkalmazás érvénytelen: \"%s\"."
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Érvénytelen társított alkalmazás"
 
 # libnautilus-private/nautilus-program-chooser.c:1238
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "A következőhöz társított művelet érvénytelen: \"%s\"."
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Érvénytelen társított művelet"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -4325,24 +4293,36 @@ msgstr ""
 "nézőprogramot rendelni?"
 
 # src/nautilus-search-bar-criterion.c:112
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Művelet hozzárendelése"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" nem tudja megnyitni a következőt: \"%s\". Ok: %s nem érhet el "
+"fájlokat a következő helyen: %s. Választasz másik alkalmazást?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nem tudja megnyitni a következőt: \"%s\". Ok: %s nem érhet el "
 "fájlokat a következő helyen: %s. Választasz másik alkalmazást?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Az alapértelmezett művelet nem tudja megnyitni a következőt: \"%s\". Ok: a "
 "művelet nem érhet el fájlokat a következő helyen: \"%s\". Választasz másik "
@@ -4350,79 +4330,109 @@ msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:1905
 # libnautilus-private/nautilus-file-operations.c:2158
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nem lehet a helyet megnyitni"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nem tudja megnyitni a következőt: \"%s\". Ok: %s nem érhet el "
+"fájlokat a következő helyen: %s. Választasz másik alkalmazást?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nem tudja megnyitni a következőt: \"%s\". Ok: %s nem érhet el "
 "fájlokat a következő helyen: %s. Nem található másik alkalmazás, amivel meg "
 "lehetne nyitni a fájlt. Ha a fájlt lemásolod a számítógépedre, lehet, hogy "
 "meg tudod majd nyitni."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Az alapértelmezett művelet nem tudja megnyitni a következőt: \"%s\". Ok: a "
-"művelet nem érhet el fájlokat a következő helyen: \"%s\". Nincs másik "
-"alkalmazás, amivel meg lehetne nyitni a fájlt. Ha a fájlt lemásolod a "
-"számítógépedre, lehet, hogy meg tudod majd nyitni."
+"művelet nem érhet el fájlokat a következő helyen: \"%s\". Választasz másik "
+"műveletet?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" nem tudja megnyitni a következőt: \"%s\". Ok: %s nem érhet el "
+"fájlokat a következő helyen: %s. Nem található másik alkalmazás, amivel meg "
+"lehetne nyitni a fájlt. Ha a fájlt lemásolod a számítógépedre, lehet, hogy "
+"meg tudod majd nyitni."
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:791
 # src/file-manager/fm-directory-view.c:3672
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s megnyitása"
 
 # src/file-manager/fm-directory-view.c:3540
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Sajnálom, de biztonsági okokból nem hajthatsz végre távoli gépekről "
 "parancsokat."
 
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:3541
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Távoli kapcsok futtatása nem lehetséges"
 
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
 # components/music/nautilus-music-view.c:1694
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Hiba történt az alkalmazás indításakor.\n"
 "\n"
 "Részletek: "
 
 # src/nautilus-search-bar-criterion.c:112
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Hiba történt az alkalmazás indításakor"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "A Drop célpont csak helyi fájlokat támogat"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Ez a drag'n'drop célpont csak a helyi fájlokat támogatja.\n"
@@ -4430,15 +4440,15 @@ msgstr ""
 "A nem helyi fájlok megnyitásához másold ezeket egy helyi mappába, majd "
 "próbáld onnan kihúzni."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "A Drop célpont csak helyi fájlokat támogat"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4733,16 +4743,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elemek, melyek neve tartalmazza a \"medúza\" szót és melyek mappák"
 
-# libnautilus-private/nautilus-trash-directory.c:73
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Keresés a lemezeken"
-
-# libnautilus-private/nautilus-trash-directory.c:74
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "A Nautilus keresi a Kuka mappákat a helyi lemezeken."
-
 # libnautilus-private/nautilus-undo-signal-handlers.c:175
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
@@ -4993,126 +4993,138 @@ msgstr "Háttér"
 msgid "Empty Trash"
 msgstr "Kuka ürítése"
 
-# src/file-manager/fm-directory-view.c:466
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Ez %d ablakot fog megnyitni. Biztosan ezt akarod?"
-
 # src/file-manager/fm-directory-view.c:468
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d ablak megnyitása?"
 
 # src/file-manager/fm-directory-view.c:2637
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Biztosan véglegesen törölni akarod a következőt: \"%s\"?"
+
+# src/file-manager/fm-directory-view.c:466
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Ez %d ablakot fog megnyitni. Biztosan ezt akarod?"
+
+# src/file-manager/fm-directory-view.c:2637
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Biztosan véglegesen törölni akarod a következőt: \"%s\"?"
 
 # src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Biztosan véglegesen törölni akarod a %d kijelölt elemet?"
 
+# src/file-manager/fm-directory-view.c:3191
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Minden kijelölt elem végleges törlése"
+
 # src/file-manager/fm-directory-view.c:2607
 # src/file-manager/fm-directory-view.c:2648
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Törlés?"
 
 # src/nautilus-property-browser.c:2012
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Kategória választása:"
 
 # src/nautilus-property-browser.c:2068
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Minták:"
 
 # src/file-manager/fm-directory-view.c:1224
 # src/file-manager/fm-directory-view.c:1189
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" kijelölve"
 
 # src/file-manager/fm-directory-view.c:1226
 # src/file-manager/fm-directory-view.c:1191
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mappa kijelölve"
 
 # src/file-manager/fm-directory-view.c:1229
 # src/file-manager/fm-directory-view.c:1194
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappa kijelölve"
 
 # src/file-manager/fm-directory-view.c:1235
 # src/file-manager/fm-directory-view.c:1200
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1237
 # src/file-manager/fm-directory-view.c:1202
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (1 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1204
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1235
 # src/file-manager/fm-directory-view.c:1200
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (összesen 0 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1237
 # src/file-manager/fm-directory-view.c:1202
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (összesen 1 elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1204
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (összesen %d elemet tartalmaz)"
 
 # src/file-manager/fm-directory-view.c:1215
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" kijelölt (%s)"
 
 # src/file-manager/fm-directory-view.c:1254
 # src/file-manager/fm-directory-view.c:1219
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elem kijelölve (%s)"
 
 # src/file-manager/fm-directory-view.c:1261
 # src/file-manager/fm-directory-view.c:1226
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "még 1 elem kijelölve (%s)"
 
 # src/file-manager/fm-directory-view.c:1229
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "még %d elem kijelölve (%s)"
@@ -5125,7 +5137,7 @@ msgstr "még %d elem kijelölve (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -5135,120 +5147,136 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "A mappában (\"%s\") több fájl van, mint amennyivel a Nautilus meg tud "
 "birkózni. Nem jelenik meg minden fájl."
 
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:1392
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Túl sok fájl"
 
 # src/file-manager/fm-directory-view.c:2589
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" nem helyezhető át a Kukába. Törölni akarod most rögtön?"
 
-# src/file-manager/fm-directory-view.c:2594
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"A kijelölt %d elem nem helyezhető át a Kukába. Törölni akarod ezeket most "
-"rögtön?"
 
-# src/file-manager/fm-directory-view.c:2594
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+# src/file-manager/fm-directory-view.c:2589
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" nem helyezhető át a Kukába. Törölni akarod most rögtön?"
+
+# src/file-manager/fm-directory-view.c:2589
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d a kijelölt elemek közül nem helyezhető át a Kukába. Törölni akarod ezt a %"
-"d elemet most rögtön?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" nem helyezhető át a Kukába. Törölni akarod most rögtön?"
 
 # src/file-manager/fm-directory-view.c:2606
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Törlés azonnal?"
 
 # src/file-manager/fm-directory-view.c:2637
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Biztosan véglegesen törölni akarod a következőt a Kukából: \"%s\"?"
 
 # src/file-manager/fm-directory-view.c:2641
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "Biztosan véglegesen törölni akarod a %d kijelölt elemet a Kukából?"
 
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2647
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Törlés a Kukából?"
 
 # src/file-manager/fm-directory-view.c:2920
 # src/file-manager/fm-directory-view.c:2961
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Használd a következőt a kijelölt elem megnyitásához: \"%s\""
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Más _alkalmazás..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Egy _alkalmazás..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Más _megjelenítő..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Egy _megjelenítő..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nem sikerült befejezni a megadott műveletet: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nem sikerült befejezni a megadott műveletet."
 
 # src/file-manager/fm-directory-view.c:2920
 # src/file-manager/fm-directory-view.c:2961
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "\"%s\" futtatása minden kijelölt elemre"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Minden ebben a mappában található futtatható fájl megjelenik a Programok "
+"menü alatt. Ha kiválasztasz egy programot a menüből, lefuttathatod bármelyik "
+"kijelölt elemmel (a kijelölt elem lesz a program bemenete)."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -5256,11 +5284,11 @@ msgstr ""
 "menü alatt. Ha kiválasztasz egy programot a menüből, lefuttathatod bármelyik "
 "kijelölt elemmel (a kijelölt elem lesz a program bemenete)."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Programok névjegye"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -5301,14 +5329,14 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: a jelenlegi ablak helyzete és mérete"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "\"%s\" áthelyezésére akkor kerül sor, ha kiválasztod a Fájl beillesztése "
 "parancsot a menüből"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
@@ -5316,7 +5344,7 @@ msgstr ""
 "parancsot a menüből"
 
 # src/file-manager/fm-directory-view.c:2594
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -5324,7 +5352,7 @@ msgstr ""
 "A %d kijelölt elem akkor kerül áthelyezésre, ha kiválasztod a Fájl "
 "beillesztése parancsot a menüből"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -5332,107 +5360,107 @@ msgstr ""
 "A %d kijelölt elem akkor kerül másolásra, ha kiválasztod a Fájl beillesztése "
 "parancsot a menüből"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Nincs semmi a vágólapon."
 
 # libnautilus-private/nautilus-volume-monitor.c:1306
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Hiba beillesztéskor"
 
 # libnautilus-private/nautilus-volume-monitor.c:1308
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Hiba leválasztáskor"
 
 # libnautilus-private/nautilus-volume-monitor.c:1306
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Hiba beillesztéskor"
 
 # src/file-manager/fm-properties-window.c:1966
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Kiadás"
 
 # src/file-manager/fm-desktop-icon-view.c:1042
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Kötet _leválasztása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Megnyitás új _ablakban"
 
 # src/file-manager/fm-directory-view.c:3165
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Megnyitás %d új _ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Saját mappa"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Saját mappa"
 
 # src/file-manager/fm-directory-view.c:3197
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Törlés a _kukából"
 
 # src/file-manager/fm-directory-view.c:3191
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Minden kijelölt elem végleges törlése"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:13
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "�t_helyezés a kukába"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Minden kijelölt elem áthelyezése a Kukába"
 
 # src/file-manager/fm-directory-view.c:2607
 # src/file-manager/fm-directory-view.c:2648
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Törlés"
 
 # src/file-manager/fm-directory-view.c:3235
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Kapcsok létrehozása"
 
 # src/file-manager/fm-directory-view.c:3429
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Kapocs létrehozása"
 
 # src/file-manager/fm-directory-view.c:3255
 # src/file-manager/nautilus-directory-view-ui.xml.h:39
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Kuka ürítése"
 
@@ -5440,7 +5468,7 @@ msgstr "_Kuka ürítése"
 # components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 # components/sample/nautilus-sample-content-view-ui.xml.h:4
 # src/nautilus-shell-ui.xml.h:77
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Fájl kivágása"
 
@@ -5448,85 +5476,93 @@ msgstr "_Fájl kivágása"
 # components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:3
 # components/sample/nautilus-sample-content-view-ui.xml.h:4
 # src/nautilus-shell-ui.xml.h:77
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Fájlok kivágása"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Fájl _másolása"
 
 # libnautilus-private/nautilus-file-operations.c:1848
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Fájlok _másolása"
 
 # src/file-manager/fm-directory-view.c:3420
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr ""
+"Ez a kapocs nem használható, mert nem mutat semmire. �thelyezed ezt a "
+"kapcsot a Kukába?"
+
+# src/file-manager/fm-directory-view.c:3420
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
 msgstr ""
 "Ez a kapocs nem használható, mert nem mutat semmire. �thelyezed ezt a "
 "kapcsot a Kukába?"
 
 # src/file-manager/fm-directory-view.c:3423
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Ez a kapocs nem használható, mert az a fájl, amire mutatott (%s) már nem "
 "létezik. �thelyezed a kapcsot a Kukába?"
 
 # src/file-manager/fm-directory-view.c:3429
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Törött kapocs"
 
 # src/file-manager/fm-directory-view.c:3483
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" egy futtatható szövegfájl. Végre szeretnéd hajtani az utasításokat, "
 "melyeket tartalmaz, vagy meg szeretnéd nézni a tartalmát?"
 
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:3489
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Futtatás vagy megtekintés?"
 
-# src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Megjelenítés"
-
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "_Futtatás terminálban"
 
+# src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Megjelenítés"
+
 # src/file-manager/fm-directory-view.c:3490
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Futtatás"
 
 # components/services/install/nautilus-view/nautilus-service-install-view.c:791
 # src/file-manager/fm-directory-view.c:3672
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" megnyitása"
 
 # src/file-manager/fm-directory-view.c:3678
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Mégsem nyitod meg?"
 
@@ -5548,20 +5584,26 @@ msgstr "\"%s\" nem található. Lehet, hogy nemrég eltávolították."
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Sajnálom, nem lehetett megjeleníteni \"%s\" teljes tartalmát."
 
-# src/file-manager/fm-error-reporting.c:66
+# src/file-manager/fm-properties-window.c:2023
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
+
+# src/file-manager/fm-error-reporting.c:66
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Hiba a mappa megjelenítésekor"
 
 # src/file-manager/fm-error-reporting.c:89
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "%s nevű elem már létezik ebben a mappában. Használj egy másik nevet."
 
 # src/file-manager/fm-error-reporting.c:94
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -5569,13 +5611,13 @@ msgstr ""
 "Nincs \"%s\" ebben a könyvtárban. Lehet, hogy letörölték, vagy áthelyezték?"
 
 # src/file-manager/fm-error-reporting.c:99
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nem vagy jogosult \"%s\" átnevezésére."
 
 # src/file-manager/fm-error-reporting.c:104
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -5585,38 +5627,44 @@ msgstr ""
 "Használj másik nevet."
 
 # src/file-manager/fm-error-reporting.c:108
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "A következő név (%s) nem érvényes. Használj másikat."
 
 # src/file-manager/fm-error-reporting.c:114
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "\"%s\" nevét nem lehetett megváltoztatni, mert csak olvasható lemezen van"
 
 # src/file-manager/fm-error-reporting.c:122
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sajnálom, nem lehet átnevezni \"%s\"-t erre: \"%s\"."
 
+# src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
+
 # src/file-manager/fm-error-reporting.c:128
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Hiba átnevezéskor"
 
 # src/file-manager/fm-error-reporting.c:148
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nem vagy jogosult \"%s\" csoportjának megváltoztatására."
 
 # src/file-manager/fm-error-reporting.c:152
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
@@ -5624,18 +5672,24 @@ msgstr ""
 "lemezen található"
 
 # src/file-manager/fm-error-reporting.c:160
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sajnálom, \"%s\" csoportját nem lehetett megváltoztatni."
 
+# src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
+
 # src/file-manager/fm-error-reporting.c:164
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Hiba a csoport beállításakor"
 
 # src/file-manager/fm-error-reporting.c:186
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
@@ -5643,18 +5697,24 @@ msgstr ""
 "található"
 
 # src/file-manager/fm-error-reporting.c:193
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sajnálom, \"%s\" tulajdonosának megváltoztatása sikertelen."
 
+# src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
+
 # src/file-manager/fm-error-reporting.c:196
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Hiba a tulajdonos beállításakor"
 
 # src/file-manager/fm-error-reporting.c:218
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -5663,24 +5723,30 @@ msgstr ""
 "lemezen található"
 
 # src/file-manager/fm-error-reporting.c:225
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sajnálom, \"%s\" jogosultságainak megváltoztatása sikertelen."
 
+# src/file-manager/fm-properties-window.c:2023
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
+
 # src/file-manager/fm-error-reporting.c:228
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Hiba a jogosultságok beállításakor"
 
 # src/file-manager/fm-error-reporting.c:294
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" átnevezése erre: \"%s\""
 
 # src/file-manager/fm-error-reporting.c:299
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Mégse nevezed át?"
 
@@ -5756,152 +5822,176 @@ msgid "Restore Icon's Original Si_ze"
 msgstr "Ikon eredeti méretének viss_zaállítása"
 
 # src/file-manager/fm-icon-view.c:1440
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "erre mutat: \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "A Drag'n'Drop csak helyi fájlrendszereken támogatott."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "A Drag'n'Drop csak helyi fájlrendszereken támogatott."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Drag'n'Drop hiba"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Érvénytelen elhúzott típus."
 
 # src/file-manager/fm-properties-window.c:1910
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Fájlnév"
 
 # src/file-manager/fm-list-view.c:1976
 # src/file-manager/fm-search-list-view.c:561
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Méret"
 
 # src/file-manager/fm-list-view.c:1982
 # src/file-manager/fm-search-list-view.c:567
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Típus"
 
 # src/file-manager/fm-list-view.c:1988
 # src/file-manager/fm-search-list-view.c:573
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Módosítás dátuma"
 
 # src/nautilus-sidebar.c:663
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Egy elemnek csak egy testreszabott ikonja lehet. Kérlek csak egy képet húzz "
+"az elemre a testreszabott ikon beállításához"
+
+# src/nautilus-sidebar.c:663
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Egy elemnek csak egy testreszabott ikonja lehet. Kérlek csak egy képet húzz "
 "az elemre a testreszabott ikon beállításához"
 
 # src/nautilus-sidebar.c:665
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Több mint egy kép"
 
 # src/nautilus-sidebar.c:684
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Az ikonra húzott fájl nem lokális. Csak helyi képeket használhatsz egyéni "
+"ikonként."
+
+# src/nautilus-sidebar.c:684
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Az ikonra húzott fájl nem lokális. Csak helyi képeket használhatsz egyéni "
 "ikonként."
 
 # src/nautilus-sidebar.c:686
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Csak helyi képek"
 
-# src/nautilus-sidebar.c:691
-#: src/file-manager/fm-properties-window.c:497
+# src/nautilus-sidebar.c:684
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Az ikonra húzott fájl nem képfájl. Csak képfájlokat használhatsz egyéni "
+"Az ikonra húzott fájl nem lokális. Csak helyi képeket használhatsz egyéni "
 "ikonként."
 
 # src/nautilus-sidebar.c:693
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Csak képek"
 
 # src/file-manager/fm-properties-window.c:519
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Tulajdonságok"
 
 # src/file-manager/fm-properties-window.c:519
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s tulajdonságai"
 
 # src/file-manager/fm-properties-window.c:714
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Mégse változtatod meg a csoportot?"
 
 # src/file-manager/fm-properties-window.c:715
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Csoport megváltoztatása"
 
 # src/file-manager/fm-properties-window.c:876
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Mégse változtatod meg a tulajdonost?"
 
 # src/file-manager/fm-properties-window.c:877
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Tulajdonos megváltoztatása"
 
 # src/file-manager/fm-properties-window.c:1052
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "semmi"
 
 # src/file-manager/fm-properties-window.c:1054
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "olvashatatlan"
 
 # src/file-manager/fm-properties-window.c:1063
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 elem, mérete %s"
 
 # src/file-manager/fm-properties-window.c:1065
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elem, összméret %s"
 
 # src/file-manager/fm-properties-window.c:1071
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(egyes részei olvashatatlanok)"
 
@@ -5912,12 +6002,12 @@ msgstr "(egyes részei olvashatatlanok)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Tartalom:"
 
 # src/file-manager/fm-properties-window.c:1418
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Alap"
 
@@ -5925,7 +6015,7 @@ msgstr "Alap"
 # src/file-manager/fm-list-view.c:1970
 # src/file-manager/fm-search-list-view.c:549
 # src/nautilus-bookmarks-window.c:164
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nevek:"
 
@@ -5933,214 +6023,215 @@ msgstr "_Nevek:"
 # src/file-manager/fm-list-view.c:1970
 # src/file-manager/fm-search-list-view.c:549
 # src/nautilus-bookmarks-window.c:164
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Név:"
 
 # src/file-manager/fm-properties-window.c:1497
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
 # src/file-manager/fm-properties-window.c:1502
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Méret:"
 
 # src/nautilus-location-bar.c:62
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Hely:"
 
 # libnautilus-private/nautilus-volume-monitor.c:1545
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Kötet:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Szabad hely:"
 
 # src/nautilus-link-set-window.c:189
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Kapocs célja:"
 
 # src/file-manager/fm-icon-text-window.c:86
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-típus:"
 
 # src/file-manager/fm-properties-window.c:1512
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Módosítva:"
 
 # src/file-manager/fm-properties-window.c:1515
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Elérés:"
 
 # src/file-manager/fm-properties-window.c:1524
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Egyéni ikon kiválasztása..."
 
 # src/file-manager/fm-properties-window.c:1530
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Egyéni ikon eltávolítása"
 
 # src/file-manager/fm-properties-window.c:1958
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Olvasás"
 
 # src/file-manager/fm-properties-window.c:1962
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "�_rás"
 
 # src/file-manager/fm-properties-window.c:1966
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Futtatás"
 
 # src/file-manager/fm-properties-window.c:1855
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "F_elhasználói ID beállítása (setuid)"
 
 # src/file-manager/fm-properties-window.c:1860
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Speciális kapcsolók:"
 
 # src/file-manager/fm-properties-window.c:1863
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "C_soport ID beállítása (setgid)"
 
 # src/file-manager/fm-properties-window.c:1865
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Ragadós"
 
 # src/file-manager/fm-properties-window.c:1891
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Jogosultságok"
 
 # src/file-manager/fm-properties-window.c:1897
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nem módosíthatod a jogosultságokat, mivel nem a tiéd a fájl."
 
 # src/file-manager/fm-properties-window.c:1910
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Fájl tulajdonosa:"
+
+# src/file-manager/fm-properties-window.c:1910
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Fájl tulajdonosa:"
 
 # src/file-manager/fm-properties-window.c:1919
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Fájl csoportja:"
 
 # src/file-manager/fm-properties-window.c:1919
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Fájl csoportja:"
 
 # src/file-manager/fm-properties-window.c:1937
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Tulajdonos:"
 
 # src/file-manager/fm-properties-window.c:1938
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Csoport:"
 
 # src/file-manager/fm-properties-window.c:1939
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "A többiek:"
 
 # components/text/Nautilus_View_text.oaf.in.h:3
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Szövegnézet:"
 
 # src/file-manager/fm-properties-window.c:2018
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Számnézet:"
 
 # src/file-manager/fm-properties-window.c:2019
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Utolsó változás:"
 
 # src/file-manager/fm-properties-window.c:2023
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" jogosultságait nem lehetett megállapítani."
 
 # src/file-manager/fm-properties-window.c:2023
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "A kijelölt fájl jogosultságait nem lehetett megállapítani."
 
 # components/music/nautilus-music-view.c:1694
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Hiba történt a súgó megjelenítése közben: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Hiba történt a súgó megjelenítése közben: %s"
 
 # src/nautilus-theme-selector.c:398
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Súgó megjelenítése sikertelen"
 
 # src/file-manager/fm-properties-window.c:2303
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Ne mutassa a tulajdonságok ablakot?"
 
 # src/file-manager/fm-properties-window.c:2304
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Tulajdonságok létrehozása ablak"
 
 # src/file-manager/fm-properties-window.c:2401
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Ikon kiválasztása"
 
@@ -6159,41 +6250,66 @@ msgstr ""
 msgid "Search Results"
 msgstr "Keresés eredményei"
 
-# src/file-manager/fm-search-list-view.c:159
+# src/file-manager/nautilus-indexing-info.c:396
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Sajnálom, a Medusa keresés nem elérhető, mert nincs telepítve."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Sajnálom, de a Medusa keresés nem elérhető."
+
+#: src/file-manager/fm-search-list-view.c:167
+msgid "Medusa is not installed."
+msgstr ""
 
 # src/file-manager/fm-search-list-view.c:160
 # src/file-manager/nautilus-indexing-info.c:397
-#: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Keresési szolgáltatás nem elérhető"
 
 # src/file-manager/fm-search-list-view.c:342
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "A kiválasztott keresés újabb a rendszeren található indexfájlnál. A keresés "
 "nem fog eredményt visszaadni. Új indexet a \"medusa-indexd\" parancs "
 "kiadásával hozhatsz létre (rendszergazdaként)."
 
+# src/file-manager/fm-search-list-view.c:342
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"A \"find\" nem tudja megnyitni a fájlrendszer indexét. Lehet, hogy az index "
+"hiányzik, vagy megsérült. Készíthetsz új indexet a \"medusa-indexd\" "
+"futtatásával (root felhasználóként kell elindítani)."
+
 # src/file-manager/fm-search-list-view.c:190
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Túl új elemek keresése"
 
 # src/file-manager/fm-search-list-view.c:201
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"A számítógépeden található minden fájl megfelel a keresési feltételeidnek. "
+"Nézd meg, hogy nem gépeltél-e el valamit, vagy adj a kereséshez további "
+"feltételeket, hogy kevesebb legyen a találat."
+
+# src/file-manager/fm-search-list-view.c:201
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "A számítógépeden található minden fájl megfelel a keresési feltételeidnek. "
@@ -6202,39 +6318,59 @@ msgstr ""
 
 # src/file-manager/fm-search-list-view.c:205
 # src/file-manager/fm-search-list-view.c:219
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Hiba a kereséskor"
 
 # src/file-manager/fm-search-list-view.c:342
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "A \"find\" nem tudja megnyitni a fájlrendszer indexét. Lehet, hogy az index "
 "hiányzik, vagy megsérült. Készíthetsz új indexet a \"medusa-indexd\" "
 "futtatásával (root felhasználóként kell elindítani)."
 
 # libnautilus-private/nautilus-file-operations.c:2005
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Hiba a fájlindex beolvasása közben"
 
 # src/file-manager/fm-search-list-view.c:214
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Hiba történt a keresés tartalmának betöltése közben: %s"
 
+# src/file-manager/fm-search-list-view.c:247
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Ahhoz, hogy tartalomra tudjon keresni, a keresőprogramnak szüksége van egy "
+"index fájlra. A keresőprogram nem fér jelenleg hozzá ehhez az indexhez."
+
+# src/file-manager/fm-search-list-view.c:247
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Ahhoz, hogy tartalomra tudjon keresni, a keresőprogramnak szüksége van egy "
+"index fájlra. A keresőprogram nem fér jelenleg hozzá ehhez az indexhez."
+
 # src/file-manager/fm-search-list-view.c:242
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -6242,32 +6378,29 @@ msgstr ""
 "rendszereden található fájlokat tartalmazza. A keresőprogram nem jelenleg "
 "fér hozzá ehhez az indexhez, a keresés lassabb lesz."
 
-# src/file-manager/fm-search-list-view.c:247
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Ahhoz, hogy tartalomra tudjon keresni, a keresőprogramnak szüksége van egy "
-"index fájlra. A keresőprogram nem fér jelenleg hozzá ehhez az indexhez."
 
 # src/file-manager/fm-search-list-view.c:251
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "A gyorskeresés nem elérhető"
 
 # src/file-manager/fm-search-list-view.c:252
 # src/file-manager/fm-search-list-view.c:292
 # src/file-manager/fm-search-list-view.c:320
 # src/file-manager/fm-search-list-view.c:339
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "A tartalomra való keresés nem elérhető"
 
 # src/file-manager/fm-search-list-view.c:255
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -6281,11 +6414,11 @@ msgstr ""
 "medusa-searchd"
 
 # src/file-manager/fm-search-list-view.c:307
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "A gyorskereséshez a keresőprogramnak szüksége van egy indexfájlra. A "
 "számítógéped éppen most állítja elő ezt a fájlt, ezért még nem lehet "
@@ -6293,52 +6426,87 @@ msgstr ""
 "eltarthat."
 
 # src/file-manager/fm-search-list-view.c:313
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "A tartalom alapján való kereséshez a keresőprogramnak szüksége van egy "
 "indexfájlra. A számítógéped most állítja elő ezt a fájlt, ezért még nem "
 "lehet használni. Tartalom alapján csak akkor lehet majd keresni, ha készen "
 "van az index."
 
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
 # src/file-manager/fm-search-list-view.c:291
 # src/file-manager/fm-search-list-view.c:319
 # src/file-manager/fm-search-list-view.c:338
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Az indexelt keresések nem elérhetők"
 
-# src/file-manager/fm-search-list-view.c:327
-#: src/file-manager/fm-search-list-view.c:291
+# src/file-manager/fm-search-list-view.c:247
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Ahhoz, hogy tartalomra tudjon keresni, a keresőprogramnak szüksége van egy "
+"index fájlra. A keresőprogram nem fér jelenleg hozzá ehhez az indexhez."
+
+# src/file-manager/fm-search-list-view.c:247
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Ahhoz, hogy tartalomra tudjon keresni, a keresőprogramnak szüksége van egy "
+"index fájlra. A keresőprogram nem fér jelenleg hozzá ehhez az indexhez."
+
+# src/file-manager/fm-search-list-view.c:327
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "A gyorskereséshez a keresőprogramnak szüksége van egy indexfájlra. Ez a fájl "
 "jelenleg nem létezik. Létrehozhatod a \"medusa-indexd\" program futtatásával "
 "(root felhasználóként). Ameddig nincs indexfájl, a keresések sokáig tartanak."
 
 # src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "A tartalomra való kereséshez a keresőprogramnak szüksége van egy "
 "indexfájlra. A gépeden jelenleg nincs ilyen index. Létrehozhatod a \"medusa-"
 "indexd\" futtatásával (root felhasználóként). Ameddig nincs indexfájl, a "
 "keresések sokáig tartanak."
 
+# src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "A gyorskeresés nincs bekapcsolva a rendszereden"
+
 # src/file-manager/fm-search-list-view.c:247
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -6349,12 +6517,13 @@ msgstr ""
 "rendszeren, ezért nem lehet indexfájlt létrehozni."
 
 # src/file-manager/fm-search-list-view.c:251
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "A gyorskeresés nincs bekapcsolva a rendszereden"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "A gyorskeresés nem elérhető"
 
 # src/file-manager/fm-search-list-view.c:555
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Hol"
 
@@ -6365,7 +6534,7 @@ msgstr "Hol"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Felfedés új ablakban"
@@ -6377,7 +6546,7 @@ msgstr "_Felfedés új ablakban"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "_Felfedés %d új ablakban"
@@ -6387,14 +6556,19 @@ msgstr "_Felfedés %d új ablakban"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr "A Nautilus több egyezést talált, mint amennyit meg tud jeleníteni."
+
+# src/file-manager/fm-search-list-view.c:727
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr "A Nautilus több egyezést talált, mint amennyit meg tud jeleníteni."
 
 # src/file-manager/fm-search-list-view.c:729
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Túl sok találat"
 
@@ -6411,14 +6585,14 @@ msgstr "In_dítóikon létrehozása"
 
 # src/file-manager/fm-search-list-view.c:191
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Új indítóikon létrehozása"
 
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 # src/file-manager/nautilus-directory-view-ui.xml.h:8
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Minden elem törlése a kukából"
 
@@ -6443,7 +6617,7 @@ msgstr ""
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Alapértelmezett _háttér használata"
@@ -6472,68 +6646,80 @@ msgstr ""
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+#, fuzzy
+msgid "Create _Document"
+msgstr "Mappa _létrehozása"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "Mappa _létrehozása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:6
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
+msgstr "Új üres mappa létrehozása ebbe a mappába"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Új üres mappa létrehozása ebbe a mappába"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:7
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Minden kijelölt elemre szimbolikus kapcsot hoz létre"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Ke_ttőzés"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Minden kijelölt elem törlése, Kukába való áthelyezés nélkül"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:10
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Minden kijelölt elem kettőzése"
 
 # data/static_bookmarks.xml.h:25
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Indítóikon szerkesztése"
 
 # components/services/install/lib/eazel-install-object.c:986
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Az indítóikon adatainak szerkesztése"
 
 # components/rpmview/nautilus-rpm-view.c:362
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Kijelölt kötet formázása"
 
 # src/file-manager/fm-properties-window.c:519
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "_Adathordozó tulajdonságai"
 
 # libnautilus-private/nautilus-volume-monitor.c:1366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "A kijelölt kötet lecsatolása"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "A Fájlok másolása vagy Fájlok kivágása parancsok által kiválasztott fájlok "
 "másolása vagy áthelyezése"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -6541,157 +6727,167 @@ msgstr ""
 "A Fájlok másolása vagy Fájlok kivágása parancsok által kiválasztott fájlok "
 "másolása vagy áthelyezése a kijelölt mappába"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Megnyitás e_zzel"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Minden kijelölt elem megnyitása új ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Megnyitás új _ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:21
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "A kijelölt elem megnyitása ebben a ablakban"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Előkészíti a kijelölt fájlokat a \"Fájlok beillesztése\" paranccsal való "
 "másolásra"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Előkészíti a kijelölt fájlokat a \"Fájlok beillesztése\" paranccsal való "
 "áthelyezésre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Vé_delem"
 
 # components/rpmview/nautilus-rpm-view.c:362
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Védi a kijelölt kötetet"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:26
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Kijelölt ikon átnevezése"
 
 # src/file-manager/fm-directory-view.c:2959
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Nézet visszaállítása az _alapértelmezettre"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Rendezési sorrend és nagyítás tulajdonságainak visszaállítása a nézet "
 "alapértelmezett értékére"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Programok futtatása vagy kezelése a ~/Nautilus/programok könyvtárból"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Minden fájlt _kijelöl"
 
 # src/nautilus-property-browser.c:2012
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Kategória választása:"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Minden elemet kijelöl ebben az ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Minden elemet kijelöl ebben az ablakban"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Megjeleníti a kijelölt kötet adathordozójának tulajdonságait"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Ebben a menüben szereplő programok mappájának megnyitása"
 
 # libnautilus-private/nautilus-volume-monitor.c:1366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "A kijelölt kötet lecsatolása"
 
 # src/nautilus-shell-ui.xml.h:40
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Alapértelmezett háttér használata ehhez a helyhez"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Minden kijelölt elem tulajdonságainak megtekintése vagy módosítása"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:73
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Fájl _másolása"
+
 # src/nautilus-shell-ui.xml.h:39
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formázás"
 
 # src/file-manager/fm-desktop-icon-view.c:1042
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Kötet _leválasztása"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:40
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Programok mappa megnyitása"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Fájlok _beillesztése"
 
 # libnautilus-private/nautilus-file-operations.c:2092
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Fájlok beillesztése a mappába"
 
 # src/file-manager/fm-properties-window.c:519
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Tulajdonságok"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:38
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "�_tnevezés..."
 
 # data/browser.xml.h:68
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Programok"
 
@@ -6796,8 +6992,14 @@ msgstr "_Kézzel"
 msgid "Indexing is %d%% complete."
 msgstr "Az indexelés %d%%-nál tart."
 
+# src/file-manager/nautilus-indexing-info.c:236
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "A fájljaid utoljára ekkor voltak indexelve: %s"
+
 # src/file-manager/nautilus-indexing-info.c:224
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -6808,27 +7010,31 @@ msgstr ""
 # src/file-manager/nautilus-indexing-info.c:219
 # src/file-manager/nautilus-indexing-info.c:226
 # src/file-manager/nautilus-indexing-info.c:280
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexelés állapota"
 
 # src/file-manager/nautilus-indexing-info.c:236
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "A fájljaid utoljára ekkor voltak indexelve: %s"
 
-# src/file-manager/nautilus-indexing-info.c:278
-#: src/file-manager/nautilus-indexing-info.c:202
+# src/file-manager/nautilus-indexing-info.c:224
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Naponta egyszer a fájljaidat és a szöveges tartalmat leindexelem, hogy a "
-"keresések gyorsabbak legyenek. Az indexelés folyamatban van."
+"keresések gyorsabbak legyenek."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Jelenleg nem létezik indexfájl."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -6838,17 +7044,21 @@ msgstr ""
 "segítségével gyorsabban tudja listázni a találatokat. A gyorskeresés nincs "
 "bekapcsolva a számítógépeden, ezért jelenleg nincs indexfájlod."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Jelenleg nem létezik indexfájl."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
 # src/file-manager/nautilus-indexing-info.c:396
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Sajnálom, de a Medusa keresés nem elérhető."
 
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
 # src/file-manager/nautilus-indexing-info.c:418
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -6878,33 +7088,39 @@ msgid "Show status of indexing used when searching"
 msgstr "Indexelés állapotának mutatása kereséskor"
 
 # src/nautilus-application.c:274
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "A szükséges mappa létrehozása sikertelen"
 
-#: src/nautilus-application.c:256
-#, c-format
+# src/nautilus-application.c:279
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "A szükséges mappák létrehozása sikertelen"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "A Nautilus nem tudta létrehozni a következő mappát: %s\n"
 "A Nautilus futtatása előtt hozd létre ezt a mappát vagy állítsd be a "
 "jogosultságokat úgy, hogy a program tudja ezt megtenni."
 
 # src/nautilus-application.c:279
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "A szükséges mappák létrehozása sikertelen"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6916,19 +7132,23 @@ msgstr ""
 "jogosultságokat úgy, hogy a program tudja ezt megtenni."
 
 # libnautilus-private/nautilus-trash-file.c:593
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Hivatkozás a régi munkaasztalra"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "�tköltöztetett régi munkaasztal"
 
 #. Can't register myself due to trouble locating the
@@ -6941,7 +7161,7 @@ msgstr "�tköltöztetett régi munkaasztal"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6953,7 +7173,7 @@ msgstr ""
 
 # src/nautilus-application.c:408
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -7001,13 +7221,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "A Nautilus most nem használható. Ok: váratlan hiba."
 
 # src/nautilus-application.c:435
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -7016,7 +7236,7 @@ msgstr ""
 "a \"file manager view server\" regisztrálása közben történt)."
 
 # src/nautilus-application.c:453
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -7027,7 +7247,7 @@ msgstr ""
 "újraindítása segíthet."
 
 # src/nautilus-application.c:460
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -7037,6 +7257,18 @@ msgstr ""
 "object nem található). Az bonobo-activation-server elpusztítása és a "
 "Nautilus újraindítása segíthet."
 
+# components/music/nautilus-music-view.c:1694
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Hiba történt a súgó megjelenítése közben: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nincsenek könyvjelzők"
@@ -7076,42 +7308,51 @@ msgstr "Kevesebb beállítás"
 msgid "Find Them!"
 msgstr "Keress!"
 
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr ""
+
 #: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+msgid "Please enter a name and try again."
 msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:1926
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Nem lehet a Sajátba átmozgatni"
 
-# src/nautilus-window-manage-views.c:1157
-#: src/nautilus-connect-server-dialog.c:100
+# src/nautilus-property-browser.c:1040
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Sajnálom, de \"%s\" nem érvényes fájlnév."
+
+# src/nautilus-window-manage-views.c:1151
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" nem érvényes hely. Ellenőrizd, hogy nem gépelted el és próbáld újra."
+"\"%s\" nem található. Ellenőrizd, hogy nem gépelted el és próbáld újra."
 
 # libnautilus-private/nautilus-global-preferences.c:995
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Hálózati kiszolgálók"
 
-# libnautilus-private/nautilus-program-chooser.c:1186
-# src/file-manager/fm-list-view.c:1970
-# src/file-manager/fm-search-list-view.c:549
-# src/nautilus-bookmarks-window.c:164
-#: src/nautilus-connect-server-dialog.c:185
+# src/nautilus-location-bar.c:62
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Név:"
+msgid "_Location:"
+msgstr "Hely:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Kapcsolódás"
@@ -7336,6 +7577,22 @@ msgstr ""
 "\n"
 "Töröld le ezt a fájl, ha újra akarod futtatni a druidát.\n"
 
+# src/nautilus-sidebar.c:663
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Egy elemnek csak egy testreszabott ikonja lehet. Kérlek csak egy képet húzz "
+"az elemre a testreszabott ikon beállításához"
+
+# src/nautilus-sidebar.c:684
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Az ikonra húzott fájl nem lokális. Csak helyi képeket használhatsz egyéni "
+"ikonként."
+
 # src/nautilus-sidebar.c:1251
 #: src/nautilus-information-panel.c:882
 #, c-format
@@ -7348,29 +7605,28 @@ msgstr "Megnyitás ezzel: %s"
 msgid "Open with..."
 msgstr "Megnyitás ezzel..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Nem sikerült elindítani a CD-égető alkalmazást:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "CD-égető indítása sikertelen"
 
 # src/file-manager/fm-desktop-icon-view.c:1022
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 # src/file-manager/nautilus-directory-view-ui.xml.h:11
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Kuka ürítése"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Tartalom felírása CD-re"
 
@@ -7380,44 +7636,44 @@ msgid "Go To:"
 msgstr "Ugorj ide:"
 
 # src/nautilus-location-bar.c:153
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Ezeket a címeket (%d db) külön ablakokban szeretnéd megnyitni?"
 
 # src/nautilus-location-bar.c:160
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Megtekintés külön ablakokban?"
 
 # libnautilus-private/nautilus-file-operations.c:1905
 # libnautilus-private/nautilus-file-operations.c:2158
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Nem lehet a helyet megnyitni"
 
 # src/nautilus-main.c:144
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Néhány gyors ellenőrzőrutin futtatása."
 
 # src/nautilus-main.c:147
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Az indulóablak létrehozása adott helyen és méretekkel."
 
 # src/nautilus-main.c:147
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
 # src/nautilus-main.c:149
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Csak a kifejezetten megadott URI-khez hozzon létre ablakot."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -7425,99 +7681,114 @@ msgstr ""
 "Nem kezeli a munkafelületet (figyelmen kívül hagyja az erre vonatkozó "
 "beállításokat)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
 # src/nautilus-main.c:151
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Kilépés a Nautilusból."
 
 # src/nautilus-main.c:153
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "A Nautilus újraindítása."
 
 # src/file-manager/fm-properties-window.c:1910
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Fájlkezelő"
 
 # data/static_bookmarks.xml.h:24 src/nautilus-window-manage-views.c:246
 # src/nautilus-window-menus.c:553
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
 # src/nautilus-main.c:208
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nem használható URI-kel.\n"
 
 # src/nautilus-main.c:212
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nem használható más paraméterekkel.\n"
 
 # src/nautilus-main.c:216
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nem használható URI-kel.\n"
 
 # src/nautilus-main.c:220
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nem használható URI-kel.\n"
 
 # src/nautilus-main.c:224
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nem használható több mint egy URI-vel.\n"
 
-# src/nautilus-window-menus.c:307
+# src/file-manager/fm-directory-view.c:2637
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Biztosan véglegesen törölni akarod a következőt: \"%s\"?"
+
+# src/nautilus-window-menus.c:307
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Biztos, hogy törölni akarod az emlékezetet? Ezáltal a Nautilus elfelejti, "
 "hogy milyen helyeken jártál már."
 
 # src/nautilus-window-menus.c:310
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Biztosan azt szeretnéd, hogy a Nautilus elfelejtse, hogy mely helyeken "
 "jártál már?"
 
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
 # src/nautilus-window-menus.c:315
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Előzmények törlése"
 
 # src/nautilus-window-menus.c:720
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "A \"%s\" hely nem létezik. Törölni akarsz egy könyvjelzőt is a listádból, "
 "amely ide mutat?"
 
+# src/nautilus-window-menus.c:738
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "A \"%s\" hely nem létezik tovább."
+
 # src/nautilus-window-menus.c:724
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Nem létező helyre mutató könyvjelző"
 
 # src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:725
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Eltávolítás"
 
@@ -7558,7 +7829,6 @@ msgstr "Minde_n ablak bezárása"
 
 # src/nautilus-shell-ui.xml.h:12
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Minden Nautilus ablak bezárása"
@@ -7585,46 +7855,53 @@ msgstr "Keresés"
 msgid "Forward"
 msgstr "Előre"
 
-# src/nautilus-shell-ui.xml.h:30
+# libnautilus-private/nautilus-search-uri.c:257
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Ugrás a kuka mappájához"
+
+# src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "A következő meglátogatott helyre ugrik"
 
 # src/nautilus-shell-ui.xml.h:31
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Az előző meglátogatott helyre ugrik"
 
 # libnautilus-private/nautilus-search-uri.c:257
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Ugrás a kuka mappájához"
 
 # components/help/converters/gnome-db2html2/gdb3html.c:717
 # libnautilus-private/nautilus-global-preferences.c:706
 # src/nautilus-shell-ui.xml.h:36
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Kezdőlap"
 
 # src/nautilus-shell-ui.xml.h:32 src/nautilus-window-menus.c:434
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Címsáv"
 
 # src/file-manager/fm-properties-window.c:1958
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Frissítés"
 
 # src/nautilus-shell-ui.xml.h:48
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Fájlok keresése ezen a számítógépen"
 
 # src/nautilus-shell-ui.xml.h:34 src/nautilus-window-menus.c:416
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "�_llapotsor"
 
@@ -7633,92 +7910,97 @@ msgstr "�_llapotsor"
 # libnautilus-private/nautilus-file-operations.c:960
 # libnautilus-private/nautilus-file-operations.c:979
 # src/nautilus-shell-ui.xml.h:54
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Leállítás"
 
 # src/nautilus-shell-ui.xml.h:58
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Fel"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "CD-re írás"
 
 # src/nautilus-shell-ui.xml.h:68
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Könyvjelző hozzáadása"
 
 # src/nautilus-shell-ui.xml.h:69
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Vissza"
 
 # src/nautilus-shell-ui.xml.h:71
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Könyvjelzők"
 
 # src/nautilus-shell-ui.xml.h:26
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Előzmények _törlése"
 
 # data/browser.xml.h:18
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Countertop"
 
 # src/nautilus-shell-ui.xml.h:75
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Köny_vjelzők szerkesztése"
 
 # src/nautilus-shell-ui.xml.h:79
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Előre"
 
 # src/nautilus-shell-ui.xml.h:80
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ugrás"
 
 # src/nautilus-shell-ui.xml.h:82
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Kezdőlap"
 
 # src/nautilus-bookmarks-window.c:177
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Hely..."
 
 # libnautilus-private/nautilus-global-preferences.c:628
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Oldalpanel"
 
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
 # data/linksets/desktop.xml.h:2 libnautilus-private/nautilus-file.c:4751
 # libnautilus-private/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:65
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Kuka"
 
 # src/nautilus-shell-ui.xml.h:58
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Fel"
 
 # src/nautilus-shell-ui.xml.h:97
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Nézet"
 
@@ -7740,37 +8022,43 @@ msgid "File Browser: %s"
 msgstr "Fájl tulajdonosa:"
 
 # src/nautilus-window-manage-views.c:925
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Az egyik oldalpanel hibát észlelt és nem tud tovább futni. Sajnos nem "
 "állapítható meg, hogy melyik oldalpanelről van szó."
 
-# src/nautilus-window-manage-views.c:929
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+# src/nautilus-window-manage-views.c:776
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "A(z) %s nézet hibát észlelt induláskor."
+
+# src/nautilus-window-manage-views.c:929
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "A(z) %s oldalpanel hibát észlelt és nem tud tovább futni. Ha a hiba továbbra "
 "is fennáll, kapcsold ki a kérdéses panelt."
 
 # src/nautilus-window-manage-views.c:934
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Oldalpanel hibát észlelt"
 
 # libnautilus-private/nautilus-global-preferences.c:628
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Oldalpanel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Az oldalpanel nézetet tartalmazza"
 
@@ -7811,182 +8099,216 @@ msgstr "Ú_j hozzáadása...  "
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Sajnálom, de a következő mintát nem lehetett eltávolítani: %s."
 
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
 # src/nautilus-property-browser.c:875 src/nautilus-property-browser.c:904
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "A minta eltávolítása sikertelen."
 
 # src/nautilus-property-browser.c:903
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Sajnálom, a következő matrica eltávolítása sikertelen: %s."
 
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+# src/nautilus-theme-selector.c:606
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Matrica törlése sikertelen."
+
 # src/nautilus-property-browser.c:939
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Új matrica létrehozása:"
 
 # src/nautilus-property-browser.c:944
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Kulcsszó:"
 
 # src/nautilus-property-browser.c:957
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Kép:"
 
 # src/nautilus-property-browser.c:961
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Válassz ki egy képet az új matrica létrehozásához:"
 
 # src/nautilus-property-browser.c:988
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Új szín létrehozása:"
 
 # src/nautilus-property-browser.c:993
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Szín _neve:"
 
 # src/nautilus-property-browser.c:1004
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Szín é_rtéke:"
 
 # src/nautilus-property-browser.c:1040
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Sajnálom, de \"%s\" nem érvényes fájlnév."
 
 # src/nautilus-property-browser.c:1042
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Sajnálom, de nem adtál meg érvényes fájlnevet."
 
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
 # src/nautilus-property-browser.c:1044 src/nautilus-property-browser.c:1087
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Minta telepítése sikertelen"
 
 # src/nautilus-property-browser.c:1055
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sajnálom, de nem cserélheted le a \"Reset\" képet."
 
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
 # components/music/nautilus-music-view.c:696
 # src/nautilus-property-browser.c:1055 src/nautilus-property-browser.c:1307
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nem kép"
 
 # src/nautilus-property-browser.c:1086
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Sajnálom, de a következő minta telepítése sikertelen: %s."
 
 # src/nautilus-property-browser.c:1109
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Válassz ki egy képfájl (ebből lesz a minta)"
 
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
 # src/nautilus-property-browser.c:1168
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sajnálom, de a színnek nem lehet üres a neve."
 
 # src/nautilus-property-browser.c:1169
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Szín hozzáadása sikertelen"
 
 # src/nautilus-property-browser.c:1225
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Hozzáadandó szín kiválasztása"
 
 # src/nautilus-property-browser.c:1306
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Sajnálom, de \"%s\" nem egy használható képfájl!"
 
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "A(z) '%s' fájl nem tűnik érvényes képnek."
+
 # src/nautilus-property-browser.c:2012
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Kategória választása:"
 
 # src/nautilus-property-browser.c:2020 src/nautilus-theme-selector.c:494
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Mégsem távolítja el"
 
 # src/nautilus-property-browser.c:2024
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Új minta _hozzáadása..."
 
 # src/nautilus-property-browser.c:2027
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Új szín _hozzáadása..."
 
 # src/nautilus-property-browser.c:2030
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Új matrica _hozzáadása..."
 
 # src/nautilus-property-browser.c:2053
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kattints egy mintára annak eltávolításához"
 
 # src/nautilus-property-browser.c:2056
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kattints egy színre annak eltávolításához"
 
 # src/nautilus-property-browser.c:2059
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kattints egy matricára annak eltávolításához"
 
 # src/nautilus-property-browser.c:2068
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Minták:"
 
 # src/nautilus-property-browser.c:2071
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Színek:"
 
 # src/nautilus-property-browser.c:2074
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Matricák:"
 
 # src/nautilus-property-browser.c:2092
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Minta _eltávolítása..."
 
 # src/nautilus-property-browser.c:2095
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Szín _eltávolítása..."
 
 # src/nautilus-property-browser.c:2098
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Matrica _eltávolítása..."
 
@@ -8469,9 +8791,15 @@ msgstr "_CD-készítő"
 # src/nautilus-shell-ui.xml.h:11
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Minde_n ablak bezárása"
 
+# components/notes/Nautilus_View_notes.oaf.in.h:3
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Oldalpanel bezárása"
+
 # libnautilus-private/nautilus-search-uri.c:257
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
@@ -8479,29 +8807,29 @@ msgid "Go to Computer"
 msgstr "Ugrás az Üres CD mappához"
 
 # libnautilus-private/nautilus-search-uri.c:257
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Ugrás a kuka mappájához"
 
 # src/nautilus-bookmarks-window.c:177
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Hely..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
 # libnautilus-private/nautilus-search-uri.c:257
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "mappák"
 
 # data/browser.xml.h:61
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "M_inták"
@@ -8534,12 +8862,16 @@ msgstr ""
 msgid "View Failed"
 msgstr "Sikertelen megtekintés"
 
-# src/nautilus-window-manage-views.c:765
+# src/nautilus-window-manage-views.c:776
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "A(z) %s nézet hibát észlelt induláskor."
+
+# src/nautilus-window-manage-views.c:765
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "A %s megjelenítő hibát észlelt és nem tudja megjeleníteni a lapot. "
 "Választhatsz másik nézetet vagy megnézhetsz egy másik helyet."
@@ -8550,97 +8882,126 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "A(z) %s nézet hibát észlelt induláskor."
 
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Az ablakhoz rendelt NautilusApplication."
+
 # components/loser/content/Nautilus_View_content-loser.oaf.in.h:1
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Tartalomnézet"
 
 # libnautilus-private/nautilus-search-uri.c:257
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Aktuális fájl vagy mappa nézete"
 
-# src/nautilus-window-manage-views.c:1151
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"\"%s\" nem található. Ellenőrizd, hogy nem gépelted el és próbáld újra."
+# src/nautilus-theme-selector.c:398
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Matricák hozzáadása sikertelen"
+
+# src/nautilus-window-manage-views.c:1241
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "A Nautilus nem tudja megjeleníteni a következőt: \"%s\"."
 
 # src/nautilus-window-manage-views.c:1171
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "\"%s\" megjelenítése sikertelen, mert a Nautilus nem tudta meghatározni a "
 "fájl típusát."
 
 # src/nautilus-window-manage-views.c:1179
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "A Nautilus nem talált olyan programot, amivel meg tudná jeleníteni a "
 "következőt: \"%s\"."
 
 # src/nautilus-window-manage-views.c:1191
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "%s megjelenítése sikertelen, mert a Nautilus nem tudja megjeleníteni a %s: "
 "helyeket."
 
 # src/nautilus-window-manage-views.c:1197
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\" nem jeleníthető meg, mert a bejelentkezés sikertelen volt."
 
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
 # src/nautilus-window-manage-views.c:1202
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" nem jeleníthető meg, mert a hozzáférés le van tiltva."
 
 # src/nautilus-window-manage-views.c:1213
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" nem jeleníthető meg, mert a következő gép nem található: \"%s\". "
 "Ellenőrizd, hogy jól írtál be mindent és hogy a proxy beállítások jók."
 
 # src/nautilus-window-manage-views.c:1221
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "\"%s\" megjelenítése sikertelen. Ellenőrizd a proxy beállításait."
 
-# src/nautilus-window-manage-views.c:1171
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+# src/nautilus-window-manage-views.c:1191
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"%s megjelenítése sikertelen, mert a Nautilus nem tudja megjeleníteni a %s: "
+"helyeket."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"\"%s\" megjelenítése sikertelen, mert a Nautilus nem tudta felvenni a "
-"kapcsolatot az SMB master browserrel.\n"
-"Győződj meg róla, hogy az SMB kiszolgáló működik a helyi hálózaton."
 
 # src/nautilus-window-manage-views.c:1233
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"A keresés jelenleg nem érhető el. Ennek oka lehet az, hogy nincs indexed, "
+"vagy az, hogy a keresési szolgáltatás nem fut. Győződj meg róla, hogy "
+"elindítottad a Medusa keresési szolgáltatást, és hogy ha nincs indexed, "
+"akkor fut a Medusa indexkészítő."
+
+# src/nautilus-window-manage-views.c:1233
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "A keresés jelenleg nem érhető el. Ennek oka lehet az, hogy nincs indexed, "
 "vagy az, hogy a keresési szolgáltatás nem fut. Győződj meg róla, hogy "
@@ -8648,18 +9009,22 @@ msgstr ""
 "akkor fut a Medusa indexkészítő."
 
 # src/nautilus-window-manage-views.c:1237
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "A keresés nem elérhető"
 
 # src/nautilus-window-manage-views.c:1241
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "A Nautilus nem tudja megjeleníteni a következőt: \"%s\"."
 
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
 # src/nautilus-window-manage-views.c:1246
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "A hely megjelenítése sikertelen."
 
@@ -8673,7 +9038,7 @@ msgstr "Ugrás a könyvjelző által jelölt helyre"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -8682,14 +9047,14 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Kovács Emese <emese@gnome.hu>\n"
 "Tímár András <timar@gnome.hu>"
 
 # src/nautilus-window-menus.c:563
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -8706,45 +9071,49 @@ msgid "Go forward a number of pages"
 msgstr "Előrelapoz néhány oldalt"
 
 # libnautilus-private/nautilus-global-preferences.c:158
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Megjelenítés a következővel: \"%s\""
 
 # data/static_bookmarks.xml.h:28
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
 # data/browser.xml.h:25
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Pontok"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD-készítő"
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Alkalmazás ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Az ablak alkalmazás ID-je"
 
 # components/help/hyperbola-filefmt.c:509
 # components/help/hyperbola-filefmt.c:833 data/linksets/apps.xml.h:1
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Az ablakhoz rendelt NautilusApplication."
 
@@ -8786,6 +9155,286 @@ msgstr "Hálózati kiszolgálók"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "_Parancsfájlok megtekintése a rájuk kattintáskor"
 
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory a hardvernézetekhez"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:3
+#~ msgid "Hardware Viewer"
+#~ msgstr "Hardvermegjelenítő"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:3
+#~ msgid "Hardware view"
+#~ msgstr "Hardvernézet"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:2
+# components/hardware/nautilus-hardware-view.c:631
+# data/static_bookmarks.xml.h:13
+#~ msgid "View as Hardware"
+#~ msgstr "Hardverként"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:4
+#~ msgid "hardware view"
+#~ msgstr "hardvernézet"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ikonnév a hardvernézethez"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "summary of hardware info"
+#~ msgstr "összefoglaló a hardverinfóhoz"
+
+# components/hardware/nautilus-hardware-view.c:230
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K gyorstár"
+
+# components/hardware/nautilus-hardware-view.c:264
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB RAM"
+
+# components/hardware/nautilus-hardware-view.c:266
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB RAM"
+
+# components/hardware/nautilus-hardware-view.c:324
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+# components/hardware/nautilus-hardware-view.c:326
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "A gép %d napja, %d órája és %d perce működik"
+
+# components/hardware/nautilus-hardware-view.c:407
+#~ msgid "Hardware Overview"
+#~ msgstr "Hardver áttekintés"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ez távtartó a CPU-oldalhoz."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ez távtartó a RAM-oldalhoz."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ez távtartó az IDE-oldalhoz."
+
+# libnautilus-private/nautilus-file-operations.c:689
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Hiba másolás közben. A célfájl: \"%s\".\n"
+#~ "\n"
+#~ "A célfájl lemezén nincs elég hely."
+
+# libnautilus-private/nautilus-file-operations.c:698
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Hiba a kapocs létrehozásakor. A hely: \"%s\".\n"
+#~ "\n"
+#~ "A célterületen nincs elég hely."
+
+# libnautilus-private/nautilus-file-operations.c:721
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Hiba áthelyezés közben. A célfájl: \"%s\".\n"
+#~ "\n"
+#~ "Lehet, hogy nincs jogod írni ebbe a mappába."
+
+# libnautilus-private/nautilus-file-operations.c:725
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Hiba áthelyezés közben. A célfájl: \"%s\".\n"
+#~ "\n"
+#~ "A céllemez csak olvasható."
+
+# libnautilus-private/nautilus-file-operations.c:732
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Hiba a kapocs létrehozása közben. A mappa: \"%s\".\n"
+#~ "\n"
+#~ "Nincs jogod írni ebbe a mappába."
+
+# libnautilus-private/nautilus-file-operations.c:736
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Hiba a kapocs létrehozása közben. A mappa: \"%s\".\n"
+#~ "\n"
+#~ "A céllemez csak olvasható."
+
+# libnautilus-private/nautilus-file-operations.c:765
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" hiba, a következő másolásakor: \"%s\".\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:769
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" hiba, a következő áthelyezésekor: \"%s\".\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:779
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\" törlése közben \"%1$s\" hiba lépett fel.\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:794
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Másolás közben \"%s\" hiba lépett fel.\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:802
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kapocs létrehozása közben \"%s\" hiba lépett fel.\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:808
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Törlés közben \"%s\" hiba lépett fel.\n"
+#~ "\n"
+#~ "Mégis folytatod?"
+
+# libnautilus-private/nautilus-file-operations.c:1872
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Nem lehet a Kukába másolni"
+
+#~ 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 ""
+#~ "Az alapértelmezett művelet nem tudja megnyitni a következőt: \"%s\". Ok: "
+#~ "a művelet nem érhet el fájlokat a következő helyen: \"%s\". Nincs másik "
+#~ "alkalmazás, amivel meg lehetne nyitni a fájlt. Ha a fájlt lemásolod a "
+#~ "számítógépedre, lehet, hogy meg tudod majd nyitni."
+
+# libnautilus-private/nautilus-trash-directory.c:73
+#~ msgid "Searching Disks"
+#~ msgstr "Keresés a lemezeken"
+
+# libnautilus-private/nautilus-trash-directory.c:74
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "A Nautilus keresi a Kuka mappákat a helyi lemezeken."
+
+# src/file-manager/fm-directory-view.c:2594
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "A kijelölt %d elem nem helyezhető át a Kukába. Törölni akarod ezeket most "
+#~ "rögtön?"
+
+# src/file-manager/fm-directory-view.c:2594
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d a kijelölt elemek közül nem helyezhető át a Kukába. Törölni akarod ezt "
+#~ "a %d elemet most rögtön?"
+
+# src/nautilus-sidebar.c:691
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Az ikonra húzott fájl nem képfájl. Csak képfájlokat használhatsz egyéni "
+#~ "ikonként."
+
+# src/file-manager/fm-search-list-view.c:159
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Sajnálom, a Medusa keresés nem elérhető, mert nincs telepítve."
+
+# src/file-manager/nautilus-indexing-info.c:278
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Naponta egyszer a fájljaidat és a szöveges tartalmat leindexelem, hogy a "
+#~ "keresések gyorsabbak legyenek. Az indexelés folyamatban van."
+
+# src/nautilus-window-manage-views.c:1157
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nem érvényes hely. Ellenőrizd, hogy nem gépelted el és próbáld "
+#~ "újra."
+
+# src/nautilus-window-manage-views.c:1171
+#~ 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 ""
+#~ "\"%s\" megjelenítése sikertelen, mert a Nautilus nem tudta felvenni a "
+#~ "kapcsolatot az SMB master browserrel.\n"
+#~ "Győződj meg róla, hogy az SMB kiszolgáló működik a helyi hálózaton."
+
+#~ msgid "file icon"
+#~ msgstr "fájl ikon"
+
+# libnautilus-private/nautilus-program-chooser.c:1186
+# src/file-manager/fm-list-view.c:1970
+# src/file-manager/fm-search-list-view.c:549
+# src/nautilus-bookmarks-window.c:164
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Név:"
+
 # libnautilus-private/nautilus-file.c:3731
 #~ msgid "Unknown"
 #~ msgstr "Ismeretlen"
@@ -8905,10 +9554,6 @@ msgstr "_Parancsfájlok megtekintése a rájuk kattintáskor"
 #~ msgid "_Toolbar"
 #~ msgstr "_Eszköztár"
 
-# src/nautilus-window-menus.c:738
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "A \"%s\" hely nem létezik tovább."
-
 # src/nautilus-window-menus.c:739
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Nemlétező helyre ugrik"
diff --git a/po/id.po b/po/id.po
index f2b463860..add0a29e4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-06-25 09:40+0700\n"
 "Last-Translator: Yohanes Nugroho <yohanes@opensource.or.id>\n"
 "Language-Team: Indonesia <sukarelawan@gnome.linux.or.id>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() error."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblem"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "View Emblem Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Tidak dapat menghapus emblem"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Tidak dapat menghapus emblem dengan nama '%s'. Mungkin emblem ini adalah "
 "emblem permanen yang tidak Anda ciptakan."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Tidak dapat menghapus emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Tidak dapat mengganti nama emblem"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Tidak dapat mengganti nama emblem yang bernama '%s. Mungkin emblem ini "
 "adalah emblem permanen, bukan yang Anda ciptakan sendiri."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Tidak dapat mengganti nama emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Ganti nama emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Masukan nama baru untuk emblem yang ditampilkan:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Ganti Nama"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Tambahkan Emblem..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Masukan nama yang deskriptif untuk tiap emblem. Nama ini akan dipakai di "
 "lokasi lain untuk mengidentifikasi emblem."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,64 @@ msgstr ""
 "Masukan nama yang deskriptif untuk emblem. Nama ini akan dipakai di lokasi "
 "lain untuk mengidentifikasi emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Beberapa file tidak bisa ditambahkan menjadi emblem karena sepertinya file "
 "gambarnya tidak valid"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "File '%s' sepertinya bukan file gambar yang valid."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Tidak dapat menambah emblem"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Tidak ada satupun file yang bisa ditambahkan menjadi emblem karena "
 "sepertinya semuanya bukan gambar yang valid"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Teks yang didrag bukan lokasi yang valid"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Tidak dapat menambah emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "File '%s' sepertinya bukan file gambar yang valid."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "File yang didrag sepertinya bukan file gambar yang valid."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Hapus"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory untuk view hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Viewer Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Tampilan Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "LIhat Sebagai Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "view hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nama ikon untuk view hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "ringkasan informasi hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"CPU %s \n"
-"%s MHz\n"
-"Ukuran cache %s K"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "RAM %lu GB "
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "RAM %lu MB "
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB "
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB "
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Waktu hidup %d hari %d jam %d menit"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Ringkasan Hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ini merupakan tempat untuk halaman CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ini merupakan tempat untuk halaman RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ini merupakan tempat untuk halaman IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "History"
@@ -909,6 +846,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internasional"
@@ -1202,32 +1143,19 @@ msgid "Desktop trash icon name"
 msgstr "Nama ikon Tong Sampah di desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-#, fuzzy
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Direktori besar, di atas ukuran ini akan dipotong kira-kira di batas ini. "
-"Tujuannya supaya memori yang terpakai tidak terlalu banyak, yang mungkin "
-"bisa membuat nautilus hang/crash. JIka nilainya negatif, artinya batasnya "
-"tidak diset. Batasnya hanya 'kira-kira' karena pembacaan direktorinya per "
-"blok."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Aktifkan flag-flag 'spesial' di dialog opsi file"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Nama file untuk latar belakang default direktori. Hanya dipakai jika "
 "background_set diaktifkan."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1235,6 +1163,20 @@ msgstr ""
 "Nama file untuk latar belakang default pane samping. Hanya dipakai jika "
 "side_pane_background_set diaktifkan."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Direktori besar, di atas ukuran ini akan dipotong kira-kira di batas ini. "
+"Tujuannya supaya memori yang terpakai tidak terlalu banyak, yang mungkin "
+"bisa membuat nautilus hang/crash. JIka nilainya negatif, artinya batasnya "
+"tidak diset. Batasnya hanya 'kira-kira' karena pembacaan direktorinya per "
+"blok."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1247,8 +1189,8 @@ msgstr "Tampilkan ikon home di desktop"
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 #, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Jika diaktifkan, Nautilus hanya akan menampilkan direktori di tree sidebar. "
 "Jika tidak\n"
@@ -1289,8 +1231,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Jika diaktifkan, maka nautilus akan menampilkan direktori sebelum file dalam "
 "tampilan ikon dan list."
@@ -1339,7 +1281,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Jika diaktifkan, maka nautilus akan menggunakan home direktori user sebagai "
@@ -1358,7 +1300,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1379,8 +1321,9 @@ msgstr ""
 "ditampilkan di desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Jika diaktifkan, maka sebuah ikon yang merupakan link ke direktori home akan "
@@ -1419,7 +1362,8 @@ msgstr ""
 "file akan diurutkan mengecil."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Jika diaktifkan, secara default ikon akan disusun lebih rapat di window yang "
 "baru."
@@ -1451,7 +1395,8 @@ msgid "List of possible captions on icons"
 msgstr "Daftar label yang mungkin untuk ikon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Jumlah file maksimum yang ditangani dalam sebuah direktori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1471,11 +1416,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus menagangi penggambaran dekstop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus memakai home directory user sebagai desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Tampilkan direktori saja di tree sidebar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1495,7 +1442,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Balik urutan di window baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Tampilkan direktori lebih dulu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1532,10 +1480,11 @@ msgstr ""
 "ini. Jika diset ke \"never\" maka preview suara tidak akan dilakukan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1549,10 +1498,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Kapan harus mempreview membuat thumbnail gambar. Jika diset \"always\" maka "
 "thumbnail selalu dibuat meskipun lokasinya di server remote. Jika diset ke "
@@ -1561,10 +1510,11 @@ msgstr ""
 "hanya ikon generik yang ditampilkan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Kapan harus menghitung jumlah objek di direktori. Jika diset \"always\" maka "
@@ -1576,15 +1526,16 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Pengurutan default untuk item di tampilan ikon. Nilai yang mungkin adalah "
 "name, size, type, modification_date, emblem."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "\"Pengurutan default untuk item di tampilan list.  Nilai yang mungkin adalah "
 "name, size, type, modification_date, emblem."
@@ -1632,7 +1583,8 @@ msgid "Use manual layout in new windows"
 msgstr "Gunakan layout manual untuk window baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Gunakan layout yang rapat di window baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1664,7 +1616,8 @@ msgstr ""
 "icon_view."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Kapan menunjukkan jumlah objek di direktori"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1676,7 +1629,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Kapan menampilkan thumbnail file gambar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Apakah latar belakang default direktori sudah diset."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1835,69 +1789,83 @@ msgstr "reset"
 msgid "on the desktop"
 msgstr "di desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Tidak bisa menghapus volume"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Anda tidak bisa menghapus ikon volume. Jika Anda ingin mengeluarkan isi "
 "volume, gunakan perintah Eject yang muncul dengan mengklik kanan pada volume."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Tidak bisa menghapus volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Tong Sampah"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Pindahkan ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Salin ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Link ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Set jadi Latar _Belakang"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Batal"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Set jadi latar belakang untuk s_emua folder"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Set jadi latar belakang untuk folder _ini"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Maaf, tapi Anda harus memberikan keyword yang tidak kosong untuk emblem yang "
 "baru."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Gagal menginstall emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1907,19 +1875,25 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Maaf, tapi sudah ada emblem yang bernama \"%s\". Tolong pilih nama yang lain"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Gagal menginstall emblem"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Maaf, tidak berhasil menyimpan emblem Anda"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Maaf, tidak berhasil menyimpan nama emblem Anda"
 
@@ -1938,22 +1912,28 @@ msgstr "Dari:"
 msgid "To:"
 msgstr "Ke:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Error ketika memindahkan."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Error ketika memindahkan.\n"
 "\n"
 "\"%s\" tidak bisa dipindahkan karena berada di disk yang read only"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Error ketika menghapus."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1962,22 +1942,17 @@ msgstr ""
 "\"%s\" tidak bisa dihapus, karena Anda tidak punya hak untuk memodifikasi "
 "folder parent."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Error ketika menghapus.\n"
 "\n"
 "\"%s\" tidak bisa dihapus, karena berada di disk yang read only."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1986,12 +1961,15 @@ msgstr ""
 "\"%s\" tidak bisa dipindahkan karena Anda tidak punya hak untuk mengubah "
 "folder parentnya"
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Error ketika memindahkan."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Error ketika memindahkan.\n"
@@ -1999,12 +1977,10 @@ msgstr ""
 "\"%s\" tidak bisa dipindahkan karena folder itu, atau folder parentnya "
 "merupakan tujua pemindahannya (overlap/bertindihan)"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Error ketika menghapus.\n"
@@ -2012,295 +1988,244 @@ msgstr ""
 "\"%s\" tidak bisa dipindah ke Tong Sampah karena Anda tidak punya hak untuk "
 "memodifikasi folder parent."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Error ketika menyalin."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Error ketika menyalin.\n"
 "\n"
 "\"%s\" tidak bisa disalin karena Anda tidak punya hak untuk membacanya."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error ketika menyalin ke \"%s\".\n"
-"\n"
-"Direktori tujuan penuh"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Error ketika menyalin."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Error ketika memindahkan \"%s\".\n"
 "\n"
 "Direktori tujuan penuh"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Error ketika membuat link di \"%s\".\n"
-"\n"
-"Direktori tujuan penuh"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Error ketika memindahkan."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Error ketika membuat link."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Error ketika menyalin ke \"%s\".\n"
 "\n"
 "Anda tidak punya hak untuk menulis ke folder tersebut."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Error ketika menyalin ke \"%s\".\n"
 "\n"
 "Disk tujuan hanya bisa dibaca (read only)"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error ketika memindahkan objek ke \"%s\".\n"
-"\n"
-"Anda tidak punya hak untuk menulisi folder tersebut."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error ketika memindahkan objek ke \"%s\".\n"
-"\n"
-"Disk tujuan hanya bisa dibaca (read only)"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Error ketika membuat link di \"%s\".\n"
-"\n"
-"Anda tidak punya hak untuk menulisi folder tersebut."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Error ketika memindahkan."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error ketika membuat link di \"%s\".\n"
-"\n"
-"Disk tujuan hanya bisa dibaca (read only)"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika menyalin \"%s\".\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Error ketika membuat link."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Error ketika menyalin."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Error \"%s\" ketika memindahkan  \"%s\".\n"
+"Error \"%s\" ketika memindahkan\n"
 "\n"
 "Apakah Anda ingin melanjutkan?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika membuat link ke  \"%s\".\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Error ketika memindahkan."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Error \"%s\" ketika menghapus \"%s\".\n"
+"Error \"%s\" ketika membuat link ke  \"%s\".\n"
 "\n"
 "Apakah Anda ingin melanjutkan?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika menyalin\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Error ketika menghapus."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika memindahkan\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Error ketika menyalin."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika membuat link\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Error ketika memindahkan."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Error \"%s\" ketika menghapus\n"
-"\n"
-"Apakah Anda ingin melanjutkan?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Error ketika membuat link."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Error ketika menghapus."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Error ketika menyalin."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Error ketika memindahkan."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Error ketika membuat link."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Error ketika menghapus."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Lewatkan"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Coba lagi"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Tidak dapat menyelesaikan aksi yang diminta"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" tidak bisa dipindahkan ke lokasi yang baru, karena namanya sudah "
 "dipakai untuk objek khusus yang tidak bisa dihapus atau diganti\n"
 "\n"
 "Jika Anda masih ingin memindahkan \"%s\", gantilah namanya dan cobalah lagi."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Tidak dapat menyelesaikan aksi yang diminta"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" tidak bisa disalin ke lokasi yang baru, karena namanya sudah dipakai "
 "untuk objek khusus yang tidak bisa dihapus atau diganti\n"
 "\n"
 "Jika Anda masih ingin menyalin \"%s\", gantilah namanya dan cobalah lagi."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Tidak dapat menimpa (replace) file"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "File \"%s\" sudah ada\n"
 "\n"
 "Apakah Anda ingin menimpanya?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflik ketika menyalin"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Timpa"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Timpa Semua"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "link ke %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "link lain ke %s"
@@ -2309,25 +2234,25 @@ msgstr "link lain ke %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "link yang ke-%d ke file %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "link yang ke-%d ke file %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "link yang ke-%d ke file %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "link yang ke-%d ke file %s"
@@ -2337,562 +2262,601 @@ msgstr "link yang ke-%d ke file %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (salinan)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (salinan lain)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ")"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ")"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (salinan) %s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (salinan lain) %s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (salinan ke-%d) %s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (salinan ke-%d) %s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (salinan ke-%d) %s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (salinan ke-%d) %s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr "("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr "(salinan ke %d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d tidak dikenal"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Memindah file ke Tong Sampah"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "File yang dibuang:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Memindahkan"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Mempersiapkan memindah ke Tong Sampah..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Memindah File"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "File yang dipindahkan:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Mempersiapkan pemindahan..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Menyelesaikan pemindahan..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Membuat link ke file"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "File yang dilink:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Melakukan linking"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Mempersiapkan Pembuatan Link ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Menyelesaikan Pembuatan Link ..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Menyalin file"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "File yang disalin:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Menyalin"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Mempersiapkan Penyalinan"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Anda tidak bisa menyalin objek ke Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Tidak bisa menyalin ke Tong Sampah"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Anda tidak bisa memindah folder Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Anda tidak bisa menyalin folder sampah ini"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Tidak bisa mengubah Lokasi Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Tidak Bisa Menyalin Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Anda tidak bisa memindah folder ke dirinya sendiri."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Anda tidak bisa menyalin folder ke dirinya sendiri."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Ciptakan folder kosong baru dalam folder ini"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Tidak Bisa Memindah ke Dirinya Sendiri"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Tidak Bisa Menyalin ke Dirinya Sendiri"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Anda tidak bisa menimpa file dengan dirinya sendiri."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Tidak Bisa Menimpa Diri Sendiri"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Error menciptakan folder baru\n"
 "\n"
 "Anda tidak punya hak untuk menulis di tujuan"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Error menciptakan folder baru\n"
 "\n"
 "Disk penuh"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Error \"%s\" ketika membuat folder baru."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Error ketika membuat folder baru"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Error ketika membuat folder baru"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "folder anomim"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Error \"%s\" ketika membuat folder baru."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Error ketika membuat folder baru"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Error ketika membuat folder baru"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 file"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Menghapus file"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "File yang dihapus:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Menghapus"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Mempersiapkan penghapusan file..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Mengosongkan Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Mempersiapkan Pengosongan Tong Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Apakah Anda yakin ingin menghapus secara permanan semua objek di Tong Sampah?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Kosongkan"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (salinan).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (salinan ke-3)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (salinan ke-3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (salinan lain).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (salinan ke-3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (salinan ke-13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (salinan ke-14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (salinan ke-13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (salinan ke-14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (salinan ke-21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th copy).txt"
 
@@ -2911,64 +2875,64 @@ msgstr "foo (124th copy).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hari ini pada pukul 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hari ini pada pukul %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hari ini pada pukul 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hari ini pada pukul %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hari ini, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hari ini, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hari ini"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "kemarin pada pukul 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "kemarin pada pukul %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "kemarin pada pukul 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "kemarin pada %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "kemarin, 00:00 "
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "kemarin, %-H:%M:"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "kemarin"
 
@@ -2977,133 +2941,133 @@ msgstr "kemarin"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Rabu, 00 September 0000 jam 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y jam %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Sen, 00 Okt 0000 jam 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y jam %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Sen, 00 Okt 0000 jam 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y jam %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Okt 0000 jam 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y jam %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Okt 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y. %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 objek"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 folder"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 file"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 objek"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 folder"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 file"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u objek"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u folder"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u file"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "sejumlah objek"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "sejumlah byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipe tidak dikenal"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tipe MIME tidak dikenal"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3113,7 +3077,7 @@ msgstr ""
 "Kemungkinan file gnome-vfs.keys Anda berada di lokasi yang salah, atau tidak "
 "bisa ditemukan karena alasant tertentu."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3122,11 +3086,11 @@ msgstr ""
 "Tidak ada deskripsi untuk tipe mime \"%s\" (filenya adalah \"%s\"), tolong "
 "beritahukan pada mailing list gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "link"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "link (terputus)"
 
@@ -3247,11 +3211,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Cari file berdasarkan namanya dan propertinya"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "view Icon"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "View List"
@@ -3395,146 +3361,151 @@ msgstr "Home %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "icon file"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "teks yang dapat diedit"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "label yang dapat diedit"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "teks tambahan"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "teks lain lagi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "disorot ketika dipilih"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "apakah akan disorot (highlight) ketika dipilih"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "disorot ketika memiliki fokus keyboard"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "apakah akan disorot (highlight) ketika memiliki fokus keyboard"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "disorot ketika bisa drag & drop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "apakah akan disorot (highlight) ketika bisa Drag &Drop"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Kotak seleksi"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Teks Frame"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Gambar frame disekeliling teks yang tidak dipilih"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Warna Kotak Seleksi"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Warna untuk kotak seleksi"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Nilai alfa untuk kotak seleksi"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Tingkat transparansi kotak seleksi"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Nilai Alfa Untuk Highgligt"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Tingkat transparansi ikon terpilih"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Warna Teks Cerah"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Warna yang digunakan untuk teks dengan latar belakang gelap"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Warna Teks Gelap"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Warna yang digunakan untuk teks dengan latar belakang cerah"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Folder ini memiliki layout otomatis. Apakah Anda ingin berpindah ke layout "
 "manual dan membiarkan objek yang Anda jatuhkan pada tempatnya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Folder ini memiliki layout otomatis. Apakah Anda ingin berpindah ke layout "
 "manual dan membiarkan objek-objek yang Anda jatuhkan pada tempatnya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Folder ini memiliki layout otomatis. Apakah Anda ingin berpindah ke layout "
 "manual dan membiarkan objek yang Anda jatuhkan pada tempatnya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Folder ini memiliki layout otomatis. Apakah Anda ingin berpindah ke layout "
 "manual dan membiarkan objek-objek yang Anda jatuhkan pada tempatnya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Pindah Ke Layout Manual?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Beralih"
 
@@ -3644,72 +3615,72 @@ msgstr "Adalah default untuk objek \"%s\""
 msgid "Is the default for all \"%s\" items."
 msgstr "Adalah default untuk semua objek \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifikasi \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Masukkan ke menu untuk objek \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Gunakan sebagai default untuk semua objek \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Masukkan ke menu untuk objek \"%s\" saja"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Gunakan sebagai default untuk \"%s\" saja"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Jangan masukkan di menu untuk objek \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nama"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Pilih"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Selesai"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modifikasi"
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipe File dan Program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "Pergi ke _Sana"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3717,48 +3688,48 @@ msgstr ""
 "Anda dapat mengkonfigurasi program apa yang ditampilkan untuk tipe file "
 "tertentu di dialog Tipe File dan Program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Buka dengan Aplikasi Lain"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Pilih Aplikasi untuk membuka \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Buka dengan Viewer Lain"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Pilih view untuk \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Tidak ada viewer yang tersedia untuk \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Viewer TIdak Tersedia"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Tidak ada aplikasi yang diasosiasikan dengan \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Asosiasi Aplikasi Tidak Tersedia"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Tidak ada aksi yang diasosiasikan dengan \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Tidak Ada Asosiasi untuk Aksi"
 
@@ -3766,11 +3737,9 @@ msgstr "Tidak Ada Asosiasi untuk Aksi"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3780,42 +3749,41 @@ msgstr ""
 "file tertentu. Apakah Anda ingin mengasosiasikan sebuah aplikasi dengan tipe "
 "file ini sekarang?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Asosiasikan Aplikasi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Viewer yang diasosasikan dengan \"%s\" tidak valid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Kesalahan Asosiasi Viewer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplikasi yang diasosasikan dengan \"%s\" tidak valid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Kesalahan Asosiasi Aplikasi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Aksi yang diasosasikan dengan %s tidak valid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Kesalahan Asosiasi Aksi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3826,95 +3794,136 @@ msgstr ""
 "lain untuk tipe file ini. Apakah Anda ingin mengasosiasikan sebuah viewer "
 "atau aplikasi dengan tipe file ini sekarang?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Asosiasikan Aksi"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"Aplikasi \"%s\" tidak dapat membuka file \"%s\" karena \"%s\" tidak dapat "
+"mengakses file di \"%s\". Apakah Anda ingin memilih aplikasi lain?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "Aplikasi \"%s\" tidak dapat membuka file \"%s\" karena \"%s\" tidak dapat "
 "mengakses file di \"%s\". Apakah Anda ingin memilih aplikasi lain?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Aksi default tidak dapat membuka \"%s\" karena tidak dapat mengakses file di "
 "lokasi \"%s\". Apakah Anda ingin memilih aksi lain?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Tidak Dapat Membuka Lokasi"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Aplikasi \"%s\" tidak dapat membuka file \"%s\" karena \"%s\" tidak dapat "
+"mengakses file di \"%s\". Apakah Anda ingin memilih aplikasi lain?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "Aplikasi \"%s\" tidak dapat membuka file \"%s\" karena \"%s\" tidak dapat "
 "mengakses file di \"%s\". Tidak ada aplikasi lain yang tersedia untuk "
 "membuka file ini. Jika Anda menyalin file ini ke komputer Anda, mungkin Anda "
 "bisa membukanya."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Aksi default tidak bisa membuka \"%s\" karena tidak dapat mengakses file di "
-"lokasi \"%s\". Tidak ada aksi lain yang tersedia untuk melihat file ini. "
-"Jika Anda menyalin file ini ke komputer Anda, mungkin file tersebut bisa "
-"dibuka."
+"Aksi default tidak dapat membuka \"%s\" karena tidak dapat mengakses file di "
+"lokasi \"%s\". Apakah Anda ingin memilih aksi lain?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"Aplikasi \"%s\" tidak dapat membuka file \"%s\" karena \"%s\" tidak dapat "
+"mengakses file di \"%s\". Tidak ada aplikasi lain yang tersedia untuk "
+"membuka file ini. Jika Anda menyalin file ini ke komputer Anda, mungkin Anda "
+"bisa membukanya."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Membuka %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Maaf, tapi Anda tidak boleh mengeksekusi perintah dari site remote untuk "
 "alasan keamanan."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Remote Link Tak dapat Dieksekusi"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Terjadi error ketika menjalankan aplikasi\n"
 "\n"
 "Detailnya adalah sebagai berikut:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Error Menjalankan Aplikasi"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Target drop hanya mendukung file lokal"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Target drop ini hanya mendukung file lokal.\n"
@@ -3922,15 +3931,15 @@ msgstr ""
 "Untuk membuka file non lokal, salin file tersebut ke folder lokal\n"
 "dan jatuhkan lagi."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Target drop hanya mendukung file lokal"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4184,14 +4193,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "[Objek]mengandung \"medusa\" dalam namanya dan adalah folder"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Mencari Disk"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautlis sedang mencari disk Anda untuk folder Tong Sampah"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Edit"
@@ -4393,97 +4394,107 @@ msgstr "Latar Belakang"
 msgid "Empty Trash"
 msgstr "Kosongkan Tong Sampah"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Ini akan membuka %d window terpisah. Apa Anda yakin ingin melakukan ini?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Buka %d Window?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Apa Anda yakin ingin menghapus \"%s\" secara permanen?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Ini akan membuka %d window terpisah. Apa Anda yakin ingin melakukan ini?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Apa Anda yakin ingin menghapus \"%s\" secara permanen?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Apa Anda yakin ingin menghapus %d objek yang terpilih secara permanen?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Hapus semua objek terpilih secara permanan"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Hapus?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Pilih Sebuah Kategori:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Pola"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" terpilih"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "satu folder dipilih"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d folder dipilih"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (mengandung 0 objek)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (mengandung 1 objek)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (mengandung %d objek)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (total mengandung 0 objek)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (total mengandung 1 objek)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (total mengandung %d objek)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" diipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d objek diipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 objek lain dipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d objek lain dipilih (%s)"
@@ -4495,7 +4506,7 @@ msgstr "%d objek lain dipilih (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4504,107 +4515,127 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Folder \"%s \" memiliki jumlah file lebih dari yang dapat ditangani "
 "Nautilus. Beberapa file tidak akan ditampilkan."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Terlalu Banyak File"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" tidak bisa dipindahkan ke Tong Sampah. Apakah Anda ingin langsung "
 "menghapusnya?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d objek yang terpilih tidak dapat dipindahkan ke Tong Sampah. Apakah Anda "
-"ingin menghapus semuanya secara permanen sekarang?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" tidak bisa dipindahkan ke Tong Sampah. Apakah Anda ingin langsung "
+"menghapusnya?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"Sejumlah %d objek yang terpilih tidak dapat dipindahkan ke Tong Sampah. "
-"Apakah Anda ingin menghapus ke %d objek itu secara permanen sekarang?"
+"\"%s\" tidak bisa dipindahkan ke Tong Sampah. Apakah Anda ingin langsung "
+"menghapusnya?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Hapus Segera?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Apakah Anda yakin ingin menghapus \"%s\" secara permanen dari Tong Sampah?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "Apakah Anda yakin ingin mengapus %d objek terpilih dari Tong Sampah?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Hapus dari Tong Sampah?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Gunakan \"%s\" untuk membuka objek terpilih"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Aplikasi Lain..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Sebuah _Aplikasi..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "_Viewer Lain..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Sebuah _Viewer ..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Aksi gagal diselesaikan: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Tidak dapat menyelesaikan aksi yang diminta"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Jalankan \"%s\" pada objek terpilih manapun"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Semua file executable pada folder ini akan tampil di menu Scripts. Memilih "
+"sebuah skrip dari menu itu akan menjalankan skrip itu dengan input file yang "
+"terpilih"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4612,11 +4643,11 @@ msgstr ""
 "sebuah skrip dari menu itu akan menjalankan skrip itu dengan input file yang "
 "terpilih"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "About Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4657,17 +4688,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: ukuran dan posisi window saat ini"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" akan dipindahkan jika Anda memilih perintah Paste File"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" akan disalin jika Anda memilih perintah Paste File"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4675,168 +4706,175 @@ msgstr ""
 "%d objek yang Anda pilih akan dipindahkan jika Anda memilih perintah Paste "
 "File"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d objek yang Anda pilih akan disalin jika Anda memilih perintah Paste File"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Clipboard kosong, tidak ada yang bisa dipaste"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Mount Error"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Unmount Error"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Mount Error"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_ject"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Unmount Volume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Buka dalam W_indow Baru"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Buka dalam %d W_indow Baru"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Folder Home"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Folder Home"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Hapus dari Tong Sampah"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Hapus semua objek terpilih secara permanan"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Pindahkan ke Tong _Sampah"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Pindahkan setiap item terpilih ke Tong Sampah"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Hapus"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Buat _Link"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Buat _Link"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Kosongkan Tong Sampah"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cu_t File"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cu_t File"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Salin File"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Salin File"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Link ini tidak bisa dipakai, karena tidak punya target. Apakah Anda ingin "
 "memindahkan link ini ke Tong Sampah?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Link ini tidak bisa dipakai, karena tidak punya target. Apakah Anda ingin "
+"memindahkan link ini ke Tong Sampah?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Link ini tidak bisa dipakai, karena targetnya \"%s\" hilang. Apakah Anda "
 "ingin memindahkan link ini ke Tong Sampah?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Link Rusak"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" adalah file teks yang dapat dieksekusi. Anda ingin menjalankannya, "
 "atau melihat isinya?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Jalankan atau Tampilkan"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Tampilkan"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Jalankan di _Terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Tampilkan"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Jalankan"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Membuka \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Batalkan Pembukaan File?"
 
@@ -4857,28 +4895,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Maaf, tidak dapat menampilkan semua isi \"%s\""
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Error menampilkan folder"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 "Nama \"%s\" sudah dipakai di folder ini. Tolong gunakan nama lain."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 ""
 "Tidak ada \"%s\" di folder ini. Mungkin baru saja dipindah atau dihapus?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Anda tidak punya cukup hak untuk mengganti nama \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4887,87 +4930,107 @@ msgstr ""
 "Nama \"%s\" tidak valid, karena mengandung karakter \"/\". Harap gunakan "
 "nama yang lain"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nama \"%s\" tidak valid. Gunakan nama yang lain."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Tidak dapat mengubah nama \"%s\" karena berada di disk yang hanya bisa "
 "dibaca (read only)"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Maaf, tidak bisa mengganti nama \"%s\" menjadi \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Error Mengganti Nama"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Anda tidak punya cukup hak untuk mengubah group \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Tidak dapat mengubah group \"%s\"  karena berada di disk yang hanya bisa "
 "dibaca (read only)"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Maaf, tidak dapat mengubah group \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Error Mengubah Group"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Tidak dapat mengubah pemilik \"%s\" karena berada di disk yang hanya bisa "
 "dibaca (read only"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Maaf tidak dapat mengubah pemilik \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Error Mengubah Pemilik"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Tidak dapat mengubah hak \"%s\" karena berada di disk yang hanya bisa dibaca."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Maaf, tidak bisa mengubah permission \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Error Mengganti Permission"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Mengganti nama \"%s\" menjadi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Batalkan penggantian nama?"
 
@@ -5025,128 +5088,150 @@ msgstr "Kembalikan ukuran asli ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Kembalikan ukuran asli ikon"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "menunjuk ke \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Drag and drop hanya didukung di file sistem lokal."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Drag and drop hanya didukung di file sistem lokal."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Drag and Drop error"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Tipe drag yang tidak valid digunakan"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nama File"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Ukuran"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipe"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Tanggal Modifikasi"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Anda tidak boleh memberi lebih dari satu ikon custom dalam satu Waktu. "
 "Tolong pilih satu gambar saja untuk dijadikan ikon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Anda tidak boleh memberi lebih dari satu ikon custom dalam satu Waktu. "
+"Tolong pilih satu gambar saja untuk dijadikan ikon."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Lebih dari Satu Gambar"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"File yang Anda jatuhkan bukan file lokal. Anda hanya boleh memakai file "
+"gambar lokal sebagai ikon."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "File yang Anda jatuhkan bukan file lokal. Anda hanya boleh memakai file "
 "gambar lokal sebagai ikon."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Hanya File Gambar Lokal"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"File yang Anda jatuhkan bukan gambar. Anda hanya boleh memakai file gambar "
-"lokal sebagai ikon."
+"File yang Anda jatuhkan bukan file lokal. Anda hanya boleh memakai file "
+"gambar lokal sebagai ikon."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Hanya Gambar"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Properti"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Properti %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Batalkan perubahan Group?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Mengubah Group"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Batalkan perubahan pemilik?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Mengubah pemilik"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "tidak ada"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "tak terbaca"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 objek, dengan ukuran %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d objek, total %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(sebagian isinya tidak terbaca)"
 
@@ -5156,191 +5241,191 @@ msgstr "(sebagian isinya tidak terbaca)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Isi:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Informasi Dasar"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nama:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nama"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipe:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Ukuran:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Ruang kosong:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Target Link:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipe MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Dimodifikasi:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Diakses terakhir:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Pilih _Ikon Custom..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Hapus _Ikon Custom"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Baca"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Tulis"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_ksekusi"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Set _user ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Flag spesial:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Set gro_up ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Hak Akses"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Anda bukan pemiliknya, jadi tidak bisa mengubah hak aksesnya"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Pemilik File:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Pemilik File:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Group _File:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Group File:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Pemilik:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Group:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Orang lain:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tampilan Teks"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Tampilan Angka Oktal:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Terakhir diubah:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Hak akses untuk \"%s\" tidak dapat ditentukan."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ukuran file terpilih tidak bisa ditentukan."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Terjadi error ketika menampilkan help:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Terjadi error ketika menampilkan help: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Tidak dapat menampilkan help"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Batalkan Melihat Window Properti?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Menciptakan Window Properti"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Pilih Ikon"
 
@@ -5358,71 +5443,111 @@ msgid "Search Results"
 msgstr "Hasil Pencarian"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Maaf, tapi layanan pencarian Medusa tidak tersedia, karena tidak diinstall."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Maaf, tapi layanan pencarian Medusa tidak tersedia."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Layanan Pencarian Tidak Tersedia"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Kriteria pencarian yang Anda lakukan melibatkan pemakaian tanggal yang lebih "
 "baru dibanding indeks yang ada di sistem Anda. Pencarian tidak akan "
 "mengembalikan hasil apa-apa. Anda bisa menciptakan indeks baru dengan "
 "menjalankan \"medusa-indexd sebagai root di command line."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find tidak dapat membuka file indeks sistem Anda. File indeks Anda mungkin "
+"hilang atau rusak. Anda dapat membuat indeks baru dengan menjalankan "
+"\"medusa-indexd\" di command line sebagai root."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Pencarian objek yang terlalu baru"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Kriteria yang Anda pilih cocok dengan semua file yang diindeks. Anda dapat "
+"memeriksa ejaan kriteria Anda atau menambah kriteria baru, untuk "
+"mempersempit hasil pencarian"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Kriteria yang Anda pilih cocok dengan semua file yang diindeks. Anda dapat "
 "memeriksa ejaan kriteria Anda atau menambah kriteria baru, untuk "
 "mempersempit hasil pencarian"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Error Ketika Melakukan Pencarian"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find tidak dapat membuka file indeks sistem Anda. File indeks Anda mungkin "
 "hilang atau rusak. Anda dapat membuat indeks baru dengan menjalankan "
 "\"medusa-indexd\" di command line sebagai root."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Error membaca file indeks"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Kesalahan terjadi ketika meload hasil mencarian ini: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks file yang "
+"ada di sistem Anda saat ini. Find tidak dapat mengakses indeks Anda saat ini."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks file yang "
+"ada di sistem Anda saat ini. Find tidak dapat mengakses indeks Anda saat ini."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5430,25 +5555,23 @@ msgstr ""
 "Find tidak dapat mengakses indeks Anda saat ini, sehingga metode pencarian "
 "yan lebih lambat yang tidak memakai indeks akan dipergunakan."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks file yang "
-"ada di sistem Anda saat ini. Find tidak dapat mengakses indeks Anda saat ini."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Pencarian cepat tidak tersedia"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Pencarian berdasarkan isi tidak tersedia"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5462,50 +5585,77 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Untuk melakukan pencarian cepat, Find memerlukan indeks file yang ada di "
 "sistem Anda. Komputer Anda sat ini sedang menciptakan indeks tersebut. "
 "Karena Find idak dapat menggunakan indeksnya sementara diciptakan, maka "
 "pencarian ini mungkin akan butuh beberapa menit."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks isi sistem "
 "Anda. Komputer Anda saat ini sedang menciptakan indeks tersebut. Pencarian "
 "berdasarkan isi akan tersedia ketika penciptaan indeks sudah selesai."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Pencarian dengan indeks tidak tersedia"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks file yang "
+"ada di sistem Anda saat ini. Find tidak dapat mengakses indeks Anda saat ini."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks file yang "
+"ada di sistem Anda saat ini. Find tidak dapat mengakses indeks Anda saat ini."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Untuk melakukan pencarian cepat, Find memerlukan indeks file yang ada di "
 "sistem Anda. Saat ini tidak ada indeks yang tersedia. Anda dapat menciptakan "
 "indeks dengan menjalankan perintah \"medusa-indexd\" di command line sebagai "
 "rot. Sampai indeks selesai dibuat, pencarian akan butuh beberapa menit."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Untuk melakukan pencarian berdasarkan isi, Find memerlukan indeks isi file "
 "yang ada di sistem Anda. Saat ini tidak ada indeks yang tersedia. Anda dapat "
@@ -5513,7 +5663,12 @@ msgstr ""
 "line sebagai root. Sampai indeks selesai dibuat, pencarian berdasarkan isi "
 "tidak dapat dilakukan."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Pencarian cepat tidak diaktifkan di komputer Anda"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5523,11 +5678,12 @@ msgstr ""
 "sistem Anda. Administrator Anda telah mematikan fitur pencarian cepat di "
 "komputer Ada, jadi indeks tidak tersedia."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Pencarian cepat tidak diaktifkan di komputer Anda"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Pencarian cepat tidak tersedia"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Lokasi"
 
@@ -5536,7 +5692,7 @@ msgstr "Lokasi"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Tampilkan di Window Baru"
@@ -5547,7 +5703,7 @@ msgstr "_Tampilkan di Window Baru"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Tampilkan di %d _Window Baru"
@@ -5556,15 +5712,21 @@ msgstr "Tampilkan di %d _Window Baru"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus menemukan hasil pencarian lebih banyak dari yang dapat "
 "ditampilkannya. Sebagian objek hasil pencarian tidak akan ditampilkan."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus menemukan hasil pencarian lebih banyak dari yang dapat "
+"ditampilkannya. Sebagian objek hasil pencarian tidak akan ditampilkan."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Terlalu banyak kecocokan"
 
@@ -5579,12 +5741,12 @@ msgid "Create L_auncher"
 msgstr "L_aunder Baru"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Buat launcher baru"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Hapus semua objek di Tong Sampah"
 
@@ -5604,7 +5766,7 @@ msgstr "Tampilkan window untuk mengubah warna atau pola latar belakang desktop"
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Gunakan Latar Belakang _Default"
@@ -5627,58 +5789,68 @@ msgstr "Pilih viewer lain untuk melihat objek terpilih"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Folder Home"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Folder Home"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Ciptakan folder kosong baru dalam folder ini"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Ciptakan folder kosong baru dalam folder ini"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Ciptakan link simbolik untuk setiap objek terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Buat D_uplikat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Hapus setiap objek, tanpa memindahkannya ke Tong Sampah"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Buat duplikat setiap objek terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Edit Launcher"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Edit informasi launcher"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Format volume terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Properti Medi_a"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Unmount volume terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Pindahkan atau Salin file yang sebelumnya dipilih dengan menu Cut File atau "
 "Copy File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5687,130 +5859,139 @@ msgstr ""
 "Pindahkan atau Salin file yang sebelumnya dipilih dengan menu Cut File atau "
 "Copy File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Buka Dengan"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Buka setiap objek terpilih di window baru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Buka dalam W_indow Baru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Buka item terpilih di window ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Siapkan file terpilih untuk disalin dengan perintah Paste File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Siapkan file terpilih untuk dipindahkan dengan perintah Paste File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_ek"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Proteksi volume terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Ganti nama objek terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Reset View ke _Default"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Reset pengurutan dan level zoom untuk dicocokan dengan konfigurasi view ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Menjalankan, atau mengatur skrip di ~/Nautilus/scripts\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Pilih Semu_a file"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Pola"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Pilih semua objek di window ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Pilih semua objek di window ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Tampilkan properti media untuk volume terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Tampilkan folder yang mengandung skrip yang muncul di menu ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Unmount volume terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Gunakan background default untuk lokasi ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Lihat, atau modifikasi properti setiap item terpilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Salin File"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Format"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Unmount Volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Buka"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Buka Folder Script"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Paste File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "_Paste File"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Properti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Ganti Nama"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Script"
 
@@ -5896,7 +6077,12 @@ msgstr "Secara _Manual"
 msgid "Indexing is %d%% complete."
 msgstr "Pengindeksan sekarang sudah mencapai %d%%"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "File Anda terakhir kali diindeks pada %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5904,25 +6090,29 @@ msgstr ""
 "Sekali sehari file dan isi teks Anda akan diindeks sehingga proses "
 "pencariannya menajadi cepat."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Status Pengindeksan"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "File Anda terakhir kali diindeks pada %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Sekali sehari file dan isi teks Anda akan diindeks sehingga proses penc"
-"\\ariannya menajadi cepat. File Anda sekarang sedang diindeks."
+"Sekali sehari file dan isi teks Anda akan diindeks sehingga proses "
+"pencariannya menajadi cepat."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Tidak ada indeks file Anda saat ini."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5932,15 +6122,19 @@ msgstr ""
 "pencarian. Pencarian cepat sekarang tidak diaktifkan di komputer Anda, jadi "
 "Anda tidak punya indeks saat ini."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Tidak ada indeks file Anda saat ini."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Maaf, tapi layanan pencarian Medusa tidak tersedia."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%x, %H:%M"
 
@@ -5964,32 +6158,37 @@ msgstr "Perlihatan Status Pembuatan _Indeks"
 msgid "Show status of indexing used when searching"
 msgstr "Tunjukan status indeks yang digunakan ketika melakukan pencarian"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Tidak Dapat Menciptakan Folder yang diperlukan"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Tidak Dapat Menciptakan Folder yang diperlukan"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus tidak dapat menciptakan folder \"%s\" yang diperlukan. Sebelum "
 "menjalankan Nautilus, tolong ciptakan folder ini, atau set hak aksesnya "
 "supaya Nautilus bisa menciptakannya sendiri."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Tidak Dapat Menciptakan Folder yang diperlukan"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6000,24 +6199,28 @@ msgstr ""
 "Sebelum menjalankan Nautilus, tolong ciptakan folder ini, atau set hak "
 "aksesnya supaya Nautilus bisa menciptakannya sendiri."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Link ke Desktop yang lama"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 #, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Lokasi direktori dekstop sudah berubah di Gnome 2.4. Sebuah link yang "
 "bernama \"Link ke Desktop Lama\" telah diciptakan di desktop yang baru. Anda "
 "bias membuka link ini untuk memindahkan file yang Anda mau, atau menghapus "
 "linknya."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Desktop lama yang dimigrasi"
 
 #. Can't register myself due to trouble locating the
@@ -6030,7 +6233,7 @@ msgstr "Desktop lama yang dimigrasi"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6041,7 +6244,7 @@ msgstr ""
 "coba reboot komputer Anda, atau install ulang Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6087,12 +6290,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus tidak bisa dipakai sekarang, karena error yang tidak terduga."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6100,7 +6303,7 @@ msgstr ""
 "Nautilus tidak bisa dipakai sekarang,karena ada error yang tidak terduga "
 "dari Bonobo ketika mendaftarkan server file manager view "
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6110,7 +6313,7 @@ msgstr ""
 "Bonobo ketika mencoba mencari factory. Mematikan bonobo-activation-server "
 "dan merestart Nautilus mungkin akan menyelesaikan masalahnya."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6120,6 +6323,17 @@ msgstr ""
 "Bonobo ketika mencoba mencari shell object. Mematikan bonobo-activation-"
 "server dan merestart Nautilus mungkin akan menyelesaikan masalahnya. "
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Terjadi error ketika menampilkan help:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Isi bookmark kosong"
@@ -6153,34 +6367,45 @@ msgstr "Opsi Dasar"
 msgid "Find Them!"
 msgstr "Cari!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Tidak Bisa Memindah ke Dirinya Sendiri"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Maaf, tapi \"%s\" bukanlah nama file yang valid."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" bukan lokasi yang valid. Periksa ejaannya dan coba lagi."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Tidak dapat menemukan \"%s\". Periksa ejaannya dan coba lagi."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Server jaringan"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Nama"
+msgid "_Location:"
+msgstr "Lokasi:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Connect"
@@ -6381,6 +6606,20 @@ msgstr ""
 "\n"
 "Anda dapat menghapus file ini untuk menampilkan wizardnya lagi.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Anda tidak boleh memberi lebih dari satu ikon custom dalam satu Waktu. "
+"Tolong pilih satu gambar saja untuk dijadikan ikon."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"File yang Anda jatuhkan bukan file lokal. Anda hanya boleh memakai file "
+"gambar lokal sebagai ikon."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6391,26 +6630,25 @@ msgstr "Buka dengan %s"
 msgid "Open with..."
 msgstr "Buka dengan..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Gagal menjalankan aplikasi pembakar cd:\n"
 "\"%s\""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Tidak bisa menjalankan cd burner"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Kosongkan _Tong Sampah"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Tuliskan ke CD"
 
@@ -6418,82 +6656,82 @@ msgstr "_Tuliskan ke CD"
 msgid "Go To:"
 msgstr "Pergi Ke:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Apakah Anda ingin melihat %d lokasi ini dalam window terpisah?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Lihat dalam Window Terpisah?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Tidak Dapat Membuka Lokasi"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Lakukan pemeriksaan diri sendiri"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Ciptakan window baru dengan geometri yang diberikan."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Hanya ciptakan window untuk URI yang diberikan secara eksplisit."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Jangan melakukan managemen dekstop (abaikan opsi yang ada di dialog opsi)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Keluar dari Nautilus"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Restart Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "File Manager"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: parameter --check tidak bisa dipakai untuk URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: parameter --check tidak boleh digunakan dengan opsi lain.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: parameter --quit tidak bisa digunakan untuk URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: parameter --restart tidak bisa digunakan untuk URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: parameter --geometry  tidak bisa digunakan untuk lebih dari satu "
@@ -6502,34 +6740,47 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Apa Anda yakin ingin menghapus \"%s\" secara permanen?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "\"Apakah Anda ingin menghapus daftar lokasi yang pernah Anda kunjungi?"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Apakah Anda ingin menghapus daftar lokasi yang pernah Anda kunjungi?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Hapus History"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Lokasi \"%s\" tidak ada. Apakah Anda ingin menghapus semua bookmark dengan "
 "lokasi ini?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Lokasi \"%s\" sudah tidak ada lagi."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bookmark untuk lokasi yang tidak ada"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Hapus"
 
@@ -6562,7 +6813,6 @@ msgid "Close _All Windows"
 msgstr "Tutup Semu_a Window"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Tutup semua window Nautilus"
@@ -6585,107 +6835,118 @@ msgid "Forward"
 msgstr "Maju"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Pergi ke Tong Sampah"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Pergi ke lokasi berikutnya yang pernah dikunjungi"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Pergi ke lokasi terakhir yang dikunjungi"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Pergi ke Tong Sampah"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Location _Bar"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Reload"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Cari file di komputer ini"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_atusbar"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Naik"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Tulis ke CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "T_ambah Bookmark"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Mundur"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bookmark"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Bersihkan History"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Countertop"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Edit Bookmark"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Maju"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Pergi"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lokasi..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Pane _Samping"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Tong Sampah"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Naik"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Tampilkan"
 
@@ -6703,34 +6964,39 @@ msgstr "Tampilkan sebagai.."
 msgid "File Browser: %s"
 msgstr "Pemilik File:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Salah satu panel sidebar mengalami error dan tidak bisa melanjutkan. "
 "Sayangnya saya tidak tahu yang mana."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Tampilan %s mengalami error ketika memulai."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Panel sidebar %s mengalami error dan tidak bisa melanjutkan. Jika ini selalu "
 "terjadi, Anda sebaiknya mematikan panel ini."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Panel Sidebar Error"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Pane Samping"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Mengandung tampilan pane samping"
 
@@ -6764,147 +7030,180 @@ msgstr "T_ambah Baru..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Maaf, tapi pola %s tidak bisa dihapus."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Tidak bisa menghapus pola"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Maaf, tapi emblem %s tidak bisa dihapus."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Tidak dapat menghapus emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Buat Emblem Baru:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Kata Kunci:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Gambar:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Pilih file gambar untuk emblem baru:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Buat Warna Baru:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nama warna:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Nilai _Warna"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Maaf, tapi \"%s\" bukanlah nama file yang valid."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Maaf, tapi Anda tidak memberikan nama file yang sah."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Tidak bisa menginstall pola"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Maaf, tapi Anda tidak bisa mengganti gambar reset."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Bukan File Gambar"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Maaf, tapi pola %s tidak bisa diinstall."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Pilih sebuah file gambar untuk dijadikan pola"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Maaf, tapi nama warna tidak boleh kosong."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Tidak bisa menginstall warna"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Pilih warna untuk ditambahkan"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Maaf, tapi file '%s' bukanlah file gambar yang bisa dipakai!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "File '%s' sepertinya bukan file gambar yang valid."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Pilih Sebuah Kategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Batalkan Penghapusan"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "T_ambah Pola Baru..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "T_ambah Warna Baru..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "T_ambah Emblem Baru..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klik pada pola untuk menghapusnya"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klik pada warna untuk menghapusnya"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klik pada emblem  untuk menghapusnya"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Pola:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Warna:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblem:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Hapus Pola..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Hapus Warna..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Hapus Emblem..."
 
@@ -7297,34 +7596,39 @@ msgstr "_Pembuat CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Tutup Semu_a Window"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Tutup pane samping"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Pergi ke Folder CD Kosong"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Pergi ke Tong Sampah"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lokasi..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Objek yang adalah] folder"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Pola"
@@ -7354,10 +7658,13 @@ msgid "View Failed"
 msgstr "View gagal"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Tampilan %s mengalami error ketika memulai."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Tampilan %s mengalami error dan tidak bisa dilanjutkan. Anda bisa memilih "
 "tampilan yang lain, atau pergi ke lokasi lain"
@@ -7367,101 +7674,133 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Tampilan %s mengalami error ketika memulai."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "NautilusApplication yang diasosiasikan dengan window ini."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Tampilan Isi"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Tampilan file atau folder saat ini"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Tidak dapat menemukan \"%s\". Periksa ejaannya dan coba lagi."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Tidak dapat menambah emblem"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus tidak dapat menampilkan \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Tidak dapat menampilkan \"%s\" karena Nautilus tidak bisa menentukan tipe "
 "filenya."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus tidak memiliki viewer yang mampu menampilkan \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Tidak bisa menampilkan \"%s\", karena Nautilus tidak bisa menangani lokasi %"
 "s:."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Tidak bisa menampilkan \"%s\" karena gagal melakukan login."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Tidak dapat menampilkan \"%s\" karena akses ditolak"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Tidak dapat menemukan \"%s\" karena tidak berhasil menemukan host \"%s\". "
 "Periksa apakah ejaannya sudah benar dan apakah setting proxy Anda sudah "
 "benar."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Tidak dapat menampilkan \"%s\" karena nama hostnya kosong. Periksa apakah "
 "setting proxy Anda sudah benar."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Tidak bisa menampilkan \"%s\", karena Nautilus tidak bisa menangani lokasi %"
+"s:."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Tidak dapat menampilkan \"%s\" karena Nautilus tidak dapat menghubungi "
-"Master Browser SMB\n"
-"Pastikan bahwa server SMB sudah berjalan di jaringan lokal."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Pencarian tidak dapat dilakukan sekarang, entah karena Anda tidak punya "
+"indeks, atau karena layanan pencarian tidak dijalankan. Pastikan bahwa Anda "
+"sudah mengaktifkan layanan pencarian Medusa, dan jika Anda tidak punya "
+"indeks, pastikan bahwa pengindeks Medusa sudah berjalan."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Pencarian tidak dapat dilakukan sekarang, entah karena Anda tidak punya "
 "indeks, atau karena layanan pencarian tidak dijalankan. Pastikan bahwa Anda "
 "sudah mengaktifkan layanan pencarian Medusa, dan jika Anda tidak punya "
 "indeks, pastikan bahwa pengindeks Medusa sudah berjalan."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Pencarian Tidak Dapat Dilakukan"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus tidak dapat menampilkan \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Tidak bisa menampilkan Lokasi"
 
@@ -7473,7 +7812,7 @@ msgstr "Pergi ke lokasi yang ditunjuk bookmark ini"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7481,11 +7820,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Yohanes Nugroho (yohanes@opensource.or.id)"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7501,39 +7840,43 @@ msgstr "Mundur sejumlah halaman"
 msgid "Go forward a number of pages"
 msgstr "Maju sejumlah halaman"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Tampilkan lokasi ini dengan \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Titik-titik"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Pembuat CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID Aplikasi"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID Aplikasi untuk window"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplikasi"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication yang diasosiasikan dengan window ini."
 
@@ -7569,6 +7912,245 @@ msgstr "Server jaringan"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Lihat Server Jaringan Anda di file manager Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory untuk view hardware"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Viewer Hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Tampilan Hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "LIhat Sebagai Hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "view hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nama ikon untuk view hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "ringkasan informasi hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "CPU %s \n"
+#~ "%s MHz\n"
+#~ "Ukuran cache %s K"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "RAM %lu GB "
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "RAM %lu MB "
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB "
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB "
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Waktu hidup %d hari %d jam %d menit"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Ringkasan Hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ini merupakan tempat untuk halaman CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ini merupakan tempat untuk halaman RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ini merupakan tempat untuk halaman IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error ketika menyalin ke \"%s\".\n"
+#~ "\n"
+#~ "Direktori tujuan penuh"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Error ketika membuat link di \"%s\".\n"
+#~ "\n"
+#~ "Direktori tujuan penuh"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error ketika memindahkan objek ke \"%s\".\n"
+#~ "\n"
+#~ "Anda tidak punya hak untuk menulisi folder tersebut."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error ketika memindahkan objek ke \"%s\".\n"
+#~ "\n"
+#~ "Disk tujuan hanya bisa dibaca (read only)"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Error ketika membuat link di \"%s\".\n"
+#~ "\n"
+#~ "Anda tidak punya hak untuk menulisi folder tersebut."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Error ketika membuat link di \"%s\".\n"
+#~ "\n"
+#~ "Disk tujuan hanya bisa dibaca (read only)"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika menyalin \"%s\".\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika memindahkan  \"%s\".\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika menghapus \"%s\".\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika menyalin\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika membuat link\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Error \"%s\" ketika menghapus\n"
+#~ "\n"
+#~ "Apakah Anda ingin melanjutkan?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Tidak bisa menyalin ke Tong Sampah"
+
+#~ 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 ""
+#~ "Aksi default tidak bisa membuka \"%s\" karena tidak dapat mengakses file "
+#~ "di lokasi \"%s\". Tidak ada aksi lain yang tersedia untuk melihat file "
+#~ "ini. Jika Anda menyalin file ini ke komputer Anda, mungkin file tersebut "
+#~ "bisa dibuka."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Mencari Disk"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautlis sedang mencari disk Anda untuk folder Tong Sampah"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d objek yang terpilih tidak dapat dipindahkan ke Tong Sampah. Apakah "
+#~ "Anda ingin menghapus semuanya secara permanen sekarang?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Sejumlah %d objek yang terpilih tidak dapat dipindahkan ke Tong Sampah. "
+#~ "Apakah Anda ingin menghapus ke %d objek itu secara permanen sekarang?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "File yang Anda jatuhkan bukan gambar. Anda hanya boleh memakai file "
+#~ "gambar lokal sebagai ikon."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Maaf, tapi layanan pencarian Medusa tidak tersedia, karena tidak "
+#~ "diinstall."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Sekali sehari file dan isi teks Anda akan diindeks sehingga proses penc"
+#~ "\\ariannya menajadi cepat. File Anda sekarang sedang diindeks."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" bukan lokasi yang valid. Periksa ejaannya dan coba lagi."
+
+#~ 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 ""
+#~ "Tidak dapat menampilkan \"%s\" karena Nautilus tidak dapat menghubungi "
+#~ "Master Browser SMB\n"
+#~ "Pastikan bahwa server SMB sudah berjalan di jaringan lokal."
+
+#~ msgid "file icon"
+#~ msgstr "icon file"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nama"
+
 #~ msgid "Unknown"
 #~ msgstr "Tidak dikenal"
 
@@ -7678,8 +8260,5 @@ msgstr "Lihat Server Jaringan Anda di file manager Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "_Toolbar"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Lokasi \"%s\" sudah tidak ada lagi."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Pergi ke lokasi yang tidak ada"
diff --git a/po/is.po b/po/is.po
index 9536a0892..99f52a1b9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-20 20:19-0100\n"
 "Last-Translator: Samuel Jon Gunnarsson <sammi@techattack.nu>\n"
 "Language-Team: Icelandic <gnome@techattack.nu>\n"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() mistókst."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Merkimiðar"
 
@@ -53,49 +53,61 @@ msgid "Nautilus Emblem view"
 msgstr "Merkimiðasýn Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Ekki tókst að fjarlægja merkmiða"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Ekki tókst að fjarlægja merkimiða með skráarheitinu '%s'. �stæðan er "
 "líklegast sú að merkimiðin er varanlegur og ekki einn sem þú hefur sjálf(ur) "
 "bætt við."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Ekki tókst að fjarlægja merkmiða"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Ekki tókst að endurnefna merkimiða"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Ekki tókst að endurnefna merkimiða með heitinu '%s'. �stæðan er líklegast sú "
 "að merkimiðinn er varanlegur og ekki einn sem þú hefur sjálf(ur) bætt við."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Ekki tókst að endurnefna merkimiða"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Endurnefna merkimiða"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Sláðu inn nýtt heiti fyrir merkimiðan:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Endurnefna"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Bæta við merkimiða..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Sláðu inn lýsingur við hliðiná hverjum merkimiða. Þetta heiti mun verða "
 "notað á öðrum stöðum til að auðkenna merkimiðana."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,141 +123,64 @@ msgstr ""
 "Sláðu inn lýsingur við hliðiná merkimiðanum. Þetta heiti mun verða notað á "
 "öðrum stöðum til að auðkenna merkimiðann."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Sumar af skránum var ekki hægt að bæta við sem merkimiðum þar sem þær voru "
 "ekki í gildu myndaformi."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Skráin '%s' virðist ekki vera gild myndaskrá."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Ekki tókst að bæta við merkimiðum"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Ekki var hægt að bæta við neinni skrá sem merkimiða  þar sem þær voru ekki í "
 "gildu myndaformi."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Dregni textinn var ekki gild skráarstaðsetning."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Ekki tókst að bæta við merkmiða"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Skráin '%s' virðist ekki vera gild myndaskrá."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Dregna skráin virðist ekki lýta út fyrir að vera gild sem mynd."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Stroka út"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Verksmiðja velbúnaðarsýnar"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Vélbúnaður"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Vélbúnaðarrýnir"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vélbúnaðarsýn"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Skoða sem vélbúnað"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vélbúnaðarsýn"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "heiti táknmyndar fyrir vélbúnaðarsýn"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "samantekt yfir velbúnaðarupplýsingar"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s Örgjafi\n"
-"%s MHz\n"
-"%s K skyndiminni"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Upptími er %d dagar, %d tímar, %d mínútur"
-
-#  set up the title
-#  set up the title
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Vélbúnaðaryfirsýn"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Þetta er griðastaður fyrir CPU síðuna."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Þetta er griðastaður fyrir RAM síðuna."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Þetta er griðastaður fyrir IDE síðuna."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Ferill"
@@ -912,6 +847,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Vélbúnaður"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Alþjóðlegt"
@@ -1193,31 +1132,32 @@ msgid "Desktop trash icon name"
 msgstr "Heiti táknmyndar fyrir ruslamöppu á skjáborði"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Skráarheiti fyrir sjálfgefinn bakgrunn möppu. Einungis notað ef "
 "background_set er virkt."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Fela sjálfgefin bókamerki í bókamerkjavalmynd."
@@ -1227,9 +1167,10 @@ msgid "Home icon visible on desktop"
 msgstr "Heim táknmynd sýnileg á skjáborði"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Ef virkt mun Nautilus einungis sýna möppur í síðustiku undir trésýn. Annars "
 "munu bæði skrár og möppur verða sýndar."
@@ -1260,9 +1201,10 @@ msgstr ""
 "skráarstillingarglugganum."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Ef virkt mun Nautilus sýna möppur á undan skrám í lista og táknmyndasýn."
 
@@ -1303,8 +1245,9 @@ msgstr ""
 "Ef virkt mun Nautilus einugis sýna bókamerki notanda í bókamerkjavalmynd."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Ef virkt mun Nautilus nota heimamöppu notanda sem skjáborð, annars mun hann "
@@ -1321,9 +1264,10 @@ msgstr ""
 "skilgreindar sem öryggisafrit."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Ef virkt munu faldar skrár verða sýndar í skráarstjóra. Faldar skrár eru "
 "annaðhvort punktaskrár eða skráðar í .hidden skrá möppunar."
@@ -1344,8 +1288,9 @@ msgid ""
 msgstr "Ef virkt mun táknmynd sem tengist ruslinu verða sett á skjáborð."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Ef virkt mun táknmynd sem tengist heimamöppu þinni verða sett á skjáborð."
@@ -1379,7 +1324,8 @@ msgstr ""
 "sjást efst í staðinn fyrir minnstu skrá."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Ef virkt munu táknmyndir verða lagðar þéttar saman í nýjum gluggum."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1408,7 +1354,8 @@ msgid "List of possible captions on icons"
 msgstr "Listi yfir mögulegan texta á táknmyndum"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Hámarksfjöldi möðhöndlaðra skráa í möppu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1428,11 +1375,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus sér um að teikna skjáborð"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus notar heimamöppu notanda sem skjáborð"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Sýna einungis möppur í síðustiku undir trésýn"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1452,7 +1401,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Sortera í öfugri röð í nýjum gluggum"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Sýna fyrst möppur í gluggum"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1487,7 +1437,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1495,30 +1445,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1560,7 +1510,8 @@ msgid "Use manual layout in new windows"
 msgstr "Nota handvirka uppröðun í nýjum gluggum"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Nota þéttari uppröðun í nýjum gluggum"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1583,7 +1534,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Hvort sýna eigi fjölda hluta í möppu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1595,7 +1547,7 @@ msgid "When to show thumbnails of image files"
 msgstr "Hvort sýna eigi smámyndir af myndaskrám"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1753,67 +1705,80 @@ msgstr "endursetja"
 msgid "on the desktop"
 msgstr "á skjáborði"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Ekki tókst að eyða gagnahirslu"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Ekki tókst að eyða gagnahirslu"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Rusl"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Flytja hingað"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Afrita hingað"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Tengil hingað"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Setja sem _bakgrunn"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Setja sem bakgrunn fyrir _allar möppur"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Setja sem bakgrunn fyrir _þessa möppu"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Því miður, en þú getur ekki uppgefið tómt kenniorð fyrir þennan nýja "
 "merkimiða."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Ekki tókst að innsetja merkmiða"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1822,20 +1787,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Því miður, en það finnst nú þegar merkimiði með skráarheitinu \"%s\". "
 "Vinsamlegast veldu annað skráarheiti."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Ekki tókst að innsetja merkmiða"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Því miður, en ekki tókst að vista sérvalin merkimiða."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Því miður, en ekki tókst að vista skráarheiti sérvalins merkimiða."
 
@@ -1854,22 +1825,28 @@ msgstr "Frá:"
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Villa kom upp við flutning."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Villa við flutning.\n"
 "\n"
 "\"%s\" er ekki hægt að flytja venga þess að diskurinn er ritvarinn."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Villa kom upp við útstrokun gagna."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1878,22 +1855,17 @@ msgstr ""
 "Ekki er hægt að eyða \"%s\" þar sem þú hefur ekki réttindi til að breyta "
 "möppunni sem skráin liggur í."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Villa. Ekki tókst að eyða.\n"
 "\n"
 "Ekki er hægt að eyða \"%s\" þar sem diskurinn er ritvarinn."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1902,12 +1874,15 @@ msgstr ""
 "Ekki er hægt að flytja \"%s\" þar sem þú hefur ekki réttindi til þess að "
 "breyta skránni eða möppunni sem hún liggur í."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Villa kom upp við flutning."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Villa kom upp við flutning.\n"
@@ -1915,12 +1890,10 @@ msgstr ""
 "Ekki tókst að flytja \"%s\" þar sem mappan eða foreldramappan innihalds "
 "áfangastaðin. "
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Villa kom upp við flutning.\n"
@@ -1928,288 +1901,235 @@ msgstr ""
 "Ekki var hægt að flytja \"%s\" í ruslið vegna þess að þú hefur ekki réttindi "
 "til að breyta skránni eða möppunni sem hún liggur í."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Villa kom upp við afritun."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Villa kom upp við afritun.\n"
 "\n"
 "Ekki var hægt að afrita \"%s\" þar sem þú hefur ekki réttindi til að lesa "
 "skránna / möppuna."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Villa kom upp við afritun yfir í \"%s\".\n"
-"\n"
-"Það er ekki nægjanlegt pláss á áfangastað."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Villa kom upp við afritun."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Villa kom upp við flutning yfir í \"%s\".\n"
 "\n"
 "Það er ekki nægjanlegt pláss á áfangastað."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Villa kom upp við stofnun tengils í \"%s\".\n"
-"\n"
-"Það er ekki nægjanlegt pláss á áfangastað."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Villa kom upp við flutning."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Villa kom upp við tengingu."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Villa við afritun yfir í \"%s\".\n"
 "\n"
 "Þú hefur ekki réttindi til að rita í þessa möppu."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Villa kom upp við afritun yfir í \"%s\".\n"
 "\n"
 "�fangastaður er lesvarinn diskur."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Villa kom upp við flutning hluta yfir í \"%s\".\n"
-"\n"
-"Þú hefur ekki réttindi til að rita í þessa möppu."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Villa kom upp við flutning á hlutum yfir í \"%s\".\n"
-"\n"
-"�fangastaður er lesvarinn diskur."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Villa kom upp við stofnun tengils í \"%s\".\n"
-"\n"
-"Þú heur ekki réttindi til að rita í þessa möppu."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Villa kom upp við flutning."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Villa kom upp við stofnun tengils í \"%s\".\n"
-"\n"
-"�fangastaður er lesvarinn diskur."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við afritun á \"%s\".\n"
-"\n"
-"Viltu halda áfram?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Villa kom upp við tengingu."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Villa kom upp við afritun."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Villa \"%s\" við flutning á \"%s\".\n"
+"Villa \"%s\" við flutning.\n"
 "\n"
 "Viltu halda áfram?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við stofnun tengils á \"%s\".\n"
-"\n"
-"Viltu halda áfram?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Villa kom upp við flutning."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Villa \"%s\" við útstrokun á \"%s\".\n"
+"Villa \"%s\" við stofnun tengils á \"%s\".\n"
 "\n"
 "Viltu halda áfram?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við afritun.\n"
-"\n"
-"Viltu halda áfram?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Villa kom upp við útstrokun gagna."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við flutning.\n"
-"\n"
-"Viltu halda áfram?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Villa kom upp við afritun."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við tengingu tengils.\n"
-"\n"
-"Viltu halda áfram?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Villa kom upp við flutning."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Villa \"%s\" við útstrokun.\n"
-"\n"
-"Viltu halda áfram?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Villa kom upp við tengingu."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Villa kom upp við útstrokun gagna."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Villa kom upp við afritun."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Villa kom upp við flutning."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Villa kom upp við tengingu."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Villa kom upp við útstrokun gagna."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Sleppa"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Prufa á ný"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Ekki tókst að framkvæma tilgreinda aðgerð."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Ekki tókst að framkvæma tilgreinda aðgerð."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Ekki tókst að útskipta skrá."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Skráin \"%s\" finnst nú þegar.\n"
 "\n"
 "Viltu yfirrita hana?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "�rekstur kom upp við afritun"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Útskipta"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Útskipta öllu"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "tengill að %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "annar tengill að %s"
@@ -2218,25 +2138,25 @@ msgstr "annar tengill að %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d tengill að %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d tengill að %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d tengill að %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d tengill að %s"
@@ -2246,567 +2166,606 @@ msgstr "%d tengill að %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr "(afrita)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (annað afrit)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "afrit)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "afrit)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "afrit)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "afrit)"
 
 #  localizers: appended to first file copy
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (afrit)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (annað afrit)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d afrit)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d afrit)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d afrit)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d afrit)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Óþekkt GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Flyt skrár í ruslatunnuna"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Skrám hent út:"
 
 #  localizers: label prepended to the name of the current file moved
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Flyt"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Undirbý flutning í ruslatunnu..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Flyt skrár"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Skrár fluttar:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Undirbý flutning..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Flutning lokið..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Stofna tengla yfir í skrár"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Skrár tengdar:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Tengi"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Undirbý stofnun tengla..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Stofnun tengla lokið..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Afrita skjöl"
 
 #  localizers: label prepended to the progress count
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Skrár afritaðar:"
 
 #  localizers: label prepended to the name of the current file copied
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Afrita"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Undirbý afritun..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Þú getur ekki afritað hluti í ruslið."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Ekki tókst að afrita yfir í Ruslið"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Þú getur ekki flutt þessa ruslamöppu."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Þú getur ekki afritað þessa ruslamöppu"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Þú getur ekki breytt staðsetningu ruslatunnunar"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Þú getur ekki afritað ruslið"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Þú getur ekki flutt möppuna inn í sjálfa sig."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Þú getur ekki afritað möppuna inn í sjálfa sig."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Búa til nýja tóma möppu inn í þessari möppu"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Get ekki flutt mig inn í sjálfa mig"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Get ekki afritað mig inn í sjálfa mig"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Þú getur ekki afritað skrá inn í sjálfa sig."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Get ekki afritað yfir í sjálfa mig"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Villa við stofnun nýrrar möppu.\n"
 "\n"
 "Þú hefur ekki skrifréttindi á áfangastað."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Villa við stofnun möppu.\n"
 "\n"
 "Það er ekkert pláss laust á áfangastað."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Villa \"%s\" við stofnun nýrrar möppu."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Villa við stofnun nýrrar möppu"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Villa við stofnun nýrrar möppu"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "ónefnd mappa"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Villa \"%s\" við stofnun nýrrar möppu."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Villa við stofnun nýrrar möppu"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Villa við stofnun nýrrar möppu"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 skrá"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Eyði skrám"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Skrám eytt:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Eyði"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Undirbý það að eyða skrám..."
 
 #  localizers: progress dialog title
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tæmi ruslatunnuna"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Undirbý það að tæma ruslið..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Ertu viss um að þú endanlega eyða öllum hlutum sem liggja í ruslatunnunni?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tæma"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (afrit).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (annað afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (annað afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (annað afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo ( þriðja afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo ( þriðja afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (annað afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo ( þriðja afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (Þrettánda afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (Fjórtánda afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo ( þrettánda afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (fjórtánda afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo ( 21 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000'asta afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (tíunda afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (ellefta afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (tíunda afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (ellefta afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (tólfta afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (tólfta).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123 afrit).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124 afrit)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124 afrit).txt"
 
@@ -2839,64 +2798,64 @@ msgstr "foo (124 afrit).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "í dag kl. 00:00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "í dag kl. %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "í dag kl. 00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "í dag kl. %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "í dag, 00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "í dag, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "í dag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "í gær kl. 00:00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "í gær kl. %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "í gær kl. 00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "í gær kl. %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "í gær, 00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "í gær, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "í gær"
 
@@ -2905,117 +2864,117 @@ msgstr "í gær"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Miðvikudagur, September 00 0000 kl 00:00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y kl. %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mán, Ókt 00 0000 at 00:00:00 eh"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y kl. %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mán, Oct 00 0000 at 00:00 FH"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y kl. %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Ókt 00 0000 at 00:00 FH"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y kl. %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Ókt 00 0000, 00:00 FH"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 FH"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 hlutir"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 möppur"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 skrár"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 hlutur"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 skrá"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u hlutir"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u möppur"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u skjöl"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? hlutir"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bæti"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "óþekkt gerð"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "óþekkt MIME gerð"
 
@@ -3024,23 +2983,23 @@ msgstr "óþekkt MIME gerð"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "óþekkt"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "forrit"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3049,11 +3008,11 @@ msgstr ""
 "Engin lýsing fannst fyrir mime gerð \"%s\" (skráin er \"%s\"), vinsamlegast "
 "láttu gnome-vfs póstlistan vita."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "tengill"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "tengill (rofin)"
 
@@ -3174,11 +3133,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Leita að skrám eftir skráarheiti og eigindum"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Táknmyndasýn"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listasýn"
@@ -3322,149 +3283,154 @@ msgstr "Heimasvæðið þitt"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "CNET Computers.com"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "skráartáknmynd"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "breytanlegur texti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "breytanlegur miði"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "viðbótartexti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "frekari texti"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "Upplýst vegna vals"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "Hvort lýsa eigi upp vegna vals"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "lýsa upp þegar lyklaborð fókusar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 #, fuzzy
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "Hvort lýsa eigi upp vegna málun lyklaborðs"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Texti ramma"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Teikna ramma utan um óvaldan texta"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Ljós uppl. litur"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Litur notaður fyrir upplýsingatexta þegar sýnt er á dökkum bakgrunn"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Dökkur uppl. litur"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Litur notaður fyrir upplýsingatexta þegar sýnt er á ljósum bakgrunn"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Þessi mappa notar sjálfvirka uppröðun. Viltu skipta yfir í handvirka "
 "uppröðun og skilja þá hluti sem þú sleppir þar sem þú slepptir þeim? Þetta "
 "mun breyta áður uppsetta handvirka uppröðum."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Þessi mappa notar sjálfvirka uppröðun. Viltu skipta yfir í handvirka "
 "uppröðun og skilja hlutina eftir þar sem þú sleppir þeim? Þetta mun setja "
 "áður vistaða uppröðun úr skorðum."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Þessi mappa notar sjálfvirka uppröðun. Viltu skipta yfir í handvirka "
 "uppröðun og skilja hlutina eftir þar sem þú sleppir þeim?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Þessi mappa notar sjálfvirka uppröðun. Viltu skipta yfir í handvirka "
 "uppröðun og skilja hlutina eftir þar sem þú sleppir þeim?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Skipta yfir í handvirkt útlit?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Skipta"
 
@@ -3557,73 +3523,73 @@ msgstr "Er sjálfgefið fyrir \"%s\" hluti."
 msgid "Is the default for all \"%s\" items."
 msgstr "Er sjálfgefið fyrir alla \"%s\" hluti."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Breyta \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Bæta við í valmynd fyrir \"%s\" hluti"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Setja sem sjálfgefið fyrir \"%s\" hluti"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Bæta við í valmynd einungis fyrir \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Nota einungis sem sjálfgefið fyrir \"%s\" "
 
 #  Radio button for not including program in short list for type or file.
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Heiti"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Staða"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Vel_ja"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Lokið"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Breyta..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Skráargerðir og Forrit"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Fara þangað"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3631,48 +3597,48 @@ msgstr ""
 "Þú getur stillt af hvaða forrit eru í boði fyrir vissar skráargerðir innan "
 "\"Skráargerð og Forrit\" gluggans."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Opna með öðru forriti"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Veldu forrit sem opna á \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Opna með öðrum rýni"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Veldu sýn fyrir \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Engin rýnir til reiðu fyrir \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Engin rýnir til reiðu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Það er ekkert forrit útdeilt á \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Ekkert forrit útdeilt"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Það er engin aðgerð útdeild á \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Engin aðgerð útdeild"
 
@@ -3680,11 +3646,9 @@ msgstr "Engin aðgerð útdeild"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3693,42 +3657,41 @@ msgstr ""
 "Þú getur stillt GNOME af til að útdeila forritum á skráargerðir.  Viltu "
 "útdeila forriti á þessa skráargerð núna?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Útdeila forriti"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Ógildum rýni hefur verið úthlutað á \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Ógildum rýni úthlutað"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Ógildu forriti hefur verið úthlutað á \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Ógilt forrit úthlutað"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Óglid aðgerð úthlutað á \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Útdeild aðgerð er ógild"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3738,93 +3701,125 @@ msgstr ""
 "Þú getur stillt GNOME af til að útdeila forritum á skráargerðir.  Viltu "
 "útdeila forriti eða rýnir á þessa skráargerð núna?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Útdeila aðgerð"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
+"Er ekki fær um að sýna \"%s\", vegna þess að Nautilus  getur ekki meðhöndlað "
+"%s: staðsetningar."
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ekki tókst að opna áfangastað"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Er ekki fær um að sýna \"%s\", vegna þess að Nautilus  getur ekki meðhöndlað "
+"%s: staðsetningar."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Opna %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Get ekki ræst fjarbundna tengla"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Villa átti sér stað við ræsingu á forritinu.\n"
 "\n"
 "Nánar: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Villa við ræsingu forrits"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Dregið og sleppt er einungis stutt á staðbundnum skjalakerfum."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4075,14 +4070,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Hlutir sem innihalda \"medúsa\" í skráarheiti þeirra og eru möppur"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Leita á diskum"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus leitar nú eftir rusla-möppum á diskunum þínum."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Breyta"
@@ -4281,97 +4268,107 @@ msgstr "Bakgrunnur"
 msgid "Empty Trash"
 msgstr "Tæma rusl"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Þetta mun opna %d sjálfstæða glugga. Ertu viss um að þú viljir gera þetta?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Opna %d glugga?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ertu viss um að þú viljir endanlega eyða \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Þetta mun opna %d sjálfstæða glugga. Ertu viss um að þú viljir gera þetta?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ertu viss um að þú viljir endanlega eyða \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ertu viss um að þú viljir endanlega eyða þessum %d völdu hlutum?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Eyða öllum völdum hlutum varanlega"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Eyða?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Veldu flokk:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "M_ynstur"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" valin"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mappa valin"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d möppur valdar"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (inniheldur 0 hluti)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (inniheldur 1 hlut)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (inniheldur %d hluti)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr "(inniheldur samtals 0 hluti)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr "(inniheldur samtals 1 hlut)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr "(inniheldur samtals %d hluti)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" valin (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d hlutir valdir (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 annar hlutur valin (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d aðrir hlutir valdir (%s)"
@@ -4389,7 +4386,7 @@ msgstr "%d aðrir hlutir valdir (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4398,113 +4395,124 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mappan \"%s\" inniheldur fleiri skrár en Nautilus ræður við. Sumar skrár "
 "verða ekki birtar."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Of mörg skjöl"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Það er ekki hægt að flytja \"%s\" í ruslið. Viltu eyða skrá(num)?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Þessir %d valdir hlutir var ekki hægt að flytja í ruslið. Viltu eyða þeim "
-"varanelga?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Það er ekki hægt að flytja \"%s\" í ruslið. Viltu eyða skrá(num)?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d af völdum hlutum var ekki hægt að flytja í ruslið. Viltu eyða þessum %d "
-"hlutum varanlega?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Það er ekki hægt að flytja \"%s\" í ruslið. Viltu eyða skrá(num)?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Eyða eins og skot?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ertu viss um að þú viljir eyða \"%s\" varanlega úr ruslinu?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "Ertu viss um að þú viljir eyða %d völdum hlutum varanlega úr ruslinu?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Eyða úr ruslatunnu?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Nota \"%s\" til að opna valdan hlut"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Öðru _Forriti"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Forriti..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Öðrum _rýni..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Rýnir..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Ekki tókst að klára tilgreinda aðgerð: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Ekki tókst að framkvæma tilgreinda aðgerð."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Keyra \"%s\" á hvern valdan hlut"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Um forskrift"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4526,184 +4534,191 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" verður flutt ef þú velur \"Líma\" skráarskipunina"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" verður afrituð ef þú velur \"Líma\" skráarskipunina"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "Þessi %d völdu hlutir verða fluttir ef þú velur \"Líma\" skráarskipunina"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "Þessir %d völdur hlutir verða afritaðir ef þú velur \"Líma\" skráarskipunina"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Það er ekkert í úrklippusafni til að líma með."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Tengingarvilla"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Aftengingarvilla"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Tengingarvilla"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Spýta út"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Aftengja Gagnahirslu"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Opna í Nýjum _glugga"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Opna í %d nýjum _gluggum"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Eigin mappa"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Eigin mappa"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Eyða úr Ruslatunnu"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Eyða öllum völdum hlutum varanlega"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Fl_ytja í ruslið"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Flytja hvern og einn valin hlut í ruslið"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Eyða"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Sto_fna tengla"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Sto_fna tengil"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Eyða Rusli"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Klippa skrá"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Klippa skrár"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Afrita skrá"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Afrita skrár"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Ekki er hægt að nota tengilinn þar sem hann hefur engan áfangastað. Viltu "
 "flytja tengilinn í ruslið?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Ekki er hægt að nota tengilinn þar sem hann hefur engan áfangastað. Viltu "
+"flytja tengilinn í ruslið?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Þessi tengill er ónothæfur þar sem áfangastaðurinn \"%s\" ekki er til "
 "staðar. Viltu flytja tengilinn í ruslið?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Rofin tengill"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" er keyranleg textaskrá. Viltu keyra hana eða skoða innihald hennar?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Keyra eða sýna "
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Sýna"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Keyra í _skel"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Sýna"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Keyra"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Opna \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Hætta við að opna?"
 
@@ -4724,10 +4739,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Því miður, en ekki tókst að sýna allt innihald \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Villa við skoðun á möppu"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4735,7 +4755,7 @@ msgstr ""
 "Skráarheitið \"%s\" er núþegar notað innan þessarar möppu. Vinsamlegast "
 "veldu annað skráarheiti."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4743,12 +4763,12 @@ msgstr ""
 "Þessi mappa inniheldur ekki \"%s\". Kannski hefur hluturinn verið færður eða "
 "strokaður út?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Þú hefur ekki nægjanleg réttindi til að endurnefna \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4757,66 +4777,81 @@ msgstr ""
 "Skráarheitið \"%s\" er ógilt vegna þess að það inniheldur táknið \"/\". "
 "Vinsamlegast notið annað skráarheiti."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Skráarheitið \"%s\" er óglit. Vinsamlegast notið annað skráarheiti."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Ekki tókst að breyta skráarheiti fyrir \"%s\" þar sem það liggur á ritvörðum "
 "disk"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Því miður, en ekki tókst að endurnefna \"%s\" yfir í \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Endurskírnarvilla"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Þú hefur ekki nægjanleg réttindi til að breyta hópréttindum fyrir \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Ekki tókst að breyta hópréttidnum fyrir \"%s\" þar sem hún liggur á "
 "ritvörðum disk"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Því miður, en ekki tókst að breyta hóp fyrir \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Villa við breytingu hóp"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Ekki tókst að breyta eiganda  \"%s\" þar sem hún liggur á ritvörðum disk"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Því miður, en ekki tókst að breyta eiganda \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Villa við breytingu á eiganda"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4824,21 +4859,26 @@ msgstr ""
 "Ekki tókst að breyta réttindum fyrir \"%s\"  þar sem það liggur á ritvörðum "
 "disk"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Því miður, en ekki tókst að breyta réttindum fyrir \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Villa við uppsetningu á réttindum"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Endurnefni \"%s\" yfir í \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Hætta við að endurnefna?"
 
@@ -4896,128 +4936,150 @@ msgstr "Endurheimta upprunalegu _stærðir táknmynda"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Endurheimta upprunalegu _stærð táknmyndar"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "bendir á \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Dregið og sleppt er einungis stutt á staðbundnum skjalakerfum."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Dregið og sleppt er einungis stutt á staðbundnum skjalakerfum."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Dregið og sleppt villa"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Ógild dráttargerð var notuð."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Skráarheiti"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Stærð"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Gerð"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Breytt þann"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Þú getur ekki tildeilt fleiri en eina sérvalda táknmynd í einu! Vinsamlegast "
+"dragðu einungis eina mynd til að setja sérvalda táknmynd."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Þú getur ekki tildeilt fleiri en eina sérvalda táknmynd í einu! Vinsamlegast "
 "dragðu einungis eina mynd til að setja sérvalda táknmynd."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Fleiri en ein mynd"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Skráin sem þú slepptir er ekki staðbundin. Þú getur einungis notað "
 "staðbundnar myndir í sérvaldar táknmyndir."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Skráin sem þú slepptir er ekki staðbundin. Þú getur einungis notað "
+"staðbundnar myndir í sérvaldar táknmyndir."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Einungis staðbundnar myndir"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Skráin sem þú slepptir er ekki mynd. Þú getur einungis notað staðbundnar "
-"myndir í sérvaldar táknmyndir."
+"Skráin sem þú slepptir er ekki staðbundin. Þú getur einungis notað "
+"staðbundnar myndir í sérvaldar táknmyndir."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Einungis myndir"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Stillingar"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Stillingar f. %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Hætta við breytingu á hóp?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Breyti hóp"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Hætta við breytingu á eiganda?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Breyti eiganda"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ekkert"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ólesanlegt"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 hlutur, stærð alls %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d hlutir, stærð alls %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(sumt er ólesanlegt)"
 
@@ -5027,193 +5089,193 @@ msgstr "(sumt er ólesanlegt)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Innihald:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Grunn"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Skráarheiti:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Skráarheiti:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Gerð:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Stærð:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Staðsetning:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Gagnahirsla:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Laust pláss:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "�fangastaður tengils:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME gerð:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Breytt þann:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Síðast notað:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Veldu sérvalda táknmynd..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Fjarlægja sérvalda táknmynd"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lesa"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Rita"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Ke_yra"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Setja notendaa_uðkenni"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Sérstök flögg:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Setja hópa a_uðkenni"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Klí_strað"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Réttindi"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 "Þar sem þú ert ekki eigandi þá getur þú þar af leiðandi ekki breytt þessum "
 "réttindum."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Eigandi skráar:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Eigandi skráar:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "S_kráarhópur:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Skráarhópur:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Eigandi:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Hópur:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Annað:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Textasýn:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Tölusýn:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Síðast breytt:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ekki var hægt að ákvarða skráarréttindi fyrir valda skrá."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Villa kom upp þegar sýna átti hjálp: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Villa kom upp þegar sýna átti hjálp: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Ekki tókst að sýna hjálp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr ""
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
+msgstr "Myndaeigindasýn Nautilus"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Veldu táknmynd"
 
@@ -5229,83 +5291,104 @@ msgid "Search Results"
 msgstr "Leitarniðurstöður"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 "Því miður, en Medusa leitarþjónustan er ekki til reiðu vegna þess að hún er "
 "ekki innsett."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Leitarþjónusta ekki til reiðu"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Villa á meðan að á leit stóð"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Villa við lestur á spjaldskrá skráar"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
+msgstr "Leitarþjónusta ekki til reiðu"
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
+msgstr "Leitarþjónusta ekki til reiðu"
+
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5314,53 +5397,75 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
+msgstr "Leitarþjónusta ekki til reiðu"
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr ""
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Leitarþjónusta ekki til reiðu"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Hvar"
 
@@ -5373,7 +5478,7 @@ msgstr "Hvar"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5384,7 +5489,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5393,13 +5498,16 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr "Skráarstjóri Nautilus fyrir leitarniðustöður í listasýn"
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Of margar samstæður"
 
@@ -5413,12 +5521,12 @@ msgid "Create L_auncher"
 msgstr "Búa til r_æsir"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Búa til nýjan ræsir"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Eyða öllum hlutum í ruslið"
 
@@ -5437,7 +5545,7 @@ msgstr "Sýna glugga sem gerir þér kleift að sejta bakgrunns mynstur eða lit
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Nota _sjáfgefin bakgrunn"
@@ -5459,187 +5567,206 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Veldu annan rýni til að skoða valdan hlut"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Sto_fna Möppu "
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Sto_fna Möppu "
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Búa til nýja tóma möppu inn í þessari möppu"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Búa til nýja tóma möppu inn í þessari möppu"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Búa til sýndartengil fyrir hvern valin hlut"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Fj_ölfalda"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Eyða hverjum völdum hlut, án þess að henda í ruslið"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Breyta ræsi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Breyta upplýsingum fyrir ræsiskipun"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Forsníða valda gagnahirslu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Aftengja valda gagnahirslu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Opna me_ð"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Opna hvern valdan hlut í nýjum glugga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Opna í Nýjum _glugga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Opna valin hlut í þessum glugga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Undirbýr valdar skrár undir það að verða afritaðar með \"Líma\" "
 "skráarskipuninni"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Undirbýr valdar skrár undir það að verða fluttar með \"Líma\" "
 "skráarskipuninni"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "V_erja"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Verja valda gagnahirslu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Endurnefna valin hlut"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Endursetja s_jálfgefna sýn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Endursetja uppröðun og stærðir svo þær passi við áður forstillta sýn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Velja _allar skrár"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "M_ynstur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Velja alla hluti inn í þessum glugga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Velja alla hluti inn í þessum glugga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Aftengja valda gagnahirslu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Nota sjálfgefin bakgrunn fyrir þessa staðsetningu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Skoða eða breyta eigindum fyrir hvern valdan hlut"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Afrita skrá"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Forsníða"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Aftengja Gagnahirslu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Opna"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Opna forskriftarmöppu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Lí_ma skrár"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Lí_ma skrár inn í möppu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Stillingar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Endu_rnefna..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "For_skriftur"
 
@@ -5724,44 +5851,55 @@ msgstr "Handvirk_t"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5785,47 +5923,54 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Ekki tókst að stofna nauðsynlega möppu"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Ekki tókst að stofna nauðsynlegar möppur"
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Ekki tókst að stofna nauðsynlegar möppur"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Tengill yfir á gamla skjáborð"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "Tengill yfir á gamla skjáborð"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5837,7 +5982,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5845,7 +5990,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5874,13 +6019,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "Ekki er hægt að nota Nautilus eins og er vegna ófyrirsjáanlegrar villu."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5888,20 +6033,31 @@ msgstr ""
 "Ekki er hægt að nota Nautilus eins og er vegna ófyrirsjánlegrar villu frá "
 "Bonobo. Ekki tókst að skrá rýnisþjón skráarstjóra."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Villa kom upp þegar sýna átti hjálp: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Engin bókamerki skilgreind"
@@ -5936,36 +6092,46 @@ msgstr "Færri valmöguleikar"
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Get ekki flutt mig inn í sjálfa mig"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Því miður, en \"%s\" er ógilt skráarheiti."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" er ógild staðsetning. Vinsamlegast athugið stafsetningu og prufið á "
-"ný."
+"Ekki tókst að finna \"%s\". Vinsamlegast athugið stafsetningu og prufið á ný."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Netþjónar"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Skráarheiti:"
+msgid "_Location:"
+msgstr "Staðsetning:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Tengjast"
@@ -6163,6 +6329,20 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Þú getur ekki tildeilt fleiri en eina sérvalda táknmynd í einu! Vinsamlegast "
+"dragðu einungis eina mynd til að setja sérvalda táknmynd."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Skráin sem þú slepptir er ekki staðbundin. Þú getur einungis notað "
+"staðbundnar myndir í sérvaldar táknmyndir."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6173,24 +6353,22 @@ msgstr "Opna með %s"
 msgid "Open with..."
 msgstr "Opna með..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Búa til r_æsir"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Tæma rusl"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Rita innihald á geisladisk"
 
@@ -6198,82 +6376,82 @@ msgstr "_Rita innihald á geisladisk"
 msgid "Go To:"
 msgstr "Fara:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Viltu skoða þessa %d áfangastaði í aðskildum gluggum? "
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Sýna í mörgum gluggum?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Ekki tókst að opna áfangastað"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Búa til fyrsta glugga með uppgefnum stærðarhlutföllum."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "STÆR�ARHLUTFÖLL"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Loka Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Endurræsa Nautilus"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Skráarstjóri"
 
 #  Set initial window title
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check er ekki hægt að nota með URI slóðum.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check  er ekki hægt að nota með öðrum rökum.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit er ekki hægt að nota með URI slóðum.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart er ekki hægt að nota með URI slóðum.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --geometry er ekki hægt að nota með fleiri en einu URI slóðum.\n"
@@ -6281,32 +6459,43 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ertu viss um að þú viljir endanlega eyða \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Hreinsa feril"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Fjarlægja"
 
@@ -6339,7 +6528,6 @@ msgid "Close _All Windows"
 msgstr "Loka _öllum gluggum"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Loka öllum Nautilus gluggum"
@@ -6363,107 +6551,118 @@ msgid "Forward"
 msgstr "�fram"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Fara í ruslatunnu"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Fara í ruslatunnu"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Heim"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Staðsetningarr_önd"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Endurhlaða"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Leita eftir skrám í þessari tölvu"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Stöðustik_a"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Upp"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Rita á Geisladisk"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Bæt_a við bókamerki"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Til_baka"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bókamerki"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Hrei_nsa feril"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Afrita hingað"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Br_eyta bókamerki"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "�_fram"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "Fa_ra"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Heim"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "S_taðsetning..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Síðustika"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Rusl"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Upp"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "Sko_ða"
 
@@ -6482,29 +6681,33 @@ msgstr "Skoða sem..."
 msgid "File Browser: %s"
 msgstr "Eigandi skráar:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Síðustikusýn"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Síðustika"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6538,150 +6741,183 @@ msgstr "Bæt_a við nýjum.."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Því mirður, en ekki tókst að eyða mynstri %s"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Ekki tókst að eyða mynstri"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Því miður, en ekki tókst að eyða merkmiða %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Ekki tókst að fjarlægja merkmiða"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Búa til nýjan merkimiða:"
 
 #  make the keyword label and field
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr ""
 
 #  set up a gnome icon entry to pick the image file
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "M_ynd:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Veldu mynd fyrir nýja merkimiðan:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Búa til nýjan lit:"
 
 #  make the name label and field
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Nafn lits:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Lita_gildi:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Því miður, en \"%s\" er ógilt skráarheiti."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Því miður, en þú gafst upp ógilt skráarheiti."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Ekki tókst að innsetja mynstur"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Er ekki mynd"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Því miður, en ekki tókst að mynstur %s"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Veldu myndaskrá sem bæta á við sem mynstri"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Því miður, en skráarheiti fyrir þennan nýja lit má ekki vera autt."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Ekki tókst að innsetja lit"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Veldu lit til að bæta við"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Því miður, en '%s' er ekki nýtanleg myndaskrá!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Skráin '%s' virðist ekki vera gild myndaskrá."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Veldu flokk:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Hætt_a við að fjarlægja"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Bæta við nýju mynstri..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Bæta við nýjum lit..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Bæt_a við nýjum merkimiða..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "klikkaðu á munstrið til að fjarlægja það"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "klikkaðu á litinn til að fjarlægja hann"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klikkaðu á merkimiða til að fjarlægja hann"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mynstur:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Litir:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Merkimiðar:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Fja_rlægja mynstur..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Fja_rlægja lit..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Fja_rlægja merkmiða..."
 
@@ -7063,34 +7299,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Loka _öllum gluggum"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Loka síðustiku"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Fara í tóma geisladiskmöppu"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Fara í ruslatunnu"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "S_taðsetning..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[hlutir sem eru]möppur"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "M_ynstur"
@@ -7121,9 +7362,11 @@ msgstr "Sýn mistókst"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -7131,95 +7374,123 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Nautilusforrit sem bundið er þessum glugga."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Innihaldssýn"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Skoða þessa skrá eða möppu"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Ekki tókst að finna \"%s\". Vinsamlegast athugið stafsetningu og prufið á ný."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Ekki tókst að bæta við merkimiðum"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus getur ekki sýnt \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Er ekki fær um að sýna \"%s\", vegna þess að Nautilus gat ekki ákvarðað "
 "skráargerð."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus inniheldur ekki neinn rýnir sem er fær um sýna \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Er ekki fær um að sýna \"%s\", vegna þess að Nautilus  getur ekki meðhöndlað "
 "%s: staðsetningar."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Er ekki fær um að sýna \"%s\", vegna þess að innskráning mistókst."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Er ekki fær um að sýna \"%s\", þar sem aðgangi var meinað."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Er ekki fær um að sýna \"%s\", vegna þess að hýsill \"%s\" fannst ekki. "
 "Athugaðu hvort að stafsetningarvilla hafi átt sér stað, eða hvort réttar sel "
 "(proxy) stillingar séu settar."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Er ekki fær um að sýna \"%s\", vegna þessa að hýsilsnafn var tómt. Athugaðu "
 "hvort sel stillingar séu réttar."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Er ekki fær um að sýna \"%s\", vegna þess að Nautilus  getur ekki meðhöndlað "
+"%s: staðsetningar."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Leitin er ekki til reiðu"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus getur ekki sýnt \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Ekki tókst að birta áfangastað"
 
@@ -7231,7 +7502,7 @@ msgstr ""
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Höfundarréttur áskilin (C) 1999-2001 Eazel, Inc."
 
@@ -7239,13 +7510,13 @@ msgstr "Höfundarréttur áskilin (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Samúel Jón Gunnarsson  <sammi@techattack.nu> \n"
 "Endilega sendið tilkynningar um slæma þýðingu á mig."
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7261,39 +7532,43 @@ msgstr "Fara til baka um nokkrar síður"
 msgid "Go forward a number of pages"
 msgstr "Fara áfram um nokkrar síður"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Sýna þessa staðsetningu með \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Netið"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Punktar"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Fara í ruslatunnu"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Forritsauðkenni"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Forritsauðkenni þessa glugga."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Forrit"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Nautilusforrit sem bundið er þessum glugga."
 
@@ -7329,6 +7604,216 @@ msgstr "Netþjónar"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Skoða netþjóna í Nautilus skráarstjóranum"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Verksmiðja velbúnaðarsýnar"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Vélbúnaðarrýnir"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vélbúnaðarsýn"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Skoða sem vélbúnað"
+
+#~ msgid "hardware view"
+#~ msgstr "vélbúnaðarsýn"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "heiti táknmyndar fyrir vélbúnaðarsýn"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "samantekt yfir velbúnaðarupplýsingar"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s Örgjafi\n"
+#~ "%s MHz\n"
+#~ "%s K skyndiminni"
+
+#~ 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 "Upptími er %d dagar, %d tímar, %d mínútur"
+
+#  set up the title
+#  set up the title
+#~ msgid "Hardware Overview"
+#~ msgstr "Vélbúnaðaryfirsýn"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Þetta er griðastaður fyrir CPU síðuna."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Þetta er griðastaður fyrir RAM síðuna."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Þetta er griðastaður fyrir IDE síðuna."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Villa kom upp við afritun yfir í \"%s\".\n"
+#~ "\n"
+#~ "Það er ekki nægjanlegt pláss á áfangastað."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Villa kom upp við stofnun tengils í \"%s\".\n"
+#~ "\n"
+#~ "Það er ekki nægjanlegt pláss á áfangastað."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Villa kom upp við flutning hluta yfir í \"%s\".\n"
+#~ "\n"
+#~ "Þú hefur ekki réttindi til að rita í þessa möppu."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Villa kom upp við flutning á hlutum yfir í \"%s\".\n"
+#~ "\n"
+#~ "�fangastaður er lesvarinn diskur."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Villa kom upp við stofnun tengils í \"%s\".\n"
+#~ "\n"
+#~ "Þú heur ekki réttindi til að rita í þessa möppu."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Villa kom upp við stofnun tengils í \"%s\".\n"
+#~ "\n"
+#~ "�fangastaður er lesvarinn diskur."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við afritun á \"%s\".\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við flutning á \"%s\".\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við útstrokun á \"%s\".\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við afritun.\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við tengingu tengils.\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Villa \"%s\" við útstrokun.\n"
+#~ "\n"
+#~ "Viltu halda áfram?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ekki tókst að afrita yfir í Ruslið"
+
+#~ msgid "Searching Disks"
+#~ msgstr "Leita á diskum"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus leitar nú eftir rusla-möppum á diskunum þínum."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Þessir %d valdir hlutir var ekki hægt að flytja í ruslið. Viltu eyða þeim "
+#~ "varanelga?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d af völdum hlutum var ekki hægt að flytja í ruslið. Viltu eyða þessum %"
+#~ "d hlutum varanlega?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Skráin sem þú slepptir er ekki mynd. Þú getur einungis notað staðbundnar "
+#~ "myndir í sérvaldar táknmyndir."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" er ógild staðsetning. Vinsamlegast athugið stafsetningu og prufið "
+#~ "á ný."
+
+#~ msgid "file icon"
+#~ msgstr "skráartáknmynd"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Skráarheiti:"
+
 #~ msgid "Unknown"
 #~ msgstr "Óþekkt"
 
diff --git a/po/it.po b/po/it.po
index 98ee8e015..4ad4b7a89 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.2.x\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-08-21 15:20+0200\n"
+"POT-Creation-Date: 2003-12-07 20:28+0100\n"
+"PO-Revision-Date: 2003-12-07 20:29+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italiano <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() fallita."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
+#: src/file-manager/fm-properties-window.c:2408
 #: src/file-manager/fm-search-list-view.c:500
 msgid "Emblems"
 msgstr "Simboli"
@@ -72,8 +72,8 @@ msgid ""
 "Couldn't rename emblem with name '%s'.  This is probably because the emblem "
 "is a permanent one, and not one that you added yourself."
 msgstr ""
-"Impossibile rinominare il simbolo «%s». Probabilmente si tratta di un "
-"simbolo preinstallato e non uno di quelli aggiunti dall'utente."
+"Impossibile rinominare il simbolo di nome «%s». Probabilmente si tratta di "
+"un simbolo preinstallato e non uno di quelli aggiunti dall'utente."
 
 #: components/emblem/nautilus-emblem-view.c:239
 msgid "Couldn't rename emblem"
@@ -111,7 +111,7 @@ msgstr ""
 "Inserire un nome descrittivo accanto al simbolo. Tale nome sarà poi usato "
 "per identificare il simbolo."
 
-#: components/emblem/nautilus-emblem-view.c:739
+#: components/emblem/nautilus-emblem-view.c:740
 msgid ""
 "Some of the files could not be added as emblems because they did not appear "
 "to be valid images."
@@ -119,12 +119,12 @@ msgstr ""
 "Alcuni file non possono essere aggiunti come simboli poiché non sembrano "
 "essere immagini valide."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:740
+#: components/emblem/nautilus-emblem-view.c:742
 msgid "Couldn't add emblems"
 msgstr "Impossibile aggiungere i simboli"
 
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
 msgid ""
 "None of the files could be added as emblems because they did not appear to "
 "be valid images."
@@ -132,27 +132,27 @@ msgstr ""
 "Nessun file può essere aggiunto come simbolo poiché non sembrano essere "
 "immagini valide."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:763
 msgid "The dragged text was not a valid file location."
 msgstr "Il testo trascinato non è una posizione di file valida."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:763
+#: components/emblem/nautilus-emblem-view.c:788
+#: components/emblem/nautilus-emblem-view.c:838
 msgid "Couldn't add emblem"
 msgstr "Impossibile aggiungere il simbolo"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:783
+#: components/emblem/nautilus-emblem-view.c:837
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Il file «%s» non sembra essere un'immagine valida."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:786
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Il file trascinato non sembra essere una immagine valida."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
+#: components/emblem/nautilus-emblem-view.c:902 data/browser.xml.h:35
 #: src/nautilus-property-browser.c:1731
 msgid "Erase"
 msgstr "Cancella"
@@ -272,51 +272,59 @@ msgid "Nautilus Image Properties view"
 msgstr "Vista «Proprietà immagine» di Nautilus"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Fotografia"
+msgstr "Marca fotocamera"
 
+# --new
+#
+# preso da gthumb
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Fotografia"
+msgstr "Modello fotocamera"
 
+# --new
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Data dello scatto"
 
+# --new
+#
+# preso da gthumb s/di /d'
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Tempo d'esposizione"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "programma"
+msgstr "Programma d'esposizione"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Valore d'apertura"
 
+# parebbe + corretto "modalità di lettura dell'esposizione", ma è troppo lungo...
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Modalità esposimetro"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Scatto con flash"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Lunghezza focale"
 
+# --new
+#
+# presa da gthumb
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Velocità dell'otturatore"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "Sensibilità ISO"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -334,11 +342,11 @@ msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:235
 msgid "Failed to load image information"
-msgstr "Errore nel caricare le informazioni sull'immagine"
+msgstr "Caricamento delle informazioni sull'immagine fallito"
 
 #: components/image_properties/nautilus-image-properties-view.c:423
 msgid "loading..."
-msgstr "caricamento..."
+msgstr "caricamento in corso..."
 
 #: components/image_properties/nautilus-image-properties-view.c:439
 msgid "URI currently displayed"
@@ -451,14 +459,11 @@ msgstr "Caricamento..."
 msgid "Home Folder"
 msgstr "Cartella Home"
 
-# :new
-#
-# ???
 #: components/tree/nautilus-tree-view.c:531
 msgid "Filesystem"
 msgstr "File system"
 
-# :new
+# è la traduzione dell'omonimo sotto Win
 #: components/tree/nautilus-tree-view.c:533
 msgid "Network Neighbourhood"
 msgstr "Risorse di rete"
@@ -1127,11 +1132,10 @@ msgstr "Aggiungi Nautilus alla sessione"
 msgid "Bring up a new window for every opened file"
 msgstr "Richiama una nuova finestra per ogni file aperto"
 
-# :new --??
+# :new --short
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "Icona home visibile sul desktop"
+msgstr "Icona Computer visibile sul desktop"
 
 # :new -short
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
@@ -1246,7 +1250,7 @@ msgid ""
 "Nautilus on massive directories. A negative value denotes no limit. The "
 "limit is approximate due to the reading of directories chunk-wise."
 msgstr ""
-"Directory più grandi di così verranno troncate approssimativamente a questa "
+"Directory più grandi di così sono troncate approssimativamente a questa "
 "dimensione. Lo scopo di questa chiave è di evitare l'esaurimento non "
 "intenzionale dello heap (causando così l'uccisione di Nautilus) quando si ha "
 "a che fare con directory di dimensioni eccessive. Un valore negativo indica "
@@ -1293,37 +1297,37 @@ msgid ""
 "If set to true, Nautilus will only show directories in the tree side pane. "
 "Otherwise it will show both directories and files."
 msgstr ""
-"Se impostata a vero, Nautilus mostrerà soltato le directory nel riquadro "
-"laterale \"Albero\". In caso contrario saranno mostrati sia le directory che "
-"i file."
+"Se impostata a vero, nel riquadro laterale \"Albero\" di Nautilus sono "
+"mostrate soltato le directory. In caso contrario sono mostrati sia le "
+"directory che i file."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr ""
-"Se impostata a vero, le nuove finestre aperte avranno la barra della "
-"posizione visibile."
+"Se impostata a vero, le nuove finestre aperte hanno la barra della posizione "
+"visibile."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr ""
-"Se impostata a vero, le nuove finestre aperte avranno il riquadro laterale "
+"Se impostata a vero, le nuove finestre aperte hanno il riquadro laterale "
 "visibile."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "If set to true, newly opened windows will have the status bar visible."
 msgstr ""
-"Se impostata a vero, le nuove finestre aperte avranno la barra di stato "
+"Se impostata a vero, le nuove finestre aperte hanno la barra di stato "
 "visibile."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr ""
-"Se impostata a vero, le nuove finestre avranno la barra degli strumenti "
+"Se impostata a vero, le nuove finestre hanno la barra degli strumenti "
 "visibile."
 
 # :new -long
@@ -1332,8 +1336,8 @@ 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 ""
-"Se impostata a vero, sarà possibile modificare alcune caratteristiche "
-"avanzate dei file nella finestra di dialogo delle proprietà del file."
+"Se impostata a vero, è possibile modificare alcune caratteristiche avanzate "
+"dei file dalla finestra di dialogo delle proprietà del file."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
@@ -1341,7 +1345,7 @@ msgid ""
 "If set to true, then Nautilus shows directories prior to showing files in "
 "the icon and list views."
 msgstr ""
-"Se impostata a vero, le directory saranno sempre elencate prima degli altri "
+"Se impostata a vero, le directory sono sempre elencate prima degli altri "
 "file nella vista a icone ed in quella a lista."
 
 # :new -long
@@ -1350,7 +1354,7 @@ msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
 msgstr ""
-"Se impostata a vero, sarà richiesta una conferma ogni volta che si sposta un "
+"Se impostata a vero, è richiesta una conferma ogni volta che si sposta un "
 "file nel cestino."
 
 # :new -long
@@ -1359,13 +1363,13 @@ msgid ""
 "If set to true, then Nautilus will bring up a new Nautilus window by default "
 "whenever an item is opened."
 msgstr ""
-"Se impostata a vero, allora Nautilus richiamerà in modo predefinito una "
-"nuova finestra ogni volta che un oggette viene aperto."
+"Se impostata a vero, allora Nautilus richiama in modo predefinito una nuova "
+"finestra ogni volta che un oggette viene aperto."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Se impostata a vero, allora Nautilus disegnerà le icone sul desktop."
+msgstr "Se impostata a vero, allora Nautilus disegna le icone sul desktop."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
@@ -1374,7 +1378,7 @@ msgid ""
 "file immediately and in-place, instead of moving it to the trash. This "
 "feature can be dangerous, so use caution."
 msgstr ""
-"Se impostata a vero, sarà abilitata la possibilità di eliminare un file "
+"Se impostata a vero, è abilitata la possibilità di eliminare un file "
 "immediatamente e \"sul posto\", invece che spostarlo nel cestino. Questa "
 "funzionalità può risultare dannosa, quindi usarla con attenzione."
 
@@ -1384,7 +1388,7 @@ msgid ""
 "If set to true, then Nautilus will just show the user's bookmarks in the "
 "bookmark menu."
 msgstr ""
-"Se impostata a vero, nel menù segnalibri di Nautilus saranno mostrati solo i "
+"Se impostata a vero, nel menù segnalibri di Nautilus sono mostrati solo i "
 "segnalibri dell'utente."
 
 # :new -long
@@ -1393,9 +1397,8 @@ msgid ""
 "If set to true, then Nautilus will use the user's home directory as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
 msgstr ""
-"Se impostata a vero, allora Nautilus userà la directory home dell'utente "
-"come desktop. Se non attivato, allora verrà utilizzata ~/Desktop come "
-"desktop."
+"Se impostata a vero, allora Nautilus usa la directory home dell'utente come "
+"desktop. Se non attivato, allora viene utilizzata ~/Desktop come desktop."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
@@ -1404,7 +1407,7 @@ msgid ""
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
 "files."
 msgstr ""
-"Se impostata a vero, verrano visualizzati file di backup come quelli creati "
+"Se impostata a vero, vengono visualizzati file di backup, come quelli creati "
 "da Emacs. Al momento solo i file che terminano con la tilde (~) sono "
 "considerati file di backup."
 
@@ -1414,7 +1417,7 @@ msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the directory's .hidden file."
 msgstr ""
-"Se impostata a vero, allora nel file manager verrano visualizzati i file "
+"Se impostata a vero, allora nel file manager vengono visualizzati i file "
 "nascosti. I file nascosti sono sia i dotfile (file il cui nome comincia per "
 "\".\"), sia quelli elencati nel file \".hidden\" di ciascuna directory."
 
@@ -1424,18 +1427,17 @@ 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 ""
-"Se impostata a vero, Nautilus sarà aggiunto alla sessione quando questa avrà "
-"inizio. In pratica verrà avviato al prossimo login."
+"Se impostata a vero, Nautilus è aggiunto alla sessione quando questa inizia. "
+"In pratica verrà avviato al prossimo login."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
-"Se impostata a vero, sarà presente sul desktop una icona che rimanda al "
-"cestino."
+"Se impostata a vero, è presente sul desktop una icona che rimanda al "
+"computer."
 
 # :new --long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
@@ -1443,7 +1445,7 @@ msgid ""
 "If this is set to true, an icon linking to the home directory will be put on "
 "the desktop."
 msgstr ""
-"Se impostata a vero, sarà presente sul desktop una icona che rimanda alla "
+"Se impostata a vero, è presente sul desktop una icona che rimanda alla "
 "directory home."
 
 # :new -long
@@ -1452,8 +1454,7 @@ msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
 msgstr ""
-"Se impostata a vero, sarà presente sul desktop una icona che rimanda al "
-"cestino."
+"Se impostata a vero, è presente sul desktop una icona che rimanda al cestino."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
@@ -1462,9 +1463,9 @@ msgid ""
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"."
 msgstr ""
-"Se impostata a vero, i file nelle nuove finestre verranno disposti in ordine "
+"Se impostata a vero, i file nelle nuove finestre sono disposti in ordine "
 "inverso. Per esempio, se si dispongono per nome, invece di ordinarli dalla "
-"\"A\" alla \"Z\", saranno ordinati dalla \"Z\" alla \"A\"."
+"\"A\" alla \"Z\", vengono ordinati dalla \"Z\" alla \"A\"."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
@@ -1474,17 +1475,17 @@ msgid ""
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 msgstr ""
-"Se impostata a vero, i file nelle nuove finestre verranno disposti in ordine "
+"Se impostata a vero, i file nelle nuove finestre sono disposti in ordine "
 "inverso. Per esempio, se si dispongono per nome, invece di ordinarli dalla "
-"\"A\" alla \"Z\", saranno ordinati dalla \"Z\" alla \"A\"; se disposti per "
-"dimensione, invece che in ordine cresente saranno dispoti in ordine "
+"\"A\" alla \"Z\", vengono ordinati dalla \"Z\" alla \"A\"; se disposti per "
+"dimensione, invece che in ordine cresente saranno disposti in ordine "
 "decrescente."
 
-# :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
-"Se impostata a vero, le icone saranno disposte più vicine l'una all'altra in "
+"Se impostata a vero, le icone sono disposte più vicine l'una all'altra in "
 "modo predefinito nelle nuove finestre"
 
 # :new
@@ -1492,14 +1493,14 @@ msgstr ""
 msgid ""
 "If true, labels will be placed beside icons rather than underneath them."
 msgstr ""
-"Se impostata a vero, le etichette saranno poste accanto alle icone invece "
-"che al di sotto."
+"Se impostata a vero, le etichette sono poste accanto alle icone invece che "
+"al di sotto."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If true, new windows will use manual layout by default."
 msgstr ""
-"Se impostata a vero, nelle nuove finestre sarà usata in modo predefinito la "
+"Se impostata a vero, nelle nuove finestre è usata in modo predefinito la "
 "disposizione manuale."
 
 # :new -long
@@ -1509,7 +1510,7 @@ msgid ""
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
 msgstr ""
-"Immagini di dimensione maggiore di questa (in byte) non avranno la "
+"Immagini di dimensione maggiore di questa (in byte) non hanno alcuna "
 "miniatura. Lo scopo di questa impostazione è di evitare il processo di "
 "creazione di miniature per immagini grandi; tale processo infatti può "
 "richiedere un lungo tempo di esecuzione e un consistente uso della memoria."
@@ -1609,10 +1610,10 @@ msgid ""
 msgstr ""
 "Compromesso per la velocizzazione sull'anteprima di file audio quando il "
 "mouse si trova sopra l'icona del file per motivi di velocità. Se impostata "
-"ad \"always\", allora l'audio sarà riprodotto in ogni caso, anche per "
-"directory su server remoti. Se impostata a \"local_only\", saranno "
-"riprodotti solo file sui i filesystem locali. Se impostata a \"never\" "
-"allora in nessun caso sarà possibile avere una anteprima del suono."
+"ad \"always\", allora l'audio è riprodotto in ogni caso, anche per directory "
+"su server remoti. Se impostata a \"local_only\", sono riprodotti solo file "
+"sui i file system locali. Se impostata a \"never\" allora in nessun caso è "
+"possibile ascoltare un'anteprima del suono."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
@@ -1625,10 +1626,10 @@ msgid ""
 msgstr ""
 "Compromesso sulla visualizzazione di anteprime del contenuto dei file di "
 "testo nella icona del file per motivi di velocità.  Se impostata ad \"always"
-"\", allora l'anteprima sarà mostrata in ogni caso, anche per directory su "
-"server remoti. Se impostata a \"local_only\", saranno mostrate solo "
-"anteprime per i filesystem locali. Se impostata a \"never\" allora in nessun "
-"caso sarà possibile avere una anteprima del contenuto."
+"\", allora l'anteprima è mostrata in ogni caso, anche per directory su "
+"server remoti. Se impostata a \"local_only\", sono mostrate solo anteprime "
+"per i file system locali. Se impostata a \"never\" allora in nessun caso è "
+"possibile avere un'anteprima del contenuto."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
@@ -1639,11 +1640,11 @@ msgid ""
 "use a generic icon."
 msgstr ""
 "Compromesso sulla visualizzazione delle miniature di file di immagine per "
-"motivi di velocità. Se impostata ad \"always\", allora la miniatura sarà "
+"motivi di velocità. Se impostata ad \"always\", allora la miniatura è "
 "generata in ogni caso, anche per directory su server remoti. Se impostata a "
-"\"local_only\", saranno mostrate le miniature solo per i filesystem locali. "
-"Se impostata a \"never\" allora in nessun caso sarà possibile avere una "
-"miniatura delle immagini, ma solo icone generiche."
+"\"local_only\", sono mostrate le miniature solo per i file system locali. Se "
+"impostata a \"never\" allora in nessun caso è possibile avere una miniatura "
+"delle immagini, ma solo icone generiche."
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
@@ -1655,32 +1656,29 @@ msgid ""
 msgstr ""
 "Compromesso sulla visualizzazione del numero di oggetti in una directory per "
 "motivi di velocità. Se impostata ad \"always\", allora il numero totale di "
-"oggetti sarà mostrato in ogni caso, anche per directory su server remoti. Se "
-"impostata a \"local_only\", allora il conteggio sarà effettuato solo sui "
-"filesystem locali. Se impostata a \"never\" allora in nessun caso sarà "
-"disponibile il conteggio degli oggetti."
+"oggetti è mostrato in ogni caso, anche per directory su server remoti. Se "
+"impostata a \"local_only\", allora il conteggio è effettuato solo sui file "
+"system locali. Se impostata a \"never\" allora in nessun caso è disponibile "
+"il conteggio degli oggetti."
 
-# new -long
+# -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "L'ordine di disposizione predefinito per gli oggetti nella vista a icone. "
 "Valori ammessi sono: \"name\", \"size\", \"type\", \"modification_date\", "
 "\"emblems\"."
 
-# :new -long
-#
-# L'originale è errato, mancano le "", non ho avuto tempo di inviare la patch
+# -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "L'ordine di disposizione predefinito per gli oggetti nella vista a lista. "
-"Valori ammessi sono: \"name\", \"size\", \"type\", \"modification_date\", "
-"\"emblems\"."
+"Valori ammessi sono: \"name\", \"size\", \"type\" e \"modification_date\""
 
 # :new -long
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1732,7 +1730,8 @@ msgstr "Usa la disposizione manuale nelle nuove finestre"
 
 # :new -short
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Usa la disposizione stretta nelle nuove finestre"
 
 # :new -short
@@ -1960,7 +1959,7 @@ msgid "Can't delete volume"
 msgstr "Impossibile eliminare il volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5720
 #: libnautilus-private/nautilus-global-preferences.c:555
 #: libnautilus-private/nautilus-trash-directory.c:376
 msgid "Trash"
@@ -2406,7 +2405,7 @@ msgstr "Sostituisci tutto"
 
 #. appended to new link file
 #: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file.c:4541
 #, c-format
 msgid "link to %s"
 msgstr "collegamento a %s"
@@ -2733,13 +2732,14 @@ msgid "Preparing to Empty the Trash..."
 msgstr "Preparazione allo svuotamento del cestino..."
 
 #: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr "Eliminare permanentemente tutti gli oggetti presenti nel cestino?"
+msgstr "Svuotare il cestino di tutti gli oggetti presenti?"
 
 #: libnautilus-private/nautilus-file-operations.c:2307
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
+"Svuotando il cestino, gli oggetti sono eliminati in modo definitivo ed "
+"incontrovertibile."
 
 #: libnautilus-private/nautilus-file-operations.c:2319
 msgid "_Empty"
@@ -3046,64 +3046,64 @@ msgstr "foo (copia 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2767
 msgid "today at 00:00:00 PM"
 msgstr "oggi alle 0.00.00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at %-I:%M:%S %p"
 msgstr "oggi alle %k.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2770
 msgid "today at 00:00 PM"
 msgstr "oggi alle 0.00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today at %-I:%M %p"
 msgstr "oggi alle %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2773
 msgid "today, 00:00 PM"
 msgstr "oggi, 0.00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2774
 msgid "today, %-I:%M %p"
 msgstr "oggi, %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2776
+#: libnautilus-private/nautilus-file.c:2777
 msgid "today"
 msgstr "oggi"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2786
 msgid "yesterday at 00:00:00 PM"
 msgstr "ieri alle 0.00.00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ieri alle %k.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2789
 msgid "yesterday at 00:00 PM"
 msgstr "ieri alle 0.00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday at %-I:%M %p"
 msgstr "ieri alle %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2792
 msgid "yesterday, 00:00 PM"
 msgstr "ieri, 0.00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2793
 msgid "yesterday, %-I:%M %p"
 msgstr "ieri, %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2795
+#: libnautilus-private/nautilus-file.c:2796
 msgid "yesterday"
 msgstr "ieri"
 
@@ -3112,133 +3112,133 @@ msgstr "ieri"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2807
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Mercoledì, 0 settembre 0000 alle 0.00.00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2808
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y alle %k.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2810
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Lun, 0 ott 0000 alle 0.00.00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2811
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y alle %k.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2813
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Lun, 0 ott 0000 alle 0.00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2814
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y alle %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2816
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0 ott 0000 alle 0.00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2817
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y alle %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2819
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0 ott 0000, 0.00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2820
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2822
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 0.00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2823
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %k.%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2825
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2826
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4121
 msgid "0 items"
 msgstr "0 oggetti"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4121
 msgid "0 folders"
 msgstr "0 cartelle"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4122
 msgid "0 files"
 msgstr "0 file"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4126
 msgid "1 item"
 msgstr "1 oggetto"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4126
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4127
 msgid "1 file"
 msgstr "1 file"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4130
 #, c-format
 msgid "%u items"
 msgstr "%u oggetti"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4130
 #, c-format
 msgid "%u folders"
 msgstr "%u cartelle"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4131
 #, c-format
 msgid "%u files"
 msgstr "%u file"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4443
+#: libnautilus-private/nautilus-file.c:4459
 msgid "? items"
 msgstr "? oggetti"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4449
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4464
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4467
 msgid "unknown MIME type"
 msgstr "tipo MIME sconosciuto"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4473
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4505
 msgid "program"
 msgstr "programma"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4517
 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 "
@@ -3248,7 +3248,7 @@ msgstr ""
 "probabilmente che il file gnome-vfs.keys si trova nel posto sbagliato o non "
 "viene trovato per altri motivi."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4521
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3257,11 +3257,11 @@ msgstr ""
 "Nessuna descrizione è stata trovata per il tipo MIME «%s» (il file è «%s»); "
 "avvisare cortesemente la mailing list di gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4535
 msgid "link"
 msgstr "collegamento"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4555
 msgid "link (broken)"
 msgstr "collegamento (interrotto)"
 
@@ -3382,6 +3382,7 @@ msgid "Search for files by file name and file properties"
 msgstr "Cercare i file per nome e proprietà "
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:496
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vista a icone"
@@ -3533,58 +3534,51 @@ msgstr "Home di %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1173
 msgid "Computer"
-msgstr "Fòrmica"
+msgstr "Computer"
 
-# qui finisce la prima parte delle stringhe delle impostazioni.
-# Continua più oltre
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "icona del file"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "testo modificabile"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "l'etichetta modificabile"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "testo addizionale"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "altro testo"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "evidenziazione per la selezione"
 
 # Si tratta di una proprietà di questo oggetto ed è booleana.
 # È una stringa per i programmatori, non verrà mai visualizzata.
 # Idem per tutte quelle del medesimo file che iniziano per whether.
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "se la selezione rende evidenziato"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "evidenziazione al focus della tastiera"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "se il focus da tastiera lo rende evidenziato"
 
 # bruttissimo!!!! e se si usasse solo trascinamento
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "evidenziato per il rilascio"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "se il D&D lo rende evidenziato"
 
@@ -4419,9 +4413,10 @@ msgstr "Seleziona tutto il testo di un campo di testo"
 msgid "_Paste Text"
 msgstr "_Incolla testo"
 
+# --new
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Mostra i supporti di memorizzazione del computer"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4435,17 +4430,13 @@ msgstr "Gestione dei file"
 msgid "View your home folder in the Nautilus file manager"
 msgstr "Mostra la cartella home dell'utente nel file manager Nautilus"
 
-# :new
-#
-# ???
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "File system"
+msgstr "Esplora file system"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Esplora in file system con il file manager"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4453,7 +4444,7 @@ msgstr "Fabbrica per la shell e file manager Nautilus"
 
 #: src/Nautilus_shell.server.in.h:2
 msgid "Icons"
-msgstr "icone"
+msgstr "Icone"
 
 #: src/Nautilus_shell.server.in.h:3
 msgid "Icons Viewer"
@@ -4461,7 +4452,7 @@ msgstr "Visualizzatore icone"
 
 #: src/Nautilus_shell.server.in.h:4
 msgid "List"
-msgstr "lista"
+msgstr "Lista"
 
 #: src/Nautilus_shell.server.in.h:5
 msgid "List Viewer"
@@ -4568,87 +4559,85 @@ msgstr "Verranno aperte %d finestre separate. Proseguire?"
 msgid "Open %d Windows?"
 msgstr "Aprire %d finestre?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:836
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Eliminare permanentemente «%s»?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:840
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Selezionati %d oggetti: eliminarli permanentemente?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:846
 msgid "Delete?"
 msgstr "Eliminare?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:985
 msgid "Select Pattern"
-msgstr "Seleziona una categoria:"
+msgstr "Seleziona modello"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1001
 msgid "_Pattern:"
-msgstr "_Motivi"
+msgstr "_Modello:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1598
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Selezionato «%s»"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1600
 msgid "1 folder selected"
 msgstr "Selezionata 1 cartella"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1603
 #, c-format
 msgid "%d folders selected"
 msgstr "Selezionate %d cartelle"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1610
 msgid " (containing 0 items)"
 msgstr " (0 oggetti)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1612
 msgid " (containing 1 item)"
 msgstr " (1 oggetto)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1614
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d oggetti)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1621
 msgid " (containing a total of 0 items)"
 msgstr " (0 oggetti complessivamente)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1623
 msgid " (containing a total of 1 item)"
 msgstr " (1 oggetto complessivamente)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1625
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (%d oggetti complessivamente)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1638
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Selezionato «%s» (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1642
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "Selezionati %d oggetti (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1649
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 altro oggetto (%s)"
 
 # questo appare sempre dopo la virgola
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1652
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "altri %d oggetti (%s)"
@@ -4660,7 +4649,7 @@ msgstr "altri %d oggetti (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1681
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s e %s"
@@ -4669,7 +4658,7 @@ msgstr "%s%s e %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:1793
+#: src/file-manager/fm-directory-view.c:1806
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -4678,19 +4667,19 @@ msgstr ""
 "La cartella «%s» contiene più file di quelli che Nautilus può gestire. "
 "Alcuni file non potranno essere mostrati."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1813
 msgid "Too Many Files"
 msgstr "Troppi file"
 
 # :revi
-#: src/file-manager/fm-directory-view.c:3032
+#: src/file-manager/fm-directory-view.c:3058
 #, c-format
 msgid ""
 "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "Impossibile spostare «%s» nel cestino. Eliminarlo immediatamente?"
 
 # :revi
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3063
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
@@ -4699,7 +4688,7 @@ msgstr ""
 "Impossibile spostare gli oggetti selezionati (%d) nel cestino. Eliminarli "
 "immediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3041
+#: src/file-manager/fm-directory-view.c:3067
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -4708,65 +4697,65 @@ msgstr ""
 "Impossibile spostare %d tra gli oggetti selezionati nel cestino. Eliminare "
 "questi %d oggetti immediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3075
 msgid "Delete Immediately?"
 msgstr "Eliminare immediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3107
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Eliminare permanentemente «%s» dal cestino?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3111
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
 "Trash?"
 msgstr "Eliminare permanentemente gli oggetti selezionati (%d) dal cestino?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3117
 msgid "Delete From Trash?"
 msgstr "Eliminare dal cestino?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3396
+#: src/file-manager/fm-directory-view.c:3438
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usa «%s» per aprire l'oggetto selezionato"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3514
 #: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Other _Application..."
-msgstr "Altre _applicazioni..."
+msgstr "Altra _applicazione..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3514
 msgid "An _Application..."
 msgstr "Una _applicazione..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3536
 #: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Other _Viewer..."
 msgstr "Altro _visualizzatore..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3536
 msgid "A _Viewer..."
 msgstr "Un _visualizzatore..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3629
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Impossibile completare l'azione specificata: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3653
 msgid "Could not complete specified action."
 msgstr "Impossibile completare l'azione specificata."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4162
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Esegue «%s» su ogni oggetto selezionato"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4379
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
@@ -4776,11 +4765,11 @@ msgstr ""
 "Scegliendo uno script da questo menù, esso verrà eseguito con ogni oggetto "
 "selezionato come input."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4382
 msgid "About Scripts"
 msgstr "Informazioni sugli script"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4383
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4821,18 +4810,17 @@ msgstr ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posizione e dimensione della finestra "
 "corrente"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4513
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "Selezionare il comando «Incolla i file» per spostare «%s»"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4517
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "Selezionare il comando «Incolla i file» per copiare «%s»"
 
-# :modi
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4524
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4840,8 +4828,7 @@ msgstr ""
 "Gli oggetti selezionati (%d) verranno spostati selezionando il comando "
 "«Incolla i file»"
 
-# :modi
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4528
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4849,134 +4836,130 @@ msgstr ""
 "Gli oggetti selezionati (%d) verranno copiati selezionando il comando "
 "«Incolla i file»"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:4607
 msgid "There is nothing on the clipboard to paste."
 msgstr "Non c'è nulla da incollare negli appunti."
 
-# :revi
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:4708
+#: src/file-manager/fm-directory-view.c:5594
 msgid "Mount Error"
 msgstr "Errore nel montare"
 
-# :revi
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:4769
 msgid "Unmount Error"
 msgstr "Errore nello smontare"
 
-# :revi
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+# --new
+#: src/file-manager/fm-directory-view.c:4771
 msgid "Eject Error"
-msgstr "Errore nel montare"
+msgstr "Errore nell'espellere"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:4993
 msgid "E_ject"
 msgstr "_Espelli"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:4993
 #: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Unmount Volume"
 msgstr "Smonta _volume"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5073
 msgid "Open in New Window"
-msgstr "Apri _in una nuova finestra"
+msgstr "Apri in una nuova finestra"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5075
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Apri _in %d nuove finestre"
+msgstr "Apri in %d nuove finestre"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+# --new
+#: src/file-manager/fm-directory-view.c:5080
 msgid "Browse Folder"
-msgstr "Cartella Home"
+msgstr "Esplora cartella"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+# --new
+#: src/file-manager/fm-directory-view.c:5082
 msgid "Browse Folders"
-msgstr "Cartella Home"
+msgstr "Esplora cartelle"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5105
 msgid "_Delete from Trash"
 msgstr "Eli_mina dal cestino"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5107
 msgid "Delete all selected items permanently"
 msgstr "Elimina tutti gli oggetti selezionati permanentemente"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5110
+#: src/file-manager/fm-directory-view.c:5398
 #: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Mo_ve to Trash"
 msgstr "Spost_a nel cestino"
 
-#: src/file-manager/fm-directory-view.c:5080
+#: src/file-manager/fm-directory-view.c:5112
 #: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Move each selected item to the Trash"
 msgstr "Sposta ogni oggetto selezionato nel cestino"
 
-#: src/file-manager/fm-directory-view.c:5104
+#: src/file-manager/fm-directory-view.c:5136
 #: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "_Delete"
 msgstr "Eli_mina"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5156
 msgid "Ma_ke Links"
 msgstr "Crea colle_gamenti"
 
-#: src/file-manager/fm-directory-view.c:5125
+#: src/file-manager/fm-directory-view.c:5157
 #: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Ma_ke Link"
 msgstr "Crea colle_gamento"
 
-#: src/file-manager/fm-directory-view.c:5138
+#: src/file-manager/fm-directory-view.c:5170
 #: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "_Empty Trash"
 msgstr "S_vuota cestino"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5186
 msgid "Cu_t File"
 msgstr "_Taglia file"
 
-#: src/file-manager/fm-directory-view.c:5155
+#: src/file-manager/fm-directory-view.c:5187
 #: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Cu_t Files"
 msgstr "_Taglia i file"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5196
 msgid "_Copy File"
 msgstr "_Copia file"
 
-#: src/file-manager/fm-directory-view.c:5165
+#: src/file-manager/fm-directory-view.c:5197
 #: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "_Copy Files"
 msgstr "_Copia i file"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5389
 msgid ""
 "This link can't be used, because it has no target. Do you want to move this "
 "link to the Trash?"
 msgstr ""
-"Questo collegamento non può essere usato, perché non punta a niente. "
+"Questo collegamento non può essere usato, perché non ha una destinazione. "
 "Spostarlo nel cestino?"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5392
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
 "want to move this link to the Trash?"
 msgstr ""
-"Questo collegamento non può essere usato, perché il suo target «%s» non "
+"Questo collegamento non può essere usato, perché la destinazione «%s» non "
 "esiste. Spostarlo nel cestino?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5398
 msgid "Broken Link"
 msgstr "Collegamento interrotto"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5455
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -4984,28 +4967,28 @@ msgid ""
 msgstr ""
 "Il file «%s» è un file di testo eseguibile. Eseguire o mostrare il contenuto?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5461
 msgid "Run or Display?"
 msgstr "Eseguire o mostrare?"
 
-#: src/file-manager/fm-directory-view.c:5430
+#: src/file-manager/fm-directory-view.c:5462
 msgid "_Display"
 msgstr "_Mostra"
 
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5463
 msgid "Run in _Terminal"
 msgstr "Esegui nel _terminale"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5466
 msgid "_Run"
 msgstr "_Esegui"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:5725
 #, c-format
 msgid "Opening \"%s\""
 msgstr "Apertura di «%s»"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:5731
 msgid "Cancel Open?"
 msgstr "Annullare l'apertura?"
 
@@ -5212,26 +5195,26 @@ msgstr "Errore di drag and drop"
 msgid "An invalid drag type was used."
 msgstr "È stato usato un tipo non valido di trascinamento."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:764
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/file-manager/fm-list-view.c:786
+#: src/file-manager/fm-list-view.c:788
 #: src/file-manager/fm-search-list-view.c:512
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/file-manager/fm-list-view.c:797
+#: src/file-manager/fm-list-view.c:799
 #: src/file-manager/fm-search-list-view.c:518
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:808
+#: src/file-manager/fm-list-view.c:810
 #: src/file-manager/fm-search-list-view.c:524
 msgid "Date Modified"
 msgstr "Data di modifica"
 
-#: src/file-manager/fm-properties-window.c:479
+#: src/file-manager/fm-properties-window.c:482
 #: src/nautilus-information-panel.c:506
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
@@ -5240,12 +5223,12 @@ msgstr ""
 "Impossibile assegnare più di un'icona personalizzata alla volta. Trascinare "
 "una sola immagine per impostare l'icona personalizzata."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Più di una immagine"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
@@ -5254,12 +5237,12 @@ msgstr ""
 "Il file che è stato trascinato non è locale. È possibile usare solo immagini "
 "locali come icone personalizzate."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Solo immagini locali"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
@@ -5268,55 +5251,55 @@ msgstr ""
 "Il file che è stato trascinato non è un'immagine. È possibile usare solo "
 "immagini locali come icone personalizzate."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Solo immagini"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Proprietà di «%s»"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Annullare l'impostazione del gruppo?"
 
-#: src/file-manager/fm-properties-window.c:1381
+#: src/file-manager/fm-properties-window.c:1384
 msgid "Changing group"
 msgstr "Impostazione del gruppo"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Annullare l'impostazione del proprietario?"
 
-#: src/file-manager/fm-properties-window.c:1543
+#: src/file-manager/fm-properties-window.c:1546
 msgid "Changing owner"
 msgstr "Impostazione del proprietario"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "niente"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "illeggibile"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 oggetto, con dimensione %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d oggetti, in totale %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(qualcosa di illeggibile)"
 
@@ -5326,171 +5309,176 @@ msgstr "(qualcosa di illeggibile)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Contenuto:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Generali"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nomi:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:185
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
 #: src/nautilus-location-dialog.c:145
 msgid "Location:"
 msgstr "Posizione:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Spazio libero:"
 
-#: src/file-manager/fm-properties-window.c:2294
+# sarebbe "Destinazione collegamento:" ma è troppo lungo
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Collegamento a:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Ultima modifica:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Ultimo accesso:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Seleziona icona personalizzata..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Rimuovi icona personalizzata"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lettura"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Scrittura"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Esecuzione"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Imposta ID _utente"
 
 # controllare sugli howto, sono uid gid stycky
 # nota: in konquerori sono chiamati permessi speciali
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Flag speciali:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Imposta ID _gruppo"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Stick_y"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permessi"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Solo il proprietario del file può modificare questi permessi."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "_Proprietario del file:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Proprietario del file:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Gruppo del _file:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Gruppo del file:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Proprietario:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Gruppo:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Altri:"
 
 # praticamente è -rw-rw-r--
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Simbolici:"
 
 # praticamente è 644
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Numerici:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Ultimo cambiamento:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "I permessi di «%s» non possono essere determinati."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "I permessi del file selezionato non possono essere determinati."
 
-#: src/file-manager/fm-properties-window.c:3322
+#: src/file-manager/fm-properties-window.c:3349
 #: src/nautilus-bookmarks-window.c:146
 #: src/nautilus-file-management-properties.c:237
 #: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
@@ -5502,20 +5490,20 @@ msgstr ""
 "Errore nel mostrare la documentazione: \n"
 "%s"
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3351
 msgid "Couldn't show help"
 msgstr "Impossibile mostrare la documentazione"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3688
 msgid "Cancel Showing Properties Window?"
 msgstr "Annullare la finestra delle proprietà?"
 
-#: src/file-manager/fm-properties-window.c:3662
+#: src/file-manager/fm-properties-window.c:3689
 msgid "Creating Properties window"
 msgstr "Creazione della finestra delle proprietà"
 
 # :newtitolo di scelta icona per personalizzazione
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3815
 msgid "Select an icon"
 msgstr "Selezionare un'icona"
 
@@ -5846,10 +5834,10 @@ msgstr "Formatta il volume selezionato."
 msgid "Medi_a Properties"
 msgstr "Proprietà  medi_a"
 
+# --new
 #: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
 msgid "Mount the selected volume"
-msgstr "Smonta il volume selezionato."
+msgstr "Monta il volume selezionato"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid ""
@@ -5872,14 +5860,13 @@ msgid "Open Wit_h"
 msgstr "Ap_ri con"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
 msgid "Open each selected item in a navigation window"
-msgstr "Apre ogni oggetto selezionato in una nuova finestra"
+msgstr "Apre ogni oggetto selezionato in una finestra di navigazione"
 
+# : --spatial
 #: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
 msgid "Open in Navigation Window"
-msgstr "Apri _in una nuova finestra"
+msgstr "Apri nella finestra di esplorazione"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open the selected item in this window"
@@ -5927,18 +5914,18 @@ msgid "Select _All Files"
 msgstr "_Seleziona tutti i file"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
 msgid "Select _Pattern"
-msgstr "_Motivi"
+msgstr "Seleziona _modello"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Select all items in this window"
 msgstr "Seleziona tutti gli oggetti in questa finestra"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
 msgid "Select items in this window matching a given pattern"
-msgstr "Seleziona tutti gli oggetti in questa finestra"
+msgstr ""
+"Seleziona tutti gli oggetti in questa finestra che corrispondono ad un "
+"determinato modello"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Show media properties for the selected volume"
@@ -5964,10 +5951,10 @@ msgstr "Mostra o modifica le proprietà di ogni oggetto selezionato"
 msgid "_Format"
 msgstr "_Formatta"
 
+# --new
 #: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
 msgid "_Mount Volume"
-msgstr "Smonta _volume"
+msgstr "Monta _volume"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:53
 msgid "_Open"
@@ -6351,38 +6338,38 @@ msgstr "Meno opzioni"
 msgid "Find Them!"
 msgstr "Trovalo!"
 
+# --new
 #: src/nautilus-connect-server-dialog.c:87
 msgid "You must enter a name for the server"
-msgstr ""
+msgstr "È necessario fornire un nome per il server"
 
+# --new
 #: src/nautilus-connect-server-dialog.c:87
 #: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
 msgid "Can't connect to server"
-msgstr "Impossibile spostare su se stesso"
+msgstr "Impossibile connettersi al server"
 
 # :modi
 #: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1246
 #, c-format
 msgid ""
 "\"%s\" is not a valid location. Please check the spelling and try again."
 msgstr "Posizione «%s» non valida. Controllare se corretto e riprovare."
 
+# --new
 #: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
 msgid "Connect to Server"
-msgstr "Server di rete"
+msgstr "Connessione al server"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nome:"
+#: src/nautilus-connect-server-dialog.c:203
+msgid "_Location:"
+msgstr "_Posizione:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+# --new
+#: src/nautilus-connect-server-dialog.c:228
 msgid "Connect"
-msgstr "_Connetti"
+msgstr "Connetti"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6633,9 +6620,8 @@ msgid "View in Multiple Windows?"
 msgstr "Mostrare in finestre multiple?"
 
 #: src/nautilus-location-dialog.c:138
-#, fuzzy
 msgid "Open Location"
-msgstr "Impossibile aprire la posizione"
+msgstr "Apri posizione"
 
 #: src/nautilus-main.c:187
 msgid "Perform a quick set of self-check tests."
@@ -6663,7 +6649,7 @@ msgstr ""
 
 #: src/nautilus-main.c:196
 msgid "open a browser window."
-msgstr ""
+msgstr "apre una finestra di esplorazione."
 
 #: src/nautilus-main.c:198
 msgid "Quit Nautilus."
@@ -6771,16 +6757,16 @@ msgstr "Elimina la memoria delle posizioni visitate"
 msgid "Close _All Windows"
 msgstr "Chiudi _tutte le finestre"
 
+# : --spatial
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Chiude tutte le finestre di Nautilus"
+msgstr "Chiude tutte le finestre di navigazione"
 
+# --new
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Connetti al _server..."
 
 # infedele, ma meglio relazionata alla funzione
 #: src/nautilus-navigation-window-ui.xml.h:11
@@ -6860,11 +6846,11 @@ msgstr "_Segnalibri"
 msgid "_Clear History"
 msgstr "S_vuota cronologia"
 
+# --new
 #: src/nautilus-navigation-window-ui.xml.h:29
 #: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
 msgid "_Computer"
-msgstr "_Courier"
+msgstr "C_omputer"
 
 # mmmhhh dovrebbe avere i ... visto che apre una dialog
 #: src/nautilus-navigation-window-ui.xml.h:30
@@ -6914,40 +6900,40 @@ msgstr "Informazioni"
 msgid "View as..."
 msgstr "Vedi come..."
 
+# --new
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Proprietario del file:"
+msgstr "Esplorazione file: %s"
 
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
+#: src/nautilus-navigation-window.c:1104
 msgid ""
 "One of the side panels encountered an error and can't continue. "
 "Unfortunately I couldn't tell which one."
 msgstr ""
-"Uno dei pannelli del riquadro laterale ha riscontrato un errore e non può "
-"continuare. Impossibile stabilire di quale si tratti."
+"Uno dei pannelli laterali ha riscontrato un errore e non può continuare. "
+"Impossibile stabilire di quale si tratti."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
+# --new
+#: src/nautilus-navigation-window.c:1108
+#, c-format
 msgid ""
 "The %s side panel encountered an error and can't continue. If this keeps "
 "happening, you might want to turn this panel off."
 msgstr ""
-"Il pannello «%s» del riquadro laterale ha riscontrato un errore e non può "
-"continuare. Se il problema persiste, chiudere questo riquadro."
+"Il pannello laterale «%s» ha riscontrato un errore e non può continuare. Se "
+"il problema persiste, è preferibile disabilitare questo riquadro."
 
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Pannello della barra laterale fallito"
+msgstr "Pannello laterale fallito"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Riquadro laterale"
 
 # non sicuro su forma verbale, ma non so quando appare
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contiene la vista di un riquadro laterale"
 
@@ -7374,7 +7360,7 @@ msgstr "Va su di un livello"
 
 #: src/nautilus-shell-ui.xml.h:14
 msgid "Normal Si_ze"
-msgstr "Dimensioni _normali"
+msgstr "Dimensione _normale"
 
 #: src/nautilus-shell-ui.xml.h:15
 msgid "Prefere_nces"
@@ -7522,45 +7508,47 @@ msgstr "Mostra %s"
 #
 # Voce nel menù "Vai"
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "C_reazione CD"
 
+# --new
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "Chiudi _tutte le finestre"
+msgid "Close P_arent Folders"
+msgstr "Chiudi cartelle s_uperiori"
+
+# --new
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Chiude i \"genitori\" di questa cartella"
 
 # :new
 # suggerimento della voce in "Vai"
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Va alla cartella «CD vuoto»"
+msgstr "Va al Computer"
 
 #: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
 msgid "Go to the CD Creator"
-msgstr "Va alla cartella del cestino"
+msgstr "Va alla «Creazione CD»"
 
 #: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
 msgid "Open _Location..."
-msgstr "_Posizione..."
+msgstr "Apri posi_zione..."
 
+# --new
 #: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "Apri _genitore"
 
+# --new
 #: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
 msgid "Open the parent folder"
-msgstr "[Oggetti che sono]cartelle"
+msgstr "Apre la cartella di livello superiore"
 
+# --new
 #: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
 msgid "_Places"
-msgstr "_Motivi"
+msgstr "_Luoghi"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7579,8 +7567,9 @@ msgid "the current selection"
 msgstr "la selezione corrente"
 
 #: src/nautilus-view-frame.c:622
+#, fuzzy
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "Il tipo di finestra in cui la vista è inserita"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
@@ -7609,12 +7598,12 @@ msgstr "Vista contenuto"
 msgid "View of the current file or folder"
 msgstr "Vista del file o cartella corrente"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1240
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "Impossibile trovare «%s». Verificare se corretto e riprovare."
 
-#: src/nautilus-window-manage-views.c:1259
+#: src/nautilus-window-manage-views.c:1260
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -7623,31 +7612,31 @@ msgstr ""
 "Impossibile mostrare «%s», perché Nautilus non può determinare che tipo di "
 "file sia."
 
-#: src/nautilus-window-manage-views.c:1267
+#: src/nautilus-window-manage-views.c:1268
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
 msgstr ""
 "Nautilus non ha nessun visualizzatore installato capace di mostrare «%s»."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1280
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
 msgstr ""
 "Impossibile mostrare «%s», perché Nautilus non può gestire gli indirizzi «%"
 "s:»."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1286
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Impossibile mostrare «%s», perché il tentativo di login è fallito."
 
-#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1291
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Impossibile mostrare «%s», perché l'accesso è stato negato."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1302
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -7656,14 +7645,14 @@ msgstr ""
 "Impossibile mostrare «%s», perché non è stato trovato nessun host «%s». "
 "Controllare che sia corretto il nome o le impostazioni del proxy."
 
-#: src/nautilus-window-manage-views.c:1309
+#: src/nautilus-window-manage-views.c:1310
 #, c-format
 msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
 msgstr ""
 "Impossibile mostrare «%s». Controllare che le impostazioni del proxy siano "
 "corrette."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1317
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
@@ -7674,7 +7663,7 @@ msgstr ""
 "browser SMB.\n"
 "Verificare che sia in esecuzione un server SMB nella rete locale."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1329
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -7686,16 +7675,16 @@ msgstr ""
 "servizio di ricerca Medusa, e se non c'è un indice che l'indicizzatore di "
 "Medusa sia in esecuzione."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1333
 msgid "Searching Unavailable"
 msgstr "Ricerca non disponibile"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1338
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus non può mostrare «%s»."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1343
 msgid "Can't Display Location"
 msgstr "Impossibile mostrare la posizione"
 
@@ -7739,44 +7728,40 @@ msgstr "Va indietro un certo numero di posizioni"
 msgid "Go forward a number of pages"
 msgstr "Va avanti un certo numero di posizioni"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:906
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Mostra questa posizione con «%s»"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+# --new
+#: src/nautilus-window.c:1176
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Rete"
 
-# Questo ed i successivi riferiti ai caratteri erano di nautilus per GNOME1
-#: src/nautilus-window.c:1175
-#, fuzzy
+# --new
+#: src/nautilus-window.c:1179
 msgid "Fonts"
-msgstr "F_ont"
+msgstr "Tipi di carattere"
 
-# :new
-#
-# Voce nel menù "Vai"
-#: src/nautilus-window.c:1178
-#, fuzzy
+# --new
+#: src/nautilus-window.c:1182
 msgid "CD Creator"
-msgstr "C_reazione CD"
+msgstr "Creazione CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1614
 msgid "Application ID"
 msgstr "ID applicazione"
 
 # :revi ho impressione che non sia corretta
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1615
 msgid "The application ID of the window."
 msgstr "L'ID dell'applicazione della finestra."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1621
 msgid "Application"
 msgstr "Applicazione"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1622
 msgid "The NautilusApplication associated with this window."
 msgstr "L'oggetto NautilusApplication associato a questa finestra."
 
@@ -7812,6 +7797,15 @@ msgstr "Server di rete"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Mostra i server della rete nel file manager Nautilus"
 
+# qui finisce la prima parte delle stringhe delle impostazioni.
+# Continua più oltre
+#~ msgid "file icon"
+#~ msgstr "icona del file"
+
+# --new
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
 #~ msgid "Unknown"
 #~ msgstr "Sconosciuto"
 
@@ -7881,6 +7875,10 @@ msgstr "Mostra i server della rete nel file manager Nautilus"
 #~ msgid "Mount or unmount disks"
 #~ msgstr "Monta o smonta i dischi"
 
+# : --spatial
+#~ msgid "%d Navigation Windows"
+#~ msgstr "%d finestra di esplorazione"
+
 #~ msgid "Open _in This Window"
 #~ msgstr "Apri _in questa finestra"
 
@@ -7915,100 +7913,3 @@ msgstr "Mostra i server della rete nel file manager Nautilus"
 
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Va in una posizione non esistente"
-
-# new -short
-#~ msgid "Default zoom level used by the icon view"
-#~ msgstr "Livello di ingrandimento prefedinito usato nella vista a icone"
-
-# :new -short
-#~ msgid "Default zoom level used by the list view"
-#~ msgstr "Livello di ingrandimento predefinito usato nella vista a lista"
-
-# :new -long
-#~ msgid ""
-#~ "If set to true, then hidden files (dotfiles) are shown in the file "
-#~ "manager."
-#~ msgstr ""
-#~ "Se impostata a vero, i file nascosti (dotfile) saranno mostrati nel file "
-#~ "manager."
-
-#~ msgid "_New Folder"
-#~ msgstr "_Nuova cartella"
-
-#~ msgid "Sort in _reverse"
-#~ msgstr "Ordinare al co_ntrario"
-
-#~ msgid "Use _manual layout"
-#~ msgstr "Usare la disposizione _manuale"
-
-#~ msgid "New _Window"
-#~ msgstr "Nuova _finestra"
-
-#~ msgid "Your HTTP Proxy requires you to log in.\n"
-#~ msgstr "Il proxy HTTP richiede di fare login.\n"
-
-#~ msgid ""
-#~ "You must log in to access \"%s\".\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Effettuare il login per accedere a «%s».\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Your password will be transmitted unencrypted."
-#~ msgstr "La password verrà trasmessa in chiaro."
-
-#~ msgid "Your password will be transmitted encrypted."
-#~ msgstr "La password verrà trasmessa cifrata."
-
-#~ msgid "Authentication Required"
-#~ msgstr "Richiesta autenticazione"
-
-#~ msgid "The Trash must remain on the desktop."
-#~ msgstr "Il cestino deve rimanere sul desktop."
-
-#~ msgid "You cannot copy the Trash."
-#~ msgstr "Non è possibile copiare il cestino."
-
-#~ msgid "Last modified:"
-#~ msgstr "Ultima modifica"
-
-#~ msgid "Last accessed:"
-#~ msgstr "Ultimo accesso"
-
-#~ msgid "Lucida"
-#~ msgstr "Lucida"
-
-#~ msgid "Services"
-#~ msgstr "Servizi"
-
-#~ msgid "Use the Courier Font"
-#~ msgstr "Usa il carattere Courier"
-
-#~ msgid "Use the Fixed Font"
-#~ msgstr "Usa il carattere Fixed"
-
-#~ msgid "Use the GTK System Font"
-#~ msgstr "Usa il carattere predefinito"
-
-#~ msgid "Use the Helvetica Font"
-#~ msgstr "Usa il carattere Helvetica"
-
-#~ msgid "Use the Lucida Font"
-#~ msgstr "Usa il carattere Lucida"
-
-#~ msgid "Use the Times Font"
-#~ msgstr "Usa il carattere Times"
-
-#~ msgid "_Fixed"
-#~ msgstr "_Fixed"
-
-#~ msgid "_GTK System Font"
-#~ msgstr "Carattere _predefinito"
-
-#~ msgid "_Helvetica"
-#~ msgstr "_Helvetica"
-
-#~ msgid "_Times"
-#~ msgstr "_Times"
diff --git a/po/ja.po b/po/ja.po
index e3b7e4bb7..5e670e4d5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-11-02 11:28+0900\n"
-"Last-Translator: KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-18 00:04+0900\n"
+"Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Nautilus コン�ー�ント・アダプタ・ファクトリ�一�
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:2
 msgid "Factory for Nautilus component adapter factories "
-msgstr "Nautilus コン�ー�ント・アダプタ・ファクトリ�一�"
+msgstr "Nautilus コン�ー�ント・アダプタ・ファクトリ�一���。"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:3
 msgid ""
@@ -45,8 +45,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() �呼�出��失敗����。"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "エンブレム"
 
@@ -60,47 +60,55 @@ msgstr "Nautilus エンブレム・ビュー"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "'%s' ������エンブレムを削除����ん���。"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"'%s' ���エンブレムを削除����ん���。�れ���ら�絶対�削除�る��"
-"も追加�る��も����エンブレム�も�れ��ん。"
+"�れ���ら�絶対�削除�る��も追加�る��も����エンブレム�も�れ�"
+"�ん。"
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "エンブレムを削除����ん���"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "エンブレム�を '%s' �変更����ん���。"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"'%s' ���エンブレム�を変更����ん���。�れ���ら�絶対�削除�る�"
-"�も追加�る��も����エンブレム�も�れ��ん。"
+"�れ���ら�絶対�削除�る��も追加�る��も����エンブレム�も�れ�"
+"�ん。"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "エンブレム�を変更����ん���"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "エンブレム��変更"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "表示�る新��エンブレム�:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "���変更"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "エンブレム�追加..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -108,7 +116,7 @@ msgstr ""
 "�エンブレム�隣���りや����を入力��下��。�����エンブレムを識"
 "別�る���他�場所�使用���。"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -116,139 +124,55 @@ msgstr ""
 "�エンブレム�隣���りや����を入力��下��。�����エンブレムを識"
 "別�る���他�場所�使用���。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"�����ファイル�正��画����表示�れ�����エンブレム���追加�"
-"���ん���。"
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "エンブレム��������ファイルを追加����ん���。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "エンブレム�正��画����表示�れ��ん。"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "エンブレムを追加����ん���"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"正��画����表示�れ�����エンブレム���追加��るファイル��り�"
-"�ん。"
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "エンブレム���追加��るファイル��り��ん。"
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "エンブレムを追加����ん。"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "ドラッグ��テキスト�正��場所��り��ん���。"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "エンブレムを追加����ん���"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "ファイル '%s' �正��画����表示�れ��ん。"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "ドラッグ��ファイル�正��画����表示�れ��ん。"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "削除"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "�ードウェア・ビュー�ファクトリ"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "�ードウェア"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "�ードウェア・ビューア"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "�ードウェア・ビュー"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "�ードウェア表示"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "�ードウェア・ビュー"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "�ードウェア・ビュー�アイコン�"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "�ードウェア情報�概�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K キャッシュ"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB メモリ"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB メモリ"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "稼�時間� %d日 %d時間 %d分"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "�ードウェア�概�"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "�れ� CPU ページ�プレースホルダ��。"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "�れ�メモリページ�プレースホルダ��。"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "�れ� IDE ページ�プレースホルダ��。"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "履歴"
@@ -912,6 +836,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "�ードウェア"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "インターナショナル"
@@ -1112,9 +1040,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "ファイルを開�度�新��ウィンドウを生��る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "デスクトップ�ホーム・アイコンを表示�る"
+msgstr "デスクトップ�コンピュータ・アイコンを表示�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1196,30 +1123,18 @@ msgid "Desktop trash icon name"
 msgstr "デスクトップ�ゴミ箱アイコン���"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"��サイズを超��巨大�フォルダを��サイズ�切り����。���図�巨大�"
-"フォルダを開��際� CPU 使用率を大����り�Nautilus を強制終了�る���"
-"��よ���る����。負�値�制���を�味���。��値�近���フォル"
-"ダ�読�込�を�止���。"
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "ファイル設定ダイアログ� '特別' �フラグを有効��る"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"ディレクトリ表示�背景�使用�るファイル� (�期値) ��background_set � "
-"TRUE �場����使用�能��。"
+"フォルダ�背景�使用�るファイル� (�期値) ��background_set � TRUE �場�"
+"���使用�能��。"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1227,6 +1142,18 @@ msgstr ""
 "サイド・ペイン�背景�使用�るファイル� (�期値) ��"
 "side_pane_background_set � TRUE �場����使用�能��。"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"��サイズを超��フォルダを強制的���サイズ�切り����。���図�巨大"
+"�フォルダを開��際� CPU 使用率を大����り�Nautilus を強制終了�る��"
+"���よ���る����。負�値�制���を�味���。��値�フォルダ� "
+"chunk-wise �読�込������よ��値��。"
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "ブックマーク・メニュー�中�デフォルト�ブックマークを表示���"
@@ -1237,8 +1164,8 @@ msgstr "デスクトップ�ホーム・アイコンを表示�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "TRUE ��る��Nautilus �ツリー�サイド・ペイン�中�フォルダ��表示��"
 "�。�れ以外�フォルダ�ファイル�両方を表示���。"
@@ -1271,8 +1198,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "TRUE ��る��アイコン表示�一覧表示�ファイル���フォルダを表示���。"
 
@@ -1314,7 +1241,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "TRUE ��る��ユーザ�ホーム・フォルダをデスクトップ���利用���。FALSE "
@@ -1333,11 +1260,10 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
-"TRUE ��る��隠�ファイル�ファイル・マ�ージャ�中�表示�れ��。隠�ファ"
-"イル��ドット・ファイル (先頭� .) ����フォルダ�隠�ファイル�一覧�中"
-"��り��。"
+"TRUE ��る��ファイル・マ�ージャ�中�隠�ファイルを表示���。隠�ファイ"
+"ル��\".ファイルドット\" ���フォルダ�隠�ファイル�一覧�中��り��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -1348,15 +1274,16 @@ msgstr ""
 "る� Nautilus �必�起動�れ��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr "TRUE ��る��ゴミ箱を指�アイコン�デスクトップ上�表示�れ��。"
+msgstr ""
+"TRUE ��る��コンピュータ�場所を指�アイコン�デスクトップ上�表示�れ�"
+"�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "TRUE ��る��ホーム・フォルダを指�アイコン�デスクトップ上�表示�れ��。"
@@ -1389,8 +1316,10 @@ msgstr ""
 "�並���。サイズ順��る��大��順���り����順�並���。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
-msgstr "TRUE ��る��デフォルト�アイコン�����置�れ��。"
+msgid "If true, icons will be laid out tighter by default in new windows."
+msgstr ""
+"TRUE ��る��新��ウィンドウ�中�デフォルト�アイコン�����置�れ�"
+"�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1416,8 +1345,8 @@ msgid "List of possible captions on icons"
 msgstr "アイコン�下�表示�る見出�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
-msgstr "フォルダ�中��り扱�最大ファイル数"
+msgid "Maximum handled files in a folder"
+msgstr "フォルダ内��り扱�最大ファイル数"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Maximum image size for thumbnailing"
@@ -1436,11 +1365,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus �デスクトップを�り扱�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr "Nautilus �デスクトップ���ユーザ�ホームを使用�る"
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus �ユーザ�ホーム・フォルダをデスクトップ���使用�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr "ツリー�サイド・ペイン��フォルダ��表示�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1460,7 +1389,7 @@ msgid "Reverse sort order in new windows"
 msgstr "新��ウィンドウ�中�逆順�並�替�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "ウィンドウ�中�フォルダを最��表示�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1499,35 +1428,35 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
-"テキスト・ファイル�上�マウスを移動��プレビュー�る際�スピード�トレード"
-"オフ��。\"always\" ��る��リモート・サー�上��るファイル�も常�プレ"
-"ビュー表示���。\"local_only\" ��る��ローカル�ファイルシステム上�ファ"
-"イル��プレビュー表示���。\"never\" ��る��プレビュー表示���一般的"
-"�アイコン表示��り��。"
+"ファイル�アイコン��るテキスト・ファイル�内容�マウスを移動��プレビュー"
+"�る際�スピード�トレードオフ��。\"always\" ��る��リモート・サー�上�"
+"�るファイル�も常�プレビュー表示���。\"local_only\" ��る��ローカル�"
+"ファイルシステム上�ファイル��プレビュー表示���。\"never\" ��る��プ"
+"レビュー表示���一般的�アイコン表示��り��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
-"画�ファイル�上�マウスを移動��プレビュー�る際�スピード�トレードオフ�"
-"�。\"always\" ��る��リモート・サー�上��るファイル�も常�サム�イル表"
-"示���。\"local_only\" ��る��ローカル�ファイルシステム上�ファイル��"
-"サム�イル表示���。\"never\" ��る��サム�イル表示���一般的�アイコ"
-"ン表示��り��。"
+"画�ファイルをサム�イル���表示�る際�スピード�トレードオフ��。"
+"\"always\" ��る��リモート・サー�上��るファイル�も常�サム�イル表示�"
+"��。\"local_only\" ��る��ローカル�ファイルシステム上�ファイル��サム"
+"�イル表示���。\"never\" ��る��サム�イル表示���一般的�アイコン表"
+"示��り��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "フォルダ�中�アイテム数を表示�る際�スピード�トレードオフ��。\"always\" "
@@ -1538,18 +1467,18 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "アイコン表示�アイテムを並�るデフォルト�順番��。利用�能�値: \"name\", "
 "\"size\", \"type\", \"modification_date\", \"emblems\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"一覧表示�アイテムを並�るデフォルト�順番��。利用�能�値: size, type, "
-"and modification_date"
+"一覧表示�アイテムを並�るデフォルト�順番��。利用�能�値: \"name\", "
+"\"size\", \"type\", � \"modification_date\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
@@ -1591,7 +1520,7 @@ msgid "Use manual layout in new windows"
 msgstr "新��ウィンドウをマニュアル��置�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "新��ウィンドウ�中�����置�る"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1620,7 +1549,7 @@ msgstr ""
 "示形���。利用�能�値: \"list_view\", \"icon_view\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "フォルダ�中��るアイテム数を表示�る�件"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1632,8 +1561,8 @@ msgid "When to show thumbnails of image files"
 msgstr "サム�イル表示�る際��件"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
-msgstr "ディレクトリ�背景をカスタマイズ�る����"
+msgid "Whether a custom default folder background has been set."
+msgstr "フォルダ�背景 (�期値) をカスタマイズ�る����"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
@@ -1789,68 +1718,77 @@ msgstr "リセット"
 msgid "on the desktop"
 msgstr "デスクトップ上"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "ボリューム・アイコン�削除����ん。"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"ボリューム・アイコン�削除����ん。\n"
-"ボリュームをアンマウント�る際��アイコン��クリック・メニュー�らアンマウ"
-"ントを�択��下��。"
+"ボリュームを排出�る際��ボリューム��クリック・メニュー�ら \"�り出�\" "
+"を�択��下��。"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "ボリューム�削除����ん"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "���移動(_M)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "���コピー(_C)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "���リンクを作る(_L)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "背景���セット(_B)"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "全��フォルダ�背景�セット(_A)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "��フォルダ�背景�セット(_T)"
 
 #: 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 "エンブレムをインストール����ん。"
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "新��エンブレム��空白以外�キーワードを指定��下��。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "エンブレムをインストール����ん���"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "文字�スペース�数字���エンブレム�キーワード�����。"
@@ -1859,18 +1797,24 @@ msgstr "文字�スペース�数字���エンブレム�キーワード
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr "既� \"%s\" ���エンブレム�存在���。別���を指定��下��。"
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "既� \"%s\" ���エンブレム�存在���。"
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "別�エンブレム�を�択��下��。"
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "エンブレムをインストール����ん���"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "カスタム・エンブレムを�存����ん。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "カスタム・エンブレム���を�存����ん。"
 
@@ -1889,366 +1833,259 @@ msgstr "å…ƒ:"
 msgid "To:"
 msgstr "å…ˆ:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "移動中�エラー�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"移動中�エラー�発生����。\n"
-"\n"
-"\"%s\" �読�込�専用ディスク���移動����ん。"
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "\"%s\" �読�込�専用ディスク���移動����ん。"
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "削除中�エラー�発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
-msgstr ""
-"削除中�エラー�発生����。\n"
-"\n"
-"親フォルダ�対�る変更権������ \"%s\" を削除����ん。"
+msgstr "親フォルダ�対�る変更権������ \"%s\" を削除����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"消去中�エラー�発生����。\n"
-"\n"
-"\"%s\" �読�込�専用ディスク���削除����ん。"
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "\"%s\" �読�込�専用ディスク���削除����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"移動中�エラー�発生����。\n"
-"\n"
 "\"%s\" 自身�����親フォルダ�対�る変更権������移動����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "移動中�エラー�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
-msgstr ""
-"移動中�エラー�発生����。\n"
-"\n"
-"移動先� \"%s\" 自身�����親フォルダ��る��移動����ん。"
+msgstr "移動先� \"%s\" 自身�����親フォルダ��る��移動����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"移動中�エラー�発生����。\n"
-"\n"
 "\"%s\" 自身�����親フォルダ�対�る変更権������ゴミ箱�移動����"
 "ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "コピー中�エラー�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"コピー中�エラー�発生����。\n"
-"\n"
-"\"%s\" 自身�対�る読�込�権������コピー����ん。"
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr "\"%s\" 自身�対�る読�込�権������コピー����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" �コピー中�エラー�発生����。\n"
-"\n"
-"コピー先��分�空�容���り��ん。"
+msgid "Error while copying to \"%s\"."
+msgstr "\"%s\" �コピー中�エラー�発生����。"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" �移動中�エラー�発生����。\n"
-"\n"
-"移動先��分�空�容���り��ん。"
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "移動先��分�空�容���り��ん。"
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" �リンク�作�中�エラー�発生����。\n"
-"\n"
-"リンク先��分�空�容���り��ん。"
+msgid "Error while moving to \"%s\"."
+msgstr "\"%s\" �移動中�エラー�発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\" �コピー中�エラー�発生����。\n"
-"\n"
-"��フォルダ��書�込�権���り��ん。"
+msgid "Error while creating link in \"%s\"."
+msgstr "\"%s\" �リンクを生�中�エラー�発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" �コピー中�エラー�発生����。\n"
-"\n"
-"コピー先�ディスク�読�込�専用��。"
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "��フォルダ��書�込�権���り��ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"アイテムを \"%s\"�移動中�エラー�発生����。\n"
-"\n"
-"��フォルダ�対�る書�込�権���り��ん。"
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "コピー先�ディスク�読�込�専用��。"
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"アイテムを \"%s\" �移動中�エラー�発生����。\n"
-"\n"
-"移動先�ディスク�読�込�専用��。"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\" ��リンク�作�中�エラー�発生����。\n"
-"\n"
-"��フォルダ��書�込�権���り��ん。"
+msgid "Error while moving items to \"%s\"."
+msgstr "アイテムを \"%s\" �移動中�エラー�発生����。"
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" ��リンク�作�中�エラー�発生����。\n"
-"\n"
-"リンク先�ディスク�読�込�専用��。"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (\"%s\" �コピー中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error while creating links in \"%s\"."
+msgstr "\"%s\" �リンクを生�中�エラー�発生����。"
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (\"%s\" �移動中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "エラー \"%s\" � \"%s\" をコピー中�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "続行��もよ������？"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (\"%s\" �リンク作�中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "エラー \"%s\" � \"%s\" を移動中�発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (\"%s\" を消去中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "エラー \"%s\" � \"%s\" ��リンク�生�中�発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (コピー中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "エラー \"%s\" � \"%s\" を削除中�発生����。"
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (移動中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while copying."
+msgstr "コピー中�エラー \"%s\" �発生����。"
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (リンク作�中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while moving."
+msgstr "移動中�エラー \"%s\" �発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"エラー \"%s\" (削除中) ��。\n"
-"\n"
-"続行����？"
+msgid "Error \"%s\" while linking."
+msgstr "リンク中�エラー \"%s\" �発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "コピー中�エラー�発生����。"
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "削除中�エラー \"%s\" �発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "移動中�エラー�発生����。"
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "コピー�エラー"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "リンク中�エラー�発生����。"
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "移動�エラー"
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "削除中�エラー�発生����。"
+msgid "Error While Linking"
+msgstr "リンク�生�エラー"
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "削除�エラー"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "スキップ"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "スキップ�る(_S)"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "�試行"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "�試行�る(_R)"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "\"%s\" を新��場所�移動����ん���。"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"既� \"%s\" ����削除も置���も����特別�アイテム�使用���る�"
-"��新��場所�移動����ん���。\n"
-"\n"
-"����も \"%s\" を移動�る場�����を変更���ら試行��下��。"
+"既������削除も置���も����特別�アイテム�使用�����。���"
+"�も��アイテムを移動�る場�����を変更���ら�試行��下��。"
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "\"%s\" を新��場所�コピー����ん���。"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"既� \"%s\" ����削除も置���も����特別�アイテム�使用���る�"
-"��新��場所�コピー����ん���。\n"
-"\n"
-"����も \"%s\" をコピー�る場�����を変更���ら試行��下��。"
+"既������削除も置���も����特別�アイテム�使用�����。���"
+"�も��アイテムをコピー�る場�����を変更���ら�試行��下��。"
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "ファイルを置���る�������ん。"
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "ファイルを置���る�������ん"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"既�ファイル \"%s\" �存在���。\n"
-"\n"
-"置����も宜�����？"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "既�ファイル \"%s\" �存在���。置����もよ������？"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "既存�ファイルを置���る����中身�上書��れ��。"
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "コピー中��題発生"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "置�"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "置���る(_R)"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "全�置�"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "全�置���る(_A)"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s ��リンク"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s ��別�リンク"
@@ -2257,25 +2094,25 @@ msgstr "%s ��別�リンク"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d 番目� %s ��リンク"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d 番目� %s ��リンク"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d 番目� %s ��リンク"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d 番目� %s ��リンク"
@@ -2285,560 +2122,584 @@ msgstr "%d 番目� %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (コピー)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (別�コピー)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "番目�コピー)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "番目�コピー)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "番目�コピー)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "番目�コピー)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (コピー)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (別�コピー)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d 番目�コピー)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d 番目�コピー)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d 番目�コピー)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�明� GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "ファイルをゴミ箱�移動中"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "移動��ファイル:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "移動中"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "ゴミ箱�移動�る準備中..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "ファイル�移動中"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "ファイル�移動完了:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "移動�準備中..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "移動完了..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "ファイル��リンク�作�中"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "ファイル�リンク完了:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "リンク中"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "リンク作��準備中..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "リンク�作��完了����..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "ファイル�コピー中"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "コピー��ファイル:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "コピー中"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "コピー�準備中..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
 msgstr "アイテムをゴミ箱�中�コピー����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "ゴミ箱�コピー����ん"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "ファイル�フォルダ��ゴミ箱�移動����。"
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "��ゴミ箱�移動����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "��ゴミ箱�コピー����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr "��フォルダ�ゴミ箱�移動�るアイテムを格��る��使用���。"
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "ゴミ箱�場所を変更�る�������ん"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ゴミ箱�コピー����ん"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "フォルダを��フォルダ�中�移動����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "フォルダを��フォルダ�中�コピー����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "転�先�フォルダ�転�元�内部��り��。"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "自分�中�移動����ん"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "自分�中�コピー����ん"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "�れ自身�中�フォルダをコピー����ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "移動/コピー元�先���ファイル��。"
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "自分�上�コピー����ん"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"新��フォルダ�作�中�エラー�発生����。\n"
-"\n"
-"作�先��書�込�権���り��ん。"
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "転�先��書�込�権���り��ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"新��フォルダ�作�中�エラー�発生����。\n"
-"\n"
-"作�先��分�空���り��ん。"
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "転�先��分�空���り��ん。"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
-msgstr "エラー \"%s\" (新��フォルダ�作�中) ��。"
+msgstr "新��フォルダ�生�中�エラー \"%s\" �発生����。"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
-msgstr "新��フォルダ�作�中�エラー"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "新��フォルダ�生�中�エラー�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
+msgstr "新��フォルダ�生�中�エラー"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "未タイトル�フォルダ"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "新��ドキュメント�生�中�エラー \"%s\" �発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "新��ドキュメント�生�中�エラー�発生����。"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "新��ドキュメント�生�中�エラー"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "新��ファイル"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "ファイルを削除中"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "削除��ファイル:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "削除中"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "ファイル削除�準備中..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "ゴミ箱を空������"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "ゴミ箱を空��る準備中..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr "ゴミ箱��る全��アイテムを完全�削除��も宜�����?"
+msgstr "ゴミ箱��る全��アイテムを完全�削除��もよ������？"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr "ゴミ箱を空��る��削除�れ�アイテム�永久�失�れ��。"
+msgstr "ゴミ箱を空��る��アイテム�完全�削除�れ��。"
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "空��る(_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (コピー).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (別�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (別�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (別�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (別�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (1000兆番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (14番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123番目�コピー).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124番目�コピー)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124番目�コピー).txt"
 
@@ -2857,64 +2718,64 @@ msgstr "foo (124番目�コピー).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "今日� �後 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "今日� %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "今日� �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "今日� %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "今日� �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "今日� %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "今日"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "昨日� �後 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "昨日� %p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "昨日� �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "昨日� %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "昨日� �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "昨日� %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "昨日"
 
@@ -2923,133 +2784,133 @@ msgstr "昨日"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000年 9月00日 水曜日 �後 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Y年%-m月%-d日 %A %p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000/10/00 (月) �後 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y/%-m/%-d (%a) %p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000/10/00 (月) �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y/%-m/%-d (%a) %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000/10/00 �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y/%-m/%-d %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000/10/00 �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y/%-m/%-d %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00 �後 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%-m/%-d %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 個�アイテム"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 個�フォルダ"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 個�ファイル"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 個�アイテム"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 個�フォルダ"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 個�ファイル"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u 個�アイテム"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u 個�フォルダ"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u 個�ファイル"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? アイテム"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? �イト"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "�明�種類"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "�明"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "プログラム"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3059,7 +2920,7 @@ msgstr ""
 "イル�間���場所��る���る��何�他��由�見��られ���能性��り"
 "��。"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3068,11 +2929,11 @@ msgstr ""
 "MIME型 \"%s\" (ファイル� \"%s\") �説明�見��り��ん。gnome-vfs メーリン"
 "グ・リスト��知ら�下��。"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "リンク"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "リンク切れ"
 
@@ -3193,11 +3054,13 @@ msgid "Search for files by file name and file properties"
 msgstr "ファイル��属性�ファイルを検索���"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "アイコン表示"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "リスト表示"
@@ -3341,148 +3204,146 @@ msgstr "%s �ホーム"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "カウンタートップ"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ファイル�アイコン"
+msgstr "コンピュータ"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "編集�能�テキスト"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "編集�能�ラベル"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "追加�テキスト"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "追加�テキスト"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "�択範囲�強調表示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "�択��部分を強調表示�る����を設定���"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "キーボード・フォーカス�強調表示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "キーボード・フォーカスを与��部分を強調表示�る����を設定���"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "ドロップ�強調表示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "ドラッグ＆ドロップ��部分を強調表示�る����を設定���"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "�択範囲"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "テキストを枠�囲む"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "テキスト�周囲を枠�囲む"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "�択範囲�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "�択範囲�色を設定���"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "�択範囲�α"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "�択範囲��明度を設定���"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "強調表示�α"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "�択��アイコンを強調表示�る際��明度を設定���"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "明る�色 (テキスト情報)"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "暗�背景�対��テキスト情報�使用�る色を設定���"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "暗�色 (テキスト情報)"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "明る�背景�対��テキスト情報�使用�る色を設定���"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"��フォルダ�自動レイアウト�������。手動レイアウト�切替�����ア"
-"イテムをドロップ��場所�置��宜�����？\n"
-"�注�】�れ�今��使用����手動レイアウトを無効����。"
+"手動レイアウト�切り替�����アイテムをドロップ��場所�置��よ����"
+"��？ (�れ�今��使用����手動レイアウトを無効����。)"
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "��フォルダ�自動レイアウトを利用���。"
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"��フォルダ�自動レイアウト�������。手動レイアウト�切替�����ア"
-"イテムをドロップ��場所�置��宜�����？\n"
-"�注�】�れ�今��使用����手動レイアウトを無効����。"
+"手動レイアウト�切り替����れら�アイテムをドロップ��場所�置��よ��"
+"����？ (�れ�今��使用����手動レイアウトを無効����。)"
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"��フォルダ�自動レイアウト�������。手動レイアウト�切替�����ア"
-"イテムをドロップ��場所�置��宜�����？"
+"手動レイアウト�切り替�����アイテムをドロップ��場所�置��よ����"
+"��？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"��フォルダ�自動レイアウト�������。手動レイアウト�切替�����ア"
-"イテムをドロップ��場所�置��宜�����？"
+"手動レイアウト�切り替����れら�アイテムをドロップ��場所�置��よ��"
+"����？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "手動レイアウト�切替����？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "切替�る"
 
@@ -3590,72 +3451,72 @@ msgstr "\"%s\" アイテム�デフォルト��"
 msgid "Is the default for all \"%s\" items."
 msgstr "\"%s\" �全アイテム�デフォルト��"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\" �修正"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" アイテム�メニュー��り��"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" アイテム�デフォルト��"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "\"%s\" �メニュー����り��"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "\"%s\" ���デフォルト��"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" アイテム�メニュー��り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "��"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "状態"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "�択(_H)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "完了"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "修正(_M)..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "ファイル�関連��"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "起動�る(_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3663,48 +3524,48 @@ msgstr ""
 "ファイル�種類�応��アプリケーション�起動を\n"
 "\"ファイル�種類�編集\" ダイアログ�設定����。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "他�アプリケーション�開�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\" を開�アプリケーション��択:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "他�ビューア�開�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\" �表示スタイル��択:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" 用�ビューア��り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "利用��るビューア��り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" �関連��られ�アプリケーション��り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "関連��られ�アプリケーション��り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
-msgstr "\"%s\" �関連��られ�動作��り��ん。"
+msgstr "\"%s\" �関連��られ�アクション��り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "関連��られ�アクション��り��ん"
 
@@ -3712,176 +3573,180 @@ msgstr "関連��られ�アクション��り��ん"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
-"GNOME ��ファイル�種類�応��アプリケーション�関連��を設定����。\n"
-"今�����ファイル�種類�アプリケーションを関連�����？"
+"GNOME ��ファイル�種類�応��アプリケーション�関連��を設定����。�"
+"�����ファイル�種類�アプリケーションを関連�����？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "アプリケーション�関連��"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "関連��る(_A)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" �関連��られ�ビューア�正���り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "関連�るビューア�正���り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" �関連��られ�アプリケーション�正���り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "関連��られ�アプリケーション�正���り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
-msgstr "\"%s\" �関連��られ�動作�正���り��ん。"
+msgstr "\"%s\" �関連��られ�アクション�正���り��ん。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
-msgstr "関連��られ�動作�正���り��ん"
+msgstr "関連��られ�アクション�正���り��ん"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"GNOME ����種類�応��別�アプリケーション���ビューア�\n"
-"関連��を設定����。今�����ファイル�種類�\n"
-"アプリケーション���ビューアを関連�����？"
+"GNOME ����種類�応��別�アプリケーション���ビューア�関連��を設定"
+"����。������ファイル�種類�アプリケーション���ビューアを関連�"
+"����？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "動作�関連��"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "関連��る(_A)"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "オープン�失敗����。他�アプリケーションを�択����？"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" � \"%s\" を開���ん。���ら \"%s\" � \"%s\" ��るファイル�アク"
-"セス�����ら��。他�アプリケーションを�択����？"
+"セス�����ら��。"
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "オープン�失敗����。別�アクションを指定����？"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
-"デフォルト�動作�� \"%s\" を開���ん。���ら場所 \"%s\" ��るファイル"
-"�アクセス�����ら��。別�動作を�択����？"
+"デフォルト�アクション�� \"%s\" を開���ん。���ら場所 \"%s\" ��る"
+"ファイル�アクセス�����ら��"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "場所を開���ん"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "\"%s\" � \"%s\" を開���ん。���ら \"%s\" � \"%s\" ��るファイル�アク"
-"セス�����ら��。\n"
-"��ファイルを�照��るアプリケーション��り��ん。��ファイルをローカル"
-"�コピー�る��開�る�も�れ��ん。"
+"セス�����ら��。"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"��ファイルを�照��るアプリケーション��り��ん。��ファイルを�使��"
+"コンピュータ�コピー�る��開�る�も�れ��ん。"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"デフォルト�アクション�� \"%s\" を開���ん。���ら場所 \"%s\" ��る"
+"ファイル�アクセス�����ら��。"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
-"デフォルト�動作�� \"%s\" を開���ん。���ら場所 \"%s\" ��るファイル"
-"�アクセス�����ら��。\n"
-"��ファイルを表示�る����能�動作��り��ん。��ファイルをローカル�"
-"コピー�る��開�る�も�れ��ん。"
+"��ファイルを�照��るアクション�他��り��ん。��ファイルを�使��コ"
+"ンピュータ�コピー�る��開�る�も�れ��ん。"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s �オープン中"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"セキュリティ上�関係�リモート・サイト��るコマンドを実行�る�������"
-"ん。"
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "リモート・サイト�らコマンドを実行�る�������ん。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "リモート・リンクを実行�る�������ん"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "セキュリティを考慮���れを無効����。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"アプリケーションを起動�る際�エラー�発生����。\n"
-"\n"
-"詳細: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "リモート・リンクを実行����ん"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "詳細: "
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "アプリケーションを起動�る際�エラー�発生����。"
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "アプリケーション�起動エラー"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "ドロップ�対象�ローカル・ファイル���サ�ート�����。"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"��ドロップ対象�ローカル・ファイル��サ�ート���。\n"
-"ローカル以外�ファイルを開�場���\n"
-"��ファイルを一度ローカルフォルダ�コピー���ら�ドロップ��下��。"
+"��ファイルを一度ローカル・フォルダ�コピー���ら�ドロップ��下��。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "ドロップ�対象�ローカル・ファイル��サ�ート"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"��ドロップ対象�ローカル・ファイル��サ�ート���。\n"
-"ローカル以外�ファイルを開�場���\n"
-"��ファイルを一度ローカルフォルダ�コピー���ら�ドロップ��下��。ド"
-"ロップ��ローカルファイル�既�開�れ����。"
+"��ファイルを一度ローカル・フォルダ�コピー���ら�ドロップ��下��。ド"
+"ロップ��ローカル・ファイル�既�開�れ����。"
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4126,16 +3991,6 @@ msgstr "å��å‰�ã�®ä¸­ã�« \"stuff\" ã‚’å�«ã‚€ã‚¢ã‚¤ãƒ†ãƒ ã�§ 2000 ãƒ�イト以下ã
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "���中� \"medusa\" を�むアイテム�フォルダ"
 
-# msgid "Produces metafile objects for accessing Nautilus metadata"
-# msgstr "Nautilusメタデータ�関連��る���メタファイルオブジェクト�作�"
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "ディスク�検索"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus �ディスク�らゴミ箱を検索�����。"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "編集"
@@ -4204,7 +4059,7 @@ msgstr "テキスト�貼り付�(_P)"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "�使��コンピュータを表示���"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4219,13 +4074,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Nautilus ファイル・マ�ージャ�ホーム・フォルダを表示���"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "ファイルシステム"
+msgstr "ファイルシステム�閲覧"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "ファイル・マ�ージャを使��ファイルシステムを閲覧���"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4342,95 +4196,102 @@ msgstr "背景"
 msgid "Empty Trash"
 msgstr "ゴミ箱を空��る"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"�れ� %d 個�ウィンドウ�分割�れ��。����実行��も宜�����？"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d 個�ウィンドウを開����？"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "全��ファイルを開��もよ������？"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "�れ�れ %d 個�ウィンドウ�オープン���。"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "\"%s\"を完全�削除��も宜�����？"
+msgstr "\"%s\"を完全�削除��もよ������？"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
-msgstr "�択�� %d 個�アイテムを完全�削除��も宜�����？"
+msgstr "�択�� %d 個�アイテムを完全�削除��もよ������？"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "アイテムを削除�る��完全�失�れ��。"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "削除����？"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "�択��パターン"
+msgstr "パターン��択"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "パターン(_P):"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" を�択����"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
-msgstr "1 ��フォルダを�択����"
+msgstr "1 個�フォルダを�択����"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d ��フォルダを�択����"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
-msgstr "(0 個�アイテムを�む)"
+msgstr " (0 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
-msgstr "(1 個�アイテムを�む)"
+msgstr " (1 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
-msgstr "(%d 個�アイテムを�む)"
+msgstr " (%d 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
-msgstr "(0 個�全��アイテムを�む)"
+msgstr " (0 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
-msgstr "(1 個�全��アイテムを�む)"
+msgstr " (1 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
-msgstr "(%d 個�全��アイテムを�む)"
+msgstr " (全 %d 個�アイテムを�む)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" を�択���� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d 個�アイテムを�択���� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "他� 1 個�アイテムを�択���� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "他� %d 個�アイテムを�択���� (%s)"
@@ -4442,7 +4303,7 @@ msgstr "他� %d 個�アイテムを�択���� (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4451,114 +4312,126 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
-"フォルダ \"%s\" �� Nautilus �処���る以上�数�ファイル��り��。��"
-"���ファイル�表示�れ��ん。"
+"フォルダ \"%s\" �� Nautilus �処���る数を超��ファイル��り��。"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "�����ファイル�表示�れ��ん。"
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "ファイル�多����"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr "\"%s\" をゴミ箱�移動����ん。今��削除����？"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "ファイルをゴミ箱�移動����ん。今��削除����？"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr "�択�� %d 個�アイテムをゴミ箱�移動����ん。今��削除����？"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "ファイル \"%s\" をゴミ箱�移動����ん。"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"�����アイテムをゴミ箱�移動����ん。�れらを今��削除����？"
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"�択�� %d 個�アイテムをゴミ箱�移動����ん。今���れら� %d 個�アイ"
-"テムを削除����？"
+"�����アイテムをゴミ箱�移動����ん。�れらを今��削除����？"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "今��削除����？"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "ゴミ箱�ら \"%s\" を完全�削除��も宜�����？"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "ゴミ箱�ら \"%s\" を完全�削除��もよ������？"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
-msgstr "ゴミ箱�ら�択�� %d 個�アイテムを完全�削除��も宜�����？"
+"trash?"
+msgstr "ゴミ箱�ら�択�� %d 個�アイテムを完全�削除��もよ������？"
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "アイテムを削除�る��完全�失�れ��。"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "ゴミ箱�ら削除����？"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "�択��アイテムを \"%s\" を使��開���"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "他�アプリケーション(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "アプリケーション(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "他�ビューア(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "ビューア(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
-msgstr "指定���作を完了����ん���: %s"
+msgstr "指定��アクションを完了����ん���: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
-msgstr "指定���作を完了����ん���。"
+msgstr "指定��アクションを完了����ん���。"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "�択��アイテムを \"%s\" �実行���"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "テンプレート \"%s\" �らドキュメントを生��る"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"��フォルダ��る実行�能�全��ファイル� [スクリプト] メニュー�表示�れ"
+"��。"
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"��フォルダ��る実行�能�全��ファイル�\n"
-"[スクリプト] メニュー�表示�れ��。\n"
-"メニュー�らスクリプトを�択�る��スクリプト�実行�れ��。"
+"メニュー�らスクリプトを�択�る���択��アイテムを入力値���スクリプト"
+"を実行���。"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "スクリプト����"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4600,183 +4473,180 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: ウィンドウ��在�置�サイズ"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"ファイル�貼り付�\" コマンドを�択�る� \"%s\" を移動���"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"ファイル�貼り付�\" コマンドを�択�る� \"%s\" をコピー���"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "\"ファイル�貼り付�\" コマンドを�択�る� %d 個 �ファイルを移動���"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "\"ファイル�貼り付�\" コマンドを�択�る� %d 個�ファイルをコピー���"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "貼り付�るも��クリップボード���り��ん。"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "マウント・エラー"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "アンマウント・エラー"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "マウント・エラー"
+msgstr "�り出�エラー"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "�り出�(_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "アンマウント(_U)"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "新��ウィンドウ�開�"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "%d 個�新��ウィンドウ�開�"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "フォルダ�閲覧"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "フォルダ�閲覧"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "ゴミ箱を空��る(_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "�択��全��アイテムを完全�削除���"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ゴミ箱�移動�る(_V)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "�択��アイテムをゴミ箱�移動���"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "リンク�作�(_K)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "リンク�作�(_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空��る(_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "ファイル�切り�り(_T)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "ファイル�切り�り(_T)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "ファイル�コピー(_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "ファイル�コピー(_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"��リンク�リンク先�存在�����使用����ん。��箱�移動����？"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "リンク先�存在���ん。��箱�移動����？"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "��リンク�リンク先�存在�����使用����ん。"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"��リンク�リンク先 \"%s\" �存在�����使用����ん。��箱�移動��"
-"��？"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "��リンク�リンク先 \"%s\" �存在�����使用����ん。"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "リンク切れ"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"\"%s\" �実行�能�テキスト・ファイル��。\n"
-"実行����？ �れ�も内容を表示����？"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "\"%s\" を実行����？ �れ�も内容を表示����？"
 
-#: src/file-manager/fm-directory-view.c:5429
-msgid "Run or Display?"
-msgstr "実行 or 表示？"
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "\"%s\" �実行�能�テキストファイル��。"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "表示�る(_D)"
+#: src/file-manager/fm-directory-view.c:5923
+msgid "Run or Display?"
+msgstr "実行�る or 表示�る？"
 
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "端末内�実行�る(_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "表示�る(_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "実行�る(_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "\"%s\" をオープン中"
+msgid "Opening \"%s\"."
+msgstr "\"%s\" を開�����。"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
-msgstr "オープンをキャンセル����?"
+msgstr "キャンセル����？"
 
 #: src/file-manager/fm-error-reporting.c:57
 #, c-format
@@ -4795,29 +4665,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "\"%s\" �内容を表示�る�������ん���。"
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "フォルダ�内容を表示����ん���。"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
-msgstr "フォルダを表示�る際�エラー"
+msgstr "フォルダ表示エラー"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "�� \"%s\" �既���フォルダ内�使�れ����。別���を使��下��。"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "��フォルダ� \"%s\" ��り��ん。��ら�移動���削除�����ょ�？"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\" ���を変更�る���必��権���り��ん。"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4826,80 +4700,96 @@ msgstr ""
 "�� \"%s\" �中� \"/\" 文字��る���切���り��ん。別���を使��下"
 "��。"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "�� \"%s\" �正���り��ん。別���を使��下��。"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "読�込�専用ディスク����� \"%s\" を変更����ん���。"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\" �ら \"%s\" ���を変更�る�������ん���。"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "アイテム���を変更����ん���。"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
-msgstr "���変更中�エラー"
+msgstr "��変更�エラー"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "\"%s\" �グループを変更�る���必��権���り��ん。"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "読�込�専用ディスク��� \"%s\" �グループを変更����ん���。"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "\"%s\" �グループを変更�る�������ん���。"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "グループを変更����ん���。"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
-msgstr "グループ�設定中�エラー"
+msgstr "グループ�設定エラー"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "読�込�専用ディスク��� \"%s\" �所有者を変更����ん���。"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\" �所有者を変更�る�������ん���。"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "所有者を変更����ん���。"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
-msgstr "所有者�設定中�エラー"
+msgstr "所有者�設定エラー"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "読�込�専用ディスク��� \"%s\" �権�を変更����ん���。"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\" �アクセス権を変更�る�������ん���。"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "アクセス権を変更����ん���。"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
-msgstr "アクセス権�設定中�エラー"
+msgstr "アクセス権�設定エラー"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "�� \"%s\" �ら \"%s\" �変更中"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "���変更をキャンセル����？"
 
@@ -4957,129 +4847,131 @@ msgstr "アイコンを元�サイズ�戻�(_Z)"
 msgid "Restore Icon's Original Si_ze"
 msgstr "アイコンを元�サイズ�戻�(_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "%s を指�����"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "ドラッグ＆ドロップ�サ�ート�����ん。"
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
-"ドラッグ＆ドロップ�ローカル�ファイル・システム���サ�ート�れ��。"
+"ドラッグ＆ドロップ�ローカル�ファイル・システム���サ�ート�����。"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "ドラッグ＆ドロップ�エラー"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "使用��ドラッグ�種類�無効��。"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "ファイル�"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "サイズ"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "種類"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "更新日時"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
-"一度�カスタム・アイコンを二�以上作る�������ん�\n"
-"画�を一���カスタム・アイコン�ドラッグ��下��。"
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "画�を一���カスタム・アイコン�ドラッグ��下��。"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
-msgstr "複数�画�"
+msgstr "カスタム・アイコン�生�エラー"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"ドロップ��ファイル�ローカル�も����り��ん。\n"
-"カスタム・アイコン�指定��る��ローカル�画�����。"
+msgid "The file that you dropped is not local."
+msgstr "ドロップ��ファイル�ローカル�も����り��ん。"
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "カスタム・アイコン�指定��る��ローカル�画�����。"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
-msgstr "ローカル画���"
+msgstr "カスタム・アイコン�生�エラー"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"ドロップ��ファイル�画����り��ん。\n"
-"カスタム・アイコン�指定��る��ローカル�画�����。"
+msgid "The file that you dropped is not an image."
+msgstr "ドロップ��ファイル�画����り��ん。"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "画���"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s �プロパティ"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "グループ�変更をキャンセル����？"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "グループ�変更中"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "グループ�変更中��。"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "所有者�変更をキャンセル����？"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "所有者�変更中"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "所有者�変更中��。"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "何も���"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "読�込���"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 個�アイテム�サイズ %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d 個�アイテム��計 %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(�����内容�読���ん)"
 
@@ -5089,192 +4981,188 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "内容:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "基本"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "��(_N):"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "��(_N):"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "種類:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "サイズ:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "場所:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "ボリューム:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
-msgstr "空�領域:"
+msgstr "空�容�:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "リンク先:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME åž‹:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "修正日時:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "アクセス日時:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "カスタム・アイコン��択(_S)..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "カスタム・アイコン�削除(_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "読�込�(_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "書�込�(_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "実行(_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "ユーザ ID をセット�る(_U)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "特別�フラグ:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "グループ ID をセット�る(_U)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Sitcky ビットを立�る(_S)"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "アクセス権"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
-"貴方�所有者���り��ん。������れら�アクセス権を変更����ん。"
+"����所有者���り��ん。������れら�アクセス権を変更����ん。"
+
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "ファイル�所有者(_O):"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "ファイル�所有者:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "ファイル�グループ(_F):"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "ファイル�グループ:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "所有者:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "グループ:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "��他:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "文字形�:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "数値形�:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "�回�変更:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" �アクセス権�確定����ん���。"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "指定��ファイル�アクセス権を決定����ん���。"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"ヘルプを表示�る際�エラー�発生����: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "ヘルプを表示�る際�エラー�発生����。"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
-msgstr "ヘルプを起動����ん���"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "ヘルプを起動����ん"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "プロパティ・ウィンドウ�表示をキャンセル����？"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "プロパティ・ウィンドウ�作�中"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "プロパティ・ウィンドウ�作�中��。"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "アイコン��択"
 
@@ -5292,94 +5180,113 @@ msgid "Search Results"
 msgstr "検索�果"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Medusa 検索サービス�インストール�れ�������利用��れ��ん。"
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Medusa 検索サービス�利用����ん。"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa �インストール�れ����ん。"
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "検索サービス��利用��れ��ん"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "�使��システム�インデックスよりも新��検索を�択����。���検索��"
-"も�果�何も�り��ん。コマンド・ライン�ら root 権��� \"medusa-indexd\" "
-"を実行���新��インデックスを生��る�������。"
+"も�果�何も�り��ん。"
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"コマンド・ライン�ら root 権��� \"medusa-indexd\" を実行���新��イン"
+"デックスを生��る�������。"
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr "新���るアイテム�検索"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
-msgstr "新��アイテム�検索��"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"�使��コンピュータ�作���ファイル�インデックス��択��検索基準�一致"
+"���。"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"全��インデックス・ファイル�指定��検索基準�一致���。検索基準�綴りを"
-"確��る��検索範囲を��る���別�基準を追加��下��。"
+"�択��も��スペル�ェック����検索�果を増や����検索基準を�ら�追"
+"加�る�������。"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
-msgstr "検索中�エラー"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
+msgstr "検索エラー"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"インデックス�存在����壊れ��る����検索システム�インデックスを開�"
-"��ん。コマンド・ライン�ら root 権��� \"medusa-indexd\" を実行���新�"
-"�インデックスを生��る�������。"
+"インデックス�存在����壊れ��る���検索システム�インデックスを開��"
+"�ん。"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "インデックス�読�込�中�エラー"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "ファイル・インデックス�読�込�エラー"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "検索内容�読�込�中�エラー: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "検索内容�読�込�中�エラー�発生����。"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
 "高速検索を利用�る����使��システム�格��れ�ファイル�インデックス�"
-"必�����今��インデックス�アクセス�����ん。インデックスを使���"
-"低速検索を実行���。"
+"必���。"
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
-"内容検索を利用�る����使��システム�格��れ�ファイル内容�インデック"
-"ス�必�����今��インデックス�アクセス�����ん。"
+"内容検索を利用�る����使��システム�格��れ�ファイル�インデックス�"
+"必���。"
+
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"今��インデックス�アクセス�����ん。インデックスを使���低速検索を実"
+"行���。"
+
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "���検索インデックス�アクセス����ん。"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr "高速検索�利用����ん"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr "内容検索�利用����ん"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5393,56 +5300,75 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "高速検索を利用�る����使��システム�格��れ�ファイル�インデックス�"
-"必���。�在インデックス�生�中��。インデックスを使用��検索�����"
-"�����検索��数分��り��。"
+"必���。"
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
-"内容検索を利用�る����使��システム�格��れ�ファイル�インデックス�"
-"必���。�在インデックス�生�中��。生��完了��ら内容検索�利用�能�"
-"�り��。"
+"内容検索を利用�る����使��システム�格��れ�ファイル内容�インデック"
+"ス�必���。�在インデックス�生�中��。"
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"検索インデックスを利用���������検索��数分間��る�も�れ��ん。"
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "インデックス作��完了��ら内容検索を利用����。"
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr "インデックス検索�利用����ん"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 "高速検索を利用�る����使��システム�格��れ�ファイル�インデックス�"
-"必���。インデックス���利用�能���り��ん。コマンド・ライン "
-"\"medusa-indexd\" を root 権���実行�る���インデックス�生���能�"
-"�。インデックス�利用�能��る���検索��数分��り��。"
+"必���。今��利用�能�インデックス��り��ん。"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 "内容検索を利用�る����使��システム�格��れ�ファイル内容�インデック"
-"ス�必���。インデックス���利用�能���り��ん。コマンドライン "
-"\"medusa-indexd\" を root 権���実行�る���インデックス�生���能�"
-"�。インデックス�利用�能��る���内容検索�実行����ん。"
+"ス�必���。今��利用�能�インデックス��り��ん。"
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"コマンド・ライン \"medusa-indexd\" を root 権���実行�る���インデックス"
+"�生���能��。インデックス�利用�能��る���検索��数分��り��。"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"コマンドライン \"medusa-indexd\" を root 権���実行�る���インデックス�"
+"生���能��。インデックス�利用�能��る���内容検索�実行����ん。"
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "�使��コンピュータ���高速検索�有効�������ん。"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5452,11 +5378,11 @@ msgstr ""
 "必���。����システム�管�者�高速検索を無効����る���インデック"
 "スを利用����ん。"
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "高速検索�有効�������ん"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "高速検索�利用��"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "場所"
 
@@ -5465,7 +5391,7 @@ msgstr "場所"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "新��ウィンドウ�表示(_R)"
@@ -5476,7 +5402,7 @@ msgstr "新��ウィンドウ�表示(_R)"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d 個�新��ウィンドウ�表示(_N)"
@@ -5485,15 +5411,15 @@ msgstr "%d 個�新��ウィンドウ�表示(_N)"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"Nautilus �表示�能�件数を越��検索�果��り���。��一致��アイテム�"
-"�����表示�れ��ん。"
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "表示�能�件数を越��検索�果��り���。"
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "��一致��アイテム������表示�れ��ん。"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "検索�果�多����"
 
@@ -5507,12 +5433,12 @@ msgid "Create L_auncher"
 msgstr "ラン�ャ�生�(_L)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "新��ラン�ャを作����"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "ゴミ箱��る全��アイテムを削除���"
 
@@ -5531,7 +5457,7 @@ msgstr "デスクトップ背景�パターンや色を設定���"
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "デフォルト�背景(_D)"
@@ -5553,58 +5479,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "�択��アイテムを表示�る他�ビューアを����"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "ドキュメント�生�(_D)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "フォルダ�生�(_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "��フォルダ�中�空�ファイルを新��作����"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "��フォルダ�中�空�フォルダを新��作����"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "�択���アイテム�シンボリック・リンクを作����"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "複製(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "ゴミ箱�移動����択��アイテムを削除���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "�択��アイテム�複製を作����"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "ラン�ャ�編集"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "ラン�ャ�情報を編集���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "�択��ボリュームをフォーマット���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "メディア�プロパティ(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "�択��ボリュームをアンマウント���"
+msgstr "�択��ボリューム�マウント"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "以��ファイル�切り�り���コピー�指定��ファイルを移動���コピー��"
 "�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5612,129 +5545,136 @@ msgstr ""
 "ファイル�切り�り���ファイル�コピー�指定��ファイルを�択��フォルダ"
 "�移動���コピー���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "テンプレート�インストール�れ����ん"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "アプリケーション�ら開�(_H)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "�択��アイテムをナビゲーション・ウィンドウ�中�開���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "新��ナビゲーション・ウィンドウ�開�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "�択��アイテムを��ウィンドウ�中�開���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "�択��ファイルを \"ファイル�貼り付�\" コマンド�コピー�る準備を行���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "�択��ファイルを \"ファイル�貼り付�\" コマンド�移動�る準備を行���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "�護(_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "�択��ボリュームを�護���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "�択��アイテム���を変更���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "デフォルト表示�リセット(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "並�替��ズーム・レベルを��ビュー�設定�リセット���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 "スクリプト・フォルダ (~/Nautilus/scripts) ��る�スクリプト�実行��管�を"
 "行���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "全��ファイル��択(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "�択��パターン(_P)"
+msgstr "パターン��択(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "��ウィンドウ�中��る全��アイテムを�択���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr ""
 "指定�れ�パターン�一致�る���ウィンドウ�中�全��アイテムを�択���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "�択��ボリューム�メディア・プロパティを表示���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
-msgstr "スクリプト・フォルダ�ジャンプ���"
+msgstr "スクリプト・フォルダ�移動���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "�択��ボリュームをアンマウント���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "��場所�背景をデフォルト�戻���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "�択��アイテム�プロパティを表示���変更���"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "ファイルを空��る(_E)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "フォーマット(_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "アンマウント(_U)"
+msgstr "ボリューム�マウント(_M)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "開�(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "��フォルダを開�(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "ファイル�貼り付�(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "ファイルをフォルダ�貼り付�(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "���変更(_R)..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "スクリプト(_S)"
 
@@ -5819,32 +5759,39 @@ msgstr "手動(_M)"
 msgid "Indexing is %d%% complete."
 msgstr "インデックス�生�: %d%% 完了"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "��ファイル� %s �インデックス化�れ���。"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 "ファイル���内容�一日�一度インデックス化�れる��検索�高速��り��。"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "インデクス生�状�"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "ファイル� %s �インデックス化�れ���"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "��ファイル��在インデックス化�����。"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"ファイル���内容�一日�一度インデックス化�れる��検索�高速��り��。"
-"�在インデックス�生�中��。"
+"一日�一度�ファイル���内容�インデックス化�れる��検索�高速��り�"
+"�。"
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "�使��システム��インデックス��り��ん。"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5853,15 +5800,19 @@ msgstr ""
 "高速検索�有効�場��検索速度を上�る���インデックスを生����。�使�"
 "�システム��高速検索�有効�������インデックス��り��ん。"
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "�使��システム��インデックス��り��ん。"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "ファイル�インデックス��り��ん"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Medusa 検索サービス�利用����ん。"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Medusa �正��設定�れ��る�確�下��。"
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%p %I:%M, %x"
 
@@ -5885,59 +5836,60 @@ msgstr "インデックス生�状��表示(_I)"
 msgid "Show status of indexing used when searching"
 msgstr "検索�使用�るインデックス生��状�を表示���"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "指定��フォルダを生�����ん���"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "指定��フォルダ \"%s\" を生�����ん���。"
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus �指定��フォルダ \"%s\" を生�����ん���。��フォルダを "
-"Nautilus を起動�る��作��る��Nautilus �フォルダを生���るよ���切"
-"�パーミションを設定��下��。"
+"Nautilus を起動�る����フォルダを生��る��Nautilus �フォルダを生��"
+"�るよ���切�パーミションを設定��下��。"
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "指定��フォルダを生�����ん���"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus �必��フォルダを生�����ん���: %s"
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus �指定�れ�次�フォルダを生�����ん���:\n"
-"\n"
-"%s\n"
-"\n"
 "Nautilus を起動�る���れら�フォルダを作��る��Nautilus ��れら�フォ"
 "ルダを作���るよ���切�パーミッションを設定��下��。"
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "��デスクトップ��リンク"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"デスクトップ� \"��デスクトップ��リンク\" ���リンク�生��れ���。"
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"GNOME 2.4 ��デスクトップ�フォルダ�変更�れ���。\"��デスクトップ��"
-"リンク\" ���リンク�デスクトップ上�作��れ��。��中��るファイルを�"
-"好��場所�移動���リンクを削除�る�������。"
+"GNOME 2.4 ��デスクトップ�フォルダ�変更�れ���。��中��るファイルを"
+"�好��場所�移動���リンクを削除�る�������。"
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr "��デスクトップを移動���"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "��デスクトップ�移行"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5949,7 +5901,7 @@ msgstr "��デスクトップを移動���"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5960,7 +5912,7 @@ msgstr ""
 "� Nautilus ��インストールを試��下��。"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6007,12 +5959,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "予期���エラー���� Nautilus ��在利用����ん。"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6020,7 +5972,7 @@ msgstr ""
 "ファイル・マ�ージャ�ビュー・サー�を登録�る際� Bonobo �予期���エラー"
 "�発生���� Nautilus ��在利用����ん。"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6030,7 +5982,7 @@ msgstr ""
 "��在利用����ん。bonobo-activation-server を強制終了� Nautilus を�起動"
 "�る����題�解決�る�も�れ��ん。"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6040,6 +5992,17 @@ msgstr ""
 "Nautilus ��在利用����ん。bonobo-activation-server を強制終了�� "
 "Nautilus を�起動�る����題�解決�る�も�れ��ん。"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"ヘルプを表示�る際�エラー�発生����: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "ブックマーク�定義�れ����ん"
@@ -6073,37 +6036,43 @@ msgstr "オプションを少��"
 msgid "Find Them!"
 msgstr "検索開始�"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "サー��を入力��下��。"
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "自分�中�移動����ん"
+msgid "Please enter a name and try again."
+msgstr "��を入力���試行��下��。"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "サー��接続��"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" �正��場所���り��ん。綴りを確����試行��下��。"
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" �正��場所���り��ん。"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "スペルを確����試行��下��。"
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "�ットワーク・サー�"
+msgstr "サー��接続"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "��(_N):"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "場所(_L):"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "接続(_C)"
+msgstr "接続"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6244,7 +6213,7 @@ msgstr "アイコン内�テキスト表示(_X):"
 
 #: src/nautilus-file-management-properties.glade.h:61
 msgid "Sort _folders before files"
-msgstr "フォルダをファイルより��並�る(_F)"
+msgstr "フォルダをファイルより���置�る(_F)"
 
 #: src/nautilus-file-management-properties.glade.h:62
 msgid "View _new folders using:"
@@ -6301,6 +6270,14 @@ msgstr ""
 "\n"
 "��ドルイドを起動�る���手動���ファイルを削除�る�������。\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "カスタム・アイコンを一度�二�以上作る�������ん。"
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "カスタム・アイコン�指定��る��画�����。"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6311,26 +6288,21 @@ msgstr "%s �ら開�"
 msgid "Open with..."
 msgstr "他�アプリケーション�ら開�..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"CD Burner アプリケーションを起動����ん:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "CD Burner アプリケーションを起動����ん。"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "CD Burner を起動����ん"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
+msgstr "CD Burner �起動��"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "ゴミ箱を空��る(_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "内容を CD �書�込む(_W)"
 
@@ -6338,115 +6310,122 @@ msgstr "内容を CD �書�込む(_W)"
 msgid "Go To:"
 msgstr "移動:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "�れら %d �場所を別々�ウィンドウ�表示����？"
+msgid "Do you want to view %d locations?"
+msgstr "%d 個�場所を表示����？"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "複数�ウィンドウ�表示����？"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "場所を開�"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "簡易自己診断テストセットを実行�る"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "指定��大���ウィンドウを起動�る"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "明示的�指定�れ� URL �ウィンドウ��を起動�る"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "デスクトップを管���� (設定ダイアログ�設定を無視���)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "ブラウザ・ウィンドウを開�"
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Nautilus を強制終了�る"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus を�起動�る"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "ファイル・マ�ージャ"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check オプション�� URI を指定����ん。\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check オプション��他�オプションを指定����ん。\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit オプション�� URI を指定����ん。\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart オプション�� URI を指定����ん。\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry オプション��複数� 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"本当�履歴をクリア��も宜�����？ クリア�る�最��ら作り直�必���り"
-"��。"
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "履歴をクリア��もよ������？"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "実行�る��最��ら作り直�必���り��。"
+
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "本当�訪���場所�一覧をクリア��も宜�����？"
+msgstr "本当�訪���場所�一覧をクリア��もよ������？"
+
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "場所�一覧をクリア�る���れら�完全�消去�れ��。"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "履歴を削除���"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
-msgstr ""
-"場所 \"%s\" �存在���ん。一覧�ら��場所�ブックマークを削除����？"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr "一覧�ら存在���場所をも�ブックマークを削除����？"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "場所 \"%s\" �も�や存在���ん。"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "存在���場所�ブックマーク"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "削除"
 
@@ -6479,14 +6458,13 @@ msgid "Close _All Windows"
 msgstr "全��ウィンドウを閉�る(_A)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "全��ナビゲーション・ウィンドウを閉���"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "サー��接続(_S)..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6501,107 +6479,116 @@ msgid "Forward"
 msgstr "進む"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "テンプレート�フォルダ�移動���"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "次�訪�済��場所�移動���"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "��訪�済��場所�移動���"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "ゴミ箱フォルダ�移動���"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "ホーム"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "ロケーション・�ー(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "�読込�"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "��マシン�ファイルを検索���"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "ステータス�ー(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "�止"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "上�"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "CD ��書�込�"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "ブックマーク�追加(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "戻る(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "ブックマーク(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "履歴�削除(_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "カウンタートップ"
+msgstr "コンピュータ(_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "ブックマーク�編集(_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "進む(_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "ジャンプ(_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "ホーム(_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "場所(_L)..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "サイドフレーム(_S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "テンプレート(_T)"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "ゴミ箱(_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "上�(_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "表示(_V)"
 
@@ -6619,32 +6606,32 @@ msgstr "表示..."
 msgid "File Browser: %s"
 msgstr "ファイル・ブラウザ: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"サイド・パ�ル�����エラー�発生����続行����ん。残念��ら���"
-"パ�ル�発生����分�り��ん。"
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "サイド・パ�ル�����エラー�発生����続行����ん。"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "残念��ら���パ�ル�発生����分�り��ん。"
+
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"%s サイド・パ�ル�エラー�発生����続行����ん。も����象�起り続�"
-"るよ��ら���パ�ルを無効�����下��。"
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s サイド・パ�ル�エラー�発生����続行����ん。"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "も����象�起り続�るよ��ら���パ�ルを無効�����下��。"
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "サイド・パ�ル�起動�失敗"
+msgstr "サイド・パ�ル�起動��"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "サイド・ペイン"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "サイド・ペイン表示を��る"
 
@@ -6678,147 +6665,175 @@ msgstr "新�追加(_A)..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "パターン %s �削除����ん���。"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "パターンを削除�る権���る�確���下��。"
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "パターンを削除����ん���"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "エンブレム %s �削除����ん���。"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "エンブレムを削除�る権���る�確���下��。"
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "エンブレム�削除��"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "新��エンブレム�作�:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "キーワード(_K):"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "画�(_I):"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "新��エンブレム�画�ファイル��択"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "新��色を作�:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "色���(_N):"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "色�値(_V):"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" �正��ファイル����り��ん。"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "正��ファイル��指定�れ����ん。"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
-msgstr "パターンをインストール����ん���"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "�試行��下��。"
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr "パターン�インストール��"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "リセット�れ�画�を置���る�������ん。"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "リセット�削除����特別�画���。"
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "画����り��ん"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "パターン %s �インストール����ん���"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "パターン���追加�る画�ファイル��択"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "色をインストール����ん。"
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "新��色�空白以外���を指定��下��。"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
-msgstr "色をインストール����ん���"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "色�インストール��"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "追加�る色��択"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "画�ファイル '%s' �利用����ん�"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "画�ファイル '%s' �利用����ん。"
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "��ファイル�画����り��ん。"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "カテゴリ��択"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "削除�キャンセル(_A)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "新��パターン�追加(_A)..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "新��色�追加(_A)..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "新��エンブレム�追加(_A)..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "削除�るパターンをクリック��下��"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "削除�る色をクリック��下��"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "削除�るエンブレムをクリック��下��"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "パターン:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "色:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "エンブレム:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "パターン�削除(_R)..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "色�削除(_R)..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "エンブレム�削除(_R)..."
 
@@ -7204,31 +7219,34 @@ msgid "CD _Creator"
 msgstr "CD �作�(_C)"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "全��親フォルダを閉�る(_A)"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "��フォルダ�親フォルダを閉���"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "空� CD フォルダ�移動���"
+msgstr "コンピュータ�移動���"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "CD 作��移動"
+msgstr "CD 作�フォルダ�移動���"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "場所を開�(_L)..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "親フォルダを開�"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "親フォルダを開�"
+msgstr "親フォルダを開���"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "場所(_P)"
 
@@ -7258,109 +7276,123 @@ msgstr "表示�失敗����"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"%s 表示�エラー�発生����続行����ん。他�表示方法を�択�る��別�場"
-"所�移動��下��。"
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s 表示�る際�エラー�発生����続行����ん。"
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "他�表示方法を�択�る��別�場所�移動��下��。"
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "起動�る際�� %s 表示�エラー発生����。"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "��場所���ビューア�表示����ん。"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "内容表示"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "��ファイル���フォルダを表示���"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"\"%s\" を見��る�������ん���。綴りを確����試行��下��。"
+msgid "Couldn't find \"%s\"."
+msgstr "\"%s\" を見��られ��ん���。"
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr "Nautilus �ファイル�種類を�識������ \"%s\"を表示����ん。"
+msgid "Couldn't display \"%s\"."
+msgstr "\"%s\" を表示����ん���。"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr ""
-"Nautilus � \"%s\" を表示�る���ビューア�インストール�れ����ん。"
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "��ファイル�種類を�識����ん。"
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
-"\"%s\" を表示����ん���。Nautilus � %s: �場所を扱��������ん。"
+"Nautilus ���ファイルを表示�る���ビューア�インストール�れ����ん。"
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "\"%s\" を表示����ん���。ログイン�失敗����。"
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus � %s: �場所を扱��������ん。"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "\"%s\" を表示����ん���。アクセス�拒��れ���。"
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "ログイン�失敗����。"
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "アクセス�拒��れ���。"
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "\"%s\" を表示����ん���。ホスト \"%s\" �見��り��ん���。"
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
-"\"%s\" を表示����ん���。ホスト� \"%s\" �見��り��ん���。綴り�"
-"プロクシ�設定�正���確���下��。"
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr "スペル�プロキシ�設定�正���確���下��。"
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
-"\"%s\" を表示����ん���。プロクシ�設定�正���確���下��。"
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "プロキシ�設定�正���確���下��。"
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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 ""
-"Nautilus � SMB マスタ・ブラウザ�接続�������\"%s\" を表示����"
-"ん。\n"
-"�使��ローカル・�ットワーク� SMB サー��起動�れ��る�確���下��。"
+"browser."
+msgstr "\"%s\" を表示����ん���。SMB マスタ・ブラウザ�接続����ん。"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "SMB サー��ローカル・�ットワーク上�動作���る�確���下��。"
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "�在�検索用�インデックス�������検索サービス�起動�れ�������"
-"検索�利用����ん。Medusa 検索サービス�起動を確����インデックス���"
-"場�� medusa-indexd を起動��下��。"
+"検索�利用����ん。"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Medusa 検索サービス�起動���る��を確����インデックス���場�� "
+"medusa-indexd を起動��下��。"
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "検索�利用����ん"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus � \"%s\" を表示����ん。"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "別�ビューアを�択���試行��下��。"
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "場所を表示����ん"
 
@@ -7372,7 +7404,7 @@ msgstr "��ブックマーク�指定�れ��る場所�移動���
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7380,7 +7412,7 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Akira TAGOH <tagoh@gnome.gr.jp>\n"
@@ -7391,7 +7423,7 @@ msgstr ""
 "KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
 "Takeshi AIHANA <aihana@gnome.gr.jp>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7407,39 +7439,40 @@ msgstr "数ページ��戻り��"
 msgid "Go forward a number of pages"
 msgstr "数ページ進���"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "\"%s\" ���場所を表示���"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "レッド�ット・�ットワーク"
+msgstr "�ットワーク"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "ドット"
+msgstr "フォント"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "テーマ"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "CD �作�(_C)"
+msgstr "CD �作�"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "アプリケーションID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ウィンドウ�アプリケーション ID ��。"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "アプリケーション"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "��ウィンドウ�関連��られ� NautilusApplication ��。"
 
@@ -7474,103 +7507,3 @@ msgstr "�ットワーク・サー�"
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Nautilus ��使���ットワーク�サー�を表示���"
-
-#~ msgid "Unknown"
-#~ msgstr "�明"
-
-#~ msgid "Floppy"
-#~ msgstr "フロッピー"
-
-#~ msgid "CD-ROM"
-#~ msgstr "CD-ROM"
-
-#~ msgid "Zip Drive"
-#~ msgstr "Zip ドライブ"
-
-#~ msgid "Audio CD"
-#~ msgstr "オーディオ CD"
-
-#~ msgid "Root Volume"
-#~ msgstr "ルート・ボリューム"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. There is probably no "
-#~ "floppy in the drive."
-#~ msgstr ""
-#~ "Nautilus �フロッピー・ディスクをマウント����ん���。��ら�ディス"
-#~ "ク�ドライブ�入�����ん。"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the volume. There is probably no media in "
-#~ "the device."
-#~ msgstr ""
-#~ "Nautilus �ボリュームをマウント����ん���。��ら�メディア�ドライ"
-#~ "ブ�入�����ん。"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
-#~ "a format that cannot be mounted."
-#~ msgstr ""
-#~ "Nautilus �フロッピー・ディスクをマウント����ん���。��ら�マウン"
-#~ "ト����フォーマット��。"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the selected volume. The volume is probably "
-#~ "in a format that cannot be mounted."
-#~ msgstr ""
-#~ "Nautilus ��択��ボリュームをマウント����ん���。��ら�マウント"
-#~ "����フォーマット��。"
-
-#~ msgid "Nautilus was unable to mount the selected floppy drive."
-#~ msgstr "Nautilus ��択��フロッピー・ディスクをマウント����ん���。"
-
-#~ msgid "Nautilus was unable to mount the selected volume."
-#~ msgstr "Nautilus ��択��ボリュームをマウント����ん���。"
-
-#~ msgid "Nautilus was unable to unmount the selected volume."
-#~ msgstr "Nautilus ��択��ボリュームをアンマウント����ん���。"
-
-#~ msgid "ISO 9660 Volume"
-#~ msgstr "ISO 9660 ボリューム"
-
-#~ msgid "Error executing utility program '%s': %s"
-#~ msgstr "ユーティリティ・プログラム '%s' �実行中�エラー�発生����: %s"
-
-#~ msgid "Dis_ks"
-#~ msgstr "ディスク(_K)"
-
-#~ msgid "Mount or unmount disks"
-#~ msgstr "ディスクをマウント��りアンマウント���"
-
-#~ msgid "Open _in This Window"
-#~ msgstr "��ウィンドウ�開�(_I)"
-
-#~ msgid "_Open activated item in a new window"
-#~ msgstr "有効���アイテムを新��ウィンドウ�中�開�(_O)"
-
-#~ msgid "Change the visibility of this window's toolbar"
-#~ msgstr "ツール�ー�表示/�表示を切り替���"
-
-#~ msgid "Go to the Start Here folder"
-#~ msgstr "\"���らスタート\" フォルダ�移動���"
-
-#~ msgid "Open New _Window"
-#~ msgstr "新��ウィンドウを開�(_W)"
-
-#~ msgid "Open another Nautilus window for the displayed location"
-#~ msgstr "��場所を表示�る Nautilus ウィンドウをも�一�開���"
-
-#~ msgid "_Find"
-#~ msgstr "検索(_F)"
-
-#~ msgid "_Start Here"
-#~ msgstr "���らスタート(_S)"
-
-#~ msgid "_Toolbar"
-#~ msgstr "ツール�ー(_T)"
-
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "場所 \"%s\" �も�や存在���ん"
-
-#~ msgid "Go to Nonexistent Location"
-#~ msgstr "存在���場所�ジャンプ���"
diff --git a/po/ko.po b/po/ko.po
index 5afd64c9c..1cee241e6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,10 +2,10 @@
 # Young-Ho, Cha <ganadist@chollian.net>, 2000, 2001, 2002
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus 2.3.8\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-08-24 06:54+0900\n"
-"Last-Translator: Young-Ho, Cha <ganadist at mizi.com>\n"
+"Project-Id-Version: nautilus 2.5.2\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-11-26 13:59+0900\n"
+"Last-Translator: Young-Ho Cha <ganadist at mizi.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +37,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() 실패."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "꼬리표"
 
@@ -51,48 +51,60 @@ msgid "Nautilus Emblem view"
 msgstr "노틸러스 꼬리표 보기"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "꼬리표를 지울 수 없습니다"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "'%s'�름� 가진 꼬리표를 지울 수 없습니다. 사용�가 �한것� 아닌 것� 지울 "
 "수 없습니다."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "꼬리표를 지울 수 없습니다"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "꼬리표� �름� 바꿀 수 없습니다"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "'%s'�름� 가진 꼬리표� �름� 바꿀 수 없습니다. 사용�가 �한것� 아닌 것"
 "� �름� 바꿀 수 없습니다."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "꼬리표� �름� 바꿀 수 없습니다"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "꼬리표 �름 바꾸기"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "꼬리표� 새 �름� 넣어주십시오:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "�름 바꾸기"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "새 꼬리표 �하기..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -100,7 +112,7 @@ msgstr ""
 "��� 꼬리표� 알맞� �름� 넣어주십시오. � �름� 다른 곳�서 꼬리표를 구"
 "별할 때 쓰입니다."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -108,136 +120,61 @@ msgstr ""
 "꼬리표� 알맞� �름� 넣어주십시오. � �름� 다른 곳�서 꼬리표를 구별할 "
 "때 쓰입니다."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "몇몇 파�� 꼬리표로 �할 수 없습니다. 올바른 그림파�� 아닌 것 같습니다."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "파� '%s'(�)가  올바른 그림파�� 아닌것 같습니다."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "꼬리표를 �할 수 없습니다"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "파�� 꼬리표를 �할 수 없습니다. 올바른 그림파�� 아닌 것 같습니다."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "�어 놓� �스트가 올바른 파�위치가 아닌것 같습니다."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "꼬리표를 �할 수 없습니다"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "파� '%s'(�)가  올바른 그림파�� 아닌것 같습니다."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "�어 놓� 파�� 올바른 그림파�� 아닌것 같습니다."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "지우기"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "하드웨어 보기용 팩토리"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "하드웨어"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "하드웨어 Viewer"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "하드웨어 보기"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "하드웨어로 보기"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "하드웨어 보기"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "하드웨어 보기를 위한 아�콘 �름"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "하드웨어 정보 요약"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache �기"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB 램"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB 램"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "%d �, %d 시간, %d 분 �안 가��고 있습니다"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "하드웨어 대략보기"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "�곳� CPU 페�지를 배치합니다."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "�곳� RAM 페�지를 배치합니다."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "�곳� IDE 페�지를 배치합니다."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "방문기�"
@@ -252,7 +189,7 @@ msgstr "노틸러스� 방문기� 가장�리 창"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:1
 msgid "Image"
-msgstr "그림:"
+msgstr "그림"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:2
 msgid "Image Properties content view component"
@@ -263,51 +200,48 @@ msgid "Nautilus Image Properties view"
 msgstr "노틸러스 그림 기본 설정 보기"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "카메�"
+msgstr "카메� �표"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "카메�"
+msgstr "카메� 모�"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "�� 날짜"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "노출 시간"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "프로그램"
+msgstr "노출 프로그램"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "조리개 값"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "측광 방�"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "플래시 켜�"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "초� 거리"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "셔터 ��"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO ê°’"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -903,6 +837,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "하드웨어"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "국제화"
@@ -1102,9 +1040,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "파�� 열 때다 새 창� 엽니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "바탕화면� 홈 아�콘� 보입니다"
+msgstr "바탕화면� 컴퓨터 아�콘� 보입니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1186,30 +1123,18 @@ msgid "Desktop trash icon name"
 msgstr "바탕화면 휴지통 아�콘 �름"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"� �기를 넘어가는 �기� 디렉토리는 � �기� 맞게 잘려질 것입니다. � 설정"
-"� 목��, �기가 아주 � 디렉토리를 열다가 힙� 모� 사용해 버려서 노틸러스"
-"가 죽어 버리는 �� 방지하기 위한 것입니다. �수 값� 한계가 없�� �미합니"
-"다. � 값� 정확한 값� 아니� 근사값입니다 -- 디렉토리를 청� 단위로 �기 때"
-"문입니다."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "파� 기본 설정 대화���서 '특별' 플래그 사용"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "기본 디렉토리 바탕� 파��름. background_set� 참� 경우�만 사용�니다."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1217,6 +1142,20 @@ msgstr ""
 "기본 가장�리 창 바탕� 파��름. side_pane_background_set� 참� 경우�만 사"
 "용�니다."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"� �기를 넘어가는 �기� 디렉토리는 � �기� 맞게 잘려질 것입니다. � 설정"
+"� 목��, �기가 아주 � 디렉토리를 열다가 힙� 모� 사용해 버려서 노틸러스"
+"가 죽어 버리는 �� 방지하기 위한 것입니다. �수 값� 한계가 없�� �미합니"
+"다. � 값� 정확한 값� 아니� 근사값입니다 -- 디렉토리를 청� 단위로 �기 때"
+"문입니다."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "책갈피 메뉴�서 기본 책갈피를 �춥니다"
@@ -1226,9 +1165,10 @@ msgid "Home icon visible on desktop"
 msgstr "바탕화면� 홈 아�콘� 보입니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "참으로 설정하면, �� 가장�리 창�서 디렉토리만 보여�니다. 아니면, 디렉토리"
 "와 파�� 모� 보여�니다."
@@ -1259,9 +1199,10 @@ msgstr ""
 "� 편집할 수 있습니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "참으로 설정하면, 노틸러스� 아�콘 뷰와 목� 뷰�서 디렉토리를 파�보다 먼저 "
 "보여 �니다."
@@ -1301,8 +1242,9 @@ msgstr ""
 "참으로 설정하면, 노틸러스� 책갈피 메뉴�서 사용�� 책갈피를 보여�니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "참으로 설정하면, 노틸러스�서 사용�� 홈 디렉토리를 바탕화면으로 사용합니"
@@ -1318,9 +1260,10 @@ msgstr ""
 "(~)로 �나는 파�� 백업 파�로 취급합니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "참으로 설정하면, 파� 관리��서 숨겨진 파�들� 보입니다. 숨겨진 파�� �으"
 "로 시작하는 파��거나 디렉토리� .hidden 파� 안� 목�� 들어 있습니다."
@@ -1334,15 +1277,15 @@ msgstr ""
 "� 로그�할 때� 노틸러스가 시작합니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr "참으로 설정하면, 휴지통 아�콘� �스�탑� 만듭니다."
+msgstr "참으로 설정하면, 컴퓨터 아�콘� �스�탑� 만듭니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "참으로 설정하면, 홈 디렉토리 아�콘� �스�탑� 만듭니다."
 
@@ -1373,7 +1316,8 @@ msgstr ""
 "기 순서대로 정렬하면 오름차 순� 아니� 내림차 순으로 정렬합니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "참�면, 새 창�서 아�콘� 기본�으로 빽빽하게 배치�니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1400,7 +1344,8 @@ msgid "List of possible captions on icons"
 msgstr "아�콘� 표시가능 캡션 목�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "디렉토리 하나�서 처리할 최대 파� 개수"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1420,11 +1365,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "노틸러스가 바탕화면 그리기를 담당합니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "노틸러스�서 사용�� 홈 디렉토리를 바탕화면으로 사용합니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "트리 가장�리 창� 디렉토리만 보여�니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1444,7 +1391,8 @@ msgid "Reverse sort order in new windows"
 msgstr "새 창�서 정렬 순서 거꾸로"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "창�서 ��를 먼저 보여�니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1480,10 +1428,11 @@ msgstr ""
 "\"�면 사운드 미리 듣기를 하지 않습니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1493,12 +1442,13 @@ msgstr ""
 "면 미리 보기를 하지 않습니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "�미지 파�� �네�로 보여줄 때 �� 트레�드오프. \"always\"로 설정�면 파"
 "�� �격 서버� 있� 경우�� �네�로 만들어 보여�니다. \"local_only\"는 "
@@ -1506,10 +1456,11 @@ msgstr ""
 "�콘� 사용합니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "디렉토리 안� 항목 개수를 보여줄 때 �� 트레�드오프. \"always\"로 설정�면 "
@@ -1518,17 +1469,19 @@ msgstr ""
 "를 세어 보지 않습니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "아�콘 뷰�서 � 항목들� 기본 정렬 순서. 가능한 값� \"name\", \"size\", "
 "\"type\", \"modification_date\", \"emblems\"입니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "목� 뷰�서 � 항목들� 기본 정렬 순서. 가능한 값� \"name\", \"size\", "
 "\"type\", \"modification_date\"입니다."
@@ -1571,7 +1524,8 @@ msgid "Use manual layout in new windows"
 msgstr "새 창�서 수� 배치를 �니다"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "새 창�서 빽빽한 배치 사용"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1599,7 +1553,8 @@ msgstr ""
 "�니다.  가능한 값� \"list_view\"와 \"icon_view\"입니다."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "언제 디렉토리 안� 항목� 개수를 보여줄 지"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1611,7 +1566,8 @@ msgid "When to show thumbnails of image files"
 msgstr "그림 파�� �네�� 보여줄 때"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "사용� 지정 디렉토리 바탕� 설정할 지 여부."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1768,67 +1724,81 @@ msgstr "다시 초기화"
 msgid "on the desktop"
 msgstr "바탕화면"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "볼륨� 지울 수 없습니다"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "볼륨� 지울 수 없습니다"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "휴지통"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "여기로 옮기기(_M)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "여기로 복사(_C)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "여기� 따�가기 만들기(_L)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "바탕그림으로 설정(_B)"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "취소"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "모든 ��� 바탕그림으로 설정(_A)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "� ��� 바탕그림으로 설정(_T)"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "꼬리표� 사용� 키워드를 지정하여야 합니다."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "꼬리표를 설치할 수 없습니다"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "꼬리표 키워드는 문�와 공백, 숫�만 �함할 수 있습니다."
@@ -1837,20 +1807,26 @@ msgstr "꼬리표 키워드는 문ìž�와 공백, 숫ìž�만 í�¬í•¨í•  수 있습ë
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "\"%s\"(�)�는 �름� �미 쓰�고 있는 꼬리표�름 입니다. 다른 �름� 사용하"
 "십시오."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "꼬리표를 설치할 수 없습니다"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "사용� 꼬리표를 저장할 수 없습니다."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "사용� 꼬리표 �름� 저장할 수 없습니다."
 
@@ -1869,22 +1845,28 @@ msgstr "발신:"
 msgid "To:"
 msgstr "수신:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "옮기는 중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "옮기는 중 오류.\n"
 "\n"
 "�기 전용디스��기 때문� \"%s\"�(를) 옮길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "지우는 중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1893,22 +1875,17 @@ msgstr ""
 "부모 ��를 수정할 수 있는 허가권� 기�고 있지 않기 때문� \"%s\"�(를) 옮"
 "길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "옮기는 중 오류.\n"
 "\n"
 "�기 전용디스��기 때문� \"%s\"�(를) 옮길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1917,12 +1894,15 @@ msgstr ""
 "부모 ��나 그 �신� 수정할 수 있는 허가권� 기�고 있지 않기 때문� \"%s"
 "\"�(를) 옮길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "옮기는 중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "옮기는 중 오류.\n"
@@ -1930,12 +1910,10 @@ msgstr ""
 "옮길 곳� 파��나 파�� 부모 ��� �함�지 않기 때문� \"%s\"�(를)옮길 "
 "수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "옮기는 중 오류.\n"
@@ -1943,296 +1921,245 @@ msgstr ""
 "부모 ��를 수정할 수 있는 허가권� 가지고 있지 않기 때문� \"%s\"�(를) 휴지"
 "통으로 옮길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "복사중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "복사중 오류.\n"
 "\n"
 "�� 수 있는 허가권� 가지고 있지 않기 때문� \"%s\"�(를) 복사할 수 없습니"
 "다."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"�(를) 복사하는 중 오류.\n"
-"\n"
-"목표� 남� 공간� 없습니다."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "복사중 오류"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "\"%s\"�(를) 옮기는 �안 오류.\n"
 "\n"
 "목표� 남� 공간� 없습니다."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\"�(를) 연결하는�안 오류.\n"
-"\n"
-"목표� 남� 공간� 없습니다."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "옮기는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "연결하는 중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "\"%s\"�(를) 복사하는 중 오류.\n"
 "\n"
 "목표� 쓸 수 있는 허가권� 가지고 있지 않습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "항목�  \"%s\"(으)로 복사하는 중 오류.\n"
 "\n"
 "목표디스�는 �기전용 입니다."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"항목들� \"%s\"(으)로 옮기는 중 오류.\n"
-"\n"
-"� ��� 쓸 수 있는 허가권� 가지고 있지 않습니다."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"항목들� \"%s\"(으)로 옮기는 중 오류.\n"
-"\n"
-"목표디스�가 �기 전용입니다."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\"� 연결� 만드는 중 오류.\n"
-"\n"
-"� ��� 쓸 수 있는 허가권� 가지고 있지 않습니다."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "옮기는 중 오류"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\"� 연결� 만드는�안 오류.\n"
-"\n"
-"목표디스�가 �기 전용입니다."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%2$s\"�(를) 복사하는 중 \"%1$s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "연결하는 중 오류"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "복사중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"\"%2$s\"�(를) 옮기는 중 \"%1$s\"오류.\n"
+"옮기는 중 \"%s\"오류.\n"
 "\n"
 "계� 진행 하겠습니까?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%2$s\"� 연결� 만드는 중 \"%1$s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "옮기는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"\"%2$s\"�(를) 지우는 중 \"%1$s\"오류.\n"
+"\"%2$s\"� 연결� 만드는 중 \"%1$s\"오류.\n"
 "\n"
 "계� 진행 하겠습니까?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"복사하는 중 \"%s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "지우는 중 오류"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"옮기는 중 \"%s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "복사중 오류"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"연결하는 �안 \"%s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "옮기는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"지우는 중 \"%s\"오류.\n"
-"\n"
-"계� 진행 하겠습니까?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "연결하는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "지우는 중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "복사중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "옮기는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "연결하는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "지우는 중 오류"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "건너뜀"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "재시�"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "지정� 행�� 완료하지 못함."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\"�(를) 새로운 위치로 옮길 수 없습니다, 그 �름� �미 지우거나 바꿀 수 "
 "없는 특수한 항목� 쓰�고 있습니다.\n"
 "\n"
 "\"%s\"�(를) 옮기고 싶다면 �름� 바꾸고 다시 하여 보십시오."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "지정� 행�� 완료하지 못함."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\"�(를) 새로운 위치로 복사할 수 없습니다, 그 �름� �미 지우거나 바꿀 "
 "수 없는 특수한 항목� 쓰�고 있습니다.\n"
 "\n"
 "\"%s\"�(를) 복사하고 싶다면 �름� 바꾸고 다시 시�하십시오."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "파�� 바꿀 수 없�."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "\"%s\" 파�� �미 존재합니다. \n"
 "\n"
 "파�� 바꾸시겠습니까?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "복사 하는 중 충�"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "바꾸기"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "모� 바꾸기"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s(으)로 연결"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s(으)로 다른 연결"
@@ -2241,25 +2168,25 @@ msgstr "%s(으)로 다른 연결"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%2$s(으)로 %1$d번째 연결"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s(으)로 %1$d번째 연결"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s(으)로 %1$d번째 연결"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s(으)로 %1$d번째 연결"
@@ -2269,561 +2196,599 @@ 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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (사본)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (� 다른 사본)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "번째 사본)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "번째 사본)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "번째 사본)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "번째 사본)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (사본)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (� 다른 사본)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d번째 사본)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d번째 사본)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d번째 사본)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "모르는 GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
-msgstr "파�� 휴지통으로 옮기는 중"
+msgstr "파�� 휴지통으로 보내는 중"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "파� 버림:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "옮길 중"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
-msgstr "휴지통으로 옮길 준비 중"
+msgstr "휴지통으로 보낼 준비 중"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "파� 옮기는 중"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "파� 옮겨졌�:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "옮길 준비중"
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "옮김 완료"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "파� 연결 작성중"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "파� 연결�:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "연결하는 중"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "연결할 준비 중"
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "연결� 만들 완료"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "파� 복사중"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "파� 복사�:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "복사중"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "복사 준비중"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "선�한 항목� 휴지통으로 복사할 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "휴지통으로 복사할 수 없습니다."
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "� 휴지통 ��를 옮길 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "� 휴지통 ��를 복사할 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "휴지통� 위치를 바꿀 수 없습니다"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "휴지통� 복사할 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "��를 그 �신�게 옮길수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "��를 그 �신�게 복사할 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "� ��안� 새로운 빈 ��를 만듭니다"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�신으로 옮길 수 없습니다"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�신으로 복사할 수 없습니다"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "파�� 그 �신�게 복사할 수 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�신으로 복사할 수 없습니다"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "새 ��를 만드는중 오류.\n"
 "\n"
 "목표� 쓰기 허가권� 가지고 있지 않습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "새 ��를 만드는중 오류.\n"
 "\n"
 "목표� 남� 공간� 없습니다."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "새 ��를 만드는� \"%s\" 오류."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "새 ��를 만드는중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "새 ��를 만드는중 오류"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "�름없는 ��"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "새 ��를 만드는� \"%s\" 오류."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "새 ��를 만드는중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "새 ��를 만드는중 오류"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 파�"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "파� 지우는중"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "파� 지워�:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "지우는중"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "파�� 지울 준비중"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "휴지통 비우는중"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "휴지통 비우기 준비중"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "휴지통� 있는 모든 항목� 완전히 지우시겠습니까?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "휴지통� 비우면 항목들� 완전히 지워지게 �니다."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "비우기(_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (사본).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (� 다른 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (� 다른 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (� 다른 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (� 다른 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (세번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123번째 사본).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124번째 사본)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124번째 사본).txt"
 
@@ -2842,64 +2807,64 @@ msgstr "foo (124번째 사본).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "오늘 00:00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "오늘 %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "오늘 00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "오늘 %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "오늘, 00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "오늘, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "오늘"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "어제 00:00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "어제 %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "어제 00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "어제 %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "어제, 00:00 오후"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "어제, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "어제"
 
@@ -2908,133 +2873,133 @@ msgstr "어제"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000 구월 00 수요� 오후 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Y %B %-d %A %p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000 10 00 월 오후 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y %b %-d %a  %p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000 10 00 월 오후 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %-d %a %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 10 00 오후 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %-d %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 10 00, 오후 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y %b %-d, %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 오후 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%m/%-d, %p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 항목"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 ��"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 파�"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 항목"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 ��"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 파�"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u 항목"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u ��"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u 파�"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? 항목"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? 바�트"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "알 수 없는 형�"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "알 수 없�"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "프로그램"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3043,7 +3008,7 @@ msgstr ""
 "\"x-directory/normal\"� 대한 설명� 찾� 수 없습니다. �것� gnome-vfs.keys "
 "파�� 잘못� 위치� 있거나 다른 �유로 찾� 수 없다는것� �미합니다."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3052,11 +3017,11 @@ msgstr ""
 "mime 형� \"%s\"(파�� \"%s\")� 대한 설명� 찾� 수 없습니다, gnome-vfs 메"
 "�� 리스트로 알려주십시오."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "ì—°ê²°"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "연결 (깨어�)"
 
@@ -3177,11 +3142,13 @@ msgid "Search for files by file name and file properties"
 msgstr "파�명과 등� 정보로 파� 찾기"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "아�콘 보기"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "목� 보기"
@@ -3325,146 +3292,150 @@ msgstr "%s� ��"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "카운터탑"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "파� 아�콘"
+msgstr "컴퓨터"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "고칠 수 있는 �스트"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "고칠 수 있는 �벨"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "�할 �스트"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "� 많� �스트"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "선�한 것 강조"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "선�한 것� 강조를 합니다"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "키보드 초�� 강조"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "키보드 초�� 강조를 합니다"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "놓기� 강조"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "�어서 놓기� 강조를 합니다"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "선�한 �역"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "글� 테�리"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "선��지 않� 글� 주위� 테�리를 칩니다"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "선� �� 색�"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "선� ��� 색�"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "선� �� 투명�"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "선� ��� 투명�"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "강조 투명�"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "선�한 아�콘� 강조 투명�"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "�� 정보 글씨색"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "어�운 바탕� 어울리는 정보 글씨색"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "어�운 정보 글씨색"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "�� 바탕� 어울리는 정보 글씨색"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "� ��는 �� 배치를 �니다. 수� 배치로 바꾸고 옮긴 항목� 그대로 �고 싶습"
 "니까? "
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "� ��는 �� 배치를 �니다. 수� 배치로 바꾸고 옮긴 항목� 그대로 �고 싶습"
 "니까? "
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "수� 배치로 바꾸겠습니까?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "바꾸기"
 
@@ -3572,72 +3543,72 @@ msgstr "\"%s\" 항목� 기본값"
 msgid "Is the default for all \"%s\" items."
 msgstr "\"%s\" 항목� 기본값."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\" 수정"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" 항목� 위한 메뉴� �함"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" 항목� 기본 프로그램으로 사용"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "\"%s\" 용으로만 메뉴� �함"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "\"%s\"만 기본설정으로 씀"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" 항목� 메뉴로 �함하지 않�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "�름"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "�태"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "선�(_H)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "완료"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "고치기(_M)..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "파� 형�과 프로그램"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "가기(_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3645,48 +3616,48 @@ msgstr ""
 "파� 형�과 프로그램 대화 ���서 형�� 따� 제공�는 프로그램� 설정할 수 "
 "있습니다. "
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "다른 프로그램으로 열기"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\"�(를) 열 �용 프로그램� 선�합니다:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "다른 보기 프로그램으로 열기"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\"�(를) 보기위한 프로그램 선�:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\"� 대한 보기 프로그램� 없습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "쓸 수 있는 보기프로그램� 없습니다"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\"� 연결� �용 프로그램� 없습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "연결� �용 프로그램� 없습니다"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\"� 연결� 액션� 없습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "연결� 액션� 없습니다"
 
@@ -3694,11 +3665,9 @@ msgstr "연결� 액션� 없습니다"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3707,42 +3676,41 @@ msgstr ""
 "그놈�서 파� 형�과 �용 프로그램� 연결��� 설정할 수 있습니다. 지금 � "
 "파� 형�� �용 프로그램� 연결하시겠습니까?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "�용프로그램 연결"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\"� 연결� 뷰어가 잘못�었습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "연결� 뷰어가 잘못�었습니다"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\"� 연결� �용 프로그램� 잘못�었습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "연결� �용 프로그램� 잘못�었습니다"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\"� 연결� 액션� 잘못�었습니다."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "연결� 액션� 잘못�었습니다"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3752,106 +3720,147 @@ msgstr ""
 "그놈 �스�탑�서 � 파� 형�과 �용 프로그램�나 뷰어를 연결하�� 설정할 "
 "수 있습니다. 지금 � 파� 형�� �용 프로그램�나 뷰어를 연결하시겠습니까?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "ì•¡ì…˜ ì—°ê²°"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\"�(가) \"%s\"�(를) 열 수 없습니다. \"%s\"�(가) \"%s\"위치� 있는 파�"
+"� 접근할 수 없습니다. 다른 �용프로그램� 선�하시겠습니까?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\"�(가) \"%s\"�(를) 열 수 없습니다. \"%s\"�(가) \"%s\"위치� 있는 파�"
 "� 접근할 수 없습니다. 다른 �용프로그램� 선�하시겠습니까?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "기본 액션�서 \"%s\"�(를) 열 수 없습니다. \"%s\"위치� 있는 파�� 접근할 "
 "수 없습니다. 다른 액션� 선�하시겠습니까?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "위치를 열 수 없습니다"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\"�(가) \"%s\"�(를) 열 수 없습니다. \"%s\"�(가) \"%s\"위치� 있는 파�"
+"� 접근할 수 없습니다. 다른 �용프로그램� 선�하시겠습니까?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\"�(가) \"%s\"�(를) 열 수 없습니다. \"%s\"�(가) \"%s\"위치� 있는 파�"
 "� 접근할 수 없습니다. � 파�� 볼 수 있는 다른 �용프로그램� 없습니다. 여"
 "러분� 컴퓨터로 파�� 복사하면, 열 수 있� 수� 있습니다."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "기본 액션�서 \"%s\"�(를) 열 수 없습니다. \"%s\"위치� 있는 파�� 접근할 "
-"수 없습니다. � 파�� 볼 수 있는 다른 액션� 없습니다. 여러분� 컴퓨터로 파"
-"�� 복사하면, 열 수 있� 수� 있습니다."
+"수 없습니다. 다른 액션� 선�하시겠습니까?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\"�(가) \"%s\"�(를) 열 수 없습니다. \"%s\"�(가) \"%s\"위치� 있는 파�"
+"� 접근할 수 없습니다. � 파�� 볼 수 있는 다른 �용프로그램� 없습니다. 여"
+"러분� 컴퓨터로 파�� 복사하면, 열 수 있� 수� 있습니다."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "\"%s\"�(를) 여는 중"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "보안문제 때문� �격사�트�서 명령� 실행할 수 없습니다"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "�격 파� %s 실행할 수 없�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "�용 프로그램� 시작하는 � 오류가 발�했습니다.\n"
 "\n"
 "�세히: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "�용 프로그램 시작 오류"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "�어서 놓기는 로컬 파�시스템�서만 지��니다."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "�어서 놓기는 로컬 파�시스템�서만 지��니다.\n"
 "\n"
 "로컬 파�� 아닌 파�� 로컬 ��� 복사한 후 다시 �어다 놓습니다."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "�어서 놓기는 로컬 파�시스템�서만 지��니다."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4105,14 +4114,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "항목 �름� \"medusa\"가 �함� 그리고 �� 임"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "디스� 찾기"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "노틸러스가 휴지통 ��를 찾는 중입니다."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "편집"
@@ -4181,7 +4182,7 @@ msgstr "글� 붙�기(_P)"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "컴퓨터� 저장장치를 봅니다"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4196,13 +4197,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "노틸러스 파� 관리�로 내 �� 보기"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "파�시스템"
+msgstr "파�시스템 찾아보기"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "파� 관리�로 파�시스템� 찾아봅니다"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4310,96 +4310,104 @@ msgstr "바탕"
 msgid "Empty Trash"
 msgstr "휴지통 비우기"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "�것� %d개� 나뉘어진 창�서 열릴것입니다. 정�로 �것� 열겠습니까?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d개� 창� 열기"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "정�로 \"%s\"�(를) 완전히 지우시겠습니까?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "�것� %d개� 나뉘어진 창�서 열릴것입니다. 정�로 �것� 열겠습니까?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "정�로 \"%s\"�(를) 완전히 지우시겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "정�로 선�한 %d 항목� 완전히 지우시겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "휴지통� 비우면 항목들� 완전히 지워지게 �니다."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "지울까요?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "분류 선�:"
+msgstr "파��름 형태 선�"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "무늬(_P)"
+msgstr "파��름 형태(_P):"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" 선��"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 �� 선��"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d �� 선��"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (1 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (모� 0 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (모� 1 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (모� %d 항목 �함)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" 선�� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d 항목 선�� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 다른 항목 선�� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d 다른 항목 선�� (%s)"
@@ -4411,7 +4419,7 @@ msgstr "%d 다른 항목 선�� (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4420,114 +4428,131 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "�� \"%s\"�(는) 노틸러스가 처리할 수 있는것보다 �많� 파�� �함하고 있습"
 "니다. 몇 파�들� 보여주지 않�수 있습니다."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "파�� 너무 많�"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr "\"%s\"�(는) 휴지통으로 옮길 수 없습니다. 지금 바로 지워버릴까요?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "\"%s\"�(는) 휴지통으로 보낼 수 없습니다. 지금 바로 지워버릴까요?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d개� 선�� 항목� 휴지통으로 옮길 수 없습니다. 지금 바로 지워버릴까요?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\"�(는) 휴지통으로 보낼 수 없습니다. 지금 바로 지워버릴까요?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d개� 선�� 항목� 휴지통으로 옮길 수 없습니다. 지금 바로 그 %d개� 항목� "
-"지워버릴까요?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\"�(는) 휴지통으로 보낼 수 없습니다. 지금 바로 지워버릴까요?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "바로 지워버릴까요?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "휴지통�서 \"%s\"�(를) 완전히 지우시겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "휴지통�서 %d� 선�한 항목� 완전히 지우시겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+#, fuzzy
+msgid "If you delete an item, it will be permanently lost."
+msgstr "휴지통� 비우면 항목들� 완전히 지워지게 �니다."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "휴지통�서 지우겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "선�한 항목� 열기 위해 \"%s\"�(를) �니다"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "다른 프로그램(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "�용프로그램(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "다른 보기 프로그램(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "보기 프로그램(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "지정� 행�� 완료하지 못함: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "지정� 행�� 완료하지 못함."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "선�한 항목� 대해 \"%s\" 실행"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"� ��� 모든 실행 파�� 혼잣� 메뉴� 나타날 것입니다. 메뉴�서 혼잣�� "
+"선�하면 선�한 어떤 항목� 입력으로 하여 혼잣�� 실행할것 입니다."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "� ��� 모든 실행 파�� 혼잣� 메뉴� 나타날 것입니다. 메뉴�서 혼잣�� "
 "선�하면 선�한 어떤 항목� 입력으로 하여 혼잣�� 실행할것 입니다."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "혼잣��"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4567,183 +4592,186 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: 현재 창� 위치와 �기"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\"�(는) 파� 붙�기 명령 선�할 때 옮길 것입니다."
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\"�(는) 파� 붙�기 명령 선�할 때 복사� 것입니다."
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d개� 선�� 항목� 파� 붙�기 명령 선�시 옮길 것입니다."
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d개� 선�� 항목� 파� 붙�기 명령 선�시 복사� 것입니다."
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "�립보드�서 붙� 것� 없습니다."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "마운트 오류"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "언마운트 오류"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "마운트 오류"
+msgstr "꺼내기 오류"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "꺼내기(_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "볼륨 마운트해제(_U)"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "새 창�서 열기(_I)"
+msgstr "새 창�서 열기"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "%d개� 새 창�서 열기(_I)"
+msgstr "%d개� 새 창�서 열기"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "내 ��"
+msgstr "�� 찾아보기"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "내 ��"
+msgstr "�� 찾아보기"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "휴지통�서 지우기(_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "선�한 항목� 모� 지�니다"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
-msgstr "휴지통으로 옮김(_M)"
+msgstr "휴지통으로 보내기(_M)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
-msgstr "�� 선�한 항목� 휴지통으로 옮�니다"
+msgstr "�� 선�한 항목� 휴지통으로 보냅니다"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "지우기(_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "따�가기 만들기(_K)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "따�가기 만들기(_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "휴지통 비우기(_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "파� �르기(_T)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "파� �르기(_T)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "파� 복사(_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "파� 복사(_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "� 따�가기는 가르키는 파�� 없기 때문� 쓸 수 없습니다. � 따�가기휴지통"
 "� 버리겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"� 따�가기는 가르키는 파�� 없기 때문� 쓸 수 없습니다. � 따�가기휴지통"
+"� 버리겠습니까?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "깨진 따�가기"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\"�(는) 실행할 수 있는 �스트 파�입니다. 실행 할까요? 아니면 내용� 보"
 "시겠습니까?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "실행 �는 보기?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "보기(_D)"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "터미��서 실행(_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "보기(_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "실행(_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\"�(를) 여는중"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "열기를 취소할까요?"
 
@@ -4764,28 +4792,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "\"%s\"� 내용� 보� 수 없습니다."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "보�는중 오류"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "\"%s\"(�)�는 �름� �미 � ���서 쓰고 있습니다. 다른 �름� 쓰십시오."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "� ���는 \"%s\"�(가) 없습니다. 옮겨지거나 지워지지 않았습니까?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\"� �름� 바꾸기 위한 허가권� 가지지 않았습니다."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4794,80 +4827,100 @@ msgstr ""
 "\"%s\"(�)�는 �름� \"/\"�(를) 들어있기 때문� 올바르지 않습니다. 다른 �"
 "름� 쓰십시오."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\"(�)�는 �름� 올바르지 않습니다. 다른 �름� 쓰십시오."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "�기 전용디스��기 때문� \"%s\"� �름� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\"�(를) \"%s\"(으)로 바꾸지 못합니다."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "�름 바꾸기 오류"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "\"%s\"� 그룹� 바꾸기 위한 허가권� 가지지 않았습니다."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "�기 전용디스��기 때문� \"%s\"� 그룹� 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "\"%s\"� 그룹� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "그룹 설정 오류"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "�기 전용디스��기 때문� \"%s\"� 소유주를 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\"� 소유주를 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "소유주 설정 오류"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "�기전용디스��기 때문� \"%s\"� 허가권� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "허가권 설정 오류"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\"� �름� \"%s\"(으)로 바꾸기."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "�름 바꾸기를 취소할까요?"
 
@@ -4925,128 +4978,150 @@ msgstr "아�콘� �래�기로 ��리기(_Z)"
 msgid "Restore Icon's Original Si_ze"
 msgstr "�래 �기� 아�콘으로 ��리기(_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\"�(를) 가르킴"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "�어서 놓기는 로컬 파�시스템�서만 지��니다."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "�어서 놓기는 로컬 파�시스템�서만 지��니다."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "�어서 놓기 오류"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "잘못� �기형�� 쓰였습니다."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "파� �름"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "�기"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "형�"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "내용� 바� 날짜"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"한번� 하나 ��� 사용� 아�콘� 할당할 수 없습니다. 사용� 아�콘으로 하나"
+"� 그림만 �어 놓으십시오."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "한번� 하나 ��� 사용� 아�콘� 할당할 수 없습니다. 사용� 아�콘으로 하나"
 "� 그림만 �어 놓으십시오."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "하나 ��� 그림"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"�어 놓� 파�� 로컬� 있지 않습니다. 로컬� 있는 그림으로만 사용� 아�콘으"
+"로 쓸 수 있습니다"
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "�어 놓� 파�� 로컬� 있지 않습니다. 로컬� 있는 그림으로만 사용� 아�콘으"
 "로 쓸 수 있습니다"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "로컬� 있는 그림파�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"�어 놓� 파�� 그림파�� 아닙니다. 로컬� 있는 그림으로만 사용� 아�콘으"
+"�어 놓� 파�� 로컬� 있지 않습니다. 로컬� 있는 그림으로만 사용� 아�콘으"
 "로 쓸 수 있습니다"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "그림파�"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "등� 정보"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s 등� 정보"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "그룹 바꾸기 취소?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "그룹 바꾸는 중"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "소유주 바꾸기 취소?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "소유주 바꾸는 중"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "없�"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "�� 수 없�"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 항목, �기 %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d 항목, 전체�기 %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(몇몇 내용� �� 수 없�)"
 
@@ -5056,191 +5131,190 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "ë‚´ìš©:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "기본"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "�름(_N):"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "�름(_N):"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "형�:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "�기:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "위치:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "볼륨:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "사용 가능한 공간:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "따�가기 목표:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME 형�:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "내용� 바� 날짜:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "접근 날짜:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "사용� 아�콘 선�(_S)..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "사용� 아�콘 지우기(_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "�기(_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "쓰기(_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "실행(_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "사용� ID 설정(_U)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "특수 표시:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "그룹 ID 설정(U)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "ê³ ì •(_S)"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "허가권"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "당신� �파�� 소유주가 아니기 때문� 허가권� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "파� 소유주(_O):"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "파� 소유주:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "파� 그룹(_F):"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "파� 그룹:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "소유주:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "그룹:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "다른 사용� 권한:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "글� 보기:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "숫� 보기:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "최근 파�� 바꾼 시간:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"� 허가권� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "선�한 파�� 접근 권한� 바꿀 수 없습니다."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"�움�� 보�는 중 오류가 발�했습니다:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "�움�� 보�는 중 오류가 발�했습니다: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�움�� 보여줄 수 없습니다"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "등� 정보창 보기를 취소할까요?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "등� 정보창 만들기"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "아�콘 선�"
 
@@ -5258,93 +5332,131 @@ msgid "Search Results"
 msgstr "찾기 결과"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "메�사 찾기 서비스가 설치�지 않았기 때문� 가능하지 않습니다"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "메�사 찾기 서비스가 가능하지 않습니다"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "찾기 서비스가 가능하지 않습니다"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "선�한 찾기는 시스템� 색�보다 � 새것입니다. 찾기 현재 결과를 출력할 수  없"
 "습니다. 루트 사용�로 명령행�서 \"medusa-indexd\"를 실행 시켜서 새로운 색�"
 "� 만들 수 있습니다."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"찾기 중 파� 시스템 색�� 열 수 없습니다. 색�� 없거나 �� �었� 것 입니"
+"다. 루트 사용�로 명령행�서 \"medusa-indexd\"를 실행 시켜서 새로운색�� 만"
+"들 수 있습니다."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "찾으려는 항목� 너무 새거임"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"컴퓨터�서 색�화� 모든 파�� 당신� 선�한 기준� �치합니다. 당신�선�한"
+"것� 맞춤법� 검사할 수� 있고 결과� 부족한 기준� �할 수� 있습니다."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "컴퓨터�서 색�화� 모든 파�� 당신� 선�한 기준� �치합니다. 당신�선�한"
 "것� 맞춤법� 검사할 수� 있고 결과� 부족한 기준� �할 수� 있습니다."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "찾는 중 오류"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "찾기 중 파� 시스템 색�� 열 수 없습니다. 색�� 없거나 �� �었� 것 입니"
 "다. 루트 사용�로 명령행�서 \"medusa-indexd\"를 실행 시켜서 새로운색�� 만"
 "들 수 있습니다."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "파� 색�� �는중 오류"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "찾기 내용� �는�안 오류가 발�하였습니다: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"내용 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 하지"
+"만 지금 색�� 접근할 수 없습니다. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"내용 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 하지"
+"만 지금 색�� 접근할 수 없습니다. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "빠른 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 바로 "
 "색�� 접근할 수 없으면 색�� 쓸 수 없는 �린 찾기가 수행�것 입니다."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"내용 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 하지"
-"만 지금 색�� 접근할 수 없습니다. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "빨리 찾기가 가능하지 않습니다"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "내용 찾기가 가능하지 않습니다"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5358,55 +5470,87 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "빠른 찾기를 하기 위해, 찾기는 여러분� 컴퓨터� 파� 색�� 필요로 합니다. 여"
 "러분� 컴퓨터는 지금 색�� 만들고 있습니다. 따�서 색�� 쓸 찾기는 할 수 없"
 "으므로, � 찾기는 몇분� 걸릴것입니다."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "내용 찾기를 하기 위해, 찾기는 여러분� 컴퓨터� 내용 색�� 필요로 합니다. 여"
 "러분� 컴퓨터는 지금 색�� 만들고 있습니다. 내용 찾기는 색�� 완료�면 쓸 "
 "수 있습니다."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "색� 찾기가 가능하지 않습니다"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"내용 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 하지"
+"만 지금 색�� 접근할 수 없습니다. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"내용 찾기를 위하여, 찾기는 여러분� 시스템� 파� 색�� 필요로 합니다. 하지"
+"만 지금 색�� 접근할 수 없습니다. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "빠른 찾기를 하기 위해, 찾기는 여러분� 컴퓨터� 파� 색�� 필요로 합니다. 하"
 "지만 지금� 색�� 없습니다. root로 \"medusa-indexd\"를 실행함으로서 색�� "
 "만들 수 있습니다. 완전한 색�� 사용가능할 때 까지는 찾는� 몇분� 걸릴 것입"
 "니다."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "내용 찾기를 위하여, 찾기는 시스템� 내용 색�� 필요로 합니다. 하지만 지금� "
 "색�� 없습니다. root로 \"medusa-indexd\"를 실행해서 색�� 만들 수 있습니"
 "다. 완전한 색�� 사용가능할 때 까지는 내용 찾기는 할 수 없습니다."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "빨리 찾기가 활성화�어 있지 않습니다"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5417,11 +5561,12 @@ msgstr ""
 "니다. 따�서 색�� 사용한 찾기를 할 수 없으므로, � 찾기는 몇분� 걸릴것입니"
 "다. "
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "빨리 찾기가 활성화�어 있지 않습니다"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "빨리 찾기가 가능하지 않습니다"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "위치"
 
@@ -5430,7 +5575,7 @@ msgstr "위치"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "새 창�서 보기(_R)"
@@ -5441,7 +5586,7 @@ msgstr "새 창�서 보기(_R)"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d개� 항목� 새 창�서 보기"
@@ -5450,15 +5595,21 @@ msgstr "%d개� 항목� 새 창�서 보기"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"노틸러스는 보여주는것보다 � 많� 결과를 발견하였습니다. 몇몇 �치하는 항목"
+"� 보여주지 않�수 있습니다."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "노틸러스는 보여주는것보다 � 많� 결과를 발견하였습니다. 몇몇 �치하는 항목"
 "� 보여주지 않�수 있습니다."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "너무 많� 결과"
 
@@ -5472,12 +5623,12 @@ msgid "Create L_auncher"
 msgstr "실행기 만들기(_A)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "새 실행기를 만듭니다"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "휴지통� 있는 모든 항목� 지�니다"
 
@@ -5496,7 +5647,7 @@ msgstr "바탕화면ì�˜ 패턴ì�´ë‚˜ 색ìƒ�ì�„ 설정할 수 있는 ì°½ì�„ ë³´ìž
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "기본 바탕색 사용(_D)"
@@ -5518,185 +5669,198 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "선�한 항목� 볼 다른 보기 프로그램� 선�합니다"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "�� 만들기"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "�� 만들기"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "� ��안� 새로운 빈 ��를 만듭니다"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "� ��안� 새로운 빈 ��를 만듭니다"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "�� 선�한 항목� 다른 파�로 연결합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "사본 만들기(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "선�한 항목� 휴지통으로 보내지 않고 지우기"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "�� 선�한 항목� 하나 � 만듭니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "실행기 편집"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "실행기 정보를 고칩니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "선�한 볼륨� �맷하기"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "미디어 등� 정보(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "선�한 볼륨� 마운트 해제"
+msgstr "선�한 볼륨� 마운트"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "�전� 선�� 파�� 파� �르기나 파� 복사 명령으로 옮기거나 복사합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 "�전� 파� �르기나 파� 복사 명령으로 선�� 파�� 옮기거나 복사합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "다른 프로그램으로 열기(_H)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "�� 선�한 항목� 새 창�서 엽니다"
+msgstr "�� 선�한 항목� 새 찾아보기 창�서 엽니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "새 창�서 열기(_I)"
+msgstr "새 찾아보기 창�서 열기"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "선�한 항목� �창�서 엽니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "파� 붙�기 명령으로 선�� 파�� 복사할 준비를 합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "파� 붙�기 명령으로 선�� 파�� 옮길 준비를 합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "보호(_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "선�한 볼륨� 보호"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "선�� 항목� �름� 바꿉니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "기본값으로 보기 리셋(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "� 보기�서 정렬 순서와 확대 수준� 기본 설정과 비�하여 리셋"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "~/Nautilus/scripts�서 혼잣�� 실행하거나 관리합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "모든 파� 선�(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "무늬(_P)"
+msgstr "파��름 형태 선�(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "� 창� 있는 모든 항목� 선�합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "� 창� 있는 모든 항목� 선�합니다"
+msgstr "창�서 주어진 파��름 형태� 맞는 항목� 선�합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "선�한 볼륨� 대한 미디어 정보를 보입니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "� 메뉴�서 보�는 혼잣�� �함하는 �� 보기"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "선�한 볼륨� 마운트 해제"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "� 위치� 기본 바탕화면� 사용합니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "�� 선�한 항목� 등� 정보를 보거나 고칩니다"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "파� 복사(_C)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "�맷(_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "볼륨 마운트해제(_U)"
+msgstr "볼륨 마운트(_M)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "혼잣� �� 열기(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "파� 붙�기(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "파�� ��� 붙여 넣기(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "등� 정보(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "�름 바꾸기(_R)..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "혼잣�(_S)"
 
@@ -5746,7 +5910,7 @@ msgstr "아�콘� 놓아진대로 둡니다"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
 msgid "Make the selected icon stretchable"
-msgstr "선�한 아�콘� 확대 합니다"
+msgstr "선�한 아�콘� �기를 바꿉니다"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
 msgid "Re_versed Order"
@@ -5762,7 +5926,7 @@ msgstr "�� 선�한 아�콘� �래 �기로 ��립니다"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Str_etch Icon"
-msgstr "아�콘 확대(_E)"
+msgstr "아�콘 �기 바꾸기(_E)"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:23
 msgid "Toggle using a tighter layout scheme"
@@ -5781,7 +5945,12 @@ msgstr "수�(_M)"
 msgid "Indexing is %d%% complete."
 msgstr "색� 만들기 %d%% 완료."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "마지막으로 색�화�것� %s 입니다"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5789,25 +5958,29 @@ msgstr ""
 "하루� 한 번씩 여러분� 파�과 �스트 내용� 색�으로 만들어 찾기가 빨�집니"
 "다. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "색� �황"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "마지막으로 색�화�것� %s 입니다"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"하루� 한번씩 여러분� 파�과 �스트 내용� 색�화 �어서 찾기가 빨�집니다. "
-"파�� 현재 색�화 �고 있습니다."
+"하루� 한 번씩 여러분� 파�과 �스트 내용� 색�으로 만들어 찾기가 빨�집니"
+"다. "
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "파�� 색�� 없습니다."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5816,15 +5989,19 @@ msgstr ""
 "빠른 찾기를 사용하게 �면, 빠르게 찾기 위해서 색�� 만듭니다. 빠른 찾기가컴"
 "퓨터�서 사용하지 않게 �어 있어서, 색�� 가지고 있지 않습니다."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "파�� 색�� 없습니다."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "메�사 찾기 서비스가 가능하지 않습니다"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5848,31 +6025,36 @@ msgstr "��싱 �황 보기(_I)"
 msgid "Show status of indexing used when searching"
 msgstr "찾는 중� 사용�는 ��싱� �황� 보기"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "필요로 하는 ��를 만들 수 없습니다"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "필요로 하는 ��를 만들 수 없습니다"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "노틸러스는 필요한 ��� \"%s\"�(를) 만들 수 없습니다. 노틸러스를 실행하기 "
 "전� � ��를 만들거나 노틸러스가 만들 수 있�� 허가권� 설정하십시오."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "필요로 하는 ��를 만들 수 없습니다"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5883,22 +6065,27 @@ msgstr ""
 "노틸러스를 실행하기 전� � ��를 만들거나 만들 수 있�� 허가권�설정하십시"
 "오."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "옛날 바탕화면으로 ��"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "그놈 2.4�서 바탕화면 디렉토리가 바뀌었습니다. \"옛날 바탕화면으로 ��\"�"
 "는 ��가 바탕화면� 만들어 졌습니다. � ��를 열어서 옛날 파�들� 옮겨 온 "
 "다�, ��를 지울 수 있습니다."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "옛날 바탕화면�서 바꾸기"
 
 #. Can't register myself due to trouble locating the
@@ -5911,7 +6098,7 @@ msgstr "옛날 바탕화면�서 바꾸기"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5921,7 +6108,7 @@ msgstr ""
 "\"를 실행하십시오. 아니면 컴퓨터를 재시작 하거나 노틸러스를 재설치 하십시오."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5967,12 +6154,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "예�하지 못한 오류로 �해 현재 노틸러스를 사용할 수 없습니다."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5980,7 +6167,7 @@ msgstr ""
 "파�관리� 보기 서버� 등�하기를 시�하는 중 OAF로 �한 예�하지 못한오류로 "
 "�해 현재 노틸러스를 사용할 수 없습니다."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -5990,7 +6177,7 @@ msgstr ""
 "노틸러스를 사용할 수 없습니다. bonobo-activation-server를 강제로 종료하고 노"
 "틸러스를재시작 하면문제가 해결�수 있습니다."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6000,6 +6187,17 @@ msgstr ""
 "노틸러스를 사용할 수 없습니다. bonobo-activation-server를 강제로 종료하고노틸"
 "러스를 재시작 하면문제가 해결�수 있습니다."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"�움�� 보�는 중 오류가 발�했습니다:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "정�� 책갈피 없�"
@@ -6033,39 +6231,48 @@ msgstr "� �� 옵션"
 msgid "Find Them!"
 msgstr "찾기!"
 
+#: src/nautilus-connect-server-dialog.c:86
+#, fuzzy
+msgid "You must enter a name for the server."
+msgstr "서버� �름� 입력하여야 합니다"
+
 #: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
-msgstr "�신으로 옮길 수 없습니다"
+msgid "Can't Connect to Server"
+msgstr "서버� 연결할 수 없습니다"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\"�(는) 올바른 테마 ��가 아닙니다."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\"�(는) 올바른 위치가 아닙니다.\n"
-"정확히 입력하였는지 확�하시고 다시 시� 해보십시오."
+"\"%s\"�(를) 찾� 수 없습니다. 정확히 입력하였는지 확�하시고 다시 시� 해보"
+"십시오."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "네트워� 서버"
+msgstr "서버� 연결"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "�름(_N):"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "위치(_L):"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "ì—°ê²°(_C)"
+msgstr "ì—°ê²°"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6263,6 +6470,20 @@ msgstr ""
 "\n"
 "마법사를 다시 실행하려면 � 파�� 수�으로 지워주십시오.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"한번� 하나 ��� 사용� 아�콘� 할당할 수 없습니다. 사용� 아�콘으로 하나"
+"� 그림만 �어 놓으십시오."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"�어 놓� 파�� 로컬� 있지 않습니다. 로컬� 있는 그림으로만 사용� 아�콘으"
+"로 쓸 수 있습니다"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6273,26 +6494,25 @@ msgstr "%s(으)로 열기"
 msgid "Open with..."
 msgstr "다른 프로그램으로 열기..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "CD 굽기 프로그램� 실행할 수 없습니다:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "CD 굽기를 실행할 수 없습니다"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "휴지통 비우기(_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "내용� CD� 쓰기(_W)"
 
@@ -6300,115 +6520,128 @@ msgstr "내용� CD� 쓰기(_W)"
 msgid "Go To:"
 msgstr "가기:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "분리� 창�서 %d 위치를 보기를 �합니까?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "다중 창으로 보기?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "위치를 열 수 없습니다"
+msgstr "위치를 엽니다"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "고� �기 검사 수행"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "초기화 창� 주어진 위치�서 만듭니다."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "위치"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "정확하게 지정� URI� 대해서만 창� 만듭니다."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "바탕화면� 관리하지 않습니다 (기본 설정 대화��� 설정� 무시 합니다)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "찾아보기 창� 엽니다."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "노틸러스 마침."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "노틸러스 재시작."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "파� 관리�"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "노틸러스"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "노틸러스: --check는 URI와 같� 사용할 수 없습니다.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "노틸러스: --check는 다른 옵션과 같� 사용할 수 없습니다.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "노틸러스: --quit는 URI와 같� 사용할 수 없습니다.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "노틸러스: --restart는 URI와 같� 사용할 수 없습니다.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "노틸러스: --geometry는 하나���  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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "정�로 \"%s\"�(를) 완전히 지우시겠습니까?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "방문 기�� 지우시겠습니까? 그렇다면 �풀� 하지 않기를 빕니다"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "정�로 노틸러스로 방문하였� 위치들� 지우시겠습니까?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+#, fuzzy
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "휴지통� 비우면 항목들� 완전히 지워지게 �니다."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "방문기� 지우기"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\"위치가 없습니다. 목��서 � 위치를 가진 책갈피를 지우시겠습니까?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "\"%s\"위치가 ��� 없습니다."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "없는 위치� 책갈피"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "지우기"
 
@@ -6441,15 +6674,13 @@ msgid "Close _All Windows"
 msgstr "모든 창 닫기(_A)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "모든 노틸러스 창� 닫습니다"
+msgstr "모든 찾아보기 창� 닫습니다"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "서버� 연결(_S)..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6464,107 +6695,117 @@ msgid "Forward"
 msgstr "앞으로"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "휴지통 ��로 갑니다"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "다� 방문한 위치로 갑니다"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "�전� 방문한 위치로 갑니다"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "휴지통 ��로 갑니다"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "내 ��"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "위치 표시줄(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "다시 �기"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "� 컴퓨터�서 파�� 찾습니다"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "�태 표시줄(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "멈추기"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "위로"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "CD� 쓰기"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "책갈피 �하기(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "뒤로(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "책갈피(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "방문기� 지우기(_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "카운터탑"
+msgstr "컴퓨터(_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "책갈피 편집(_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "앞으로(_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "가기(_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "내 ��(_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "위치(_L)..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "가장�리 창(_S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "휴지통(_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "위로(_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "보기(_V)"
 
@@ -6578,38 +6819,42 @@ msgid "View as..."
 msgstr "...로서 보기"
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "파� 소유주:"
+msgstr "파� 찾아보기: %s"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
-"가장�리 창중 하나가 오류를 발�하여 계�할 수 없습니다. 불행하게� 어�것�"
-"지 알 수 없습니다."
+"가장�리 패� 중 하나가 오류를 발�하여 계�할 수 없습니다.불행하게� 어�것 "
+"�지 알 수 없습니다."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
-"%s 가장�리 창� 오류를 발�하여 계�할 수 없습니다. 계� 발��다면 � 패�"
-"� 꺼�는 편� 좋습니다."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1109
+#, fuzzy, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s 보기가 시작할 때 오류가 발�하였습니다."
+
+#: src/nautilus-navigation-window.c:1110
 #, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr ""
+"%s 가장�리 패�� 오류를 발�하여 계�할 수 없습니다. 계� 발��다면 � 패"
+"�� 꺼�는 편� 좋습니다."
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "가장�리 창 실패"
+msgstr "가장�리 패� 실패"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "가장�리 창"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "가장�리 창 보기를 �함합니다"
 
@@ -6643,147 +6888,180 @@ msgstr "새 것 �하기(_A)..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "반복 무늬 %s�(는) 지울 수 없습니다."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "반복무늬를 지울 수 없습니다"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "꼬리표 %s�(를) 지울 수 없습니다."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "꼬리표를 지울 수 없습니다"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "새 꼬리표를 만듭니다"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "키워드(_K):"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "그림(_I):"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "새 꼬리표로 사용할 그림 파� 선�:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "새 색�� 만듭니다"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "색� �름(_N):"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "색� 값(_V):"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\"�(는) 올바른 테마 ��가 아닙니다."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "\"%s\"�(는) 올바른 파� �름가 아닙니다."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "반복무늬를 설치할 수 없습니다"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "초기화할 그림� 바꿀 수 없습니다."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "그림� 아님"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "반복무늬 %s�(는) 설치할 수 없습니다."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "무늬� �할 그림파�� 선�하십시오"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "새 색�� 대해 �름� 지정하여야 합니다."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "색�를 설치할 수 없습니다"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "�할 색�� 선�하십시오"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "'%s'�(는) 사용할 수 있는 그림 파�� 아닙니다!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "파� '%s'(�)가  올바른 그림파�� 아닌것 같습니다."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "분류 선�:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "지우기 취소(_A)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "새 무늬 �하기(_A)..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "새 색� �하기(_A)..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "새 꼬리표 �하기(_A)..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "무늬를 지울려면 �릭하십시오"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "색�� 지우려면 �릭하십시오"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "꼬리표를 지우려면 �릭하십시오"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "무늬:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "색�:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "꼬리표:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "무늬 지우기(_R)..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "색� 지우기(_R)..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "꼬리표 지우기(_R)..."
 
@@ -7005,7 +7283,7 @@ msgstr "노틸러스를 만든 사람들� 보여�니다"
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
-msgstr "모양새를 꾸밀수 있는 무늬 � ��, 그리고 꼬리표등� 보여�니다"
+msgstr "모양새를 꾸밀수 있는 무늬 � 색�, 그리고 꼬리표등� 보여�니다"
 
 #: src/nautilus-shell-ui.xml.h:8
 msgid "Display the latest contents of the current location"
@@ -7165,43 +7443,42 @@ msgid "Show %s"
 msgstr "%s 보기"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "CD 만들기(_C)"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
-msgstr "모든 창 닫기(_A)"
+msgid "Close P_arent Folders"
+msgstr "모든 부모 �� 닫기(_A)"
 
-#: src/nautilus-spatial-window-ui.xml.h:5
+#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
+msgid "Close this folder's parents"
+msgstr "가장�리 창 닫기"
+
+#: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
-msgstr "CD 지우기 ��로 갑니다"
+msgstr "컴퓨터 ��로 갑니다"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "휴지통 ��로 갑니다"
+msgstr "CD 만들기 ��로 갑니다"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "위치(_L)..."
+msgstr "위치 열기(_L)..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "부모 �� 열기(_P)"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[항목 ]��"
+msgstr "부모 ��를 엽니다"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "무늬(_P)"
+msgstr "가기(_P)"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7221,17 +7498,20 @@ msgstr "현재 선�"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "창안� �함� 형�"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
 msgstr "보기 실패"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s 보기가 시작할 때 오류가 발�하였습니다."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s 보기가  오류를 발�하여 계�할 수 없습니다. 계� 발��다면 다른 보기를 선"
 "�하거나 다른 위치로 갈 수 있습니다."
@@ -7241,97 +7521,125 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "%s 보기가 시작할 때 오류가 발�하였습니다."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "� 창� 연결� 노틸러스 �용프로그램."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "내용보기 프로그램"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "현재 파��나 ��를 보여�니다"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"\"%s\"�(를) 찾� 수 없습니다. 정확히 입력하였는지 확�하시고 다시 시� 해보"
-"십시오."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "꼬리표를 �할 수 없습니다"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "노틸러스가 \"%s\"�(를) 보여 줄 수 없습니다."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "\"%s\"�(를) 보여 줄 수 없습니다. 어떤 형�� 파��지 결정할 수 없습니다"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "\"%s\"�(를) 보여 줄 수 있는 보기 프로그램� 설치�어 있지 않았습니다."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "\"%s\"�(를) 보여 줄 수 없습니다. %s: 형�� 위치를 처리할 수 없습니다."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\"�(를) 보여 줄 수 없습니다. 로그� 시�가 실패하였습니다.."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "접근� 거부�어 \"%s\"�(를) 보여 줄 수 없습니다."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\"�(를) 보여 줄 수 없는 �, 그것� \"%s\" 호스트를 찾� 수 없기 때문입니"
 "다. 맞춤법� 올바르고 프�시 설정� 올바른지 확�하십시오."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "\"%s\"�(를) 보여 줄 수 없습니다. 프�시 설정� 올바른지 확�하십시오."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"\"%s\"�(를) 보여 줄 수 없습니다. %s: 형�� 위치를 처리할 수 없습니다."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"\"%s\"�(를) 보여 줄 수 없습니다. 노틸러스가 SMB 마스터 브�우저� 연결할 수 "
-"없습니다.\n"
-"로컬 네트워��서 SMB서버가 실행�고 있는지 확�하삽시오."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "찾기가 지금 바로 실행할 수 없습니다, 색�� 없거나 찾기 서비스가 실행�고있"
 "지 않기 때문입니다. 메�사 찾기 서비스를 시작하고, 색�� 없다면 메�사��서"
 "를 실행하십시오."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"찾기가 지금 바로 실행할 수 없습니다, 색�� 없거나 찾기 서비스가 실행�고있"
+"지 않기 때문입니다. 메�사 찾기 서비스를 시작하고, 색�� 없다면 메�사��서"
+"를 실행하십시오."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "찾기를 할 수 없�"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "노틸러스가 \"%s\"�(를) 보여 줄 수 없습니다."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "위치를 보여 줄 수 없습니다"
 
@@ -7343,7 +7651,7 @@ msgstr "� 책갈피가 가르키는 위치로 갑니다"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7351,11 +7659,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "차�호 <ganadist@mizi.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7371,39 +7679,40 @@ msgstr "페�지 뒤로"
 msgid "Go forward a number of pages"
 msgstr "페�지 앞으로"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "� 위치를 \"%s\"(으)로 보여�니다"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "레드햇 네트워�"
+msgstr "네트워�"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "ì �"
+msgstr "글꼴"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "CD 만들기(_C)"
+msgstr "CD 만들기"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "�용 프로그램 ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "창� �용프로그램 ID"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "�용 프로그램"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "� 창� 연결� 노틸러스 �용프로그램."
 
@@ -7439,6 +7748,242 @@ msgstr "네트워� 서버"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "노틸러스 파� 관리��서 네트워� 서버를 봅니다"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "하드웨어 보기용 팩토리"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "하드웨어 Viewer"
+
+#~ msgid "Hardware view"
+#~ msgstr "하드웨어 보기"
+
+#~ msgid "View as Hardware"
+#~ msgstr "하드웨어로 보기"
+
+#~ msgid "hardware view"
+#~ msgstr "하드웨어 보기"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "하드웨어 보기를 위한 아�콘 �름"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "하드웨어 정보 요약"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache �기"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB 램"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB 램"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "%d �, %d 시간, %d 분 �안 가��고 있습니다"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "하드웨어 대략보기"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "�곳� CPU 페�지를 배치합니다."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "�곳� RAM 페�지를 배치합니다."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "�곳� IDE 페�지를 배치합니다."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"�(를) 복사하는 중 오류.\n"
+#~ "\n"
+#~ "목표� 남� 공간� 없습니다."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\"�(를) 연결하는�안 오류.\n"
+#~ "\n"
+#~ "목표� 남� 공간� 없습니다."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "항목들� \"%s\"(으)로 옮기는 중 오류.\n"
+#~ "\n"
+#~ "� ��� 쓸 수 있는 허가권� 가지고 있지 않습니다."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "항목들� \"%s\"(으)로 옮기는 중 오류.\n"
+#~ "\n"
+#~ "목표디스�가 �기 전용입니다."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\"� 연결� 만드는 중 오류.\n"
+#~ "\n"
+#~ "� ��� 쓸 수 있는 허가권� 가지고 있지 않습니다."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\"� 연결� 만드는�안 오류.\n"
+#~ "\n"
+#~ "목표디스�가 �기 전용입니다."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\"�(를) 복사하는 중 \"%1$s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\"�(를) 옮기는 중 \"%1$s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%2$s\"�(를) 지우는 중 \"%1$s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "복사하는 중 \"%s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "연결하는 �안 \"%s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "지우는 중 \"%s\"오류.\n"
+#~ "\n"
+#~ "계� 진행 하겠습니까?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "휴지통으로 복사할 수 없습니다."
+
+#~ 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 ""
+#~ "기본 액션�서 \"%s\"�(를) 열 수 없습니다. \"%s\"위치� 있는 파�� 접근"
+#~ "할 수 없습니다. � 파�� 볼 수 있는 다른 액션� 없습니다. 여러분� 컴퓨터"
+#~ "로 파�� 복사하면, 열 수 있� 수� 있습니다."
+
+#~ msgid "Searching Disks"
+#~ msgstr "디스� 찾기"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "노틸러스가 휴지통 ��를 찾는 중입니다."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d개� 선�� 항목� 휴지통으로 보낼 수 없습니다. 지금 바로 지워버릴까요?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d개� 선�� 항목� 휴지통으로 보낼 수 없습니다. 지금 바로 그 %d개� 항목"
+#~ "� 지워버릴까요?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "�어 놓� 파�� 그림파�� 아닙니다. 로컬� 있는 그림으로만 사용� 아�콘"
+#~ "으로 쓸 수 있습니다"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "메�사 찾기 서비스가 설치�지 않았기 때문� 가능하지 않습니다"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "하루� 한번씩 여러분� 파�과 �스트 내용� 색�화 �어서 찾기가 빨�집니"
+#~ "다. 파�� 현재 색�화 �고 있습니다."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\"�(는) 올바른 위치가 아닙니다.\n"
+#~ "정확히 입력하였는지 확�하시고 다시 시� 해보십시오."
+
+#~ 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 ""
+#~ "\"%s\"�(를) 보여 줄 수 없습니다. 노틸러스가 SMB 마스터 브�우저� 연결할 "
+#~ "수 없습니다.\n"
+#~ "로컬 네트워��서 SMB서버가 실행�고 있는지 확�하삽시오."
+
+#~ msgid "file icon"
+#~ msgstr "파� 아�콘"
+
+#~ msgid "Name:"
+#~ msgstr "�름(_N):"
+
 #~ msgid "Unknown"
 #~ msgstr "알 수 없�"
 
@@ -7533,8 +8078,5 @@ msgstr "노틸러스 파� 관리��서 네트워� 서버를 봅니다"
 #~ msgid "_Toolbar"
 #~ msgstr "�구 모�(_T)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "\"%s\"위치가 ��� 없습니다."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "없는 위치로 가기"
diff --git a/po/li.po b/po/li.po
index a79433add..f9020c0a5 100644
--- a/po/li.po
+++ b/po/li.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-06-06 17:37+0000\n"
 "Last-Translator: Mathieu van Woerkom <mathieu@brabants.org>\n"
 "Language-Team: Limburgish <li@li.org>\n"
@@ -38,8 +38,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() neet gelök."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Embleme"
 
@@ -52,48 +52,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus embleemvinster"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Kèn 't embleem neet ewegdoon"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Kèn 't embleem mit de naam '%s' neet ewegdoon. Dènkelik kump dit doordet 't "
 "ein permanent embleem is, en neet ein die geer zelf höbt toegeveug."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Kèn 't embleem neet ewegdoon"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kèn 't embleem neet herneume"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Kèn 't embleem mit de naam '%s' neet herneume. Dènkelik kump dit doordet 't "
 "ein permanent embleem is, en neet ein die geer zelf höbt toegeveug."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Kèn 't embleem neet herneume"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Embleem herneume"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Geuf ein nuuj naam veur 't weergegaeve embleem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Herneume"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Embleme toeveuge..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -101,7 +113,7 @@ msgstr ""
 "Geuf ein besjrievende naam bie eder embleem. Deze naam weurt op angere "
 "plaatse gebroek veur 't embleem te identifisere."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -109,140 +121,64 @@ msgstr ""
 "Geuf ein besjrievende naam bie 't embleem. Deze naam weurt op angere plaatse "
 "gebroek veur 't embleem te identifisere."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Sómmige van de besjtenj kènne neet es embleme waere toegeveug wiel ze gein "
 "geljige besjtenj lieke te zeen."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "'t besjtandj '%s' lik gein geljige aafbiljing te zeen."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Kèn embleme neet biedoon"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Gein van de besjtenj kènne es embleme waere biegedaon wiel ze gein geljige "
 "aafbiljinge lieke te zeen."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "De gesjleipde teks waor gein geljige besjtandjlokasie."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Kèn embleem neet biedoon"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'t besjtandj '%s' lik gein geljige aafbiljing te zeen."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "'t gesjleipde besjtandj lik gein geljige aafbiljing te zeen."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Ewegdoon"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Febrik veur 't hardware-vinster"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardware-weergaaf"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardware-weergaaf"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Bekieke es Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardware-weergaaf"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "naam van 't piktogram veur hardware te tuine"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "samevatting van de hardware-infermasie"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cachegruutde"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-# &l
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "De computer sjteit al %d daag, %d oere e %d minute aan"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardware-euverzich"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Dit is eine plaatshauwer veur de CPU-pagina."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Dit is eine plaatshauwer veur de RAM-pagina."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Dit is eine plaatshauwer veur de IDE-pagina."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historie"
@@ -909,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internasjonaal"
@@ -1205,32 +1145,19 @@ msgid "Desktop trash icon name"
 msgstr "Naam van papeerkörf-piktogram op wirkblaad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-#, fuzzy
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Directories baove dees gruutde zólle waere verkleind bis ómmetom deze "
-"ómvank. 't doel hievan is 't veurkómme van 't per óngelök opblaoze van "
-"Nautilus door te groete directories. Ein negatieve waerd geuf geine limiet "
-"aan. De limiet is bie benajering door 't in sjtökskes laeze van de "
-"directories."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "'Sjpesjale' vane insjakele in besjtandjprifferensies-dialoogvinster"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Besjtandjnaam veur de sjtanderd mapachtergróndj. Allein gebroek wen "
 "background_set waor is."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1238,6 +1165,20 @@ msgstr ""
 "Besjtandjnaam veur sjtanderd ziejpeniel-achtergróndj. Allein gebroek wen "
 "side_pane_background_set waor is."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Directories baove dees gruutde zólle waere verkleind bis ómmetom deze "
+"ómvank. 't doel hievan is 't veurkómme van 't per óngelök opblaoze van "
+"Nautilus door te groete directories. Ein negatieve waerd geuf geine limiet "
+"aan. De limiet is bie benajering door 't in sjtökskes laeze van de "
+"directories."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1250,8 +1191,8 @@ msgstr "Persoenlike map-piktogram zichbaar op wirkblaad"
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 #, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Ingeval waor, tuint Nautilus allein mappe in de boum-ziejbalk. Angers tuint "
 "'t zoewaal mappe es besjtenj."
@@ -1286,8 +1227,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Ingeval waor, tuint Nautilus directories veurdet de besjtenj in de "
 "piktogram- en liesweergaaf getuind waere."
@@ -1336,7 +1277,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Ingeval waor, gebroek Nautilus de gebroekers heimdirectory es beroblaad. "
@@ -1354,7 +1295,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1375,8 +1316,9 @@ msgstr ""
 "beroblaad gezat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Ingeval waor, weurt ein piktogram mit ein koppeling nao de heimdirectory op "
@@ -1413,7 +1355,8 @@ msgstr ""
 "zie aafloupend in plaats van oploupend gesorteerd."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Ingeval waor, waere piktogramme sjtanderd dichter opgemaak in nuuj vinsters."
 
@@ -1441,7 +1384,8 @@ msgid "List of possible captions on icons"
 msgstr "Lies van mäögelike biesjrifte bie piktogramme"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maksimum deil aafhanjelbare besjtenj in ein map"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1461,11 +1405,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus zörg veur 't teikene van 't wirkblaad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus gebroek de persoenlike map van de gebroeker es wirkblaad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Mappe sjlechs in de boum-ziejbalk tuine"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1485,7 +1431,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Sorteerresem ómdrieje in nuuj vinsters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Mappe iers tuine in vinsters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1523,10 +1470,11 @@ msgstr ""
 "geluud gesjpeeld."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1539,10 +1487,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Wisselsjnelheid veur wienie ein aafbiljing te tuine es verkleinde weergaaf. "
 "Ingeval \"ummer\" weurt 't ummer verkleind getuind, ouch wen 't op ein "
@@ -1551,10 +1499,11 @@ msgstr ""
 "getuind, zjus ein algemein plaetje."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Wisselsjnelheid veur wienie 't deil items in eine directory aan te gaeve. "
@@ -1566,7 +1515,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "De sjtanderd sorteerresem veur 't item in de piktogramweergaaf. Mäögelike "
 "waerdes zeen naam, gruutde, tiep, datem-gewiezig, embleme."
@@ -1574,8 +1523,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 #, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "De sjtanderd sorteerresem veur 't item in de liesweergaaf. Mäögelike waerdes "
 "zeen naam, gruutde, tiep en datem_gewiezig."
@@ -1625,7 +1574,8 @@ msgid "Use manual layout in new windows"
 msgstr "Handjmesige opmaak gebroek in nuuj vinsters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Sjtrakkere opmaak gebroeke in nuuj vinsters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1656,7 +1606,8 @@ msgstr ""
 "lies_weergaaf en piktogram_weergaaf."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Wienie 't deil items in de directory te tuine"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1669,7 +1620,7 @@ msgstr "Wienie miniature van aafbiljingsbesjtenj te tuine"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Of ein aangepasde sjtanderd-mapachtergróndj is ingesjtèld."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1833,68 +1784,82 @@ msgstr "obbenuuts laje"
 msgid "on the desktop"
 msgstr "op 't wirkblaad"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Kèn 't geselekteerde volume neet ewegdoon"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Geer kènt volumepiktogramme neet ewegdoon. Est geer 't volume wilt "
 "oetsjmiete. gebroek den Oetsjmiete in 't rechtermoesklik-menu."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Kèn 't geselekteerde volume neet ewegdoon"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papeerkörf"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Hiehaer _verplaatse"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "Hiehaer _kopiëre"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Hiehaer _koppele"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Es _achtergróndj insjtèlle"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Annulere"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Es achtergróndj insjtèlle veur _alle mappe"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Es achtergróndj insj_tèlle veur deze map"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Sorry, mer geer moot ein neet-laeg trefwaord veur 't nuuj embleem opgaeve."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Kèn 't embleem neet installere"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1905,20 +1870,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Sorry, mer 't geuf al ein embleem mit de naam \"%s\". Keus esuchbleef ein "
 "angere naam hieveur."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Kèn 't embleem neet installere"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Sorry, neet in sjtaot aangepas embleem op te sjlaon."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Sorry, neet in sjtaot aangepasde embleemnaam op te sjlaon."
 
@@ -1937,23 +1908,29 @@ msgstr "Van:"
 msgid "To:"
 msgstr "Nao:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Faeler bie 't verplaatse."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Faeler bie verplaatse.\n"
 "\n"
 "\"%s\" kèn neet verplaats waere, den 't item bevundj zich op ein allein-"
 "laeze sjief."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Faeler bie 't ewegdoon."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1962,23 +1939,18 @@ msgstr ""
 "\"%s\" kèn neet eweggedaon waere, den geer höbt gein rechte veur de "
 "baovelikgende map te verangere."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Faeler bie ewegdoon.\n"
 "\n"
 "\"%s\" kèn neet eweggedaon waere, den 't bevundj zich op ein allein-laeze "
 "sjief."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1987,12 +1959,15 @@ msgstr ""
 "\"%s\" kèn neet verplaats waere, den geer höbt gein rechte veur dit item of "
 "de baovelikgende map te verangere."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Faeler bie 't verplaatse."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Faeler bie verplaatse.\n"
@@ -2000,12 +1975,10 @@ msgstr ""
 "\"%s\" kèn neet verplaats waere, wiel dit item of zien baovelikgene map zich "
 "bevundj in de besjtemmingslokasie."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Faeler bie verplaatse.\n"
@@ -2013,295 +1986,244 @@ msgstr ""
 "\"%s\" kèn neet nao de papeerkörf verplaats waere, den geer höbt gein rechte "
 "veur dit item of de baovelikgende map te verangere."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Faeler bie 't kopiëre."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Faeler bie kopiëre\n"
 "\n"
 "\"%s\" kèn neet waere gekopiëerd wiel geer gein laesrechte daoveur höbt"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Faeler bie 't kopiëre nao \"%s\".\n"
-"\n"
-"'t geuf neet genóg ruumde op de besjtemmingslokasie."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Faeler bie 't kopiëre."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Faeler bie 't verplaatse nao \"%s\".\n"
 "\n"
 "'t geuf neet genóg ruumde op de besjtemmingslokasie."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Faeler bie 't aanmake van verwiezing in \"%s\".\n"
-"\n"
-"'t geuf neet genóg ruumde op de besjtemmingslokasie."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Faeler bie 't verplaatse."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Faeler bie 't aanmake van verwiezinge."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Faeler bie 't kopiëre nao \"%s\".\n"
 "\n"
 "Geer  höbt gein sjriefrechte veur deze map."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Faeler bie 't kopiëre nao \"%s\".\n"
 "\n"
 "De besjtemmingslokasie is allein-laeze."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Faeler bie 't verplaatse nao \"%s\".\n"
-"\n"
-"Geer höbt gein sjriefrechte op de doelmap."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Faeler bie 't verplaatse nao \"%s\".\n"
-"\n"
-"De doelsjief sjtiep allein laeze."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Faeler bie 't aanmake van verwiezinge in \"%s\".\n"
-"\n"
-"Geer höbt gein sjriefrechte veur deze map."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Faeler bie 't verplaatse."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Faeler bie 't aanmake van verwiezinge in \"%s\".\n"
-"\n"
-"De besjtemmingssjief is allein-laeze."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't kopiëre van \"%s\".\n"
-"\n"
-"Wilt geer doorgaon?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Faeler bie 't aanmake van verwiezinge."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Faeler bie 't kopiëre."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Faeler \"%s\"  bie 't verplaatse van \"%s\".\n"
+"Faeler \"%s\" bie 't verplaatse.\n"
 "\n"
 "Wilt geer doorgaon?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't aanmake van ein verwiezing nao \"%s\".\n"
-"\n"
-"Wilt geer doorgaon?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Faeler bie 't verplaatse."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Faeler \"%s\" bie 't ewegdoon van \"%s\".\n"
+"Faeler \"%s\" bie 't aanmake van ein verwiezing nao \"%s\".\n"
 "\n"
 "Wilt geer doorgaon?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't kopiëre.\n"
-"\n"
-"Wilt geer doorgaon?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Faeler bie 't ewegdoon."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't verplaatse.\n"
-"\n"
-"Wilt geer doorgaon?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Faeler bie 't kopiëre."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't aanmake van verwiezinge.\n"
-"\n"
-"Wilt geer doorgaon?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Faeler bie 't verplaatse."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Faeler \"%s\" bie 't ewegdoon.\n"
-"\n"
-"Wilt geer doorgaon?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Faeler bie 't aanmake van verwiezinge."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Faeler bie 't ewegdoon."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Faeler bie 't kopiëre."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Faeler bie 't verplaatse."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Faeler bie 't aanmake van verwiezinge."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Faeler bie 't ewegdoon."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Euversjlaon"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Obbenuuts"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kèn aangegaeve aksie neet aafmake."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kèn neet verplaats waere nao de nuuj lokasie, den de naam weurt al "
 "gebroek veur ein sjpesjaal item det neet verplaats of vervange kèn waere.\n"
 "\n"
 "Went geer \"%s\" toch wilt verplaatse, moot 't iers herneump waere."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kèn aangegaeve aksie neet aafmake."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kèn neet gekopiëerd waere nao de nuuj lokasie, den de naam weurt al "
 "gebroek veur ein sjpesjaal item det neet verplaats of vervange kèn waere.\n"
 "\n"
 "Went geer \"%s\" toch wilt kopiëre, herneum 't en probeer 't obbenuuts."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Vervange van besjtandj mislök."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Besjtandj \"%s\" besjteit al.\n"
 "\n"
 "Wilt geer 't vervange?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflik bie 't kopiëre"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Vervange"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Alles vervange"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "verwiezing nao %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "nog ein verwiezing nao %s"
@@ -2310,25 +2232,25 @@ msgstr "nog ein verwiezing nao %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%de verwiezing nao %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%de verwiezing nao %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%de verwiezing nao %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%de verwiezing nao %s"
@@ -2338,562 +2260,601 @@ msgstr "%de verwiezing nao %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (nog ein kopie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "e kopie"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "e kopie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "e kopie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "e kopie"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (nog ein kopie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dte kopie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ónbekènde GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Besjtenj nao de papeerkörf aan 't verplaatse"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "d'roet gesjmiete: "
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "verplaatsentaere"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Baezig mit veurbereide van verplaatse nao de papeerkörf..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Besjtenj aan 't verplaatse"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Verplaatsde besjtenj:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Verplaatsing aan 't veurbereide..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Verplaatsing aan 't aafmake..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Baezig mit aanmake van verwiezinge nao besjtenj"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Besjtandjverwiezinge:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Verwiezinge aan 't make"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Baezig mit veurbereide van aanmake van verwiezinge..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Baezig mit aafmake van aanmake van verwiezinge..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "kopiërentaere"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Gekopieerde besjtenj:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopiërentaere"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Baezig mit veurbereide van kopiëre..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Geer kènt gein items nao de papeerkörf kopiëre"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Kèn neet kopiëre nao papeerkörf"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Geer kènt gein map verplaatse nao zichzelf."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Geer kènt deze papeerkörf-map neet kopiëre."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Geer kènt de lokasie van de papeerkörf neet verangere"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Geer kènt de papeerkörf neet kopiëre"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Geer kènt gein map verplaatse nao zichzelf."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Geer kènt gein map nao zichzelf kopiëre"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Nuuj laeg map aanmake in deze map"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Verplaatse nao zichzelf neet mäögelik"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kèn neet kopiëre nao zichzelf "
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Geer kènt gein map euver zichzelf haer kopiëre"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kèn neet kopiëre euver zichzelf haer"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Faeler bie aanmake van nuuj map.\n"
 "\n"
 "Geer höbt gein sjriefrechte veur de besjtemmingslokasie."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Faeler bie aanmake van nuuj map.\n"
 "\n"
 "'t geuf geine ruumde op de besjtemmingslokasie."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Faeler \"%s\" bie aanmake nuuj map."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Faeler bie aanmake nuuj map"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Faeler bie aanmake nuuj map"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "naamloeze map"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Faeler \"%s\" bie aanmake nuuj map."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Faeler bie aanmake nuuj map"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Faeler bie aanmake nuuj map"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 besjtandj"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Wösjentaere van besjtenj"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Gewösjde besjtenj:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Wösjentaere"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Baezig mit veurbereide van ewegdoon van besjtenj..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Laegentaere van papeerkörf"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Baezig mit veurbereide van papeerkörf laege..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Wit geer vas det geer alle objekte in de papeerkörf permanent eweg wilt doon?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Laege"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopie).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (nog ein kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (nog ein kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (nog ein kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (nog ein kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (112e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124e kopie).txt"
 
@@ -2912,64 +2873,64 @@ msgstr "foo (124e kopie).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "huuj óm 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "huuj óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "huuj óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "huuj óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "huuj, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "huuj óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "huuj"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "gister óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "gister óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "gister óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "gister óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "gister, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "gister óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "gister"
 
@@ -2978,118 +2939,118 @@ msgstr "gister"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Goonsdig 00 September 00 0000 óm 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y óm %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mao 00 Oct 0000 óm 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y óm %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mao 00 Oct 0000 óm 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y at %-I:%M %"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Okt 0000 óm 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y óm %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Okt 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 items"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mappe"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 besjtenj"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 map"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 besjtandj"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u items"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mappe"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u besjtenj"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? items"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 #, fuzzy
 msgid "unknown type"
 msgstr "ónbekènd tiep"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 #, fuzzy
 msgid "unknown MIME type"
 msgstr "ónbekènd MIME-tiep"
@@ -3097,16 +3058,16 @@ msgstr "ónbekènd MIME-tiep"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ónbekènd"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3116,7 +3077,7 @@ msgstr ""
 "dènkelik det eur gnome-vfs.keys besjtandj op de verkierde plaats sjteit, of "
 "neet gevónje kós waere óm ein angere raej."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, fuzzy, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3125,11 +3086,11 @@ msgstr ""
 "Gein besjrieving gevónje veur MIME-tiep \"%s\" (besjtandj is \"%s\"), geuf "
 "dit esuchbleef door aan de gnome-vfs mailing lies."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "verwiezing"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "verwiezing (doedloupend)"
 
@@ -3251,11 +3212,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Besjtenj zeuke op besjtandjnaam en eigesjappe"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "piktogrammeweergaaf"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Liesweergaaf"
@@ -3401,152 +3364,157 @@ msgstr "%s's Heim"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "besjtandjpiktogram"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "bewirkbare teks"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "'t bewirkbare label"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "aanvöllende teks"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "get mie teks"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "gemarkeerd veur seleksie"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 #, fuzzy
 msgid "whether we are highlighted for a selection"
 msgstr "of veer gemarkeerd veur seleksie zeen"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "gemarkeerd es tósjebordfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 #, fuzzy
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "of veer gemarkeerd zeen veur de tósjebordfokus trök te gaeve"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "gemarkeerd veur loslaote"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 #, fuzzy
 msgid "whether we are highlighted for a D&D drop"
 msgstr "of veer gemarkeerd zeen veur sjleipaksie loslaote"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "De seleksierechhook"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Teks omkadere"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Kader óm ongeselekteerde teks teikene"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Kleur seleksieveldj"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Kleur van 't selectieveldj"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha-waerd seleksieveldj"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Doorsjienendheid van 't seleksieveldj"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alpha-waerd markering"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Doorsjienendheid van de markering veur geselekteerde piktogramme"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Lichte infermasiekleur"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Kleur veur infermasieteks taenge ein duusjtere achtergróndj"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Duusjtere infermasiekleur"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Kleur veur infermasieteks taenge ein lichte achtergróndj"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Dees map maak gebroek van ein automatisse plaatsing. Wilt geer dit verangere "
 "in handjmesige plaatsing en dit item laote sjtaon woe geer 't naergezat "
 "höbt? Dit kèn de opgesjlaoge handjmesige plaatsing rómmelig make."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Dees map maak gebroek van automatisse plaatsing. Wilt geer dit verangere in "
 "handjmesige plaatsing en deze items laote sjtaon woe geer ze naergezat höbt? "
 "Dit kèn de opgesjlaoge handjmesige plaatsing rómmelig make."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Dees map maak gebroek van ein automatisse plaatsing. Wilt geer dit verangere "
 "in handjmesige opmaak en dit item laote sjtaon woe geer 't naergezat höbt?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Dees map maak gebroek van ein automatisse plaatsing. Wilt geer dit verangere "
 "in handjmesige plaatsing en deze items laote sjtaon woe geer ze naergezat "
 "höbt?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Ómsjakele nao handjmesige plaatsing?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Ómsjakele"
 
@@ -3656,73 +3624,73 @@ msgstr "Is sjtanderd veur \"%s\"-items."
 msgid "Is the default for all \"%s\" items."
 msgstr "Is de sjtanderd veur alle \"%s\"-items."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Veranger \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Zèt in 't menu veur \"%s\"-items"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Gebroek es sjtanderd veur \"%s\"-items"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Zèt in 't menu allein veur \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Gebroek es sjtanderd allein veur \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Zèt neet in 't menu veur \"%s\"-items"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Naam"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Sjtatus"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Ke_ze"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Vaerdig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Verangere..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 #, fuzzy
 msgid "File Types and Programs"
 msgstr "Besjtandjtiep en Programme"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Gank daohaer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -3731,48 +3699,48 @@ msgstr ""
 "Geer kènt insjtèlle welke programme waere aangeprizzenteerd veur welke "
 "Besjtandjtiep in 't Besjtandjtiep en programme-dialoogvinster."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Mit anger toepassing äöpene"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Keus 't program veur \"%s\" mit te äöpene:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Äöpene mit anger weergaaf"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Keus ein weergaaf veur \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Gein weergaaf besjikbaar veur \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Gein weergaaf besjikbaar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Dao is gein program verbónje mit \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Gein programme verbónje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Dao is gein aksie verbónje mit \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Gein aksie verbónje"
 
@@ -3780,11 +3748,9 @@ msgstr "Gein aksie verbónje"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3793,42 +3759,41 @@ msgstr ""
 "Geer kènt GNOME kóngfiggerere veur toepassinge mit besjtandjtiep te "
 "verbènje. Wilt geer noe ein toepassing mit dit Besjtandjtiep verbènje?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Toepassing verbènje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "De weergaaf verbónje mit \"%s\" is óngeljig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Óngeljige weergaaf verbónje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "De toepassing verbónje mit \"%s\" is óngeljig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Óngeljige toepassing verbónje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "De aksie verbónje mit \"%s\" is óngeljig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Óngeljige aksie verbónje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3839,94 +3804,135 @@ msgstr ""
 "besjtandjtiep te verbènje. Wilt geer noe ein toepassing mit dit "
 "besjtandjtiep verbènje?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Aksie verbènje"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" kèn \"%s\" neet äöpene, den \"%s\" kèn besjtenj op \"%s\" neet "
+"benaodere.  Wilt geer ein anger program keze?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" kèn \"%s\" neet äöpene, den \"%s\" kèn besjtenj op \"%s\" neet "
 "benaodere.  Wilt geer ein anger program keze?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "De sjtanderd aksie kèn \"%s\" neet äöpene, den 't kèn besjtenj op \"%s\" "
 "neet benaodere. Wilt geer ein anger program keze?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Kèn lokasie neet äöpene"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" kèn \"%s\" neet äöpene, den \"%s\" kèn besjtenj op \"%s\" neet "
+"benaodere.  Wilt geer ein anger program keze?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" kèn \"%s\" neet äöpene, den \"%s\" kèn besjtenj op \"%s\" neet "
 "benaodere.  Gein anger programme zeen besjikbaar veur dit besjtandj te "
 "äöpene. Mesjiens kènt geer 't besjtandj waal äöpene est geer 't nao eure "
 "computer kopiëert."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "De sjtanderd aksie kèn \"%s\" neet äöpene, den 't kèn besjtenj op \"%s\" "
-"neet benaodere. Gein anger programme zeen besjikbaar veur dit besjtandj te "
-"bekieke. Mesjiens kènt geer 't besjtandj waal äöpene est geer 't nao eure "
+"neet benaodere. Wilt geer ein anger program keze?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" kèn \"%s\" neet äöpene, den \"%s\" kèn besjtenj op \"%s\" neet "
+"benaodere.  Gein anger programme zeen besjikbaar veur dit besjtandj te "
+"äöpene. Mesjiens kènt geer 't besjtandj waal äöpene est geer 't nao eure "
 "computer kopiëert."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Äöpenetaere \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Sorry, door veiligheidsraeje kènt geer gein neet-lokale opdrachte oetveure."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Kèn neet-lokale verwiezinge neet oetveure"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "'t goof eien faeler bie 't stjarte van de toepassing.\n"
 "\n"
 "Detajs:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "'t goof eine faeler bie 't stjarte van de toepassing"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Sjleipdoel aksepteert allein lokale besjtenj"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Dit sjleipdoel aksepteert allein lokale besjtenj.\n"
@@ -3934,15 +3940,15 @@ msgstr ""
 "Veur neet-lokale besjtenj te äöpene, moot geer ze nao ein lokale map kopiëre "
 "en ze obbenuuts sjleipe."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Sjleipdoel aksepteert allein lokale besjtenj"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4195,14 +4201,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Items die \"medusa\" in de naam höbbe en mappe zeen."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Doorzeuke van sjieve"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus doorzeuk eur sjieve op papeerkörf"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Bewirke"
@@ -4403,97 +4401,107 @@ msgstr "Achtergróndj"
 msgid "Empty Trash"
 msgstr "Papeerkörf laege"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Dit zal %d nuuj vinsters äöpene. Wit geer vas det geer det wilt?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d vinsters äöpene?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Wit geer vas det geer \"%s\" permenent wilt ewegdoon?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Dit zal %d nuuj vinsters äöpene. Wit geer vas det geer det wilt?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Wit geer vas det geer \"%s\" permenent wilt ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Wit geer vas det geer de %d geselekteerde items permenent wilt ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Doog alle geselekteerde items permenent eweg"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Keus ein kattegerie:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Patroene"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" geselekteerd"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 map geselekteerd"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappe geselekteerd"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (haet 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (haet 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (haet %d items)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (haet in totaal 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (haet in totaal 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (haet in totaal %d items)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" geselekteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d items geselekteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 anger item geselekteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d angere items geselekteerd (%s)"
@@ -4505,7 +4513,7 @@ msgstr "%d angere items geselekteerd (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4514,108 +4522,128 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "De map \"%s\" haet mie besjtenj es Nautilus aankèn. Neet alle besjtenj waere "
 "getuind."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Te väöl besjtenj"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" kèn neet nao de papeerkörf verplaats waere. Wilt geer 't drek "
 "ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"De %d geselekteerde items kènne neet nao de papeerkörf verplaats waere. Wilt "
-"geer ze drek ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" kèn neet nao de papeerkörf verplaats waere. Wilt geer 't drek "
+"ewegdoon?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d van de geselekteerd items kènne neet nao de papeerkörf verplaats waere. "
-"Wilt geer deze %d items drek ewegdoon?"
+"\"%s\" kèn neet nao de papeerkörf verplaats waere. Wilt geer 't drek "
+"ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Drek ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Wit geer vas det geer \"%s\" permenent oet de papeerkörf wilt ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Wit geer vas det geer de %d items permenent oet de papeerkörf wilt ewegdoon?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Ewegdoon oet de papeerkörf?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Gebroek \"%s\" veur 't geselekteerde item te äöpene"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Anger _toepassing..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Ein _toepassing..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Anger _weergaaf..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Ein _weergaaf..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Kèn aangegaeve aksie neet aafmake: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Kèn aangegaeve aksie neet aafmake."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Veur \"%s\" oet op jeder geselekteerd item"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Alle oetveurbare besjtenj in dees map zólle getuind waere in 't Scripts-"
+"menu. Door ein skrip te keze oet 't menu weurt 't skrip oetgeveurd mit de "
+"geselekteerde items es inveur."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4623,11 +4651,11 @@ msgstr ""
 "menu. Door ein skrip te keze oet 't menu weurt 't skrip oetgeveurd mit de "
 "geselekteerde items es inveur."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Scripts info"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4669,17 +4697,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posisie en aafmaetinge van 't hujige vinster"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" weurt verplaats est geer de opdrach 'Plak Besjtenj' geuft"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" weurt gekopieerd est geer de opdrach 'Plak Besjtenj' geuft"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4687,7 +4715,7 @@ msgstr ""
 "De %d geselekteerde items waere verplaats est geer de opdrach 'Plek "
 "Besjtenj' geuft"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4695,162 +4723,169 @@ msgstr ""
 "De %d geselekteerde items waere gekopieeerd est geer de opdrach 'Plek "
 "Besjtenj' geeft"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Dao sjteit niks op 't klembord veur te plekke."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Aankoppelingsfaeler"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Aafkoppelingsfaeler"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Aankoppelingsfaeler"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 #, fuzzy
 msgid "E_ject"
 msgstr "Oets_jmiete"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Volume _ontkoppele"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Äöpene _in nuuj vinster"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Äöpene in %d _nuuj Vinsters"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Heimmap"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Heimmap"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Ewegdoon oet de _papeerkörf"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Doog alle geselekteerde items permenent eweg"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Verplaatse nao papeerkörf"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Verplaats alle geselekteerde items nao de papeerkörf"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Eweg_doon"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Verwiezinge ma_ke"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Verwiezing ma_ke"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Papeerkörf _laege"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Besjtandj k_nippe"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Besjtenj k_nippe"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Besjtandj _kopiëre"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Besjtenj _kopiëre"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Dees verwiezing kèn neet gebroek waere, wiel 't doel mis. Wilt geer de "
 "verwiezing in de papeerkörf sjmiete?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Dees verwiezing kèn neet gebroek waere, wiel 't doel mis. Wilt geer de "
+"verwiezing in de papeerkörf sjmiete?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Dees verwiezing kèn neet gebroek waere, wiel häör doel \"%s\" mis. Wilt geer "
 "de verwiezing in de papeerkörf sjmiete?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Doedloupende verwiezing"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\"is ein oetveurbaar teksbesjtandj. Wilt geer 't oetveure, of de inhaud "
 "bekieke?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Oetveure of tuine?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Tuine"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Oetveure in _Terminalvinster"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Tuine"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Oetveu_re"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Äöpenetaere \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Äöpene sjtoppe?"
 
@@ -4872,17 +4907,22 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Sorry, 't tuine van de inhaud van \"%s\"is mislök."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Faeler bie 't tuine van ein map"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
 "De naam \"%s\" is al in gebroek in dees map. Keus esuchbleef ein anger naam."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4890,12 +4930,12 @@ msgstr ""
 "'t geuf gein \"%s\" in dees map. Mesjiens is 't kort geleje verplaats of "
 "eweggedaon?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Geer höbt neet de benudigde rechte veur \"%s\" te herneume."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4904,85 +4944,105 @@ msgstr ""
 "De naam \"%s\" is óngeljig, wiel er de teikes \"/\" gebroek. Keus esuchbleef "
 "ein anger naam."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "De naam \"%s\" is óngeljig. Keus esuchbleef ein anger naam."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Kèn de naam van \"%s\" neet verangere, den 't is ein allein-laeze sjief"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sorry, kèn \"%s\" neet herneume nao \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Herneumfaeler"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Geer höbt de benudigde rechte neet veur de gróp van \"%s\" te verangere."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Kèn de gróp van \"%s\" neet verangere, den 't is ein allein-laeze sjief"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sorry, kèn de gróp van \"%s\" neet verangere."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Faeler bie insjtèlle van gróp"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Kèn de eigenaer van \"%s\" neet verangere, den 't is ein allein-laeze sjief"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sorry, kèn de eigenaer van \"%s\" neet verangere."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Faeler bie insjtèlle van eigenaer"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Kèn de rechte van \"%s\" neet verangere, den 't is ein allein-laeze sjief"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sorry, kèn de rechte van \"%s\" neet verangere."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Faeler bie insjtèlle rechte"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Herneume van \"%s\" nao \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Herneume sjtoppe?"
 
@@ -5042,131 +5102,154 @@ msgstr "_Oersjprunkelike piktogramaafmaetinge hersjtèlle"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Oersjprunkelike piktogramaafmaetinge hersjtèlle"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "wies nao \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Sjleipe en denaerzètte weurt allein gesjtiep op lokale Besjtandjysteme."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Sjleipe en denaerzètte weurt allein gesjtiep op lokale Besjtandjysteme."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Faeler bie sjleipe en denaerzètte"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 #, fuzzy
 msgid "An invalid drag type was used."
 msgstr "Ein óngeljig sjleiptiep woor gebroek."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Besjtandjnaam"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Gruutde"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tiep"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Verangeringsdatem"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Geer kènt neet mie es ein eige piktogram per kier toekènne! Sjleip ein "
+"aafbiljing veur ein aangepas piktogram in te sjtèlle."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Geer kènt neet mie es ein eige piktogram per kier toekènne! Sjleip ein "
 "aafbiljing veur ein aangepas piktogram in te sjtèlle."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mie es ein aafbiljing"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "'t besjtandj det geer versjleipde is neet lokaal. Geer kènt allein lokale "
 "aafbiljinge es aangepasde piktogramme gebroeke."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"'t besjtandj det geer versjleipde is neet lokaal. Geer kènt allein lokale "
+"aafbiljinge es aangepasde piktogramme gebroeke."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Allein lokale aafbiljinge"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"'t besjtandj det geer versjleipde is gein aafbiljing. Geer kènt allein "
-"lokale aafbiljinge es aangepasde piktogramme gebroeke."
+"'t besjtandj det geer versjleipde is neet lokaal. Geer kènt allein lokale "
+"aafbiljinge es aangepasde piktogramme gebroeke."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Allein aafbiljinge"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "_Eigesjappe"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Eigesjappe"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Verangering van gróp annulere?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Baezig mit verangere gróp"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Verangering van eigenaer annulere?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "baezig mit verangere eigenaer"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "niks"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "neet laesbaar"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, mit gruutde %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d items, totaal %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(sómmige inhaud neet laesbaar)"
 
@@ -5176,197 +5259,197 @@ msgstr "(sómmige inhaud neet laesbaar)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Inhaud:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Fóng"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_Naam:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 #, fuzzy
 msgid "Type:"
 msgstr "Tiep"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Gruutde:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lokasie:"
 
 # Nog eens een betere vertaling vinden veur 'Volume'?!
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Vrieje ruumde:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Verwiezingsdoel:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME-tiep:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Verangerd:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Gebroek:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Aangepas piktogram selekteren..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Aangepas piktog_ram ewegdoon"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Laeze"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Sjrieve"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 #, fuzzy
 msgid "E_xecute"
 msgstr "_Oetveure"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Gebroekers-ID insjtèlle"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Sjpesjale vane:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Gróps-ID insjtèlle"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Vas"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Rechte"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Geer zeet neet de eigenaer en kènt dus gein eigesjappe verangere."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Besjtandjeigenaer:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Besjtandjeigenaer:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Besjtandjgróp:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Besjtandjgróp:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Eigenaer:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Gróp:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Angere:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Teksweergaaf:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Numerieke weergaaf:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Lès verangerd:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "De eigesjappe van \"%s\" kènne neet waere bepaald."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"'t goof eine faeler bie 't tuine van hulpteks:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "'t goof eine faeler bie 't tuine van hulpteks: %s."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Kèn hulpteks neet tuine"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Eigesjappevinster annulere?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Baezig mit aanmake eigesjappevinster"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Keus ein piktogram"
 
@@ -5384,71 +5467,112 @@ msgid "Search Results"
 msgstr "Zeukrizzeltate"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Sorry, mer de Medusa zeukdeens is neet besjikbaar wiel ze neet geïnstalleerd "
-"is."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Sorry, de Medusa-zeukdeens is neet besjikbaar."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Zeukdeens neet besjikbaar"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "De zeukopdrach die geer gekoze höbt, is nujer es de index van eur systeem. "
 "De zeukopdrach haet op dit mement gein rizzeltate. Geer kènt ein nuuj index "
 "make door es root \"medusa-indexd\" oet te veure in ein terminal."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"'t zeukprogram kèn eur indexlies neet äöpene. Eur index kèn óntbraeke of "
+"fout zeen. Geer kènt eine make door es root \"medusa-indexd\" oet te veure "
+"in ein terminal."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Zeuk nao items die te nuuj zeen"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Eder geïndexeerd besjtandj op eure computer kump euverein mit de door uch "
+"gekaoze kriteria. Mesjiens kènt geer de sjpelling van eur seleksie "
+"kentrolere of mie kriteria toeveuge veur 't deil rizzeltate trök te bringe."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Eder geïndexeerd besjtandj op eure computer kump euverein mit de door uch "
 "gekaoze kriteria. Mesjiens kènt geer de sjpelling van eur seleksie "
 "kentrolere of mie kriteria toeveuge veur 't deil rizzeltate trök te bringe."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Faeler bie verangere eigenaer"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "'t zeukprogram kèn eur indexlies neet äöpene. Eur index kèn óntbraeke of "
 "fout zeen. Geer kènt eine make door es root \"medusa-indexd\" oet te veure "
 "in ein terminal."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Faeler bie 't laeze van de Besjtandj-index"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Eine faeler bie 't laje van dees zeukinhauwe: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Veur ein sjnelle zeukopdrach oet te veure haet 't zeukprogram ein lies nudig "
+"van de besjtenj op eur systeem. 't zeukprogram kèn op dit mement neet euver "
+"dees lies besjikke."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Veur ein sjnelle zeukopdrach oet te veure haet 't zeukprogram ein lies nudig "
+"van de besjtenj op eur systeem. 't zeukprogram kèn op dit mement neet euver "
+"dees lies besjikke."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5456,26 +5580,23 @@ msgstr ""
 "eur systeem. 't zeukprogram kèn op dit mement neet euver eur lies besjikke "
 "dus zal ein lanksemer zeukprogram gebroek waere det gein lies nudig haet."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Veur ein sjnelle zeukopdrach oet te veure haet 't zeukprogram ein lies nudig "
-"van de besjtenj op eur systeem. 't zeukprogram kèn op dit mement neet euver "
-"dees lies besjikke."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Sjnelzeuke is neet besjikbaar"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Inhaudszeuke is neet besjikbaar"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5489,37 +5610,66 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Veur 't sjnelzeuke haet de zeukdeens ein index nudig van de besjtenj op eur "
 "systeem. Eure computer is op dit mement baezig die index te make. Wiel 't "
 "nog gein index geuf, kèn 't zeuke mierdere menute dore."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Veur te kènne zeuke op inhaud, haet de zeukdeens ein index nudig van de "
 "inhaud van eur systeem. Eure computer is op dit mement baezig die index te "
 "make. Zeuke op inhaud is mäögelik zoegauw wen de index vaerdig is."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Zeuke via ein index is neet mäögelik"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Veur ein sjnelle zeukopdrach oet te veure haet 't zeukprogram ein lies nudig "
+"van de besjtenj op eur systeem. 't zeukprogram kèn op dit mement neet euver "
+"dees lies besjikke."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Veur ein sjnelle zeukopdrach oet te veure haet 't zeukprogram ein lies nudig "
+"van de besjtenj op eur systeem. 't zeukprogram kèn op dit mement neet euver "
+"dees lies besjikke."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Veur te kènne sjnelzeuke haet de zeukfónksie ein index nudig van de besjtenj "
 "op eur systeem. Op dit mement geuf 't gein index. Geer kènt ein index "
@@ -5527,12 +5677,12 @@ msgstr ""
 "Bis ein volsjtendige index besjikbaar is, zal ein zeukaksie mierdere menute "
 "dore."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Veur te kènne zeuke op inhaud, is ein index nudig van de inhaud van de "
 "besjtenj op eur systeem. Eure computer haet op dit mement gein index. Wilt "
@@ -5540,7 +5690,12 @@ msgstr ""
 "opdrachaanwiezing. Bis ein volsjtendige index besjikbaar is, kènne gein "
 "inhaudszeukaksies oetgeveurd waere."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Sjnelzeuke is neet besjikbaar op eure computer"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5550,11 +5705,12 @@ msgstr ""
 "op eur systeem. Eur systeemwirtsjaf haet 't sjnelzeuke op eur systeem aevel "
 "oetgesjakeld, en 't geuf gein index."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Sjnelzeuke is neet besjikbaar op eure computer"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Sjnelzeuke is neet besjikbaar"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Woe"
 
@@ -5563,7 +5719,7 @@ msgstr "Woe"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "In nuuj vinste_r ónthulle"
@@ -5574,7 +5730,7 @@ msgstr "In nuuj vinste_r ónthulle"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "In %d _nuuj vinsters ónthulle"
@@ -5583,15 +5739,21 @@ msgstr "In %d _nuuj vinsters ónthulle"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus haet mie zeukrizzeltate gevónje es 't kèn tuine. Sómmige rizzeltate "
 "waere neet getuind. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus haet mie zeukrizzeltate gevónje es 't kèn tuine. Sómmige rizzeltate "
+"waere neet getuind. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Te väöl euvereinkómste"
 
@@ -5606,12 +5768,12 @@ msgid "Create L_auncher"
 msgstr "Nuuj st_arter"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Nuuj starter aanmake"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Alle items oet de papeerkörf wösje"
 
@@ -5634,7 +5796,7 @@ msgstr ""
 #  add the reset background item, possibly disabled
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "_Sjtanderd achtergróndj trökzètte"
@@ -5657,58 +5819,68 @@ msgstr "Angere weergaaf keze veur 't item mit te bekieke"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Heimmap"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Heimmap"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Nuuj laeg map aanmake in deze map"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Nuuj laeg map aanmake in deze map"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Symbolisse verwiezing make veur eder geselekteerde item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Klone"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Alle geselekteerde items wösje, zónger ze in de papeerkörf te sjmiete."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Eder geselekteerde item klone"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Sjtarter bewirke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Sjtarter-infermasie bewirke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "'t geselekteerde volume formattere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medi_a-eigesjappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "'t geselekteerde volume óntkoppelen."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Besjtenj verplaatse of kopjere die ierder door ein 'Besjtenj knippe' of "
 "'Besjtenj kopjere'-opdrach waore geselekteerd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5717,134 +5889,143 @@ msgstr ""
 "Besjtenj verplaatse of kopjere die ierder door ein 'Besjtenj knippe' of "
 "'Besjtenj kopjere'-opdrach waore geselekteerd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Äöpene _mit"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Eder geselekteerd item in ein nuuj vinster äöpene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Äöpene _in nuuj vinster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Geselekteerd item in dit vinster äöpene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Geselekteerde besjtenj vaerdigmake veur gekopjeerd te waere mit de 'Besjtenj "
 "plekke'-opdrach"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Geselekteerde besjtenj vaerdigmake veur verplaats te waere mit de 'Besjtenj "
 "plekke'-opdrach"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "B_esjirme"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "'t geselekteerde volume besjirme"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Geselekteerde item herneume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Weergaaf trökzètte nao _sjtanderd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Sorteerresem en zoomnivo trökzètte nao prifferensies veur deze weergaaf"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Scripts in ~/Nautilus/scripts drieje of wirtsjafte"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Alle besjtenj selektere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Patroene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Alle items in dit vinster selektere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Alle items in dit vinster selektere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "De media-eigesjappe van 't geselekteerde volume tuine"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "De map mit scripts tuine, die in dit menu sjtaon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "'t geselekteerde volume óntkoppelen."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "De sjtanderdachtergróndj veur deze lokasie gebroeke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "De eigesjappe per geselekteerd item bekieke of verangere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Besjtandj _kopiëre"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formattere"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Volume _ontkoppele"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Äöpene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Scriptsmap äöpene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Besjtenj _plekke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "Besjtenj _plekke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Eigesjappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "He_rneume..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5933,7 +6114,12 @@ msgstr "_Handjmesig"
 msgid "Indexing is %d%% complete."
 msgstr "Indexere veur %d%% vaerdig."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Eur besjtenj zeen veur 't lès geïndexeerd op %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5941,25 +6127,29 @@ msgstr ""
 "Einmaol daags waere eur besjtenj en teksinhaud geïndexeerd zoedet eur "
 "zeukopdrachte sjneller gaon."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexeringssjtatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Eur besjtenj zeen veur 't lès geïndexeerd op %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Einmaol daags waere eur besjtenj en teksinhaud geïndexeerd zoedet eur "
-"zeukopdrachte sjneller gaon. Eur besjtenj waere op dit mement geïndexeerd."
+"zeukopdrachte sjneller gaon."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "'t geuf op dit mement gein lies van eur besjtenj."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5969,15 +6159,19 @@ msgstr ""
 "eur systeem veur 't zeuke te versjnelle. Sjnelzeuke sjteit neet aan op eure "
 "computer, geer höbt op dit mement dus gein besjtandjlies."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "'t geuf op dit mement gein lies van eur besjtenj."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Sorry, de Medusa-zeukdeens is neet besjikbaar."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I.%M %p, %x"
 
@@ -6001,32 +6195,37 @@ msgstr "_Indexeringsstatus tuine"
 msgid "Show status of indexing used when searching"
 msgstr "Indexeringssjtatus tuine die gebroekt weurt bie 't zeuke"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Kèn benudigde map neet aanmake"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Kèn benudigde mappe neet aanmake"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus kèn de benudigde map \"%s\" neet aanmake. Maak esuchbleef dees map "
 "aan teveures Nautilus te sjtarte, of de rechte zoe in te sjtèlle det "
 "Nautilus häöm kèn aanmake."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Kèn benudigde mappe neet aanmake"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6037,24 +6236,28 @@ msgstr ""
 "Maak esuchbleef dees mappe aan teveures Nautilus te sjtarten, of de rechte "
 "zoe in te sjtèlle det Nautilus ze kèn aanmake."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Verwiezing nao aud wirkblaad"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 #, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "De lokasie van de wirkblaadmap is verangerd in Gnome 2.4. Ein verwiezing mit "
 "de naam \"Verwiezing nao auw wirkblaad\" is aangemaak op 't wirkblaad. Geer "
 "kènt deze äöpene veur de besjtenj van eur keuze te verhoeze, en de "
 "verwiezing daonao eweg te doon."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Auw wirkblaad gemigreerd"
 
 #. Can't register myself due to trouble locating the
@@ -6067,7 +6270,7 @@ msgstr "Auw wirkblaad gemigreerd"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6078,7 +6281,7 @@ msgstr ""
 "geer probere eur systeem te hersjtarte of Nautilus obbenuuts te installere."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6125,12 +6328,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus kèn noe neet gebroek waere waeges ein ónbekènde faeler."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6138,7 +6341,7 @@ msgstr ""
 "Nautilus kèn noe neet gebroek waere waeges ein ónverwachde faeler van Bonobo "
 "bie 't registrere van de weergaafdeens van de Besjtandjwirtsjafder."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6148,7 +6351,7 @@ msgstr ""
 "bie 't zeuke van de Febrik. 't sjtoppe van bonobo-activation-server en 't "
 "obbenuuts sjtarte van Nautilus los 't prebleem mesjiens op. "
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6158,6 +6361,17 @@ msgstr ""
 "bie 't zeuke nao 't shell objek. 't sjtoppe van bonobo-activation-server en "
 "'t obbenuuts sjtarte van Nautilus los mesjiens 't prebleem op."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"'t goof eine faeler bie 't tuine van hulpteks:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Gein blaadwiezers gedefinieerd"
@@ -6191,36 +6405,46 @@ msgstr "Winniger opsies"
 msgid "Find Them!"
 msgstr "Zeuke!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Verplaatse nao zichzelf neet mäögelik"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Sorry, mer \"%s\" is gein geljige besjtandjnaam."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" is gein geljige lokasie. Kentroleer de sjpelling en probeer't "
-"obbenuuts."
+"Kèn \"%s\" neet vènje. Kentroleer de sjpelling en probeer 't obbenuuts."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Netwirkservers"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Naam:"
+msgid "_Location:"
+msgstr "Lokasie:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Verbènje"
@@ -6422,6 +6646,20 @@ msgstr ""
 "Geer kènt dit besjtandj eventueel handjmesig wösje veur de druïde obbenuuts "
 "te laote versjiene.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Geer kènt neet mie es ein eige piktogram per kier toekènne! Sjleip ein "
+"aafbiljing veur ein aangepas piktogram in te sjtèlle."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"'t besjtandj det geer versjleipde is neet lokaal. Geer kènt allein lokale "
+"aafbiljinge es aangepasde piktogramme gebroeke."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6432,26 +6670,25 @@ msgstr "Äöpene mit %s"
 msgid "Open with..."
 msgstr "Äöpene mit..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Kós de cd-brenner applikasie neet sjtarte:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Kèn de cd-brenner neet opsjtarte"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Papeerkörf laege"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "In_haud nao cd sjrieve"
 
@@ -6459,37 +6696,37 @@ msgstr "In_haud nao cd sjrieve"
 msgid "Go To:"
 msgstr "Gank nao:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Wilt geer deze %d lokasies in aparte vinsters tuine?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "In mierdere vinsters tuine?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Kèn lokasie neet äöpene"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Inkele sjnelle zelf-tests oetveure."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Innesjeel vinster mit de gagaeve aafmaetinge make."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Vinsters allein make veur explisiet gagaeve URI's."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6497,83 +6734,96 @@ msgstr ""
 "'t wirkblaad neet wirtsjafte (de prifferensies in 't prifferensievinster "
 "negere)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Nautilus aafsjloete"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus obbenuuts sjtarte"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Besjtandjwirtsjaf"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kèn neet gebroek waere mit URI's.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kèn neet gebroek waere mit angere opsies.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kèn neet gebroek waere mit URI's.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kèn neet gebroek waere mit URI's.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kèn neet gebroek waere mit mie es ein 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Wit geer vas det geer \"%s\" permenent wilt ewegdoon?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Weit geer zieker det geer de historie wilt vergaete? Est geer det deit, zeet "
 "geer gedoemp deze te herhaole."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Weit geer zieker det geer de lies van lokasies die geer bezoch höbt wilt "
 "wösje?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Historie wösje"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Lokasie \"%s\" besjteit neet. Wilt geer deze lokasie ewegdoon oet eure "
 "blaadwiezers en van eur lokasielies?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "De Lokasie \"%s\" besjteit neet langer."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Blaadwiezer veur neet-besjtaonde lokasie"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Ewegdoon"
 
@@ -6607,7 +6857,6 @@ msgid "Close _All Windows"
 msgstr "_Alle vinsters sjloete"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Alle Nautilus-vinsters sjloete"
@@ -6630,107 +6879,118 @@ msgid "Forward"
 msgstr "Naekste"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Nao de papeerkörf-map gaon"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Nao de naekst bezochde lokasie gaon"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Nao de veurig bezochde lokasie gaon"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Nao de papeerkörf-map gaon"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Persoenlik"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Lokasie_balk"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Verfrisje"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Op deze computer zeuke nao besjtenj"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Sjt_atusbalk"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Sjtoppe"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Boeve"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Nao CD sjrieve"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Bl_aadwiezer toeveuge"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Trök"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Blaadwiezers"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Historie _opsjoene"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Countertop"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Blaadwi_ezers bewirke"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Naekste"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Gank nao"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "Persoenlike _map"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lokasie..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Ziejpeniel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Papeerkörf"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Boeve"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "B_ild"
 
@@ -6748,34 +7008,39 @@ msgstr "Tuine es..."
 msgid "File Browser: %s"
 msgstr "Besjtandjeigenaer:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "In ein van de ziejpeniele goof 't eine faeler en deze kèn neet doorgaon. 't "
 "is jaomergenóg neet mäögelik te bepale welke."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "'t Goof eien faeler bie 't stjarte van de %s-weergaaf."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "In ziejpeniel %s goof 't eine faeler en 't kèn neet doorgaon. Wen dit dèkker "
 "gebäört, kènt geer 't peniel mesjiens baeter oetzètte."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Laje van ziejpeniel mislök"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Ziejpeniel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Haet ein ziejpeniel-bild"
 
@@ -6809,147 +7074,180 @@ msgstr "_Nuje biedoon..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Petroen %s kèn jaomergnóg neet waere eweggedaon."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Kèn petroen neet ewegdoon."
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Embleem %s kèn jaomergenóg neet waere eweggedaon."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Kèn 't embleem neet ewegdoon"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Nuuj embleem make:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Trefwaord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Aafbiljing:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Keus ein aafbiljing veur 't nuuj embleem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Nuuj kleur make:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Kleur_naam:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Kleur_waerd:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Sorry, mer \"%s\" is gein geljige besjtandjnaam."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Sorry, mer geer höbt gein geljige besjtandjnaam opgegaeve."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Kèn petroen neet installere!"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sorry, mer geer kènt de trökzèt-aafbiljing neet vervange."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Gein aafbiljing"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Sorry, mer 't petroen %s kèn neet waere geïnstalleerd"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Selekteer ein aafbiljingsbesjtandj veur es petroen toe te veuge"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sorry, mer geer moot ein neet-laege naam veur de nuuj kleur opgaeve."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Kèn de kleur neet installere"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Keus ein kleur veur toe te veuge"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Sorry, mer '%s' is gein broekbaar aafbiljingsbesjtandj!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "'t besjtandj '%s' lik gein geljige aafbiljing te zeen."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Keus ein kattegerie:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Ewegdoon _annelere"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Nuuj patroon _biedoon..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Nuuj kleur _biedoon..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Nuuj embleem _biedoon..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klik op ein petroen veur 't eweg te doon."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klik op ein kleur veur 't te ewegdoon."
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klik op ein embleem veur 't eweg te doon."
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Petroene:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Kleure:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Embleme:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Ein petroen _ewegdoon..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Ein kleur ewegdoon..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Ein embleem ewegdoon..."
 
@@ -7346,34 +7644,39 @@ msgstr "_CD maker"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "_Alle vinsters sjloete"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Ziejpeniel sjloete"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Nao laeg CD-map gaon"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Nao de papeerkörf-map gaon"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lokasie..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items die] mappe zeen"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Patroene"
@@ -7403,10 +7706,13 @@ msgid "View Failed"
 msgstr "Tuine is mislök"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "'t Goof eien faeler bie 't stjarte van de %s-weergaaf."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "In de %s-weergaaf goof 't eine faeler en deze kèn neet doorgaon. Geer kènt "
 "eventueel ein angere weergaaf keze of nao ein angere lokasie gaon."
@@ -7416,97 +7722,127 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "'t Goof eien faeler bie 't stjarte van de %s-weergaaf."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "De Nautilus Toepassing verbónje mit dit vinster"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Inhaudsweergaaf"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Huijig besjtandj of map tuine"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Kèn \"%s\" neet vènje. Kentroleer de sjpelling en probeer 't obbenuuts."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Kèn embleme neet biedoon"
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, fuzzy, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus kèn \"%s\" neet tuine."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Kos \"%s\" neet tuine wiel Nautilus 't Besjtandjtiep neet kèn vassjtelle."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus haet gein komponent die \"%s\" kèn tuine."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Weergaaf van \"%s\" mislökde, wiel Nautilus neet kèn ómgaon mit %s: lokasies."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Kèn \"%s\" tuine, wiel de aanmeldpoging mislökde."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Kèn \"%s\" neet tuine, wiel de toegangk geweigerd woor."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Weergaaf van \"%s\" is mislök, wiel computer \"%s\" neet gevónje is. "
 "Kentroleer de sjpelling en eure proxy-insjtellinge."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Weergaaf van \"%s\" is mislök, wiel de computernaam neet ingevöld waor. "
 "Kentroleer de sjpelling en eure proxy-insjtellinge."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Weergaaf van \"%s\" mislökde, wiel Nautilus neet kèn ómgaon mit %s: lokasies."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Kèn \"%s\" neet tuine, wiel Nautilus de SMB master browser neet kèn vènje.\n"
-"Zuug of eine SMB server 't lokale netwirk driejt."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Zeuke is neet besjikbaar op dit moment, wiel geer geine index höbt of wiel "
 "de zeukdeens neet driejt. Kentroleer of geer de Medusa-zeukdeens haet "
 "gesjtart en went geer geine index höbt, of de Medusa-indexeerder driejt."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Zeuke is neet besjikbaar op dit moment, wiel geer geine index höbt of wiel "
+"de zeukdeens neet driejt. Kentroleer of geer de Medusa-zeukdeens haet "
+"gesjtart en went geer geine index höbt, of de Medusa-indexeerder driejt."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Zeuke neet besjikbaar"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kèn \"%s\" neet tuine."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Kèn lokasie neet tuine"
 
@@ -7518,7 +7854,7 @@ msgstr "Gank nao de lokasie woenao deze blaadwiezer verwies"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7526,11 +7862,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Mathieu van Woerkom"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7546,39 +7882,43 @@ msgstr "Gank ein paar pagina's trök"
 msgid "Go forward a number of pages"
 msgstr "Gank ein paar pagina's veuroet"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Tuin deze lokasie mit \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Tóppele"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD maker"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Toepassings-ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "'t toepassings-ID van 't vinster"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Toepassing"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "De Nautilus Toepassing verbónje mit dit vinster"
 
@@ -7614,6 +7954,248 @@ msgstr "Netwirkservers"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Eure netwirkservers tuine mit Nautilus Besjtandjwirtsjaf"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Febrik veur 't hardware-vinster"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Hardware-weergaaf"
+
+#~ msgid "Hardware view"
+#~ msgstr "Hardware-weergaaf"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Bekieke es Hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "hardware-weergaaf"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "naam van 't piktogram veur hardware te tuine"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "samevatting van de hardware-infermasie"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cachegruutde"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB RAM"
+
+# &l
+#~ 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 "De computer sjteit al %d daag, %d oere e %d minute aan"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Hardware-euverzich"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Dit is eine plaatshauwer veur de CPU-pagina."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Dit is eine plaatshauwer veur de RAM-pagina."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Dit is eine plaatshauwer veur de IDE-pagina."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Faeler bie 't kopiëre nao \"%s\".\n"
+#~ "\n"
+#~ "'t geuf neet genóg ruumde op de besjtemmingslokasie."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Faeler bie 't aanmake van verwiezing in \"%s\".\n"
+#~ "\n"
+#~ "'t geuf neet genóg ruumde op de besjtemmingslokasie."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Faeler bie 't verplaatse nao \"%s\".\n"
+#~ "\n"
+#~ "Geer höbt gein sjriefrechte op de doelmap."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Faeler bie 't verplaatse nao \"%s\".\n"
+#~ "\n"
+#~ "De doelsjief sjtiep allein laeze."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Faeler bie 't aanmake van verwiezinge in \"%s\".\n"
+#~ "\n"
+#~ "Geer höbt gein sjriefrechte veur deze map."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Faeler bie 't aanmake van verwiezinge in \"%s\".\n"
+#~ "\n"
+#~ "De besjtemmingssjief is allein-laeze."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\" bie 't kopiëre van \"%s\".\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\"  bie 't verplaatse van \"%s\".\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\" bie 't ewegdoon van \"%s\".\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\" bie 't kopiëre.\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\" bie 't aanmake van verwiezinge.\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Faeler \"%s\" bie 't ewegdoon.\n"
+#~ "\n"
+#~ "Wilt geer doorgaon?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Kèn neet kopiëre nao papeerkörf"
+
+#~ 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 ""
+#~ "De sjtanderd aksie kèn \"%s\" neet äöpene, den 't kèn besjtenj op \"%s\" "
+#~ "neet benaodere. Gein anger programme zeen besjikbaar veur dit besjtandj "
+#~ "te bekieke. Mesjiens kènt geer 't besjtandj waal äöpene est geer 't nao "
+#~ "eure computer kopiëert."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Doorzeuke van sjieve"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus doorzeuk eur sjieve op papeerkörf"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "De %d geselekteerde items kènne neet nao de papeerkörf verplaats waere. "
+#~ "Wilt geer ze drek ewegdoon?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d van de geselekteerd items kènne neet nao de papeerkörf verplaats "
+#~ "waere. Wilt geer deze %d items drek ewegdoon?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "'t besjtandj det geer versjleipde is gein aafbiljing. Geer kènt allein "
+#~ "lokale aafbiljinge es aangepasde piktogramme gebroeke."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Sorry, mer de Medusa zeukdeens is neet besjikbaar wiel ze neet "
+#~ "geïnstalleerd is."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Einmaol daags waere eur besjtenj en teksinhaud geïndexeerd zoedet eur "
+#~ "zeukopdrachte sjneller gaon. Eur besjtenj waere op dit mement geïndexeerd."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" is gein geljige lokasie. Kentroleer de sjpelling en probeer't "
+#~ "obbenuuts."
+
+#~ 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 ""
+#~ "Kèn \"%s\" neet tuine, wiel Nautilus de SMB master browser neet kèn "
+#~ "vènje.\n"
+#~ "Zuug of eine SMB server 't lokale netwirk driejt."
+
+#~ msgid "file icon"
+#~ msgstr "besjtandjpiktogram"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Naam:"
+
 #~ msgid "Unknown"
 #~ msgstr "Ónbekènd"
 
@@ -7742,9 +8324,6 @@ msgstr "Eure netwirkservers tuine mit Nautilus Besjtandjwirtsjaf"
 #~ msgid "_Toolbar"
 #~ msgstr "_Wirkbalk"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "De Lokasie \"%s\" besjteit neet langer."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Gank nao neet-besjtaonde lokasie"
 
diff --git a/po/lt.po b/po/lt.po
index 390e9f5d8..9a4cbf0b6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 1.1.14\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2002-05-15 11:34+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemos"
 
@@ -55,191 +55,121 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus pavyzdinis vaizdas"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Negaliu išmesti temos"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
+#: components/emblem/nautilus-emblem-view.c:205
 #, fuzzy
-msgid "Couldn't remove emblem"
+msgid "Couldn't Remove Emblem"
 msgstr "Negaliu išmesti temos"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Negaliu įdiegti emblemos"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
+#: components/emblem/nautilus-emblem-view.c:241
 #, fuzzy
-msgid "Couldn't rename emblem"
+msgid "Couldn't Rename Emblem"
 msgstr "Negaliu įdiegti emblemos"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 #, fuzzy
 msgid "Rename Emblem"
 msgstr "IÅ¡mesti emblemÄ…..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 #, fuzzy
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Nurodyk paveikslÄ—lio bylÄ… naujai emblemai:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 #, fuzzy
 msgid "Add Emblems..."
 msgstr "Sukurti naujÄ… EmblemÄ…..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Atleiskite, bet %s paveikslėlis negali būti įdiegtas kaip emblema."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
 #, fuzzy
-msgid "Couldn't add emblems"
+msgid "Couldn't Add Emblems"
 msgstr "Negaliu pridÄ—ti temos"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
+msgstr "Atleiskite, bet %s paveikslėlis negali būti įdiegtas kaip emblema."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
 #, fuzzy
-msgid "Couldn't add emblem"
+msgid "Couldn't Add Emblem"
 msgstr "Negaliu pridÄ—ti temos"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "IÅ¡trinti"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Įrangos apžvalgos gamykla"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Įranga"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Įrangos žiūryklė"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Įrangos vaizdas"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Rodyti kaip įrangą"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "įrangos vaizdas"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "įrangos vaizdo ikonos pavadinimas"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "informacijos apie įrangą santrauka"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K kešo dydis"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Įrangos apžvalga"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Čia turėtų būti CPU puslapis"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Čia turėtų būti RAM puslapis"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Čia turėtų būti IDE puslapis"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Istorija"
@@ -915,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Įranga"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Tarptautinis"
@@ -1203,30 +1137,30 @@ msgid "Desktop trash icon name"
 msgstr "Darbalaukis ir šiukšlinė"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 #, fuzzy
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Rodyti specialias vėliavėles Savybių lange"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1238,8 +1172,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1266,10 +1200,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Šiukšlinė turi likti darbalaukyje."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1302,10 +1237,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Šiukšlinė turi likti darbalaukyje."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1317,7 +1253,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1334,7 +1270,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1360,7 +1296,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1384,7 +1320,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1404,11 +1340,11 @@ msgstr "Naudoti Nautilus darbalaukiui paišyti"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 #, fuzzy
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Naudoti jūsų namų katalogą kaip darbalaukį"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1428,7 +1364,7 @@ msgstr "Atidaryti kiekvienÄ… bylÄ… ar katalogÄ… atskirame lange"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Rodyti mygtukų juostą naujame lange"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1468,7 +1404,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1476,30 +1412,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1545,7 +1481,7 @@ msgstr "Naudoti glaustesnį išdėstymą"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Visus pažymėtus elementus atidaryti naujame lange"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1570,7 +1506,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 #, fuzzy
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Rodyti elementų skai�ių kataloguose"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1584,7 +1520,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Naudoti įprastą darbalaukio foną"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1747,68 +1683,81 @@ msgstr ""
 msgid "on the desktop"
 msgstr "darbastalyje"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Negaliu ištrinti dabartinės temos"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "Negaliu ištrinti dabartinės temos"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Perkelti �ia"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopijuoti �ia"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Sukurti nuorodą �ia"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Naudoti _fonui"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 #, fuzzy
 msgid "Set as background for _all folders"
 msgstr "Rodomai vietai atidaryti kitÄ… Nautilus langÄ…."
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 #, fuzzy
 msgid "Set as background for _this folder"
 msgstr "Rodomai vietai atidaryti kitÄ… Nautilus langÄ…."
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Atleiskite, bet \"%s\" temos negalima įdiegti."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Atleiskite, bet jūs privalote naujai emblemai nurodyti netuš�ią vardą."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Negaliu įdiegti emblemos"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1818,18 +1767,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Atleiskite, bet pavadinimas \"%s\" jau egzistuoja. Pasirinkite kitokį."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Negaliu įdiegti emblemos"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1848,22 +1803,28 @@ msgstr "IÅ¡:"
 msgid "To:"
 msgstr "Ä®:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Klaida perkeliant."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Klaida perkeliant.\n"
 "\n"
 "\"%s\" negali būti perkeltas, kadangi jis yra tik skaitymu skirtame diske."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Klaida trinant."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1872,22 +1833,17 @@ msgstr ""
 "\"%s\" negalima ištrinti, kadangi jūs neturite teisės keisti jo tėvinės "
 "direktorijos. "
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Klaida trinant.\n"
 "\n"
 "\"%s\" negalima ištrinti, kadangi jis yra tik skaitymui skirtame diske."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1896,24 +1852,25 @@ msgstr ""
 "\"%s\" negalima perkelti, kadangi jus neturite teisÄ—s keisti jo arba jo "
 "tÄ—vinio katalogo."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Klaida perkeliant."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Klaida perkeliant.\n"
 "\n"
 "\"%s\" negali būti perkeltas, kadangi jis yra tik skaitymu skirtame diske."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Klaida perkeliant.\n"
@@ -1921,238 +1878,178 @@ msgstr ""
 "\"%s\" negalima perkelti į šiukšlinę, kadangi jūs neturite teisės keisti jo "
 "arba jo tÄ—vinio katalogo."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Klaida kopijuojant."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Klaida kopijuojant.\n"
 "\n"
 "\"%s\" negalima nukopijuoti, kadangi jūs neturite teisės jį skaityti."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Klaida kopijuojant į \"%s\" .\n"
-"\n"
-"Paskirties vietoje trūksta laisvos vietos."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Klaida kopijuojant."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Klaida perkeliant į \"%s\".\n"
 "\n"
 "Paskirties vietoje trūksta laisvos vietos."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Klaida darant nuorodą į\"%s\".\n"
-"\n"
-"Trūksta laisvos vietos."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Klaida perkeliant."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Klaida darant nuorodÄ…."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Klaida kopijuojant į \"%s\" .\n"
 "\n"
 "Neturite teisės rašyti į šį katalogą."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Klaida kopijuojant į \"%s\" .\n"
 "\n"
 "Paskirties diskas skirtas tik skaitymui."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Klaida perkeliant elementus į\"%s\".\n"
-"\n"
-"Neturite teisės rašyti į šį katalogą."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Klaida elementus perkeliant į\"%s\".\n"
-"\n"
-"Paskirties diskas skirtas tik skaitymui."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Klaida darant nuorodą į\"%s\".\n"
-"\n"
-"Neturite teisės rašyti į šį katalogą."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Klaida perkeliant."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Klaida darant nuorodą į\"%s\".\n"
-"\n"
-"Paskirties diskas skirtas tik skaitymui."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida \"%s\" kopijuojant \"%s\".\n"
-"\n"
-"Ar norite tęsti?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Klaida darant nuorodÄ…."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Klaida kopijuojant."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Klaida \"%s\" perkeliant \"%s\".\n"
+"Klaida \"%s\" perkeliant.\n"
 "\n"
 "Ar norite tęsti?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida \"%s\" darant nuorodą į \"%s\".\n"
-"\n"
-"Ar norite tęsti?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Klaida perkeliant."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Klaida \"%s\" trinant \"%s\".\n"
+"Klaida \"%s\" darant nuorodą į \"%s\".\n"
 "\n"
 "Ar norite tęsti?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida \"%s\" kopijuojant.\n"
-"\n"
-"Ar norite tęsti?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Klaida trinant."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida \"%s\" perkeliant.\n"
-"\n"
-"Ar norite tęsti?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Klaida kopijuojant."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida \"%s\" darant nuorodÄ….\n"
-"\n"
-"Ar norite tęsti?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Klaida perkeliant."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Klaida\"%s\" trinant.\n"
-"\n"
-"Ar norite tęsti?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Klaida darant nuorodÄ…."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Klaida trinant."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Klaida kopijuojant."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Klaida perkeliant."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Klaida darant nuorodÄ…."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Klaida trinant."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Praleisti"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Bandyti dar kartÄ…"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Eiti namo"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" negalima perkelti į naują vietą, kadangi jo pavadinimą jau naudoja "
 "specialus elementas,kuris negali būti perkeltas ar pakeistas.\n"
@@ -2160,13 +2057,16 @@ msgstr ""
 "Jei vis tiek norite perkelti \"%s\", pakeiskite pavadinimÄ… ir bandykite dar "
 "kartÄ…."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Eiti namo"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" negalima nukopijuoti į naują vietą, kadangi jo pavadinimą jau naudoja "
 "specialus elementas,kuris negali būti perkeltas ar pakeistas.\n"
@@ -2174,44 +2074,50 @@ msgstr ""
 "Jei vis tiek norite nukopijuoti \"%s\", pakeiskite pavadinimÄ… ir bandykite "
 "dar kartÄ…."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Negalima pakeisti bylos."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Byla \"%s\" jau yra.\n"
 "\n"
 "Ar jūs norėtumėte ją pakeisti?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konfliktas kopijuojant"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Pakeisti"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Pakeisti visus"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "padaryti nuorodą į %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "kita nuoroda į %s"
@@ -2220,25 +2126,25 @@ msgstr "kita nuoroda į %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst nuoroda į %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd nuoroda į %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd nuoroda į %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth nuoroda į %s"
@@ -2248,562 +2154,601 @@ msgstr "%dth nuoroda į %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (kita kopija)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "-ta kopija)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "-ma kopija)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "-ra kopija)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "-�ia kopija)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopija)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (kita kopija)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-ta kopija)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d-ma kopija)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d-ra kopija)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d-�ia kopija)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Nežinomas GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Bylos perkeliamos į šiukšlinę"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Pasiruošiama perkėlimui į šiukšlinę"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Perkeliamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Bylų perkelta:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Pasiruošiama perkėlimui..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Baigiamas perkÄ—limas..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Kuriamos nuorodos į bylas"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Sukurta nuorodų:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Sukuriamos nuorodos"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Pasiruošiama sukurti nuorodas..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Baigiama kurti nuorodas..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopijuojamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Nukopijuota bylų:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Pasiruošiama kopijavimui ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Negalima kopijuoti elementų į šiukšlinę."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Negaliu kopijuoti į šiukšlinę"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Negalima perkelti šiukšlinės katalogo."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Negalima kopijuoti šiukšlinės katalogo."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Negaliu pakeisti šiukšlinės vietos."
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Negaliu kopijuoti šiukšlinės."
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Tu negali perkelti katalogo į jį patį."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Tu negali nukopijuoti katalogo į jį patį."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Šiame kataloge sukurti naują tuš�ią katalogą"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Negalima perkelti į save patį"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Negalima kopijuoti į save patį"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Negali kopijuoti bylos į save pa�ią."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Negalima kopijuoti ant savęs."
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Klaida sukuriant naujÄ… katalogÄ….\n"
 "\n"
 "Jūs neturite teisių įrašyti į norimą vietą"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Klaida sukuriant naujÄ… katalogÄ….\n"
 "\n"
 "Trūksta laisvos vietos."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Klaida \"%s\" kuriant naujÄ… katalogÄ…."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Klaida kuriant naujÄ… katalogÄ…"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Klaida kuriant naujÄ… katalogÄ…"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "bevardis katalogas"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Klaida \"%s\" kuriant naujÄ… katalogÄ…."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Klaida kuriant naujÄ… katalogÄ…"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Klaida kuriant naujÄ… katalogÄ…"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 byla"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Trinamos bylos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "IÅ¡trintos bylos:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Trinama"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Ruošiamasi trinti bylas..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Išvaloma šiukšlinė"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Ruošiamasi išvalyti šiukšlinę..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Ar Jūs iš ties norite visiškai ištrinti visus elementus iš šiukšlinės?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 #, fuzzy
 msgid "_Empty"
 msgstr "Ištuštinti"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopija).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (kita kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (kita kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (kita kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3-�ia kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-�ia kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (kita kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-�ia kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (22-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23-�ia kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-�ia kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo(24-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo(25-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo(24-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo(25-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-oji kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (100-ji kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (111-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123-�ia kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-a kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124-a kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124-a kopija).txt"
 
@@ -2822,64 +2767,64 @@ msgstr "foo (124-a kopija).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "Å¡iandien 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "Å¡iandien %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "Å¡iandien 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "Å¡iandien %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "Å¡iandien, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "Å¡iandien, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "Å¡iandien"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "vakar 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "vakar %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "vakar 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "vakar %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "vakar, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "vakar, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "vakar"
 
@@ -2888,133 +2833,133 @@ msgstr "vakar"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Tre�iadienis, 0000 m. rugsėjo 00 d., 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %Y m. %B %-d d., %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pir, 0000 Sau 00, 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %Y %b %d, %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pir, 0000 Sau 00, 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %Y %b %d, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 Sau 00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %d, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 Sau 00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y %b %d, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "0000-00-00 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%Y-%m-%d %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "0000-00-00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementų"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 katalogų"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 bylų"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 elementas"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 katalogas"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 byla"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementai"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u katalogai"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u bylos"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementų"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? baitų"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "nežinomas tipas"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "nežinomas MIME tipas"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "nežinomas"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3023,7 +2968,7 @@ msgstr ""
 "Nerandu netgi \"x-directory/normal\" aprašymo. Grei�iausiai, kad jūsų gnome-"
 "vfs.keys byla yra netinkamoje vietoje arba nerandama dėl kitų priežas�ių."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3032,11 +2977,11 @@ msgstr ""
 "Nerastas aprašymas mime tipui \"%s\" (byla yra \"%s\"), prašom pranešti "
 "gnome-vfs konferencijai."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "nuoroda"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "nuoroda (sugadinta)"
 
@@ -3159,11 +3104,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Ieškoti bylų pagal jų vardus ir savybes"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Piktogramų vaizdas"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Sąrašo vaizdas"
@@ -3307,155 +3254,160 @@ msgstr "%s namai"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Kantri"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "bylos ikona"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "kei�iamas tekstas"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "papildomas tekstas"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "Å¡iek tiek daugiau teksto"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 #, fuzzy
 msgid "highlighted for selection"
 msgstr "esamas pažymėjimas"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 #, fuzzy
 msgid "The selection rectangle"
 msgstr "Pažymėtas piktogramas padaryti kintamo dydžio"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 #, fuzzy
 msgid "Frame Text"
 msgstr "Įdėti tekstą"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 #, fuzzy
 msgid "Selection Box Color"
 msgstr "Pasirinkite spalvÄ…, kuriÄ… pridÄ—site:"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "Eiti namo"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 #, fuzzy
 msgid "Selection Box Alpha"
 msgstr "Pažymėti visus"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Opacity of the highlight for selected icons"
 msgstr "esamas pažymėjimas"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Šis katalogas naudoja automatinį išdėstymą. Ar norite perjungti į rankinį "
 "išdėstymą ir palikti šį elementą ten, kur jį padėjote? Tai sugadins "
 "išsaugotą rankinį išdėstymą."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Šis katalogas naudoja automatinį išdėstymą. Ar norite perjungti į rankinį "
 "išdėstymą ir palikti šiuos elementus ten, kur juos padėjote? Tai sugadins "
 "išsaugotą rankinį išdėstymą."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Šis katalogas naudoja automatinį išdėstymą. Ar norite perjungti į rankinį "
 "išdėstymą ir palikti šį elementą ten, kur jį padėjote?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Šis katalogas naudoja automatinį išdėstymą. Ar norite perjungti į rankinį "
 "išdėstymą ir palikti šiuos elementus ten, kur juos padėjote?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Perjungti į rankinį išdėstymą ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Perjungti"
 
@@ -3548,73 +3500,73 @@ msgstr "Yra įprasta \"%s\" elementams."
 msgid "Is the default for all \"%s\" items."
 msgstr "Yra įprasta visiems \"%s\" elementams."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Keisti \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Įdėti į meniu \"%s\" elementams"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Naudoti kaip įprasta \"%s\" elementams"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, fuzzy, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Įdėti į meniu \"%s\" elementams"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, fuzzy, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Naudoti kaip įprasta \"%s\" elementams"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Neįdėti į meniu \"%s\" elementams"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "BÅ«sena"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 #, fuzzy
 msgid "C_hoose"
 msgstr "Pasirinkti"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Atlikta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Keisti..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Bylų tipai ir programos"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Eiti ten"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 #, fuzzy
 msgid ""
 "You can configure which programs are offered for which file types in the "
@@ -3623,51 +3575,51 @@ msgstr ""
 "Jūs galite nustatyti kokios programos bus pasiūlytos atitinkamoms byloms "
 "GNOME Valdymo Centre"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 #, fuzzy
 msgid "Open with Other Application"
 msgstr "Kita programa..."
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, fuzzy, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 #, fuzzy
 msgid "Open with Other Viewer"
 msgstr "Atidaryti su kitu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, fuzzy, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Pasirinkti vaizdÄ… \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Nėra žiūryklės, galin�ios parodyti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nėra tinkamos žiūryklės"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, fuzzy, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 #, fuzzy
 msgid "No Application Associated"
 msgstr "Nėra galimų programų"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "Nėra galimų programų"
@@ -3676,158 +3628,187 @@ msgstr "Nėra galimų programų"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
+#: libnautilus-private/nautilus-program-chooser.c:1610
 #, fuzzy
-msgid "Associate Application"
+msgid "_Associate Application"
 msgstr "MÄ—gstamiausios programos"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "Nėra galimų programų"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "Nėra galimų programų"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "MÄ—gstamiausios programos"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
+"vietose. Ar norite pasirinkti kitÄ… programÄ…?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
 "vietose. Ar norite pasirinkti kitÄ… programÄ…?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
 "vietose. Ar norite pasirinkti kitÄ… programÄ…?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Negali atidaryti vietos"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
+"vietose. Ar norite pasirinkti kitÄ… programÄ…?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
 "vietose. Nėra kitų programų šiai bylai peržiūrėti. Jei persikopijuosite šią "
 "bylą į savo kompiuterį, jūs galėsite ją atsidaryti."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
+"vietose. Ar norite pasirinkti kitÄ… programÄ…?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
 "vietose. Nėra kitų programų šiai bylai peržiūrėti. Jei persikopijuosite šią "
 "bylą į savo kompiuterį, jūs galėsite ją atsidaryti."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atidaroma \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Atsiprašau, bet Jūs negalite įvykdyti komandų iš nutolusių vietų saugumo "
 "sumetimais."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Negaliu įvykdyti nutolusių nuorodų"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
 #, fuzzy
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+msgid "There was an error launching the application."
 msgstr "Atsiprašau, bet įvyko klaida nuskaitant %s."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
 #, fuzzy
-msgid "Error launching application"
+msgid "Error Launching Application"
 msgstr "MÄ—gstamiausios programos"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Rodyti tekstÄ… piktogramose"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4077,14 +4058,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementai, kurie yra katalogai ir jų pavadinimuose yra \"medusa\""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Paieška diskuose"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus Jūsų diskuose ieško šiukšlinės katalogų."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Keisti"
@@ -4290,98 +4263,108 @@ msgstr "Fonas"
 msgid "Empty Trash"
 msgstr "Ištuštinti šiukšlinę"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Tai atidarys %d atskiruose languose. Ar tikrai norite tai padaryti?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Atidaryti %d langus? "
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ar iš ties norite visiškai ištrinti \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Tai atidarys %d atskiruose languose. Ar tikrai norite tai padaryti?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ar iš ties norite visiškai ištrinti \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ar iš ties norite visiškai ištrinti %d pažymėtus elementus?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Visiškai ištrinti visus pažymėtus elementus"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "IÅ¡trinti?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "IÅ¡sirinkite kategorijÄ…:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Å ablonai"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" pažymėta"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 katalogas pažymėtas"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d katalogai pažymėti"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "(turi 0 elementų)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr "(turi 1 elementų)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr "(turi %d elementų)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 #, fuzzy
 msgid " (containing a total of 0 items)"
 msgstr "(turi 0 elementų)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 #, fuzzy
 msgid " (containing a total of 1 item)"
 msgstr "(turi 1 elementų)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, fuzzy, c-format
 msgid " (containing a total of %d items)"
 msgstr "(turi %d elementų)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" pažymėta (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elementų pažymėta (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "dar1elementas pažymėtas (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "dar %d elementų pažymėta (%s)"
@@ -4393,7 +4376,7 @@ msgstr "dar %d elementų pažymėta (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4402,115 +4385,128 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Kataloge\"%s\" yra daugiau bylų nei Nautilus gali pavaizduoti. Kai kurios "
 "bylos nebus pavaizduotos."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Per daug bylų"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" negalima perkelti į šiukšlinę. Ar norite tai ištrinti nedelsiant?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d pažymėti elementai negali būti perkelti į šiukšlinę. Ar norite juos "
-"ištrinti nedelsiant?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" negalima perkelti į šiukšlinę. Ar norite tai ištrinti nedelsiant?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d pažymėti elementai negali būti perkelti į šiukšlinę. Ar norite ištrinti "
-"tuos %d elementus nedelsiant?"
+"\"%s\" negalima perkelti į šiukšlinę. Ar norite tai ištrinti nedelsiant?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "IÅ¡trinti nedelsiant?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ar išties norite visiškai ištrinti \"%s\" iš šiukšlinės?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Ar išties norite visiškai ištrinti %d pažymėtus elementus iš šiukšlinės?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Ištrinti iš šiukšlinės?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Naudoti \"%s\" atidaryti pažymėtam elementui"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Kita _programa..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Programa..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Kita p_eržiūros programa..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "P_eržiūros programa..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Paleisti \"%s\" visiems pažymėtiems elementams"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Apie skriptus"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4532,195 +4528,201 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" bus perkeltas jei pasirinksite komandą Įdėti bylas"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" bus nukopijuota jei pasirinksite komandą Įdėti bylas"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 " %d pažymėti elementai bus perkelti jei pasirinksite komandą Įdėti bylas"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 " %d pažymėti elementai bus nukopijuoti jei pasirinksite komandą Įdėti bylas"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Krepšyje nėra nieko įdėjimui."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Montavimo klaida"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Numontavimo klaida"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Montavimo klaida"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 #, fuzzy
 msgid "E_ject"
 msgstr "Vykdymas"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 #, fuzzy
 msgid "_Unmount Volume"
 msgstr "Numontuoti Skirsnį"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Atidaryti naujame lange"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Atidaryt_i %d naujuose languose"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Namų katalogas"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Namų katalogas"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 #, fuzzy
 msgid "_Delete from Trash"
 msgstr "Ištrinti iš _šiukšlinės"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Visiškai ištrinti visus pažymėtus elementus"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 #, fuzzy
 msgid "Mo_ve to Trash"
 msgstr "Perkelti į šiukšlinę"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Perkelti visas pažymėtas bylas į šiukšlinę"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 #, fuzzy
 msgid "_Delete"
 msgstr "IÅ¡trinti"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 #, fuzzy
 msgid "Ma_ke Links"
 msgstr "Padaryti _nuorodas"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 #, fuzzy
 msgid "Ma_ke Link"
 msgstr "Padaryti nuorodÄ…"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Išvalyti šiukšlinę"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "IÅ¡_kirpti BylÄ…"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "IÅ¡_kirpti Bylas"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopijuoti bylÄ…"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopijuoti bylas"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5848
 #, fuzzy
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Nuorodos negalima naudoti, nes nÄ—ra paskirties. Ar norite tÄ… nuorodÄ… padÄ—ti "
 "į šiukšlinę?"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Nuorodos negalima naudoti, nes nÄ—ra paskirties. Ar norite tÄ… nuorodÄ… padÄ—ti "
+"į šiukšlinę?"
+
+#: src/file-manager/fm-directory-view.c:5852
 #, fuzzy, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Nuorodos negalima naudoti, nes paskirtis \"%s\" neegzistuoja. Ar norite tÄ… "
 "nuorodą padėti į šiukšlinę?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Sugadinta nuoroda"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" yra vykdomoji tekstinė byla. Ar norite ją paleisti, ar peržiūrėti jos "
 "turinį?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Vykdomosios tekstinÄ—s bylos"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Paleisti ar peržiūrėti?"
 
-#: src/file-manager/fm-directory-view.c:5430
-#, fuzzy
-msgid "_Display"
-msgstr "Peržiūrėti"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 #, fuzzy
 msgid "Run in _Terminal"
 msgstr "Naujas terminalas"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+#, fuzzy
+msgid "_Display"
+msgstr "Peržiūrėti"
+
+#: src/file-manager/fm-directory-view.c:5928
 #, fuzzy
 msgid "_Run"
 msgstr "Paleisti"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Atidaroma \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Nutraukti atidarymÄ…?"
 
@@ -4741,16 +4743,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Atsiprašau, \"%s\" turinio negaliu parodyti."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Neina nustatyti \"%s\" teisių."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Klaida rodant katalogÄ…"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" vardas jau yra šiame kataloge. Prašau pervadinkite."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4758,12 +4765,12 @@ msgstr ""
 "Šiame kataloge nėra \"%s\". Galbūt jis neseniai buvo perkeltas arba "
 "ištrintas?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Jūs neturite teisių, reikalingų \"%s\" pervadinti."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4771,86 +4778,106 @@ msgid ""
 msgstr ""
 "Vardas \"%s\" neteisingas, nes jame yra \"/\" simbolis. Prašau pervadinkite."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" vardas netinka. Prašau pervadinkite."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Negaliu pakeisti \"%s\" vardo, kadangi jis yra tik skaitymui skirtame diske."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Atsiprašau, bet negalėjau \"%s\" pervadinti į \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Atsiprašau, bet ši tema negali būti išmesta!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Pervadinimo klaida"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Jūs neturite teisių, reikalingų \"%s\" grupei pakeisti."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "NegalÄ—jau pakeisti \"%s\" grupÄ—s, kadangi jis yra tik skaitymui skirtame "
 "diske"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Atsiprašau, negalėjau pakeisti \"%s\" grupės."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Neina nustatyti \"%s\" teisių."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Klaida nustatant grupÄ™."
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Negalima pakeisti \"%s\" savininko, kadangi jis yra tik skaitymu skirtame "
 "diske"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Atsiprašau, negalėjau pakeisti \"%s\" savininko."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Neina nustatyti \"%s\" teisių."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Klaida nustatant savininkÄ…"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Negaliu pakeisti \"%s\" teisių, kadangi jis yra tik skaitymu skirtame diske."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Atsiprašau, negaliu pakeisti \"%s\" teisių."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Neina nustatyti \"%s\" teisių."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Klaida nustatant teises"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Pervadinimas \"%s\" į \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Nutraukti pervadinimÄ…?"
 
@@ -4910,128 +4937,147 @@ msgstr "Atstatyti piktogramų originalius dydžius"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Atstatyti piktogramos originalų dydį"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "rodo į \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Bylos pavadinimas"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Dydis"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipas"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Keitimo data"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "JÅ«s negalite priskirti daugiau nei vienÄ… papildomÄ… piktogramÄ… vienu metu ! "
 "Papildomos piktogramos nustatymui prašom tempti tik vieną paveikslėlį."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"JÅ«s negalite priskirti daugiau nei vienÄ… papildomÄ… piktogramÄ… vienu metu ! "
+"Papildomos piktogramos nustatymui prašom tempti tik vieną paveikslėlį."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Daugiau nei vienas paveikslÄ—lis"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Byla, kurią jūs pertempėte yra nevietinė. Kaip vartotojo pasirinktas "
 "piktogramas galima naudoti tik vietinius paveikslÄ—lius."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Byla, kurią jūs pertempėte yra nevietinė. Kaip vartotojo pasirinktas "
+"piktogramas galima naudoti tik vietinius paveikslÄ—lius."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Tik vietinius paveikslÄ—lius"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Byla, kurią jūs pertempėte nėra paveikslėlis. Kaip vartotojo pasirinktas "
+"Byla, kurią jūs pertempėte yra nevietinė. Kaip vartotojo pasirinktas "
 "piktogramas galima naudoti tik vietinius paveikslÄ—lius."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Tik paveikslÄ—lius"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "SavybÄ—s"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s savybÄ—s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Nutraukti grupÄ—s pakeitimÄ…?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Kei�iama grupė"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Nutraukti savininko pakeitimÄ…?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Kei�iamas savininkas"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "niekas"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "neįskaitomas"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 elementas, %s dydžio"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, fuzzy, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementų, sudaran�ių %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(kažkiek turinio neįskaitoma)"
 
@@ -5041,211 +5087,212 @@ msgstr "(kažkiek turinio neįskaitoma)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Turinys:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "EsmÄ—"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_Pavadinimas"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 #, fuzzy
 msgid "_Name:"
 msgstr "_Pavadinimas"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipas:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Dydis:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Vieta:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "DVD skirsnis"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 #, fuzzy
 msgid "Link target:"
 msgstr "Nuorodos paskirtis:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME tipas"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Keista:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Naudota:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 #, fuzzy
 msgid "_Select Custom Icon..."
 msgstr "Pasirinkti papildomÄ… piktogramÄ…..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 #, fuzzy
 msgid "_Remove Custom Icon"
 msgstr "IÅ¡mesti vartotojo pasirinktÄ… (papildomÄ…) piktogramÄ…"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 #, fuzzy
 msgid "_Read"
 msgstr "Skaitymas"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 #, fuzzy
 msgid "_Write"
 msgstr "Rašymas"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 #, fuzzy
 msgid "E_xecute"
 msgstr "Vykdymas"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 #, fuzzy
 msgid "Set _user ID"
 msgstr "Nustatyti vartotojo ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 #, fuzzy
 msgid "Special flags:"
 msgstr "Specialios vÄ—liavÄ—lÄ—s:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 #, fuzzy
 msgid "Set gro_up ID"
 msgstr "Nustatyti grupÄ—s ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 #, fuzzy
 msgid "_Sticky"
 msgstr "Lipnus"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "TeisÄ—s"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Jūs nesate savininkas, todėl negalite tų teisių keisti."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Bylos savininkas:"
+
+#: src/file-manager/fm-properties-window.c:2900
 #, fuzzy
 msgid "File owner:"
 msgstr "Bylos savininkas:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 #, fuzzy
 msgid "_File group:"
 msgstr "Bylos grupÄ—:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 #, fuzzy
 msgid "File group:"
 msgstr "Bylos grupÄ—:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Savininkas:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "GrupÄ—:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Kiti:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 #, fuzzy
 msgid "Text view:"
 msgstr "Teksto vaizdas"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 #, fuzzy
 msgid "Number view:"
 msgstr "Skaitinis vaizdas:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 #, fuzzy
 msgid "Last changed:"
 msgstr "Paskutinis pakeitimas:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Neina nustatyti \"%s\" teisių."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "Neina nustatyti \"%s\" teisių."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, fuzzy, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
 msgstr "Atsiprašau, bet įvyko klaida nuskaitant %s."
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3348
 #, fuzzy
-msgid "Couldn't show help"
+msgid "Couldn't Show Help"
 msgstr "Negaliu pridÄ—ti temos"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Nutraukti savybių lango rodymą?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Kuriamas savybių langas"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Pasirink piktogramÄ…:"
@@ -5264,13 +5311,16 @@ msgid "Search Results"
 msgstr "Paieškos rezultatai"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Atsiprašau, bet Medusa paieškos paslaugos negalimos, nes ji neįdiegta."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Atsiprašau, bet Medusa paieškos paslaugos negalimos."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Paieškos paslaugos negalimos"
 
@@ -5278,52 +5328,84 @@ msgstr "Paieškos paslaugos negalimos"
 #, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Jūsų pasirinkta paieška yra naujesnė nei sistemos indeksai. Paieška neduos "
 "jokių rezultatų dabar. Ar norite sukurti naujus indeksus dabar?"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Elementų, kurie yra per nauji paieška."
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Kiekviena jūsų kompiuteryje indeksuota byla atitinka nurodytą sąlygą. Jūs "
+"galite patikrinti savo sąlygos teisingumą arba pridėti daugiau sąlygų, kad "
+"sumažinti rezultatų skai�ių."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Kiekviena jūsų kompiuteryje indeksuota byla atitinka nurodytą sąlygą. Jūs "
 "galite patikrinti savo sąlygos teisingumą arba pridėti daugiau sąlygų, kad "
 "sumažinti rezultatų skai�ių."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Klaida paieškos metu"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Klaida skaitant bylų indeksą"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Klaida atsirado įkeliant paieškos turinį: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
+"sistemoje, indeksas. Dabar negalima pasiekti indekso."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
+"sistemoje, indeksas. Dabar negalima pasiekti indekso."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5331,25 +5413,23 @@ msgstr ""
 "indeksas. Dabar negalima pasiekti indekso, todÄ—l bus atliekama lÄ—tesnÄ— "
 "paieška, kuri nenaudoja indekso."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
-"sistemoje, indeksas. Dabar negalima pasiekti indekso."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Greita paieška negalima"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Paieškos turinyje yra negalimos"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 #, fuzzy
 msgid ""
 "Your index files are available but the Medusa search daemon, which handles "
@@ -5363,49 +5443,76 @@ msgstr ""
 "eilutėje įveskite šią komandą:\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Norint vykdyti greitą paiešką, reikalingas bylų, esan�ių jūsų sistemoje, "
 "indeksas. Jūsų kompiuteris kuria šį indeksą dabar. Kadangi pilno indekso dar "
 "nėra, ši paieška gali trukti keletą minu�ių."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
 "sistemoje, indeksas. Jūsų kompiuteris kuria šį indeksą dabar. Paieškas "
 "turinyje bus galima naudoti kai indeksas bus sukurtas."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indeksuotos paieškos yra negalimos"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
+"sistemoje, indeksas. Dabar negalima pasiekti indekso."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
+"sistemoje, indeksas. Dabar negalima pasiekti indekso."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Norint vykdyti greitą paiešką, reikalingas bylų, esan�ių jūsų sistemoje, "
 "indeksas. Å io indekso dabar nÄ—ra. JÅ«s galite sukurti indeksÄ…, komandinÄ—je "
 "eilutÄ—je paleisdami \"medusa-indexd\" administratoriaus (root) teisÄ—mis. Kol "
 "nebus pilno indekso, paieškos truks keletą minu�ių."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Norint vykdyti paiešką bylų turinyje, reikalingas bylų, esan�ių jūsų "
 "sistemoje, indeksas. Å io indekso dabar nÄ—ra. JÅ«s galite sukurti indeksÄ…, "
@@ -5413,7 +5520,12 @@ msgstr ""
 "teisėmis. Kol nebus pilno indekso, paieškos bylų turinyje nebus galima "
 "daryti."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Greitos paieškos Jūsų kompiuteryje negalimos"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5423,11 +5535,12 @@ msgstr ""
 "indeksas. Jūsų sistemos administratorius uždraudė greitas paieškas jūsų "
 "kompiuteryje, todÄ—l Å¡io indekso dabar nÄ—ra."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Greitos paieškos Jūsų kompiuteryje negalimos"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Greita paieška negalima"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Kur"
 
@@ -5436,7 +5549,7 @@ msgstr "Kur"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Atidaryti Naujame lange"
@@ -5447,7 +5560,7 @@ msgstr "_Atidaryti Naujame lange"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Atidaryti %d _naujuose languose"
@@ -5456,15 +5569,21 @@ msgstr "Atidaryti %d _naujuose languose"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus rado daugiau paieškos rezultatų nei gali parodyti. Kai kurie "
+"elementai nebus rodomi."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus rado daugiau paieškos rezultatų nei gali parodyti. Kai kurie "
 "elementai nebus rodomi."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Per daug atitikmenų"
 
@@ -5480,12 +5599,12 @@ msgid "Create L_auncher"
 msgstr "Naujas leistukas"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Sukurti naujÄ… leistukÄ…"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Ištrinti visus elementus iš šiukšlinės"
 
@@ -5506,7 +5625,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 #, fuzzy
 msgid "Use _Default Background"
@@ -5530,62 +5649,72 @@ msgstr "Pasirinkti kitą žiūryklę, su kuria peržiūrėti pažymėtą element
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Negaliu nuskaityti katalogo"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Negaliu nuskaityti katalogo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Šiame kataloge sukurti naują tuš�ią katalogą"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Šiame kataloge sukurti naują tuš�ią katalogą"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Sukurti simbolinę nuorodą, kiekvienam pažymėtam elementui"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 #, fuzzy
 msgid "D_uplicate"
 msgstr "Dublikuoti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Ištrinti kiekvieną pažymėtą elementą, neperkeliant į šiukšlinę"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Dublikuoti kiekvieną pažymėtą elementą"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 #, fuzzy
 msgid "Edit Launcher"
 msgstr "Naujas leistukas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 #, fuzzy
 msgid "Format the selected volume"
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto skirsnio."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 #, fuzzy
 msgid "Medi_a Properties"
 msgstr "Laikmenos savybÄ—s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto skirsnio."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Perkelti arba kopijuoti bylas, prieš tai pažymėtas Iškirpti bylas arba "
 "Kopijuoti bylas komandomis"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5594,139 +5723,148 @@ msgstr ""
 "Perkelti arba kopijuoti bylas, prieš tai pažymėtas Iškirpti bylas arba "
 "Kopijuoti bylas komandomis"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Atidaryti s_u"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Visus pažymėtus elementus atidaryti naujame lange"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Atidaryti naujame lange"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "PasirinktÄ… elementÄ… atidaryti Å¡iame lange"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Pažymėtas bylas paruošti kopijavimui su Įdėti bylas komanda"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Pažymėtas bylas paruošti perkėlimui su Įdėti bylas komanda"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 #, fuzzy
 msgid "Prot_ect"
 msgstr "Apsaugoti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 #, fuzzy
 msgid "Protect the selected volume"
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto skirsnio."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 #, fuzzy
 msgid "Rename selected item"
 msgstr "Pervadinti pažymėtas piktogramas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 #, fuzzy
 msgid "Reset View to _Defaults"
 msgstr "Sąrašo vaizdo standartai"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Atstatyti rikiavimo tvarką bei mastelį pagal nustatytą šio vaizdo standartą"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Pažymėti _visas bylas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Å ablonai"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Pažymėti visus elementus šiame lange"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Pažymėti visus elementus šiame lange"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 #, fuzzy
 msgid "Show media properties for the selected volume"
 msgstr "Žiūrėti ar keisti kiekvieno pažymėto elemento savybes"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 #, fuzzy
 msgid "Unmount the selected volume"
 msgstr "Nautilus'ui nepavyko primontuoti nurodyto skirsnio."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 #, fuzzy
 msgid "Use the default background for this location"
 msgstr "Rodomai vietai atidaryti kitÄ… Nautilus langÄ…."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Žiūrėti ar keisti kiekvieno pažymėto elemento savybes"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopijuoti bylÄ…"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 #, fuzzy
 msgid "_Format"
 msgstr "Formatuoti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Numontuoti Skirsnį"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Atidaryti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Atidaryti skriptų katalogą"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Įdėti bylas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "bevardis katalogas"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_SavybÄ—s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Pervadinti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 #, fuzzy
 msgid "_Scripts"
 msgstr "Skriptai"
@@ -5816,7 +5954,12 @@ msgstr "_Rankiniu būdu"
 msgid "Indexing is %d%% complete."
 msgstr "Indeksavimas yra %d%% baigtas."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Jūsų bylos paskutinį kartą buvo indeksuotos %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5824,25 +5967,29 @@ msgstr ""
 "Kartą per dieną jūsų bylos bei jų tekstinis turinys yra indeksuojami, todėl "
 "jūsų paieškos yra greitos."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indeksavimo būsena"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Jūsų bylos paskutinį kartą buvo indeksuotos %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Kartą per dieną jūsų bylos ir tekstinis jų turinys yra indeksuojamos, todėl "
-"jūsų paieškos yra greitos. Jūsų bylos dabar yra indeksuojamos."
+"Kartą per dieną jūsų bylos bei jų tekstinis turinys yra indeksuojami, todėl "
+"jūsų paieškos yra greitos."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Dabar pas jus nėra indeksų bylų."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5852,15 +5999,19 @@ msgstr ""
 "Greitos paieškos nėra įjungtos jūsų kompiutery, todėl dabar pas jus nėra "
 "indekso."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Dabar pas jus nėra indeksų bylų."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Atsiprašau, bet Medusa paieškos paslaugos negalimos."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5884,32 +6035,37 @@ msgstr "Rodyti _indeksavimo būseną"
 msgid "Show status of indexing used when searching"
 msgstr "Rodyti indeksavimo, naudojamo paieškant, būseną"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Negaliu sukurti reikiamo katalogo"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Negaliu sukurti reikiamų katalogų"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus negali sukurti reikiamo katalogo \"%s\". Prašom sukurti jį prieš "
 "vykdant Nautilus, arba nustatyti reikiamas teises, kad Nautilus galėtų jį "
 "sukurti."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Negaliu sukurti reikiamų katalogų"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5920,21 +6076,25 @@ msgstr ""
 "Prašom sukurti šiuos katalogus prieš vykdant Nautilus, arba nustatyti "
 "reikiamas teises, kad Nautilus galėtų juos sukurti."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "darbastalyje"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "darbastalyje"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5946,7 +6106,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 #, fuzzy
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
@@ -5958,7 +6118,7 @@ msgstr ""
 "perkrauti kompiuterį arba įdiegti Nautilus iš naujo."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 #, fuzzy
 msgid ""
 "Nautilus can't be used now. Running the command \"bonobo-slay\" from the "
@@ -6003,12 +6163,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "DÄ—l netikÄ—tos klaidos dabar negalima naudoti Nautilus."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6017,7 +6177,7 @@ msgstr ""
 "Dabar negalima naudoti Nautilus, dėl netikėtos klaidos iš OAF, bandant "
 "registruoti bylų tvarkytojo vaizdo serverį."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6028,7 +6188,7 @@ msgstr ""
 "surasti gamyklą. oafd nužudymas bei Nautilus paleidimas iš naujo gali padėti "
 "išspręsti šią problemą."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -6039,6 +6199,15 @@ msgstr ""
 "surasti apvalkalo objektą. oafd nužudymas bei Nautilus paleidimas iš naujo "
 "gali padėti išspręsti šią problemą."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, fuzzy, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr "Atsiprašau, bet įvyko klaida nuskaitant %s."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -6075,35 +6244,45 @@ msgstr "Mažiau parametrų"
 msgid "Find Them!"
 msgstr "Rasti juos!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Negalima perkelti į save patį"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Atsiprašau, bet \"%s\" nėra tinkamas bylos vardas."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" nėra tinkama vieta. Pasitikrinkite rašybą ir pabandykite dar kartą."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Negaliu rasti \"%s\". Pasitikrinkite rašybą ir pabandykite dar kartą."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Netraverse"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Pavadinimas"
+msgid "_Location:"
+msgstr "Vieta:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6330,6 +6509,20 @@ msgstr ""
 "\n"
 "Jūs galite ištrinti šią bylą, jei norite paleisti šį vadovą iš naujo.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"JÅ«s negalite priskirti daugiau nei vienÄ… papildomÄ… piktogramÄ… vienu metu ! "
+"Papildomos piktogramos nustatymui prašom tempti tik vieną paveikslėlį."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Byla, kurią jūs pertempėte yra nevietinė. Kaip vartotojo pasirinktas "
+"piktogramas galima naudoti tik vietinius paveikslÄ—lius."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6340,25 +6533,23 @@ msgstr "Atidaryti su %s"
 msgid "Open with..."
 msgstr "Atidaryti su..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Naujas leistukas"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "Ištuštinti šiukšlinę"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6366,83 +6557,83 @@ msgstr ""
 msgid "Go To:"
 msgstr "Eiti į:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Ar jūs norite žiūrėti %d vietas atskiruose languose ?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Žiūrėti keliuose languose?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Negali atidaryti vietos"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Atlikti greitą savęs patikrinimą."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Sukurti pradinį langą su nurodyta geometrija."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIJA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Nevaldyti darbalaukio (ignoruoti nustatymus, nustatytus nuostatų dialoge)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Išeiti iš Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Paleisti Nautilus iš naujo."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 #, fuzzy
 msgid "File Manager"
 msgstr "Bylos pavadinimas"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus "
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check negali būti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check negali būti naudojamas su kitais parametrais.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit negali būti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart negali būti naudojamas su URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --geometry negali būti naudojamas daugiau nei su viena URI.\n"
@@ -6450,39 +6641,52 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ar iš ties norite visiškai ištrinti \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Ar jūs tikrai norite pamiršti istoriją? Jei tai padarysite - būsite "
 "pasmerkti tai pakartoti."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 #, fuzzy
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Ar jūs tikrai norite kad Nautilus pamirštų, kurias vietas jūs aplankėte?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 #, fuzzy
 msgid "Clear History"
 msgstr "IÅ¡valyti istorijÄ…?"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Vieta \"%s\" neegzistuoja. Ar jūs norite išmesti visas žymeles, rodan�ias į "
 "šią vietą iš savo sąrašo?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Vieta \"%s\" daugiau neegzistuoja."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Neegzistuojan�ios vietos žymelė"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "IÅ¡mesti"
 
@@ -6516,7 +6720,6 @@ msgid "Close _All Windows"
 msgstr "Uždaryti _visus langus"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Uždaryti visus Nautilus langus"
@@ -6539,116 +6742,128 @@ msgid "Forward"
 msgstr "Pirmyn"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "[Elementai, kurie yra] katalogai"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Eiti į sekan�ią aplankytą vietą"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Eiti į prieš tai aplankytą vietą"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 #, fuzzy
 msgid "Go to the trash folder"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Namai"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 #, fuzzy
 msgid "Location _Bar"
 msgstr "PaslÄ—pti adreso _juostÄ…"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 #, fuzzy
 msgid "Reload"
 msgstr "Iš naujo įkelti"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Ieškoti bylų šiame kompiuteryje"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Paslėpti _būsenos juostą"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Sustabdyti"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Aukštyn"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Pridėti žymelę"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Atgal"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "Žy_melės"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 #, fuzzy
 msgid "_Clear History"
 msgstr "_IÅ¡valyti istorijÄ…"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 #, fuzzy
 msgid "_Edit Bookmarks"
 msgstr "_Redaguoti žymeles"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Pirmyn"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Eiti"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Namai"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Vieta..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Å oniniai skydeliai"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 #, fuzzy
 msgid "_Trash"
 msgstr "Šiukšlinė"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 #, fuzzy
 msgid "_Up"
 msgstr "Aukštyn"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Rodyti"
 
@@ -6667,35 +6882,40 @@ msgstr "Žiūrėti kaip ..."
 msgid "File Browser: %s"
 msgstr "Bylos savininkas:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "negalima tęsti, nes viename iš šoninių skydelių įvyko klaida. Ta�iau aš "
 "negaliu pasakyti kuriame."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Paleidžiant %s vaizdą įvyko klaida."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Negalima tęsti nes %s šoniniame skydelyje įvyko klaida. Jei tai atsitiks dar "
 "kartą, jūs galite išjungti šį skydelį."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Šoniniame skydelyje įvyko klaida"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 #, fuzzy
 msgid "Side Pane"
 msgstr "Å oniniai skydeliai"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6729,156 +6949,188 @@ msgstr "_PridÄ—ti naujÄ…... "
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Atsiprašau, bet šablono %s negalima ištrinti."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Negalima ištrinti šablono."
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Atsiprašau, bet emblemos %s negalima ištrinti."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Negaliu išmesti temos"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Sukurti naujÄ… EmblemÄ…:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Ra_ktinis žodis:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "PaveikslÄ—l_is:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Nurodyk paveikslÄ—lio bylÄ… naujai emblemai:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Sukurti naujÄ… spalvÄ…:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Spalvos pavadi_nimas:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Spal_vos reikšmė:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Atsiprašau, bet \"%s\" nėra tinkamas bylos vardas."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Atsiprašau, bet jūs pateikėte netinkamą bylos pavadinimą."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Negaliu įdiegti šablono"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Atsiprašau, bet jūs negalite pakeisti atstatymo paveikslėlio."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "NÄ—ra paveikslÄ—lis"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Atleiskite, bet šablono %s negalima įdiegti."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 #, fuzzy
 msgid "Select an image file to add as a pattern"
 msgstr "Nurodyk paveikslÄ—lio bylÄ…, Å¡ablono pridÄ—jimui:"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Atleiskite, bet jūs privalote naujai spalvai nurodyti netuš�ią vardą."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Negaliu įdiegti spalvos"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 #, fuzzy
 msgid "Select a color to add"
 msgstr "Pasirinkite spalvÄ…, kuriÄ… pridÄ—site:"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Atsiprašau, bet '%s' nėra gera paveikslėlio byla."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr ""
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "IÅ¡sirinkite kategorijÄ…:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 #, fuzzy
 msgid "C_ancel Remove"
 msgstr "Nutraukti išmetimą"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 #, fuzzy
 msgid "_Add a New Pattern..."
 msgstr "PridÄ—ti naujÄ… Å¡ablonÄ…..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 #, fuzzy
 msgid "_Add a New Color..."
 msgstr "Sukurti naujÄ… SpalvÄ…..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 #, fuzzy
 msgid "_Add a New Emblem..."
 msgstr "Sukurti naujÄ… EmblemÄ…..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Spauskite ant šablono kad jį išmestumėte"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Spauskite ant spalvos kad ją išmestumėte"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Spauskite ant emblemos kad ją išmestumėte"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Å ablonai:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Spalvos:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemos:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 #, fuzzy
 msgid "_Remove a Pattern..."
 msgstr "IÅ¡mesti Å¡ablonÄ…..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 #, fuzzy
 msgid "_Remove a Color..."
 msgstr "IÅ¡mesti spalvÄ…... "
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 #, fuzzy
 msgid "_Remove an Emblem..."
 msgstr "IÅ¡mesti emblemÄ…..."
@@ -7273,34 +7525,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Uždaryti _visus langus"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Užrašų šoninis skydelis"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Vieta..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "Å ablonai"
@@ -7330,10 +7587,13 @@ msgid "View Failed"
 msgstr "Peržiūra nepavyko"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Paleidžiant %s vaizdą įvyko klaida."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Tęsti negalima, nes %s vaizde įvyko klaida. Jūs galite pasirinkti kitokį "
 "vaizdą ar eiti į kitą vietą."
@@ -7343,92 +7603,119 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Paleidžiant %s vaizdą įvyko klaida."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Pasirinkti programÄ… su kuria atidaryti \"%s\"."
+
+#: src/nautilus-window-manage-views.c:987
 #, fuzzy
 msgid "Content View"
 msgstr "Turinys:"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 #, fuzzy
 msgid "View of the current file or folder"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Negaliu rasti \"%s\". Pasitikrinkite rašybą ir pabandykite dar kartą."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Negalėjau įkelti %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Negalėjau įkelti %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "Negalima parodyti \"%s\", nes Nautilus negali nustatyti bylos tipo."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus neturi įdiegtos žiūryklės, galin�ios parodyti \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "Negalima parodyti \"%s\", nes Nautilus negali rodyti %s: vietų."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Negalima parodyti \"%s\", kadangi nepavyko prisijungti (log in)."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Negalima parodyti \"%s\", nes priėjimas yra uždraustas."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Negalima parodyti \"%s\", kadangi negalÄ—jau rasti %s\" serverio. "
 "Patikrinkite ar teisingai užrašyta bei ar teisingi jūsų tarpinės stoties "
 "(proxy) nustatymai."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Negalima parodyti \"%s\", kadangi serverio pavadinimas yra tuš�ias. "
 "Patikrinkite teisingi jūsų tarpinės stoties (proxy) nustatymai."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, fuzzy, c-format
 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 "Negalima parodyti \"%s\", nes Nautilus negali nustatyti bylos tipo."
+"browser."
+msgstr "Negalima parodyti \"%s\", nes Nautilus negali rodyti %s: vietų."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Paieškos negalimos"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus negali parodyti \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Negaliu parodyti adreso"
 
@@ -7440,7 +7727,7 @@ msgstr "Eiti į šios žymelės rodom vietą"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7448,14 +7735,14 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Į lietuvių kalbą išvertė:\n"
 "Mantas Kriau�iūnas <mantelis@centras.lt>\n"
 "EglÄ— GirinaitÄ— <eglyte@centras.lt>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 #, fuzzy
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
@@ -7474,39 +7761,44 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Rodyti Å¡iÄ… vietÄ… su \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Å ri_ftai"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "[Elementai, kurie yra] katalogai"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Programos ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Programa"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7547,6 +7839,243 @@ msgstr "Netraverse"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Įrangos apžvalgos gamykla"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Įrangos žiūryklė"
+
+#~ msgid "Hardware view"
+#~ msgstr "Įrangos vaizdas"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Rodyti kaip įrangą"
+
+#~ msgid "hardware view"
+#~ msgstr "įrangos vaizdas"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "įrangos vaizdo ikonos pavadinimas"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "informacijos apie įrangą santrauka"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K kešo dydis"
+
+#~ 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 "Hardware Overview"
+#~ msgstr "Įrangos apžvalga"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Čia turėtų būti CPU puslapis"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Čia turėtų būti RAM puslapis"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Čia turėtų būti IDE puslapis"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Klaida kopijuojant į \"%s\" .\n"
+#~ "\n"
+#~ "Paskirties vietoje trūksta laisvos vietos."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Klaida darant nuorodą į\"%s\".\n"
+#~ "\n"
+#~ "Trūksta laisvos vietos."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Klaida perkeliant elementus į\"%s\".\n"
+#~ "\n"
+#~ "Neturite teisės rašyti į šį katalogą."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Klaida elementus perkeliant į\"%s\".\n"
+#~ "\n"
+#~ "Paskirties diskas skirtas tik skaitymui."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Klaida darant nuorodą į\"%s\".\n"
+#~ "\n"
+#~ "Neturite teisės rašyti į šį katalogą."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Klaida darant nuorodą į\"%s\".\n"
+#~ "\n"
+#~ "Paskirties diskas skirtas tik skaitymui."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida \"%s\" kopijuojant \"%s\".\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida \"%s\" perkeliant \"%s\".\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida \"%s\" trinant \"%s\".\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida \"%s\" kopijuojant.\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida \"%s\" darant nuorodÄ….\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Klaida\"%s\" trinant.\n"
+#~ "\n"
+#~ "Ar norite tęsti?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Negaliu kopijuoti į šiukšlinę"
+
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\" negali atidaryti \"%s\", nes \"%s\" negali pasiekti bylų \"%s\" "
+#~ "vietose. Nėra kitų programų šiai bylai peržiūrėti. Jei persikopijuosite "
+#~ "šią bylą į savo kompiuterį, jūs galėsite ją atsidaryti."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Paieška diskuose"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus Jūsų diskuose ieško šiukšlinės katalogų."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d pažymėti elementai negali būti perkelti į šiukšlinę. Ar norite juos "
+#~ "ištrinti nedelsiant?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d pažymėti elementai negali būti perkelti į šiukšlinę. Ar norite "
+#~ "ištrinti tuos %d elementus nedelsiant?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Byla, kurią jūs pertempėte nėra paveikslėlis. Kaip vartotojo pasirinktas "
+#~ "piktogramas galima naudoti tik vietinius paveikslÄ—lius."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Atsiprašau, bet Medusa paieškos paslaugos negalimos, nes ji neįdiegta."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Kartą per dieną jūsų bylos ir tekstinis jų turinys yra indeksuojamos, "
+#~ "todėl jūsų paieškos yra greitos. Jūsų bylos dabar yra indeksuojamos."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nėra tinkama vieta. Pasitikrinkite rašybą ir pabandykite dar kartą."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Atsiprašau, bet '%s' nėra gera paveikslėlio byla."
+
+#, fuzzy
+#~ 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 "Negalima parodyti \"%s\", nes Nautilus negali nustatyti bylos tipo."
+
+#~ msgid "file icon"
+#~ msgstr "bylos ikona"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Pavadinimas"
+
 #~ msgid "Unknown"
 #~ msgstr "Nežinomas"
 
@@ -7659,16 +8188,9 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "_Toolbar"
 #~ msgstr "Rodyti _Mygtukų juostą"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Vieta \"%s\" daugiau neegzistuoja."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Eiti neegzistuojan�iu adresu"
 
-#, fuzzy
-#~ msgid "_Location:"
-#~ msgstr "Vieta:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Šiukšlinė turi likti darbalaukyje."
 
@@ -7708,9 +8230,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #, fuzzy
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "_Vykdyti bylas ant jų paspaudus"
@@ -7798,10 +8317,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgstr " (neteisingas Unikodas)"
 
 #, fuzzy
-#~ msgid "Themes"
-#~ msgstr "_Times"
-
-#, fuzzy
 #~ msgid "New Window Behavior"
 #~ msgstr "Naujas langas"
 
@@ -7836,9 +8351,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "Click Behavior"
 #~ msgstr "Paspaudimo elgesys"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Vykdomosios tekstinÄ—s bylos"
-
 #, fuzzy
 #~ msgid "Show Options"
 #~ msgstr "Parodyti/paslÄ—pti parametrus"
@@ -7898,10 +8410,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgstr "Rodyti tekstÄ… piktogramose"
 
 #, fuzzy
-#~ msgid "Show text in icons for local files"
-#~ msgstr "Rodyti tekstÄ… piktogramose"
-
-#, fuzzy
 #~ msgid "Always show the number of items in folders"
 #~ msgstr "Rodyti elementų skai�ių kataloguose"
 
@@ -7979,9 +8487,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Negaliu pridÄ—ti temos"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Atleiskite, bet \"%s\" temos negalima įdiegti."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Negaliu įdiegti temos"
 
@@ -7999,9 +8504,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ "Atleiskite, bet jūs negalite išmesti dabartinės temos. Kad išmestumėte "
 #~ "šitą, prašau persijunkite į kitą temą."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Atsiprašau, bet ši tema negali būti išmesta!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Negaliu išmesti temos"
 
@@ -8312,9 +8814,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "Set Cover Image"
 #~ msgstr "Nustatyk viršelio vaizdą"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Atsiprašau, bet '%s' nėra gera paveikslėlio byla."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Nurodyk paveikslėlį albumo viršeliui:"
 
@@ -8371,9 +8870,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "<span size=\"xx-large\">%s - %s</span>"
 #~ msgstr "<span size=\"xx-large\">%s - %s</span>"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Atleiskite, bet %s paveikslėlis negali būti įdiegtas kaip emblema."
-
 #~ msgid "Delete"
 #~ msgstr "IÅ¡trinti"
 
@@ -8411,9 +8907,6 @@ msgstr "Rodyti namų aplanką Nautilus bylų tvarkyklėje"
 #~ msgid "%I:%M %p"
 #~ msgstr "%H:%M"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Negalėjau įkelti %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Įkeliamas %s"
 
diff --git a/po/lv.po b/po/lv.po
index 9507a98be..2df1e4be2 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-03-15 12:33+0200\n"
 "Last-Translator: Artis Trops  <hornet@navigator.lv>\n"
 "Language-Team: Latvian <ll10nt@os.lv>\n"
@@ -38,8 +38,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() neizdev�s."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblēmas"
 
@@ -52,48 +52,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus Emblēmu skats"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Nevarēju noņemt emblēmu"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nevarēju noņemt emblēmu ar nosaukumu '%s'.  Tas, iespējams, ir t�pēc, ka t� "
 "ir past�vīga emblēma, nevis t�da, ko jūs pats būtu pievienojis."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Nevarēju noņemt emblēmu"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Nevarēju p�rsaukt emblēmu"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nevarēju p�rsaukt emblēmu ar nosaukumu '%s'.  Tas, iespējams, ir t�pēc, ka "
 "t� ir past�vīga emblēma, nevis t�da, ko jūs pats būtu pievienojis"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Nevarēju p�rsaukt emblēmu"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "P�rsaukt Emblēmu"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Ievadiet jaunu noaukumu par�dītajai emblēmai:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "P�rsaukt"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Pievienot Emblēmas..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -101,7 +113,7 @@ msgstr ""
 "Ievadiet aprakstošu nosaukuma tekstu katrai emblēmai.  Šis nosaukums tiks "
 "lietots cituviet, lai identificētu emblēmu."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -109,139 +121,64 @@ msgstr ""
 "Ievadiet aprakstošu nosaukuma tekstu šai emblēmai.  Šis nosaukums tiks "
 "lietots cituviet, lai identificētu emblēmu."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Daži no failiem nevar tikt pievienoti k� emblēmas, jo neizskat�s, ka tie "
 "būtu derīgi attēli."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Fails '%s' neizskat�s, ka būtu derīgs attēls."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Nevarēju pievienot emblēmas"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Neviens no failiem nevar tikt pievienots k� emblēma, jo neizskat�s, ka tie "
 "būtu derīgi attēli."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Vilktais teksts nebija derīga faila lok�cija."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Nevarēju pievienot emblēmu"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Fails '%s' neizskat�s, ka būtu derīgs attēls."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Vilktais fails neizskat�s, ka būtu derīgs attēls."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Dzēšana"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Ražotne dzelžu skatam"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Dzelži"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Dzelžu Aplūkot�js"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Dzelžu skats"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Par�dīt k� Dzelžus"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "dzelžu skats"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ikonas nosaukums aparatūras skatam"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "inform�cijas par dzelžiem kopsavilkums"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s Mhz\n"
-"%s K keišatmiņas lielums"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Darbības laiks %d dienas, %d stundas, %d minūtes"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Dzelžu P�rskats"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Å Ä« ir vietmape CPU lapai."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Å Ä« ir vietmape RAM lapai."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Å Ä« ir vietmape IDE lapai."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "VÄ“sture"
@@ -907,6 +844,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Dzelži"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacion�ls"
@@ -1194,27 +1135,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1227,8 +1168,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1255,10 +1196,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Atkritumkastei j�paliek uz darbavirsmas."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1291,10 +1233,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Atkritumkastei j�paliek uz darbavirsmas."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1306,7 +1249,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1323,7 +1266,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1349,7 +1292,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1373,7 +1316,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1392,11 +1335,12 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus failu p�rvaldnieka darbavirsmas ikonu skatījums"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus failu p�rvaldnieka darbavirsmas ikonu skatījums"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1416,7 +1360,7 @@ msgstr "Atsegt Jaun� Log�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Mēģin�t iekļaut log�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1454,7 +1398,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1462,30 +1406,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1530,7 +1474,7 @@ msgstr "Lietot _pašrocīgu izk�rtojumu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "_Atvērt aktivēto priekšmetu jaun� log�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1554,7 +1498,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1568,7 +1512,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Izmantot noklusēto darbavirsmas fonu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1726,66 +1670,78 @@ msgstr "p�rstatīt"
 msgid "on the desktop"
 msgstr "uz darbavirsmas"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Formatēt izvēlēto partīciju"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "Formatēt izvēlēto partīciju"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Atkritumkaste"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_P�rviet šeit"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopēt šeit"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Saitēt šeit"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Uzst�dīt k� _Fonattēlu"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Iestatīt k� fonu _vis�m mapēm"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Iestatīt k� fonu š_ai mapei"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Piedodiet, bet jums j�piešķir k�ds atslēgv�rds jaunajai emblēmai."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Nevar uzst�dīt emblēmu"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1796,20 +1752,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Atvainojiet, bet šeir jau ir emblēma ar nosaukumu \"%s\". Lūdzu izvēlieties "
 "tam atšķirīgu emblēmu."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Nevar uzst�dīt emblēmu"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Atvainojiet, nevarēju saglab�t pašrocīgo emblēmu."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Atvainojiet, nevarēju saglab�t pašrocīg�s emblēmas nosaukumu."
 
@@ -1828,23 +1790,29 @@ msgstr "No:"
 msgid "To:"
 msgstr "Uz:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Kļūda p�rvietojot."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Kļūda p�rvietojot.\n"
 "\n"
 "\"%s\" nevar tikt p�rvietota t�pēc ka t� atrodas uz tikai nolasīšanai "
 "paredzēta diska."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Kļūda dzēšot."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1853,23 +1821,18 @@ msgstr ""
 "\"%s\" nevar tikt idzēsta t�pēc ka jums nav atļaujas mainīt mapi, kur t� "
 "atrodas."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Kļūda dzēšot.\n"
 "\n"
 "\"%s\" nevar tikt idzēsta t�pēc ka t� atrodas uz tikai nolasīšanai paredzēta "
 "diska."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1878,12 +1841,15 @@ msgstr ""
 "\"%s\" nevar tikt p�rvietota, t�pēc ka jums nav atļaujas mainīt mapi, kur t� "
 "atrodas."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Kļūda p�rvietojot."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Kļūda p�rvietojot.\n"
@@ -1891,12 +1857,10 @@ msgstr ""
 "\"%s\" nevar tikt p�rvietots t�pēc, ka tas vai t� pirmavota mape atrodas "
 "mērķī."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Kļūda p�rvietojot.\n"
@@ -1904,238 +1868,178 @@ msgstr ""
 "\"%s\" nevar tikt p�rvietota uz Atkritumkasti t�pēc ka jums nav atļaujas "
 "mainīt mapi, kur t� atrodas."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Kļūda kopējot."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Kļūda kopējot.\n"
 "\n"
 "\"%s\" nevar tikt nokopēta t�pēc ka jums nav atļaujas to nolasīt."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Kļuda kopējot uz \"%s\".\n"
-"\n"
-"Uz mērķa nav pietiekami daudz brīv�s vietas."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Kļūda kopējot."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Kļuda p�rvietojot uz \"%s\".\n"
 "\n"
 "Uz mērķa nav pietiekami daudz brīv�s vietas."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Kļuda veidojot saiti uz \"%s\".\n"
-"\n"
-"Uz mērķa nav pietiekami daudz brīv�s vietas."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Kļūda p�rvietojot."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Kļūda saistot."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Kļuda kopējot uz \"%s\".\n"
 "\n"
 "Jums nav atļaujas lai rakstītu šaj� mapē."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Kļuda kopējot uz \"%s\".\n"
 "\n"
 "Mērķa disks ir tikai nolasīšanai."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Kļūda p�rvietojot priekšmetus uz \"%s\".\n"
-"\n"
-"Jums nav atļaujas lai rakstītu šaj� mapē."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Kļūda p�rvietojot priekšmetus uz \"%s\".\n"
-"\n"
-"Mērķa disks ir tikai nolasīšanai."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Kļūda veidojot saites \"%s\".\n"
-"\n"
-"Jums nav atļaujas rakstīt šaj� mapē."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Kļūda p�rvietojot."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Kļūda veidojot saites \"%s\".\n"
-"\n"
-"Mērķa disks ir tikai nolasīšanai."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" kopējot \"%s\".\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Kļūda saistot."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Kļūda kopējot."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Kļūda \"%s\" p�rvietojot \"%s\".\n"
+"Kļūda \"%s\" p�rvietojot.\n"
 "\n"
-"Vai jūs vēlaties turpin�t?"
+"Vai jūs vēlaties turpin�t? "
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Kļūda p�rvietojot."
+
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "Kļūda \"%s\" veidojot saiti uz \"%s\".\n"
 "\n"
 "Vai jūs vēlaties turpin�t?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" dzēšot \"%s\".\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
-
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" kopējot.\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Kļūda dzēšot."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" p�rvietojot.\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Kļūda kopējot."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" saistot.\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Kļūda p�rvietojot."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kļūda \"%s\" dzēšot.\n"
-"\n"
-"Vai jūs vēlaties turpin�t? "
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Kļūda saistot."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Kļūda dzēšot."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Kļūda kopējot."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Kļūda p�rvietojot."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Kļūda saistot."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Kļūda dzēšot."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Izlaist"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "VÄ“lreiz"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nevarēju pabeigt nor�dīto darbību."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nevar tikt kopēts uz jaunu lok�ciu t�pēc, ka t� nosaukums jau ir "
 "izmantots speci�lam priekšmetam, kas nevar tikt izdzēsts vai p�rsaukts.\n"
@@ -2143,13 +2047,16 @@ msgstr ""
 "Ja jūs vēljoproj�m vēlaties p�rvietot \"%s\", p�rsauciet to un mēģiniet "
 "vēlreiz. "
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nevarēju pabeigt nor�dīto darbību."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nevar tikt p�rvietots uz jaunu lok�ciju t�pēc, ka t� nosaukums jau ir "
 "izmantots speci�lam priekšmetam, kas nevar tikt izdzēsts vai p�rsaukts.\n"
@@ -2157,44 +2064,50 @@ msgstr ""
 "Ja jūs vēljoproj�m vēlaties p�rvietot \"%s\", p�rsauciet to un mēģiniet "
 "vēlreiz"
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Nevaru aizvietot failu."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Fails \"%s\" jau eksistē.\n"
 "\n"
 "Vai jūs vēlētos to aizvietot?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikts kopējot."
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Aizvietot"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Aizvietot Visas"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "saite uz %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "vēl cita saite uz %s"
@@ -2203,25 +2116,25 @@ msgstr "vēl cita saite uz %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. saite uz %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. saite uz %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. saite uz %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. saite uz %s"
@@ -2231,561 +2144,600 @@ msgstr "%d. saite uz %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (vēl viena kopija)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kopija)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kopija)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kopija)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kopija)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopija)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (cita kopija)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Nezin�ms GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Parvietojam failus uz Atkritumkasti"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Izmestie faili:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "P�rvietojam"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Sagatavojam P�rvietošanai uz Atkritumkasti..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "P�rvietoju failus"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Faili p�rvietoti:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Sagatavojam P�rvietošanai..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Pabeidzam P�rvietošanu..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Izveidojam saites uz failiem"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Faili sasaistīti:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Saist�m"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Sagatavojamies Izveidot Saites..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Beidzam Izveidot Saites..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopējam failus"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Faili nokopēti:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopējam"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Sagatavojam Kopēšanai"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Jūs nevarat iekopēt objektus Atkritumkastē."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nevar nokopēt Atkritumkastē"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Jūs nevarat p�rvietot šo akritumkastes mapi."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Jūs nevarat kopēt šo atkritumkastes mapi."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Nevar Izmainīt Atkritumkastes Lok�ciju"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Nevar Kopēt Atkritumkasti"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Jūs nevarat p�rvietot mapi viņ� paš�."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Jūs nevarat kopēt mapi viņ� paš�."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Izveidot jaunu tukšo mapi iekš šīs mapes"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Nevar P�rvietot Paš�."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Nevar Kopēt Paš�."
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Jūs nevarat kopēt failu pa virsu viņam pašam."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Nevar Kopēt Pa Virsu Pašam"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Kļūda veidojot jaunu mapi.\n"
 "\n"
 "Jums nav atļauju lai rakstītu paredzētaj� viet�."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Kļūda veidojot jaunu mapi.\n"
 "\n"
 "Nav brīvas vietas paredzētaj� viet�."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Kļūda \"%s\" veidojot jaunu mapi."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Kļūda veidojot jaunu mapi"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Kļūda veidojot jaunu mapi"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "nenosaukta mape"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Kļūda \"%s\" veidojot jaunu mapi."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Kļūda veidojot jaunu mapi"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Kļūda veidojot jaunu mapi"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fails"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Dzēšam failus"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Faili izdzēsti:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Dzēšam"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Gatavojamies Dzēst failus..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tukšojam Atkritumkasti"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Sagatavojamies Tukšot Atkritumkasti..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Jūs tieš�m vēlaties nekavējoties dzēst visus failus Atkritumkastē?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tukšs"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopija).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (vēl viena kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (vēl viena kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (vēl viena kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (vēl viena kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. kopija). txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. kopija).txt"
 
@@ -2804,64 +2756,64 @@ msgstr "foo (124. kopija).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "Å¡odien plkst. 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "Å¡odien %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "Å¡odien 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "Å¡odien %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "Å¡odien, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "Å¡odiena, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "Å¡odiena"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "vakardien 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "vakardien %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "vakardien 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "vakardien %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "vakardiena, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "vakardiena, %-I:M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "vakardiena"
 
@@ -2870,133 +2822,133 @@ msgstr "vakardiena"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Trešdiena, 0000. gada 0. septembris, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pirm, Okt 00 0000, 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pirm, Okt 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Okt 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Okt 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%d/%d/%y, %i:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 priekšmetu"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mapes"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 failu"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 priekšmets"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mape"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fails"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u priekšmeti"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mapes"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u faili"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? priekšmeti"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? baiti"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "nezin�ms tips"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "nezin�ms MIME tips"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "nezin�ms"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programma"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3006,7 +2958,7 @@ msgstr ""
 "iespējams jūsu gnome-vfs.keys fails atrodas nepareiz� viet� vai arī nevar "
 "tikt atrasta k�da cita iemesla dēļ."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3015,11 +2967,11 @@ msgstr ""
 "Nav atrasts apraksts mime tipam \"%s\" (fails ir \"%s\"), lūdzu pasakiet to "
 "gnome-vfs epasta sarakstē."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "saite"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "saite (p�rrauta)"
 
@@ -3140,11 +3092,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Meklēt failus pēc faila nosaukuma un faila rekvizītiem"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonu Skats"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Saraksta Skats"
@@ -3288,148 +3242,153 @@ msgstr "%s M�jas"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Letes virsma"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "faila ikona"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "reģidējamais teksts"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "reģitējams virsraksts"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "papildus teksts"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "vēl vair�k teksta"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "izcelts priekš izvēles"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "vai mēs esam izgaismoti izvēlei"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "izgaismoti, kad tastatūra fokusē"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "vai mēs esam izgaismoti, lai renderētu tastatūras fokusēšanu"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "izgaismots nomešanai"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "vai mēs esam izgaismoti V&N nomešanai"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Izvēles taisnstūris"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Ier�mēt Tekstu"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Uzzīmēt r�mi apk�rt neizvēlētajam tekstam"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Izvēlies Lodziņa Kr�sa"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Kr�sa izvēles lodziņam"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Izvēles Lodziņš Alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Izvēles lodziņa necaurredzamība"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Izgaismošana Alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Izgaismošanas necaurredzamība izvēlētaj�m ikon�m"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Gaiš� Info Kr�sa"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Lietojam� kr�sa inform�cijas tekstam attiecīb� pret tumšu fonu"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tumš� Info Kr�sa"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Lietojam� kr�sa inform�cijas tekstam attiecīb� pret gaišu fonu"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Šī mape lieto autom�tisko izk�rtojumu. Vai jūs vēlaties parslēgties uz rokas "
 "izk�rtojumu un atst�t priekšmetu kur jūs to nomet�t? Tas atsaukts saglab�to "
 "rokas izk�rtojumu."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Šī mape lieto autom�tisko izk�rtojumu. Vai jūs vēlaties parslēgties uz rokas "
 "izk�rtojumu un atst�t priekšmetus kur jūs tos nomet�t? Tas atsaukts "
 "saglab�to rokas izk�rtojumu."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Šī mape lieto autom�tisko izk�rtojumu. Vai jūs vēlaties parslēgties uz rokas "
 "izk�rtojumu un atst�t priekšmetu kur jūs to nomet�t?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Šī mape lieto autom�tisko izk�rtojumu. Vai jūs vēlaties parslēgties uz rokas "
 "izk�rtojumu un atst�t priekšmetus kur jūs tos nomet�t?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "P�rslēgties uz Rokas Izk�rtojumu?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "P�rslēgties"
 
@@ -3536,72 +3495,72 @@ msgstr "Ir noklusētais \"%s\" priekšmetiem."
 msgid "Is the default for all \"%s\" items."
 msgstr "Ir noklusētais visiem \"%s\" priekšmetiem."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modificēt \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Iekļaut izvēlnē \"%s\" priekšmetiem"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Lietot k� noklusēto \"%s\" priekšmetiem"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Iekļaut izvēlnē tikai priekš \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Lietot k� noklusēto tikai priekš\"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Neiekļaut izvēlnē \"%s\" priekšmetiem"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nosaukums"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Statuss"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "I_zvēlies"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Izdarīts"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Mainīt..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Failu Tipi un Programmas"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ej Å eit"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3609,48 +3568,48 @@ msgstr ""
 "Jūs varat nokonfigurēt, kuras programmas tiek pied�v�tas attiecīgajiem failu "
 "tipiem, Failu Tipu un Programmu dialog�."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Atvērt ar Citu Aplik�ciju"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Izvēlies aplik�ciju, ar kuru atvērt \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Atvērt ar Citu Skatīt�ju"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Izvēlies skatīt�ju priekš \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" nav pieejamu skatīt�ju."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nav Pieejamu Skatīt�ju"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Neviena aplik�cija nav saistīta ar \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Naviena Aplik�cija Nav Saistīta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Neviena aplik�cija nav saistīta ar \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "Naviena Aplik�cija Nav Saistīta"
@@ -3659,11 +3618,9 @@ msgstr "Naviena Aplik�cija Nav Saistīta"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3672,44 +3629,43 @@ msgstr ""
 "Jūs varat konfigurēt GNOME, lai saistītu aplik�cijas ar failu tipiem.  Vai "
 "vēlaties saistīt apik�ciju ar šo faila tipu tagad?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Saistīt Aplik�ciju"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Neviena aplik�cija nav saistīta ar \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Neviena aplik�cija nav saistīta ar \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "Naviena Aplik�cija Nav Saistīta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Neviena aplik�cija nav saistīta ar \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "Naviena Aplik�cija Nav Saistīta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3719,94 +3675,134 @@ msgstr ""
 "Jūs varat konfigurēt GNOME, lai saistītu aplik�cijas ar failu tipiem.  Vai "
 "vēlaties saistīt apik�ciju ar šo faila tipu tagad?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "Saistīt Aplik�ciju"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
+"lok�cij�s.  Vai vēlaties izmantot citu aplik�ciju?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
 "lok�cij�s.  Vai vēlaties izmantot citu aplik�ciju?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
 "lok�cij�s.  Vai vēlaties izmantot citu aplik�ciju?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nevar Atvērt Lok�ciju"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
+"lok�cij�s.  Vai vēlaties izmantot citu aplik�ciju?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
 "lok�cij�s.  Neviena cita aplik�cija nav pieejama, lai apskatītu šo faila "
 "tipu.  Ja p�rkopēsiet šo failu uz savu datoru, jūs varētu spēt to atvērt."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
+"lok�cij�s.  Vai vēlaties izmantot citu aplik�ciju?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
 "lok�cij�s.  Neviena cita aplik�cija nav pieejama, lai apskatītu šo faila "
 "tipu.  Ja p�rkopēsiet šo failu uz savu datoru, jūs varētu spēt to atvērt."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atveru \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Piedodiet, bet jūs nevarat izpildīt komandas att�lin�t�s lap�s drošības "
 "apsvērumu dēļ."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Nevaru izpildīt att�lin�tas saites"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Bija kļūda, palaižot aplik�ciju.\n"
 "\n"
 "Detaļas: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Kļūda palaižot aplik�ciju"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Nomešanas mērķis atbalsta tikai lok�los failus"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Šis nomešanas mērķis atbalsta tikai lok�los failus.\n"
@@ -3814,15 +3810,15 @@ msgstr ""
 "Lai atvērtu ne-lok�lus failus, iekopējiet tos lok�l� mapē un tad nometiet "
 "tos vēlreiz."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Nomešanas mērķis atbalsta tikai lok�los failus"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4077,14 +4073,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Priekšmeti, kas satur \"medusa\" to nosaukumos un kas ir mapes"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Meklējam pa Diskiem"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus meklē jūsu diskos aktritumkastes mapes."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Rediģēt"
@@ -4288,98 +4276,108 @@ msgstr "Fons"
 msgid "Empty Trash"
 msgstr "Tukšot Atkritumkasti"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Šis atvērs %d atsevišķus logus. Vai esi p�rliecin�ts, ka vēlies to darīt?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Atvērt %d Logus?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Vai esat p�rliesin�ts, ka vēlaties pavisam izdzēst \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Šis atvērs %d atsevišķus logus. Vai esi p�rliecin�ts, ka vēlies to darīt?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Vai esat p�rliesin�ts, ka vēlaties pavisam izdzēst \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Vai esat p�rliesin�ts, ka vēlaties pavisam izdzēst %d izvēlētos priekšmetus?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Dzēst visus izvēlētos priekšmetus nekavējoties"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Dzēst?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Izvēlēties Kategoriju:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Raksti"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" izvēleti"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mape izvēlēta"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mapes izvēlētas"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (satur 0 objektus) "
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (satur 1 objektu) "
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (satur %d objektus) "
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (satur kop� 0 priekšmetus) "
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (satur kop� 1 priekšmetu) "
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (satur kop� %d priekšmetus) "
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" izvēleti (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d priekšmeti izvēlēti (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 cits priekšmets izvēlēts (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d citi priekšmeti izvēlēti (%s)"
@@ -4391,7 +4389,7 @@ msgstr "%d citi priekšmeti izvēlēti (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4400,108 +4398,126 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mape \"%s\" satur vair�k failu, nek� Nautilus spēj uzturēt. Daži faili "
 "netiks par�dīti."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Par�k Daudz Failu"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" nevar tikt p�rvietots uz Atkritumkasti. Vai vēlaties to tūliņ izdzēst?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d izvēlētie priekšmeti nevar tikt p�rvietoti uz Atkritumkasti. Vai vēlaties "
-"tos tūliņ izdzēst?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" nevar tikt p�rvietots uz Atkritumkasti. Vai vēlaties to tūliņ izdzēst?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d izvēlētie priekšmeti nevar tikt p�rvietoti uz Atkritumkasti. Vai vēlaties "
-"tos %d tūliņ izdzēst?"
+"\"%s\" nevar tikt p�rvietots uz Atkritumkasti. Vai vēlaties to tūliņ izdzēst?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Dzēst Nekavējoties?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Vai esat p�rliecin�ts, ka vēlaties pavisam izdzēst \"%s\" no Atkritumkastes?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Vai esat p�rliecin�ts, ka vēlaties pavisam izdzēst %d izvēlētos priekšmetus "
 "no Atkritumkastes?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Dzēst No Atkritumkastes?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Lieto \"%s\", lai atvērtu izvēlēto priekšmetu"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Cita _Aplik�cija..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Aplik�cija..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Cits _Skatīt�js..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Skatīt�js..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nevarēju pabeigt nor�dīto darbību:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nevarēju pabeigt nor�dīto darbību."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Palaist \"%s\" ar katru no izvēlētajiem priekšmetiem"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Visi izpild�mie faili šaj� mapē par�dīsies Skriptu izvēlnē. Izvēloties "
+"skriptu no izvēlnes, tiks palaists dotais skripts ar jebkuru no izvēlētajiem "
+"priekšmetiem k� ievadi."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4509,11 +4525,11 @@ msgstr ""
 "skriptu no izvēlnes, tiks palaists dotais skripts ar jebkuru no izvēlētajiem "
 "priekšmetiem k� ievadi."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Par Skriptiem"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4554,17 +4570,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: konkrēt� loga pozīcija un izmērs"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" tiks p�rvietots, ja izvēlēsieties Ievietot Failus komandu"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" tiks kopēts, ja izvēlēsieties Ievietot Failus komandu"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4572,168 +4588,175 @@ msgstr ""
 "%d izvēlētie priekšmeti tiks p�rvietoti, ja izvēlēsieties Ievietot Failus "
 "komandu"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d izvēlētie priekšmeti tiks kopēti, ja izvēlēsieties Ievietot Failus komandu"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Starpliktuvē nav nek�, ko ievietot."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Montēšanas Kļūda"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Nomontēšanas Kļūda"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Montēšanas Kļūda"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "At_taisīt"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Nomontēt Partīciju"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Atvērt Jaun� _Log�"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Atvērt %d Jaunos _Logos"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "M�jas Mape"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "M�jas Mape"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Dzēst no A_tkritumkastes"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Dzēst visus izvēlētos priekšmetus nekavējoties"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "P�_rvietot uz Atkritumkasti"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "P�rvietot katru izvēlēto priekšmetu uz Atkritumkasti"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Dzēst"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Izveidot _Saites"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Iz_veidot Saiti"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Iztukšot Atkritumkasti"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Iz_griezt Failu"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Iz_griezt Failus"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopēt Failu"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopēt Failus"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Šī saite nevar tikt izmantota, t�pēc ka tai nav mērķa. Vai vēlaties "
 "p�rvietot šo saiti uz Atkritumkasti?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Šī saite nevar tikt izmantota, t�pēc ka tai nav mērķa. Vai vēlaties "
+"p�rvietot šo saiti uz Atkritumkasti?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Šī saite nevar tikt lietota, jo t�s mērķis \"%s\" neeksistē. Vai vēlaties "
 "p�rvietot šo saiti uz Atkritumkasti?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "P�traukta Saite"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" ir izpilld�ms teksta fails. Vai vēlaties to palaist vai redzēt t� "
 "saturu?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "S�knēt vai Par�dīt?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Par�dīt"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Palaist _Termin�lī"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Par�dīt"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Palaist"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Atveru \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Atsaukt Atvēršanu?"
 
@@ -4754,27 +4777,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Piedodiet, nevarēju par�dīt visu \"%s\" saturu."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Nevaru noteikt atļaujas \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Kļūda R�dot Mapi"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 "Nosaukums \"%s\" jau ir lietots šaj� mapē. Lūdzu lieto citu nosaukumu."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 "Šaj� mapē nav \"%s\". Varbūt tas tika nesen p�rvietots vai izdzēsts?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Jums nav nepieciešam�s atļaujas, lai p�rsauktu \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4783,66 +4811,81 @@ msgstr ""
 "Nosaukums \"%s\" nav atļauts, jo tas satur rakstzīmi \"/\". Lūdzu lieto citu "
 "nosaukumu."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nosaukums \"%s\" nav atļauts. Lūdzu lieto citu nosaukumu."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Nevarēju izmainīt \"%s\" nosaukumu, jo tas atrodas uz tikai nolasīšanai "
 "paredzēta diska"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Piedodiet, nevarēju p�rsaukt \"%s\" par  \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Nevaru noteikt atļaujas \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "P�rsaukšanas Kļūda"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Jums nav nepieciešamo atļauju, lai mainītu \"%s\" grupu."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nevarēju mainīt \"%s\" grupu, jo tas atrodas uz tikai nolasīšanai paredzēta "
 "diska"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Piedodiet, nevarēju mainīt \"%s\" grupu."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Nevaru noteikt atļaujas \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Kļūda Uzst�dot Grupu"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nevarēju mainīt \"%s\" īpašnieku, jo tas atrodas uz tikai nolasīšanai "
 "paredzēta diska"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Piedodiet, nevarēju mainīt \"%s\" īpašnieku."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Nevaru noteikt atļaujas \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Kļūda Uzst�dot Īpašnieku"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4850,21 +4893,26 @@ msgstr ""
 "Nevarēju mainīt \"%s\" atļaujas, jo tas atrodas uz tikai nolasīšanai "
 "paredzēta diska"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Piedodiet, nevarēju mainīt \"%s\" atļaujas."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Nevaru noteikt atļaujas \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Kļūda Uzst�dot Atļaujas"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "P�rsaucu \"%s\" uz \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Atsaukt P�rsaukšanu?"
 
@@ -4922,129 +4970,151 @@ msgstr "Atjaunot Ikonas Oriģin�los Izmē_rus"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Atjaunot Ikonas Oriģin�lo Izmē_ru"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "nor�d�m uz \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Vilkt un Nomest tiek atbalstīts tikai uz lok�laj�m failsistēm�m."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Vilkt un Nomest tiek atbalstīts tikai uz lok�laj�m failsistēm�m."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Vilkt un Nomest kļūda"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Tika lietots nepareizs vilkšanas tips."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Faila nosaukums"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Izmērs"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tips"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Izmaiņu Datums"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Jūs nevarat piešķirt vair�k k� vienu piel�goto ikonu vienlaicīgi! Lūdzu "
+"uzvelciet tikai vienu attēlu, lai iest�dītu piel�goto ikonu."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Jūs nevarat piešķirt vair�k k� vienu piel�goto ikonu vienlaicīgi! Lūdzu "
 "uzvelciet tikai vienu attēlu, lai iest�dītu piel�goto ikonu."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Vair�k K� Vienu Attēlu"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Fails, ko jūs nomet�t nav lok�ls.  Jūs variet lietot tikai lok�los attēlus "
 "k� piel�got�s ikonas."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Fails, ko jūs nomet�t nav lok�ls.  Jūs variet lietot tikai lok�los attēlus "
+"k� piel�got�s ikonas."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Tikai Lok�los Attēlus"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Fails, ko jūs nomet�t, nav attēls.  Jūs variet lietot tikai lok�los attēlus "
+"Fails, ko jūs nomet�t nav lok�ls.  Jūs variet lietot tikai lok�los attēlus "
 "k� piel�got�s ikonas."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Tikai Attēlus"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "_Rekvizīti"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Rekvizīti"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Atsaukt Grupas Maiņu?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Grupas maiņa"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Atsaukt Īpašnieka Maiņu?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Īpašnieka maiņa"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nekas"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "nenolas�ms"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 priekšmets, izmērs %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d priekšmeti, kop� %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(dažas lietas nenolas�mas)"
 
@@ -5054,194 +5124,194 @@ msgstr "(dažas lietas nenolas�mas)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Saturs:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Pamats"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_Nosaukums:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nosaukums:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tips:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Izmērs:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lok�cija:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "DVD Partīcija"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Saites mērķis:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME tips:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificēts:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Izmantots:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Izvēlēties Piel�gotu Ikonu..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Noņemt Piel�goto Ikonu"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lasīt"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Rakstīt"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Iz_pildīt"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Uzst�dīt _lietot�ja ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Speci�li karogi:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Uzst�dīt gr_upas ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Lipīgs"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Atļaujas"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Jūs neesat īpašnieks, t�dēj�di jūs nevarat izmainīt atļaujas"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Faila Īpašnieks:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Faila Īpašnieks:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Faila grupa:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Faila grupa:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Īpašnieks:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupa:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Citi:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Teksta skats:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Skaitļu skats:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Pēdējoreiz mainīts:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Nevaru noteikt atļaujas \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "Nevaru noteikt atļaujas \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Bija kļūda, par�dot palīdzību: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Bija kļūda, par�dot palīdzību: %s."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Nevarēju par�dīt palīdzību"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Atsaukt Rekvizītu Loga Par�dīšanu?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Izveidoju Rekvizītu logu"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Izvēlēties ikonu:"
@@ -5260,71 +5330,110 @@ msgid "Search Results"
 msgstr "Meklēšanas Rezult�ti"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Piedodiet, bet Medusa meklēšanas serviss nav pieejams, jo tas nav "
-"uzinstalēts."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Piedodiet, bet medusa meklēšanas serviss nav pieejams."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Meklēšanas Serviss Nav Pieejams"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Meklēšana, ko esat izvēlējies, ir jaun�ka k� indekss jūsu sistēm�.  Šobrīd "
 "meklēšana nedos nek�dus rezultatus.  Jūs varat izveidot jaunu indeksu, "
 "palaižot \"medusa-indexd\" k� root no komandrindas."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Meklēt�js nevar atvērt jūsu failu sistēmas indeksu.  Jūsu indekss varetu būt "
+"pazudis vai saboj�ts.  Jūs varat izveidot jaunu indeksu, palaižot \"medusa-"
+"indexd\" k� root no komandrindas."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Meklēt priekšmetus, kas ir p�r�k jauni"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Katrs indeksētais fails jūsu dator� atbilst jūsu izvēlētajiem kritērijiem. "
+"Jūs varat p�rbaudīt jūsu izvēles pareizrakstību vai prievienot vair�k "
+"kritēriju, lai samazin�tu jūsu meklēšanas rezult�tus."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Katrs indeksētais fails jūsu dator� atbilst jūsu izvēlētajiem kritērijiem. "
 "Jūs varat p�rbaudīt jūsu izvēles pareizrakstību vai prievienot vair�k "
 "kritēriju, lai samazin�tu jūsu meklēšanas rezult�tus."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Kļūda meklējot"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Meklēt�js nevar atvērt jūsu failu sistēmas indeksu.  Jūsu indekss varetu būt "
 "pazudis vai saboj�ts.  Jūs varat izveidot jaunu indeksu, palaižot \"medusa-"
 "indexd\" k� root no komandrindas."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Kļūda nolasot faila indeksu"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Atgadīj�s kļūda, iel�dējot šīs meklēšanas saturu: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
+"indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
+"indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5332,25 +5441,23 @@ msgstr ""
 "indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam, t�pēc tiks veikta "
 "lēn�ka meklēšana, kas nelieto indeksu."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
-"indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Ātra meklēšana nav iespējama"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Satura meklēšana nav pieejama"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5364,56 +5471,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Lai veiktu �tro meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
 "indekss.  Jūsu dators pašlaik veido šo indeksu.  T� k� Meklēt�js nevar "
 "lietot indeksu, šī meklēšana aizņems dažas minūtes."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas satura "
 "indekss.  Jūsu dators šobrīd veido šo indeksu.  Satura meklēšana būs "
 "pieejama, kad indekss būs pabeigts."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indeksētie meklējumi nav pieejami"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
+"indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
+"indekss.  Meklēt�js šobrīd nevar piekļūt jūsu indeksam."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Lai veiktu �tro meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas failu "
 "indekss.  Neviens indekss šobrīd nav pieejams. Jūs varat izveidot indeksu, "
 "palaižot \"medusa-indexd\" k� root no komandrindas.  Līdz pilnīgs indekss "
 "būs pieejams, meklēšana aizņems dažas minūtes."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Lai veiktu satura meklēšanu, Meklēt�jam nepieciešams jūsu sistēmas satura "
 "indekss.  Neviens indekss šobrīd nav pieejams. Jūs varat izveidot indeksu, "
 "palaižot \"medusa-indexd\" k� root no komandrindas.  Līdz pilnīgs indekss "
 "būs pieejams, satura meklēšana nevar tikt veikta."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Uz jūsu datora �tr� meklēšana nav ieslēgta."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5423,11 +5562,12 @@ msgstr ""
 "indekss. Jūsu sistēmas administr�tors ir atslēdzis �tro meklē�nu jūsu "
 "sistēm�, t� k� indekss nav pieejams."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Uz jūsu datora �tr� meklēšana nav ieslēgta."
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Ātra meklēšana nav iespējama"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Kur"
 
@@ -5436,7 +5576,7 @@ msgstr "Kur"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Atsegt Jaun� Log�"
@@ -5447,7 +5587,7 @@ msgstr "_Atsegt Jaun� Log�"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Atsegt %d _Jaunos Logos"
@@ -5456,15 +5596,21 @@ msgstr "Atsegt %d _Jaunos Logos"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus atrada vair�k meklēšanas rezut�tus, k� tas var par�dīt. Daži "
+"atbilstošie priekšmeti nevar tikt par�dīti."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus atrada vair�k meklēšanas rezut�tus, k� tas var par�dīt. Daži "
 "atbilstošie priekšmeti nevar tikt par�dīti."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "P�r�k Daudz Atradumu"
 
@@ -5479,12 +5625,12 @@ msgid "Create L_auncher"
 msgstr "Jauns _Palaidējs"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Izveidot jaunu palaidēju"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Dzēst visus priekšmetus Atkritumkastē"
 
@@ -5505,7 +5651,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Lietot _Noklusēto Fonu"
@@ -5528,58 +5674,68 @@ msgstr "Izvēlēties citu skatīt�ju ar kuru skatīt izvēlēto priekšmetu"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "M�jas Mape"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "M�jas Mape"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Izveidot jaunu tukšo mapi iekš šīs mapes"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Izveidot jaunu tukšo mapi iekš šīs mapes"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Izveidot simbolisko saiti katram priekšmetam"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_ublicēt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Dzēst katru izvēlēto priekšmetu, bez p�rvietošanas uz Atkritumkasti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Dublicēt katru izvēlēto priekšmetu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Rediģēt Palaidēju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Rediģēt palaidēja inform�ciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatēt izvēlēto partīciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medij_a Rekvizīti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Nomontēt izvēlēto partīciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "P�rvietot vai kopēt failus, kas iepriekš izvēlēti at Izgriezt Failus vai "
 "Kopēt Failus komandu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5588,131 +5744,140 @@ msgstr ""
 "P�rvietot vai kopēt failus, kas iepriekš izvēlēti at Izgriezt Failus vai "
 "Kopēt Failus komandu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Atvē_rt Ar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Atvērt katru izvēlēto priekšmetu jaun� log�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Atvērt Jaun� _Log�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Atvērt izvēlēto priekšmetu šaj� log�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Sagatavo izvēlētos failus kopēšanai ar Ievietot Failus komandu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Sagatavo izvēlētos failus p�rvietošanai ar Ievietot Failus komandu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Aiz_sarg�t"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Aizsarg�t izvēlēto partīciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "P�rsaukt izvēlēto priekšmetu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "P�rstatīt Skatu uz _Noklusējumiem"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "P�rstatīt k�rtošanas secību un izmēra līmeni, lai atbilstu preferencēm šim "
 "skatam"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Palaist vai p�rvaldīt skriptus no ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Izvēlēties Vis_us Failus"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Raksti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Izvēlēties visus priekšmetus šaj� log�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Izvēlēties visus priekšmetus šaj� log�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Skatīt medija rekvizītus izvēlētajai partīcijai"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Par�dīt mapi kas satur skriptus šai izvēlnei"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Nomontēt izvēlēto partīciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Lietot noklusēto fonu šai lok�cijai"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Skatīt vai mainīt rekvizītus katram izvēlētam priekšmetam"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopēt Failu"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatēt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Nomontēt Partīciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Atvērt Skriptu Mapi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Ie_vietot Failus"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "Ie_vietot Failus"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Rekvizīti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_P�rsaukt..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skripti"
 
@@ -5800,7 +5965,12 @@ msgstr "_Pašrocigii"
 msgid "Indexing is %d%% complete."
 msgstr "Indeksēšana ir %d%% izpildīta."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Jūsu faili pēdējo reizi tika indeksētas %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5808,25 +5978,29 @@ msgstr ""
 "Vienreiz dien� jūsu failu un teksta saturs tiek indeksēts, lai meklēšana "
 "notiktu �tr�k."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indeksēšanas Status"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Jūsu faili pēdējo reizi tika indeksētas %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Vienreiz dien� jūsu faili un teksta saturs tiek indeksēti, lai meklēšana "
-"notiktu �tr�k. Jūsu faili šobrīd tiek indeksēti."
+"Vienreiz dien� jūsu failu un teksta saturs tiek indeksēts, lai meklēšana "
+"notiktu �tr�k."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Pašreiz jums nav indeksa jūsu failiem."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5836,15 +6010,19 @@ msgstr ""
 "�tr�k. Ātr� meklēšana nav aktivizēta uz jūsu datora, t�pēc jums pašreiz nav "
 "indeksa."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Pašreiz jums nav indeksa jūsu failiem."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Piedodiet, bet medusa meklēšanas serviss nav pieejams."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5868,32 +6046,37 @@ msgstr "Par�dīt Indeksēšanas Statusu"
 msgid "Show status of indexing used when searching"
 msgstr "Par�dīt indeksēšanas statusu, kad meklēju"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nevar izveidot Pieprasīto Mapi"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nevaru Izveidot Pieprasīt�s Mapes"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus nevarēja izveidot nepieciešamo mapi \"%s\". Pirms Nautilus "
 "palaišanas, lūdzu izveidojiet šo mapi vai uzst�diet t�das atļaujas, ka "
 "Nautilus var to izveidot."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nevaru Izveidot Pieprasīt�s Mapes"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5904,21 +6087,25 @@ msgstr ""
 "Pirms Nautilus palaišanas, lūdzu izveidojiet šīs mapes vai uzst�diet t�das "
 "atļaujas, ka Nautilus var t�s izveidot."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "uz darbavirsmas"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "uz darbavirsmas"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5930,7 +6117,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5941,7 +6128,7 @@ msgstr ""
 "datoru vai vēlreiz uzinstalēt Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5987,12 +6174,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus nevar tikt izmantots sakar� ar negaidītu kļūdu."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6000,7 +6187,7 @@ msgstr ""
 "Nautikus nevar tikt tagad izmantots, sakar� ar negaidītu kļūdu no Bonobo, "
 "k�mēr mēģin�ts reģistrēt failu p�rvaldnieka skatu serveri."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6010,7 +6197,7 @@ msgstr ""
 "kad mēģin�ts atrast ražotni. Nokaujot bonobo-activation-server un "
 "p�rstartējot Nautilus varētu palīdzēt atrisin�t problēmu."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6020,6 +6207,17 @@ msgstr ""
 "kad mēģin�ts atrast �aulas objektu. Nokaujot bonobo-activation-server un "
 "p�rstartējot Nautilus varētu palīdzēt atrisin�t problēmu."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Bija kļūda, par�dot palīdzību: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Neviena gr�matzīme nav definēta"
@@ -6055,36 +6253,47 @@ msgstr "Maz�k Opcijas"
 msgid "Find Them!"
 msgstr "Atrast Tos!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Nevar P�rvietot Paš�."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Piedodiet, bet \"%s\" nav pareizs faila nosaukums."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" nav pareiza lok�cija. Lūdzu p�rbaudiet, vai t� ir pareiza un mēģinat "
+"Nevarēju atrast \"%s\". Lūdzu p�rbaudiet, vai tas ir pareizs un mēģiniet "
 "vēlreiz."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "TÄ«kla Serveri"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Nosaukums:"
+msgid "_Location:"
+msgstr "Lok�cija:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6285,6 +6494,20 @@ msgstr ""
 "\n"
 "Jūs varat pašrocīgi izdzēst šo failu, lai izmantotu vedni atkal.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Jūs nevarat piešķirt vair�k k� vienu piel�goto ikonu vienlaicīgi! Lūdzu "
+"uzvelciet tikai vienu attēlu, lai iest�dītu piel�goto ikonu."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Fails, ko jūs nomet�t nav lok�ls.  Jūs variet lietot tikai lok�los attēlus "
+"k� piel�got�s ikonas."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6295,24 +6518,22 @@ msgstr "Atvērt ar %s"
 msgid "Open with..."
 msgstr "Atvērt ar..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Jauns _Palaidējs"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Tukšot _Atkritumkasti"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6320,37 +6541,37 @@ msgstr ""
 msgid "Go To:"
 msgstr "Iet Uz:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Vai vēlies skatīt šīs %d lok�cijas daž�dos logos?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Par�dīt Vair�kos Logos?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Nevar Atvērt Lok�ciju"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Izpildīt �tru pašp�rbaudes testu kopu."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Izveidot pamata logu ar doto ģeometriju."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "Ä¢EOMETRIJA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Izveido tikai logus ar speci�li nor�dītiem URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6358,82 +6579,95 @@ msgstr ""
 "Nep�rvaldīt darbavirsmu (ignorēt preferences, kas uzst�dītas preferen�u "
 "dialog�)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Iziet no Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Pars�knēt Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Failu P�rvaldnieks"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nevar tikt izmantots ar URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nevar tikt izmantots ar cit�m opcij�m.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nevar tikt izmantots ar URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nevar tikt izmantots ar URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nevar tikt izmantots ar vair�k k� vienu 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Vai esat p�rliesin�ts, ka vēlaties pavisam izdzēst \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Jūs esat p�rliecin�ts, ka gribat aizmirst vēsturi? Ja j�, jūs būsiet nolemts "
 "to atk�rtot."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Vai esat p�rliecin�ts, ka vēlaties attīrīt apmeklēto lok�ciju sarakstu?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Attīrīt Vēsturi"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Lok�cija \"%s\" vairs neeksistē. Vai jūs vēlaties izdzēst jebk�das "
 "gr�matzīmes, kas saistītas ar šo lok�ciju, no jūsu saraksta?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Lok�cija \"%s\" vairs neeksistē."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Gr�matzīme Neeksistējošai Lok�cijai"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Noņemt"
 
@@ -6466,7 +6700,6 @@ msgid "Close _All Windows"
 msgstr "_Aizvērt Visus Logus"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Aizvērt visus Nautilus logus"
@@ -6489,107 +6722,118 @@ msgid "Forward"
 msgstr "Uz priekšu"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Iet uz atkritumu mapi"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Iet uz n�kamo apmeklēto lok�ciju"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Iet uz iepriekš apmeklēto lok�ciju"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Iet uz atkritumu mapi"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "M�jas"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Lok�cijas _Josla"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "P�rl�dēt"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Meklēt failus dator�"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_atusjosla"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Augšup"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Pievienot Gr�m_atzīmi"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Atpakaļ"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Gr�matzīmes"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Aizmirst VÄ“sturi"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Letes virsma"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "R_ediģēt Gr�matzīmes"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Uz Priekšu"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Iet"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_M�jas"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lok�cija..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_S�na Rūts"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Atkritumkaste"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Augšup"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Skats"
 
@@ -6607,34 +6851,39 @@ msgstr "Skatīt k�..."
 msgid "File Browser: %s"
 msgstr "Faila Īpašnieks:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Viens no s�njoslas paneļiem nokļūdij�s un nevarēs turpin�t str�d�t. Diemžēl "
 "es nevarēšu pateikt, kurš tieši."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s skats izraisija kļūdu startējoties."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "S�njoslas panelis %s sastap�s ar kļūdu un nevar turpin�t. Ja t� turpina "
 "notikt, jūs varētu vēlēties izslēgt šo paneli."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "S�njoslas Panelis Nestr�d�"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "S�na Rūts"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Satur s�na rūts skatu"
 
@@ -6668,148 +6917,181 @@ msgstr "_Pievienot jaunu..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Piedodiet, bet %s raksts nevar tikt izdzēsts."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Nevar izdzēst rakstu"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Piedodiet, bet %s emblēma nevar tikt izdzēsta."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Nevarēju noņemt emblēmu"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Izveidot Jaunu Emblēmu:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Atslēgv�rds:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Attēls:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Izvēlieties attēla failu jaunajai emblēmai:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Izveidot Jaunu Kr�su:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Kr�sas no_saukums:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Kr�sas _vērtība:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Piedodiet, bet \"%s\" nav pareizs faila nosaukums."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Piedodiet, bet jūs nedev�t pareizu faila nosaukumu."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Nevar uzst�dīt rakstu"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Piedodiet, bet jūs nevarat aizvietot p�rstatīšanas attēlu."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ne attēls"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Piedodiet, bet %s raksts nevar tikt uzst�dīts."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Izvēlieties attēla failu k� rakstu"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Piedodiet, bet jums j�piešķir k�ds atslēgv�rds jaunajai kr�sai."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Nevaru uzst�dīt kr�su"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Izvēlies kr�su, kuru pievienot"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Piedodiet, bet '%s' nav lietojams attēla fails!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Fails '%s' neizskat�s, ka būtu derīgs attēls."
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Izvēlēties Kategoriju:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "At_celt Izņemšanu"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Pievienot Jaunu Rakstu..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Pievienot Jaunu Kr�su..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Pievienot Jaunu Emblēmu..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klikšķiniet uz raksta, lai to noņemtu"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klikšķiniet uz kr�sas, lai to noņemtu"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klikšķiniet uz emblēmas, lai to noņemtu"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Raksti:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Kr�sas:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblēmas:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Noņemt Rakstu..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Noņemt Kr�su..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Noņemt Emblēmu..."
 
@@ -7202,34 +7484,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "_Aizvērt Visus Logus"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Aizvērt s�na rūti"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Iet uz atkritumu mapi"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Iet uz atkritumu mapi"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lok�cija..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[priekšmeti kas ir]mapes"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Raksti"
@@ -7259,10 +7546,13 @@ msgid "View Failed"
 msgstr "Skats Neizdev�s"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s skats izraisija kļūdu startējoties."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s skats sastap�s ar kļūdu un nevar turpin�t. Jūs variet izvēlēties citu "
 "skatu vai p�riet uz citu lokaciju."
@@ -7272,100 +7562,128 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "%s skats izraisija kļūdu startējoties."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "NautilusApplication saistīta ar šo logu."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Satura Skats"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Skats pašreizējam failam vai mapei"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Nevarēju atrast \"%s\". Lūdzu p�rbaudiet, vai tas ir pareizs un mēģiniet "
-"vēlreiz."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Nevarēju pievienot emblēmas"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus nevar attēlot \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Nevarēju attēlot \"%s\", t�pēc ka Nautilus nevar noteikt, kas par faila tipu "
 "tas ir."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus nav uzst�dīts skatīt�js, kas spētu par�dīt \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Nevarēja attēlot \"%s\", t�dēļ ka Nautilus nevar p�rvaldīt %s: lok�cijas."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Nevarēja attēlot \"%s\", t�dēļ ka mēģin�jums pieslēgties neizdev�s."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Nevarēja attēlot \"%s\", t�dēļ ka pieeja tika liegta."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Nevarēja attēlot \"%s\", t�dēļ ka resursdators \"%s\" netika atrasts. "
 "P�rbaudiet, vai tas ir pareizs, un vai starpservera uzst�dījumi ir pareizi."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Nevarēju attēlot \"%s\", t�pēc ka resursdatora nosaukums bija tukšs. Lūdzu "
 "p�rbaudiet, vai jūsu starpservera uzst�dijumi ir pareizi."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Nevarēja attēlot \"%s\", t�dēļ ka Nautilus nevar p�rvaldīt %s: lok�cijas."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Nevarēju attēlot \"%s\", t�pēc ka Nautilus nevarēja savienoties ar SMB "
-"galveno p�rlūku.\n"
-"P�rbaudiet, vai SMB serveris str�d� jūsu lok�laj� tīkl�."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Meklēšana nav pašreiz pieejama, t�pēc ka jums vai nu nav indeksa, vai arī "
+"meklēšanas serviss nestr�d�. P�rliecinaties, vai jūs esat startējis Medusa "
+"meklēšanas servisu, un jua jums nav indeksa, vai Medusa indeksēt�js str�d�."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Meklēšana nav pašreiz pieejama, t�pēc ka jums vai nu nav indeksa, vai arī "
 "meklēšanas serviss nestr�d�. P�rliecinaties, vai jūs esat startējis Medusa "
 "meklēšanas servisu, un jua jums nav indeksa, vai Medusa indeksēt�js str�d�."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Meklēšana Nav Pieejama"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nevar attēlot \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Nevaru Par�dīt Lok�ciju"
 
@@ -7377,7 +7695,7 @@ msgstr "Iet uz lok�ciju, kas nor�dīta šaj� gr�matzīmē"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Autortiesības ©1999-2001 Eazel, Inc."
 
@@ -7385,13 +7703,13 @@ msgstr "Autortiesības ©1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Artis Trops <hornet@navigator.lv>\n"
 "Pēteris Krišj�nis <peteris.krisjanis@os.lv>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7407,39 +7725,43 @@ msgstr "Iet atpakaļ dažas lappuses"
 msgid "Go forward a number of pages"
 msgstr "Iet uz priekšu pa lapušu skaitu"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Par�dīt šo lok�ciju ar \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat TÄ«kls"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Punkti"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Iet uz atkritumu mapi"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Applik�cijas ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Aplik�cijas loga ID."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Applik�cija"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication saistīta ar šo logu."
 
@@ -7475,6 +7797,247 @@ msgstr "TÄ«kla Serveri"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Skatīt jūsu tīkla serverus Nautilus failu p�valdniek�"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Ražotne dzelžu skatam"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Dzelžu Aplūkot�js"
+
+#~ msgid "Hardware view"
+#~ msgstr "Dzelžu skats"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Par�dīt k� Dzelžus"
+
+#~ msgid "hardware view"
+#~ msgstr "dzelžu skats"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ikonas nosaukums aparatūras skatam"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "inform�cijas par dzelžiem kopsavilkums"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s Mhz\n"
+#~ "%s K keišatmiņas lielums"
+
+#~ 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 "Darbības laiks %d dienas, %d stundas, %d minūtes"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Dzelžu P�rskats"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Å Ä« ir vietmape CPU lapai."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Å Ä« ir vietmape RAM lapai."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Å Ä« ir vietmape IDE lapai."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Kļuda kopējot uz \"%s\".\n"
+#~ "\n"
+#~ "Uz mērķa nav pietiekami daudz brīv�s vietas."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Kļuda veidojot saiti uz \"%s\".\n"
+#~ "\n"
+#~ "Uz mērķa nav pietiekami daudz brīv�s vietas."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Kļūda p�rvietojot priekšmetus uz \"%s\".\n"
+#~ "\n"
+#~ "Jums nav atļaujas lai rakstītu šaj� mapē."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Kļūda p�rvietojot priekšmetus uz \"%s\".\n"
+#~ "\n"
+#~ "Mērķa disks ir tikai nolasīšanai."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Kļūda veidojot saites \"%s\".\n"
+#~ "\n"
+#~ "Jums nav atļaujas rakstīt šaj� mapē."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Kļūda veidojot saites \"%s\".\n"
+#~ "\n"
+#~ "Mērķa disks ir tikai nolasīšanai."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" kopējot \"%s\".\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t? "
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" p�rvietojot \"%s\".\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" dzēšot \"%s\".\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t? "
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" kopējot.\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t? "
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" saistot.\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t? "
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kļūda \"%s\" dzēšot.\n"
+#~ "\n"
+#~ "Vai jūs vēlaties turpin�t? "
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Nevar nokopēt Atkritumkastē"
+
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\" nevar atvērt \"%s\" t�pēc, ka \"%s\" nevar piekļūt failam \"%s\" "
+#~ "lok�cij�s.  Neviena cita aplik�cija nav pieejama, lai apskatītu šo faila "
+#~ "tipu.  Ja p�rkopēsiet šo failu uz savu datoru, jūs varētu spēt to atvērt."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Meklējam pa Diskiem"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus meklē jūsu diskos aktritumkastes mapes."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d izvēlētie priekšmeti nevar tikt p�rvietoti uz Atkritumkasti. Vai "
+#~ "vēlaties tos tūliņ izdzēst?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d izvēlētie priekšmeti nevar tikt p�rvietoti uz Atkritumkasti. Vai "
+#~ "vēlaties tos %d tūliņ izdzēst?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Fails, ko jūs nomet�t, nav attēls.  Jūs variet lietot tikai lok�los "
+#~ "attēlus k� piel�got�s ikonas."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Piedodiet, bet Medusa meklēšanas serviss nav pieejams, jo tas nav "
+#~ "uzinstalēts."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Vienreiz dien� jūsu faili un teksta saturs tiek indeksēti, lai meklēšana "
+#~ "notiktu �tr�k. Jūsu faili šobrīd tiek indeksēti."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nav pareiza lok�cija. Lūdzu p�rbaudiet, vai t� ir pareiza un "
+#~ "mēģinat vēlreiz."
+
+#~ 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 ""
+#~ "Nevarēju attēlot \"%s\", t�pēc ka Nautilus nevarēja savienoties ar SMB "
+#~ "galveno p�rlūku.\n"
+#~ "P�rbaudiet, vai SMB serveris str�d� jūsu lok�laj� tīkl�."
+
+#~ msgid "file icon"
+#~ msgstr "faila ikona"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nosaukums:"
+
 #~ msgid "Unknown"
 #~ msgstr "Nezin�ms"
 
@@ -7585,9 +8148,6 @@ msgstr "Skatīt jūsu tīkla serverus Nautilus failu p�valdniek�"
 #~ msgid "_Toolbar"
 #~ msgstr "_RÄ«kjosla"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Lok�cija \"%s\" vairs neeksistē."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Iet uz Neeksistējošu Lok�ciju"
 
diff --git a/po/mk.po b/po/mk.po
index 349efbd5f..b87c4b785 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -27,7 +27,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-09-04 15:26+0200\n"
 "Last-Translator: Ivan Stojmirov <stojmir@linux.net.mk>\n"
 "Language-Team: Macedonian <gnomk-main@lists.sourceforge.net>\n"
@@ -62,8 +62,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() неу�пешно."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "�мблеми"
 
@@ -76,48 +76,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus поглед на амблеми"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�еможам да го от�транам амблемот"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "�еможам да го от�транам амблемот �о името '%s'.  Ова е најверојатно поради "
 "тоа што амблемот е перманентен и не е тој што �и го додал/а."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "�еможам да го от�транам амблемот"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�еможам да го преименувам амблемот."
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "�еможам да го преименувам емблемот �о името '%s'.  Ова е најверојатно поради "
 "тоа што емблемот е перманентен и не е тој што �и го одал."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "�еможам да го преименувам амблемот."
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Преименувај aмблем..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Избери ново име за новиот aмблем:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Преименувај"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Додади емблеми..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -125,7 +137,7 @@ msgstr ""
 "Вне�и опи�но име за �екој амблем.Ова име ќе �е кори�ти за идентификација на "
 "амблемот на други ме�та"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -133,138 +145,62 @@ msgstr ""
 "Вне�и опи�но име за �екој амблем.Ова име ќе �е кори�ти за идентификација на "
 "амблемот на други ме�та "
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"�екои од датотеките не можеа да �е додадат како амблеми бидејќи не �е �лики"
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Извини, но �ликата %s неможе да �е ин�талира како емблем."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "датотеката '%s' не е валидна �лика"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "�еможам да додадам амблеми"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "�иту една од датотеките не може да �е додаде како амблем бидејќи ниту една "
 "не е �лика"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Довлечениот тек�т не е валидна локација на датотека"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "�еможам да додадам емблем"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "датотеката '%s' не е валидна �лика"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Повлечената датотека не е валидна �лика"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Избриши"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Фабрика за хардвер�ки преглед"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Хардвер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Хардвер Прегледувач"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Хардвер преглед"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Преглед како Хардвер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "хардвер преглед"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "име на иконата за хардвер�киот преглед"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "хардвер инфо"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K кеш големина"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu ГБ Р�М"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu МБ Р�М"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu ГБ"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu МБ"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Време %d денови, %d ча�ови, %d минути"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Преглед на Хардверот"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ова е ме�то за CPU �траницата."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ова е ме�то за Р�М �траницата."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ова е ме�то за IDE �траницата."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "И�торија"
@@ -930,6 +866,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Хардвер"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Интернационално"
@@ -1217,30 +1157,19 @@ msgid "Desktop trash icon name"
 msgstr "Име на де�ктоп иконата за ѓубре"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-#, fuzzy
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Повеќето од директориумите кои ја надминуваат големината ќе бидат намалени "
-"приближно на граничната големина. �амерата на ова е да �е одбегне губење на "
-"податоци. �егативните вредно�ти означуваат без граница."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Овозможи �пецијални атрибути во дијалогот за �војвтва на датотека"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Име на �тандардна датотека за позадина.Се кори�ти един�твено доколку "
 "background_set is true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1248,6 +1177,18 @@ msgstr ""
 "Име на датотека за �тандардна side pane позадина.Се кори�ти един�твено "
 "доколку background_set is true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Повеќето од директориумите кои ја надминуваат големината ќе бидат намалени "
+"приближно на граничната големина. �амерата на ова е да �е одбегне губење на "
+"податоци. �егативните вредно�ти означуваат без граница."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Сокриј ги �тандардните обележувачи во менито на обележувачи"
@@ -1257,9 +1198,10 @@ msgid "Home icon visible on desktop"
 msgstr "Иконата Дома е видлива на де�ктоп"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "�ко е поде�ено на true, Nautilus ќе ги покаже �амо директориумите во дрвото "
 "на �траничната лента. Инаку ќе ги покаже и директориумите и датотеките."
@@ -1298,9 +1240,10 @@ msgstr ""
 "е�отеричните опции на датотеката во дијалогот за референци на датотеката."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "�ко е поде�ено на true, тогаш Nautilus ги покажува директориумите пред "
 "датотеките во прегледниците на икони и ли�ти."
@@ -1344,8 +1287,9 @@ msgstr ""
 "покажува �амо обележувачите на кори�никот."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "�ко е поде�ено на true, тогаш Nautilus ќе го кори�ти директориумот на "
@@ -1363,9 +1307,10 @@ msgstr ""
 "�метаат за �игурно�ни датотеки"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "�ко е поде�ено на true, тогаш �криените датотеки �е прикажани во менаџерот "
 "на датотеки. Скриените датотеки �е или датотеки �о точка од напред или �е "
@@ -1390,8 +1335,9 @@ msgstr ""
 "на директориумот Ѓубре"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "�ко ова е поде�ено на true,тогаш на де�ктопот ќе биде �тавена икона �о линк "
@@ -1428,7 +1374,8 @@ msgstr ""
 "големина, наме�то во ра�течки ќе бидат во опаѓачки редо�лед "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "�ко е поде�ено на true,тогаш иконите ќе бидат прикажани позбиени во новите "
 "прозорци"
@@ -1459,7 +1406,8 @@ msgid "List of possible captions on icons"
 msgstr "Ли�та на можни изгледи на икони."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Мак�имален број на датотеки во директориум."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1479,11 +1427,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus може да црта на де�ктопот"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Кори�ти ја твојота домашна папка како де�ктоп"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Покажи �амо директориуми во �траничната лента."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1503,7 +1453,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Прикажи по обратен редо�лед во новите прозорци."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Покажи директориуми прво во прозорците"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1540,10 +1491,11 @@ msgstr ""
 "�и�теми.�ко е по�тавено на \"никогаш\" тогаш никогаш не прегледува. "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1554,12 +1506,13 @@ msgstr ""
 "по�тавено на \"никогаш\",тогаш никогаш не прикажува преглед.  "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Губитокот во брзина кога �е покажува �лика како мали �ликички. �ко е "
 "по�тавено на \"�екогаш\" тогаш �екогаш прикажи мали �ликички дури и кога "
@@ -1569,10 +1522,11 @@ msgstr ""
 "�тандардна икона."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Губиток на брзина при поажување број на објекти во директориум ако е "
@@ -1581,18 +1535,20 @@ msgstr ""
 "е по�тавено на \"never\",тогаш никогаш не прикажувај број.  "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Стандардниот редо�лед на подредување на објекти при прегледот �о икони. "
 "Можни вредно�ти �е \"име\", \"големина\", \"тип\", \"дата на модификација\" "
 "и \"амблеми\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Стандарден редо�лед на објекти при прегледување на ли�ти. Можни вредно�ти �е "
 "име, големина, тип, дата на модификација и амблеми."
@@ -1638,7 +1594,8 @@ msgid "Use manual layout in new windows"
 msgstr "Кори�ти мануелен изглед во нови прозорци"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Кори�ти по�тегнат изглед во новите прозорци."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1668,7 +1625,8 @@ msgstr ""
 "\"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Кога да �е покаже број на објекти во директориумот."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1680,7 +1638,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Кога да �е покаже Thumbnails на �ликите."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Дали е рачно поде�ен �тандардниот директориум за позадини."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1837,68 +1796,83 @@ msgstr "ре�етирај"
 msgid "on the desktop"
 msgstr "на работната околина"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "�еможам да го избришам волуменот"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "�е може да �е избрише иконата на волуменот. �ко �акате да го отворите "
 "волуменот кори�тете Eject од менито од де�ниот клик врз волуменот."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "�еможам да го избришам волуменот"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Ѓубре"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Поме�ти овде"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Копирај овде"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Линк овде"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "По�тави како _Позадина"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Откажи"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "По�тави го како позадина за �ите директориуми"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Извини, но \"%s\" темата не може да �е ин�талира."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Извини, но мораш да �пецифицираш не-празен важен збор за новиот емблем."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "�еможам да го ин�талирам амблемот"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1909,18 +1883,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Извини, но по�тои амблем �о име \"%s\" Избери друго име за него."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�еможам да го ин�талирам амблемот"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Извини,не �ум во можно�т да го зачувам креираниот амблем. "
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Жалам,не можам да го зачувам името на креираниот amblem"
 
@@ -1939,22 +1919,28 @@ msgstr "Од:"
 msgid "To:"
 msgstr "До:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Грешка при поме�тувањето."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Грешка при преме�тувањето.\n"
 "\n"
 "\"%s\" не може да �е преме�ти бидејќи е read-only ди�к."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Грешка при от�транувањето."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1963,22 +1949,17 @@ msgstr ""
 "\"%s\" не може да �е избрише бидејќи немаш дозвола да ја менуваш папката и "
 "нејзината�одржина."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Грешка при бришењето.\n"
 "\n"
 "\"%s\" не може да �е избрише бидејќи е read-only ди�к."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1987,24 +1968,25 @@ msgstr ""
 "\"%s\" не може да �е преме�ти бидејќи немаш дозвола да ја менуваш папката и "
 "нејзината �одржина."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Грешка при поме�тувањето."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Грешка при преме�тувањето.\n"
 "\n"
 "\"%s\" не може да �е преме�ти бидејќи и�тиот по�тои на де�тинацијата."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Грешка при преме�тувањето.\n"
@@ -2012,238 +1994,178 @@ msgstr ""
 "\"%s\" не може да �е преме�ти во корпата за отпадоци бидејќи немаш дозвола "
 "да ја менуваш папката или нејзината �одржина."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Грешка при копирањето."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Грешка при копирање.\n"
 "\n"
 "\"%s\" не може да �е и�копира бидејќи немаш дозвола да го прочиташ."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка при копирање во \"%s\".\n"
-"\n"
-"�ема доволно �лободен про�тор."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Грешка при копирањето."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Грешка при преме�тувањето \"%s\".\n"
 "\n"
 "�ема доволно �лободен про�тор."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка при �оздавање на вр�ка во\"%s\".\n"
-"\n"
-"�ема доволно �лободен про�тор."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Грешка при поме�тувањето."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Грешка при врзување."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Грешка при копирање во \"%s\".\n"
 "\n"
 "�емаш дозвола да запишуваш во оваа папка."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Грешка при копирање во \"%s\".\n"
 "\n"
 "Ди�кот-де�тинација е read-only."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при поме�тување во \"%s\".\n"
-"\n"
-"�емаш дозвола да запишуваш во оваа папка."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при шреме�тување во \"%s\".\n"
-"\n"
-"Ди�кот-де�тинација е read-only."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при �одавање на вр�ка во \"%s\".\n"
-"\n"
-"�емаш дозвола да запишуваш во оваа папка."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Грешка при поме�тувањето."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при �оздавањето на вр�ка во \"%s\".\n"
-"\n"
-"Ди�кот-де�тинација е read-only."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при копирањето \"%s\".\n"
-"\n"
-"Сакаш ли да продолжиш?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Грешка при врзување."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Грешка при копирањето."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Грешка \"%s\" при преме�тувањето \"%s\".\n"
+"Грешка \"%s\" при преме�тувањето.\n"
 "\n"
-"Сакаш ли да продолжиш?"
+"Дали �акаш да продолжиш?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Грешка при поме�тувањето."
+
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "Грешка \"%s\" при �оздавањето на вр�ка во \"%s\".\n"
 "\n"
 "Сакаш ли да продолжиш?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при бришењето \"%s\".\n"
-"\n"
-"Дали �акаш да продолжиш?"
-
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при копирањето.\n"
-"\n"
-"Дали �акаш да продолжиш? "
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Грешка при от�транувањето."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при преме�тувањето.\n"
-"\n"
-"Дали �акаш да продолжиш?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Грешка при копирањето."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при врзувањето.\n"
-"\n"
-"Дали �акаш да продолжиш?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Грешка при поме�тувањето."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка \"%s\" при бришењето.\n"
-"\n"
-"Дали �акаш да продложиш?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Грешка при врзување."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Грешка при от�транувањето."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Грешка при копирањето."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Грешка при поме�тувањето."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Грешка при врзување."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Грешка при от�транувањето."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Пре�кокни"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Обиди �е повторно"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�е може да ја изврши зададената акција."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" неможе да биде преме�тен на новата локација, поради тоа што неговото "
 "име веќе �е кори�ти за �пецијален предмет што неможе да �е от�трани или "
@@ -2251,57 +2173,66 @@ msgstr ""
 "\n"
 "�ко �еуште �акаш да го преме�тиш \"%s\", преименувај го и пробај пак."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�е може да ја изврши зададената акција."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" неможе да �е и�копира на новата локација поради тоа што неговото име "
 "�е кори�ти за �пецијален предмет што неможе да �е от�трани или замени.\n"
 "\n"
 "�ко �еуште �акаш да го и�копираш \"%s\", преименувај го и порбај пак."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "�еможам да ја заменам датотеката."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Датотеката \"%s\" веќе по�тои.\n"
 "\n"
 "Сакаш ли да ја замениш?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Конфликт при копирањето"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Замени"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Замени Се"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "вр�ка до %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "друга вр�ка до %s"
@@ -2310,25 +2241,25 @@ msgstr "друга вр�ка до %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst вр�ка до %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd вр�ка до %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd вр�ка до %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth вр�ка до %s"
@@ -2338,561 +2269,600 @@ msgstr "%dth вр�ка до %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (копирај)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (копирај повторно)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "th копирај)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st копирај)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd копирај)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd копирај)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (копирај)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (друга копија)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth копирај)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst копирај)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd копирај)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd копирај)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�епознат GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Ги прене�увам датотеките во кантата"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "И�фрлени датотеки:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Преме�тувам"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Припрема за преме�тување во Ѓубре."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Преме�тувам датотеки"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Датотеките �е преме�тени:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Се припремам за преме�тување"
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Привршувам преме�тување..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Создавам поврзувања до датотеките"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Датотеките �е поврзани:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Поврзувам"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Се припремам за �оздавање поврзувања..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Привршувам �о �оздавање поврзувања"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Датотеките �е копираат"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "И�копирани датотеки:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Копирам"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Се припремам за копирање..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "�еможе да копираш предмети во корпата."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�еможам да копирам во корпата"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "�еможе да ја поме�тиш папката �о отпадоци."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "�е може да направиш копија од папката за отпадоци."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�еможам да ја �менам Локацијата на корпата"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�е можам да ја Копирам корпата"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "�е можеш да ја преме�тиш папката �ама врз �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "�е можеш да ја копираш папка �амата врз �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Создади нова празна папка во оваа папка"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�е може да �е преме�ти �амо врз �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�е може да �е копира �амо врз �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "�е може да "
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�е може да �е копира �амо врз �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Грешка при �оздавање на нова папка. \n"
 "\n"
 "�емате дозвола да �нимите во таа де�тинација."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Грешка при �оздавање на нова папка. \n"
 "\n"
 "�ема ме�то на де�тинацијата. "
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Грешка \"%s\" при �оздавањето на нова папка."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Грешка при �оздавање на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Грешка при �оздавање на нова папка."
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "папка без име"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Грешка \"%s\" при �оздавањето на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Грешка при �оздавање на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Грешка при �оздавање на нова папка."
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 датотека"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Бришење на датотеки"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Избришани датотеки:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Бришење"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Подготвување за бришење на датотеки..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Празнење на корпата"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Подготвувам празнење на корпата."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Дали �и �игурен дека �акаш да ја и�празниш корпата?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "И�празни"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (копирај)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (копирај)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (копирај).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (копирај).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (копирај).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (копирај).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (копирај).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (копирај)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (копирај)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (друга копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (друга копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (друга копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (трета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (трета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (друга копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (трета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (тринае�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (четиринае�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (тринае�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (четиринае�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (двае�ет и прва копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (двае�ет и втора копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (двае�ет и прва копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (двае�ет и втора копија).txt "
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (двае�ет и трета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (двае�ет и трета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (двае�ет и четврта копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (двае�ет и четврта копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (двае�ет и пета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (двае�ет и пета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (двае�ет и четврта копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (двае�ет и пета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (двае�ет и четврта копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (двае�ет и пета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000 копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (де�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (единае�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (де�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (единае�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (дванае�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (дванае�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (�то и де�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (�то и единае�ета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (�то и де�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (�то единае�ета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (�то двае�ет и втора копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (�то двае�ет и трета копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (�то двае�ет и втора копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (�то двае�ет и трета копија).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (�то двае�ет и четврта копија)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (�то двае�ет и четврта копија).txt"
 
@@ -2911,64 +2881,64 @@ msgstr "foo (�то двае�ет и четврта копија).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "дене� во 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "дене� во %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "дене� во 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "дене� во %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "дене� во 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "дене�, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "дене�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "вчера во 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "вчера во %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "вчера во 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "вчера во %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "вчера, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "вчера, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "вчера"
 
@@ -2977,133 +2947,133 @@ msgstr "вчера"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Среда, Септември 00 0000 во 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Пон, Окт 00 0000 во 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Пон, Окт 00 0000 во 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y во %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Окт 00 0000 во 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y во %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Окт 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 предмети"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 папки"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 датотеки"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 предмет"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 папка"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 датотека"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u предмети"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u папки"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u датотеки"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? предмети"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? бајти"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "непознат вид"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "непознато"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "програма"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3113,7 +3083,7 @@ msgstr ""
 "значи дека твоите gnome-vfs.клучни датотеки �е на погрешно ме�то или неможат "
 "да бидат најдени поради некоја друга причина."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3122,11 +3092,11 @@ msgstr ""
 "�е по�тои опи� за mime видот \"%s\" (датотеката е \"%s\"), те молам прати "
 "mail на gnome-vfs mailing ли�тата."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "линк"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "вр�ка (�кршено)"
 
@@ -3247,11 +3217,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Барај датотеки по име и �вој�тва"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Поглед на Иконите"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Поглед на Ли�та"
@@ -3395,148 +3367,153 @@ msgstr "Домот на %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "икона на датотека"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "променилив тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "променливиота лабела"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "додатен тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "уште повеќе тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "обележан за избирање"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "дали �ме обележани за избирање"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "обележано како фоку� за та�татура"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "дали �ме обележани за рендерирање на фоку� за та�таура"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "обележано за пуштање"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "дали �ме обележани за D&D пуштање"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Селекција правоаголник"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "По�тави го тек�тот во рамка"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "�ацртај рамка околу неизбраниот тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Боја на кутијата за бирање"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Боја на кутијата за бирање"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Изборна кутија алфа"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "??? на кутијата за избирање"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Означи Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "обоележан за избирање"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Светла почетна боја"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Боја кори�тена за информационен тек�т врз темна позадина"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Темна боја за инфо"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Боја кори�тена за информационен тек�т врз �ветла позадина"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Оваа папка кори�ти автомат�ки изглед. Дали �акаш да �е префрлиш на рачно "
 "поде�ување на изгледот и да го о�тавиш овој предмет каде што го �пушти? Ова "
 "ќе го clobber �кладираниот рачен изглед. "
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Оваа папка кори�ти автомат�ки изглед. Дали �акаш да �е префрлиш на рачно "
 "поде�ување на изгледот и да о�тавиш овој предмет каде што го �пушти? Ова ќе "
 "го clobber �кладираниот рачен изглед."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Оваа папка кори�ти автомат�ки изглед. Дали �акаш да �е префрлиш на рачно "
 "поде�ување на изгледот и да ги о�тавиш овие предмети каде што ги �пушти?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Оваа папка кори�ти автомат�ки изглед. Дали �акаш да �е префрлиш на рачно "
 "поде�ување на изгледот и да ги о�тавиш овие предмети каде што ги �пушти?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Да Префрлам на Рачен Изглед?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Префрли"
 
@@ -3644,72 +3621,72 @@ msgstr "Е �тандардно за \"%s\" предметите."
 msgid "Is the default for all \"%s\" items."
 msgstr "Е �тандардно за �ите \"%s\" предмети."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Модифицирај \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Вклучи го во менито за \"%s\" предметите"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Кори�ти како �тандардно за \"%s\" предметите"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Вклучи го во главното мени �амо за \"%s\" "
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Кори�ти како �тандардно �амо за \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�е го вклучувај во менито за \"%s\" предметите"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Име"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Стату�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Избери"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Готово"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Измени..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Видови на датотеки и Програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Оди Таму"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3717,48 +3694,48 @@ msgstr ""
 " можеш да конфигурираш кои програми �е понудени за кој вид на датотека во "
 "типови на датотеки и дијалогот на програмите."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Отвори �о друга апликација"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Избери апликација �о која ќе отвориш \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Отвори �о друг прегледувач"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Избери поглед за \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "�ема други до�тапни прегледувачи за \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "�ема До�тапни Прегледувачи"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "�ема апликација а�оцирана �о \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�ема а�оцирана апликации"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "�ема акција а�оцирана �о \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "�ема а�оцирана акција"
 
@@ -3766,11 +3743,9 @@ msgstr "�ема а�оцирана акција"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3779,42 +3754,41 @@ msgstr ""
 "Можеш да го конфигурираш GNOME да а�оцира апликации �о типови на датотеки."
 "Сакаш ли да а�оцираш апликација �о овој тип на датотека �ега?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "��оцирани апликации"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Прегледувачот а�оциран �о \"%s\" не е валиден."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "��оциран невалиден прегледувач"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "�пликацијата а�оцирана �о \"%s\" не е валидна."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "��оцирана невалидна апликација"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "�кцијата а�оцирана �о \"%s\" не е валидна."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "��оцирана невалидна акција"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3825,110 +3799,151 @@ msgstr ""
 "�о овој тип на датотека.Сакаш ли да а�оцираш апликација или прегледувач за "
 "овој тип на датотека �ега?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "��оцирај акција"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" неможам да го отворам \"%s\" поради тоа што \"%s\" неможе да при�тапи "
+"на датотеките \"%s\" на тие локации. Сакаш ли да избереш друга апликација?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" неможам да го отворам \"%s\" поради тоа што \"%s\" неможе да при�тапи "
 "на датотеките \"%s\" на тие локации. Сакаш ли да избереш друга апликација?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Стандардната акција не може да го отвори \"%s\" бидејќи не може да при�тапи "
 "до датотеките во \"%s\".Сакаш ли да избереш друга акција? "
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�еможам да ја отворам локацијата"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" неможам да го отворам \"%s\" поради тоа што \"%s\" неможе да при�тапи "
+"на датотеките \"%s\" на тие локации. Сакаш ли да избереш друга апликација?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" неможе да го отворам \"%s\" поради тоа што \"%s\" неможе да при�тапи "
 "на датотеките  \"%s\" на таа локација.  �е по�тои друга апликација за "
 "отворање на оваа датотека. �ко ја и�копираш датотеката на твојот компјутер "
 "можеби ќе бидеш во можно�т да ја отвориш датотеката."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Стандардната акција не може да го отвори\"%s\" бидејќи не може да при�тапи "
-"до датотеките на \"%s\"локацијата.�е �е до�тапни други апликации за "
-"прегледување на оваа датотека.�ко ја копираш оваа датотека на твојот "
-"компјутер можеби ќе можеш да ја отвориш.  "
+"Стандардната акција не може да го отвори \"%s\" бидејќи не може да при�тапи "
+"до датотеките во \"%s\".Сакаш ли да избереш друга акција? "
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" неможе да го отворам \"%s\" поради тоа што \"%s\" неможе да при�тапи "
+"на датотеките  \"%s\" на таа локација.  �е по�тои друга апликација за "
+"отворање на оваа датотека. �ко ја и�копираш датотеката на твојот компјутер "
+"можеби ќе бидеш во можно�т да ја отвориш датотеката."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Се отвора \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Извини, но неможеш да извршуваш команди рачно од �ајтот поради безбедно�ти "
 "причини."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Can't execute remote links"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Имаше грешка при �тартувањето на апликацијата.\n"
 "\n"
 "Детали:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Грешка при �тартување на апликацијата"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Де�тинацијата поддрзува �амо локални датотеки"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Оваа де�тинација поддржува �амо локални датотеки.\n"
 "\n"
 "За да отворите нелокални датотеки и�копирајте ги во локален директориум."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Де�тинацијата поддрзува �амо локални датотеки"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4184,14 +4199,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Предмети што �одржат \"medusa\" во нивните имиња и кои �е датотеки"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Пребарувам Ди�кови"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus ги пребарува папките �о отпадотци на твојот на твојот ди�к."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Уреди"
@@ -4399,99 +4406,109 @@ msgstr "Позадина"
 msgid "Empty Trash"
 msgstr "И�празни ја корпата "
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "Отвори ги %d Прозорците?"
+
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Дали �и �игурен дека �акаш перманентно да го избришеш \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
 msgstr ""
 "Ова ќе отвори %d по�ебни прозорци. Дали �и �игурен дека �акаш да го направиш "
 "ова?"
 
-#: src/file-manager/fm-directory-view.c:499
-#, c-format
-msgid "Open %d Windows?"
-msgstr "Отвори ги %d Прозорците?"
-
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Дали �и �игурен дека �акаш перманентно да го избришеш \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Дали �и �игурен дека �акаш перманентно да ги избришеш %d избраните предмети?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Избриши ги �ите избрани предмети перманентно"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Избриши?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Избери категорија:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Шари"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" избрани"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 избрана папка"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d избрани папки"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (�одржи 0 премдети)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (�одржи 1 предмет)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (�одржи %d предмети)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (�одржи 0 предмети)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (�одржи вкупно 1 предмет)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (�одржи вкупни %d предмети)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" избрани (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d предмети избрани (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 друг избран предмет (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d други избрани предмети (%s)"
@@ -4503,7 +4520,7 @@ msgstr "%d други избрани предмети (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4512,109 +4529,127 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Папката \"%s\" �одржи повеќе датотеки од колку што Nautilus може да прикаже. "
 "�екои датотеки нема да бидат прикажани."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Премногу Датотеки"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" неможе да �е преме�ти во корпата. Дали �акаш да го избришеш веднаш?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d избраните предмети неможат да �е преме�тат во корпата. Дали �акаш да ги "
-"избришеш веднаш?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" неможе да �е преме�ти во корпата. Дали �акаш да го избришеш веднаш?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d од избраните предмети неможат да бидат преме�тени во корпата за Отпадоци. "
-"Дали �акаш да ги избришеш тие %d предмети веднаш?"
+"\"%s\" неможе да �е преме�ти во корпата. Дали �акаш да го избришеш веднаш?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Избриши Веднаш?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Дали �и �игурен дека �акаш перманетно да ги избришеш \"%s\" од корпата за "
 "Отпадоци?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Дали �и �игурен дека �акаш перманетно да ги избришеш %d избраните предмети "
 "од корпата?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Избриши од корпата?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "И�кори�ти го \"%s\" за да го отвориш �аканиот предмет"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Друга _апликација..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_�пликација..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Друг _прегледувач..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Прегледувач..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�е може да ја изврши зададената акција:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�е може да ја изврши зададената акција."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Изврши \"%s\" на било кој избран предмет"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Сите извршливи датотеки во оваа папка ќе �е појават во мени за Скрипти. Со "
+"избирањето на �крипта од менито ќе ја извршиш и�тата заедно �о �ите избрани "
+"предмети."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4622,11 +4657,11 @@ msgstr ""
 "избирањето на �крипта од менито ќе ја извршиш и�тата заедно �о �ите избрани "
 "предмети."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "За Скриптите"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4648,17 +4683,17 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" ќе биде преме�тен ако ја изберете Вменти Датотека командата"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" ќе биде и�копиран ако ја изберете Вметни Датотека командата"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4666,7 +4701,7 @@ msgstr ""
 "%d Избраниот предмет ќе биде преме�тен ако ја изберете командата Вметни "
 "датотеки"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4674,160 +4709,166 @@ msgstr ""
 "%d Избраниот предмет ќе биде и�копиран ако ја изберете командата Вметни "
 "датотеки"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "�ема ништо за вметнување"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Mount Грешка"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Unmount Грешка"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Mount Грешка"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "И_звади"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Унмаунтирај"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Отвори во �ов Прозорец"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Отвори _во %d �ови Прозорци"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Домашен директориум"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Домашен директориум"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Избриши од корпата"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Избриши ги �ите избрани предмети перманентно"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Пр_еме�ти во корпа"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Преме�ти ги �ите избрани предмети во корпата"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Избриши"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "�аправи _вр�ки"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "�а_прави вр�ка"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_И�празни ја корпата"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "И�_ечи Датотеката"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "И�_ечи_Датотеки"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Копирај Датотека"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Копирај Датотеки"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Оваа вр�ка неможе да �е и�кори�ти. Дали �акаш да го �ме�тиш во корпата?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Оваа вр�ка неможе да �е и�кори�ти. Дали �акаш да го �ме�тиш во корпата?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Скршено Поврзување"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" е извршлива тек�т датотека. Дали �акаш да го извршиш или да ја "
 "прикажеш неговата �одржина?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Изврши или Прикажи?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Прикажи"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Изврши во _терминал"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Прикажи"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Изврши"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Се отвора \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Откажи Отворање?"
 
@@ -4848,27 +4889,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Извини, неможам да ги прикажам �ите �одржини на \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "�еможат да �е одредат перми�иите на \"%s\" ."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Грешка при Прикажувањето на Папката"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Името %s\" веќе по�тои во оваа папка. Те молам пробај �о друго име."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "�ема \"%s\" во оваа папка. Изгледа дека е преме�тен или избришан?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "�емаш перми�ии да го преименуваш \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4877,85 +4923,105 @@ msgstr ""
 "Името \"%s\" е невалидно поради тоа што �одржи карактери \"/\". Те молам "
 "избери друго име."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Името \"%s\" е невалидно. Те молам избери друго име."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "�еможам да го �менам името на \"%s\" поради тоа што е на read-only ди�к"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Извини, неможам да премиенувам од \"%s\" до \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Извини, но таа тема не може да �е от�трани!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Грешка при преименување"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "�емаш перми�ии за да ја �мениш групата на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "�еможам да ја �менам групата на \"%s\" поради тоа што е на read-only ди�к"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Извини, неможам да ја �менам групата на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "�еможат да �е одредат перми�иите на \"%s\" ."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Грешка при По�тавување на Групи"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "�еможам да го �менам �оп�твеникот на \"%s\" поради тоа што е на read-only "
 "ди�к"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Извини, неможам да го �менам �оп�твеникот на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "�еможат да �е одредат перми�иите на \"%s\" ."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Грешка при По�тваување на Соп�твеник"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "�еможам да ги �менам перми�иите на \"%s\" поради тоа што е на read-only ди�к"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Извини, но неможам да ги �менам перми�иите на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "�еможат да �е одредат перми�иите на \"%s\" ."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Грешка при По�тавување на Перми�ии"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Преименувам \"%s\" до \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Откажи Преименување?"
 
@@ -5013,128 +5079,150 @@ msgstr "Поврати ги оригиналните големини на икÐ
 msgid "Restore Icon's Original Si_ze"
 msgstr "Поврати ја оригиналната големина на иконата"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "покажува на \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Drag and drop is only supported to local file systems."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Drag and drop is only supported to local file systems."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Drag and Drop error"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "An invalid drag type was used."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Име на Датотека"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Големина"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Вид"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Дата на Модификација"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "You can't assign more than one custom icon at a time! Please drag just one "
 "image to set a custom icon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Повеќе од една �лика"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Само Локални Слики"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"The file that you dropped is not an image.  You can only use local images as "
+"The file that you dropped is not local.  You can only use local images as "
 "custom icons."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Само Слики"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Свој�тва"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Свој�тва"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Откажи го Менувањето на Групата?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Менувам група"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Откажи го Менувањето на Соп�твеник на Група?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Менувам Соп�твеник"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ништо"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "нечитливо"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 предмет �о големина %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d предмети, пре�метувам %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(нечитлива �одржина)"
 
@@ -5144,191 +5232,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Содржини:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "О�новно"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Име:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Име:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Големина:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Локација:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Јачина:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Слободен про�тор:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Врзи цел:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME тип"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Модифицирано:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "При�тапено:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Избери Друга Икона..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_От�трани ја Другата Икона"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Читај"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Запиши"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "И_зврши"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "По�тави кори�ничка идентификација"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Специјални знамиња:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "По�тави ID на групата"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Лепливо"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Перми�ии"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Ти не �и �оп�твеникот, и затоа неможеш да ги менуваш овие перми�ии."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Соп�твеник на датотека:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Соп�твеник на датотека:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Група на датотека:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Група на датотека:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Соп�твеник:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Група:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Други:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Поглед на тек�т:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Преглед на број:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "По�леден пат изменето:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "�еможат да �е одредат перми�иите на \"%s\" ."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Перми�иите на избраната датотека неможат да бидат одредени."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Се појави грешка при прикажувањето на помош: \n"
-"%s."
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Се појави грешка при прикашување на помош %s."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�еможам да покажам помош"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Откажи го покажувањето на �вој�твата на прозорецот?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Создавам прозорец �о Свој�тва"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Избери икона"
 
@@ -5346,71 +5434,110 @@ msgid "Search Results"
 msgstr "Резулатати од пребарувањето"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Извини, но Medusa пребарувачкиот �ерви� не е до�тапен поради тоа што не е "
-"ин�талиран."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Извини, но medusa пребарувачкиот �ерви� не е до�тапен."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Серви�от за Пребарување �е е До�тапен"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"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."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Барај предмети што �е нови"
 
-#: src/file-manager/fm-search-list-view.c:200
-msgid ""
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
 "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."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
+msgid ""
+"You can check the spelling on your selections or add more criteria to narrow "
+"your results."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Грешка при Пребарувањето"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Грешка при читањето на датотека индек�от"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Грешка при вчитувањето на пребараната �одржина: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5418,25 +5545,23 @@ msgstr ""
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Брзите пребарувања не �е до�тапни"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Содржин�ките пребарување не �е до�тапни"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5450,56 +5575,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Индек�ните пребарувања не �е до�тапни"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"To do a content search, Find requires an index of the files on your system.  "
+"Find can't access your index right now. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "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."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Брзите пребарувања не �е вклучени на твојот компјутер"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5509,11 +5666,12 @@ msgstr ""
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Брзите пребарувања не �е вклучени на твојот компјутер"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Брзите пребарувања не �е до�тапни"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Каде"
 
@@ -5522,7 +5680,7 @@ msgstr "Каде"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Откриј во �ов Прозорец"
@@ -5533,7 +5691,7 @@ msgstr "_Откриј во �ов Прозорец"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Откриј во %d _�ови Прозорци"
@@ -5542,15 +5700,21 @@ msgstr "Откриј во %d _�ови Прозорци"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus најде повеќе резултати од пребарувањето одколку што може да "
 "прикаже. �екои резулатите нема да бидат прикажани."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus најде повеќе резултати од пребарувањето одколку што може да "
+"прикаже. �екои резулатите нема да бидат прикажани."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Премногу и�ти резултати"
 
@@ -5564,12 +5728,12 @@ msgid "Create L_auncher"
 msgstr "Креирај С_тартувач"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Создади нов лан�ер"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Избриши ги �ите предмети во корпата"
 
@@ -5590,7 +5754,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Кори�ти �тандардна позадина"
@@ -5613,59 +5777,69 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Избери друг прегледувач а да го видиш избраниот предмет"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Креирај _Папка"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Креирај _Папка"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Создади нова празна папка во оваа папка"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Создади нова празна папка во оваа папка"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Создади �имболичка вр�ка за �екој избран предмет"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Д_уплицирај"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 "Избриши го �екој избран предмет без да го преме�тиш во корпата за Отпадоци"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Дуплицирај го �екој избран предмет"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Уреди лан�ер"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Преуредија �тартер�ката информација"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Форматирај ја избраната јачина"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Медија �вој�тва"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Умаунтирај ја избраната јачина"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "И�ечи или копирај датотеки претходно избрани �о командата И�ечи датотеки или "
 "Копирај датотеки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5673,134 +5847,143 @@ msgstr ""
 "Поме�ти или копирај претходно избрани датотеки �о командата И�ечи датотеки "
 "или Копирај датотеки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Отвори С_о"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Отвори го �екој избран предмет во нов прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Отвори во �ов Прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Отвори го избраниот предмет во овој прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Припреми ги избраните датотеки да бидат и�копирани �о Вметни Датотека "
 "командата"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Припреми ги избраните датотеки да бидат и�копирани �о Вметни Датотека "
 "командата"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Зашт_ити"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Заштити ја избраната јачина"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Преименувај го избраниот предмет"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Ре�етирај го погледот на _�тандардно"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ре�етирај го редо�ледот и нивото на зум така што ќе �е вколпи во параметрите "
 "за овој поглед"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Изврши �крипти од /Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Избери ги _Сите Датотеки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Шари"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Избери ги �ите предмети во овој прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Избери ги �ите предмети во овој прозорец"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Покажи ги или модифицирај ги �вој�твата на �екој избран предмет"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Покажи ја папката што ги �одржи �криптите прикажани во ова мени"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Умаунтирај ја избраната јачина"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "И�кори�ти ја �тандардната позадина за оваа локација"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Прегледај ги или модифицирај ги �вој�твата на �екој избран предмет"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Копирај Датотека"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Формат"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Унмаунтирај"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Отвори"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Отвори Папка �о Скрипти"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Вметни Датотеки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Вметни Датотеки во Папка"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Свој�тва"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Преименувај..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Скрипти"
 
@@ -5887,7 +6070,12 @@ msgstr "_Рачно"
 msgid "Indexing is %d%% complete."
 msgstr "Индек�ирањето е %d%% завршено."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Твоите датотеки по�леден пат беа индек�ирани на %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5895,25 +6083,29 @@ msgstr ""
 "Еднаш дневно твоите датотеки и тек�т �одржини �е индек�ираат за твоите "
 "пребарувања да �е одвиваат побрзо. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Стату� на Индек�ирање"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Твоите датотеки по�леден пат беа индек�ирани на %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Еднаш дневно твоите датотеки и тек�т �одржини �е индек�ираат за твоите "
-"пребарувања да �е одвиваат побрзо. Твоите датотеки моментално �е индек�ираат."
+"пребарувања да �е одвиваат побрзо. "
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Во моментов не по�тои индек� на твоите датотеки."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5923,15 +6115,19 @@ msgstr ""
 "пребарувањето.  Брзото Пребарување не е вклучено на твојот компјутер, и "
 "затоа во моментов немаш индек�."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Во моментов не по�тои индек� на твоите датотеки."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Извини, но medusa пребарувачкиот �ерви� не е до�тапен."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5955,32 +6151,37 @@ msgstr "Покажи го _�тату�от на индек�ирање"
 msgid "Show status of indexing used when searching"
 msgstr "Прикажи го �тату�от на индек�ирање кори�тен при пребарување"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "�еможам да ја Создадам бараната Папка"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�еможам да ги Создадам бараните Папки"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus could not create the required folder \"%s\". Before running "
 "Nautilus, please create this folder, or set permissions such that Nautilus "
 "can create it."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�еможам да ги Создадам бараните Папки"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5991,23 +6192,28 @@ msgstr ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Вр�ка до �тариот де�ктоп"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Локацијата на директориумот на работната површина е �менета во GNOME 2.4. "
 "Вр�ката која �е вика \"вр�ка до �тарaта работна површина\" е �оздадена на "
 "работната површина. Можете да ја отворите за да ги поме�тите �аканите "
 "датотеките, а потоа да ја избришете вр�ката."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Migrated old desktop"
 
 #. Can't register myself due to trouble locating the
@@ -6020,7 +6226,7 @@ msgstr "Migrated old desktop"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6031,7 +6237,7 @@ msgstr ""
 "го ре�татираш компјутерот или да го ин�талираш Nautilus повторно."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6077,12 +6283,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus неможе да �е кори�ти во моментов, поради неочекувана грешка."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6090,14 +6296,14 @@ msgstr ""
 "Nautilus не може да биде кори�тен во моментот поради неочекувана грешка од "
 "Bonobo кога пробал да го реги�трира �ерверот на менаџерот на датотеки."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr "Nautilus Nautilus."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6107,6 +6313,17 @@ msgstr ""
 "Bonobo. Пробај да го убиеш bonob-activation-server и да го ре�тартираш "
 "Nautilus."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Се појави грешка при прикажувањето на помош: \n"
+"%s."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "�ема обележувачки"
@@ -6140,34 +6357,44 @@ msgstr "Помалку Опции"
 msgid "Find Them!"
 msgstr "�ајди Ги!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�е може да �е преме�ти �амо врз �ебе."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Извини, но \"%s\" не е валидно име за датотека."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" е (не)валидна локација. Провери го �пелувањето и пробај пак."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "�еможам да пронајдам \"%s\". Провери го �пелувањето и пробај пак."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Мрежни �ервери"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Име:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Локација:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Поврзи �е"
@@ -6369,6 +6596,20 @@ msgstr ""
 "\n"
 "You can manually erase this file to present the druid again.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"You can't assign more than one custom icon at a time! Please drag just one "
+"image to set a custom icon."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"The file that you dropped is not local.  You can only use local images as "
+"custom icons."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6379,26 +6620,25 @@ msgstr "Отвори �о %s"
 msgid "Open with..."
 msgstr "Отвори �о..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "�е може да ја вклучи апликацијата за цд-режачот:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "�е може да го вклучи цд-режачот"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "И�празни ја _корпата "
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "Запиши �одржина на ЦД"
 
@@ -6406,37 +6646,37 @@ msgstr "Запиши �одржина на ЦД"
 msgid "Go To:"
 msgstr "Оди До:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Дали �акаш да ги прегледаш овие %d локации во различни прозорци?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Преглед во Различни Прозорци?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�еможам да ја отворам локацијата"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Изврши брза �ерија на �амо-проверувачки те�тови."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Создади го иницијалниот прозорец �о дадената геометрија."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕОМЕТРИЈ�"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Создавај прозорци �амо за �пецифицирано URL-a."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6444,81 +6684,94 @@ msgstr ""
 "�е ја �редувај работната околина (игнорирај ги параметрите во дијалогот на "
 "параметри)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "�апушти Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Ре�тартирај Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Менаџер �о датотеки"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --проверката неможе да �е кори�ти �о URL-a.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --проверката неможе да �е кори�ти �о други опции.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --откажувањето неможе да �е кори�ти �о URL-a.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --ре�тартирањето неможе да �е кори�ти �о URL-a.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --геометријата неможе да �е кори�ти �о повеќе од едно URL.\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Дали �и �игурен дека �акаш перманентно да го избришеш \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "Сигурни ли �те дека �акате да заборавите �е во и�торија?"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Сигурен ли �и дека �акаш Nautilus да ги заборави �ите локации кои што �и ги "
 "по�етил?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "И�чи�ти и�торија"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Локацијата \"%s\" не по�тои. Дали �акаш да го от�траниш bookmark-от �о оваа "
 "локација од твојата ли�та?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Локацијата \"%s\" не по�тои повеќе."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bookmark за непо�тоечка Локација"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "От�трани"
 
@@ -6551,7 +6804,6 @@ msgid "Close _All Windows"
 msgstr "Затвори го �ите прозорци"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Затвори ги �ите Nautilus прозорци"
@@ -6574,107 +6826,119 @@ msgid "Forward"
 msgstr "�апред"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Оди до корпата"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Оди на �ледната по�етена локација"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Оди на претходно по�етената локација"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Оди до корпата"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Дома"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Локациона _линија"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Вчитај повторно"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Барај датотеки на компјутеров"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Ста_ту�на линија"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Горе"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Запиши на ЦД"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Додади Bookmark"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_�азад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_И�чи�ти И�торија"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Уреди "
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_�апред"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Оди"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Дома"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Локација..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Странична линија панел"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Корпа"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Горе"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Преглед"
 
@@ -6692,34 +6956,39 @@ msgstr "Преглед како..."
 msgid "File Browser: %s"
 msgstr "Соп�твеник на датотека:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Една од �траничните-ленти панели дојде до грешка и не може да продолжи. За "
 "не�реќа неможам да кажам која."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Погледот %s наиде на грешка додека �е �тартуваше."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Страничната %s -линија панел наиде на грешка и не може да продолжи. �ко "
 "продолжи да �е �лучува ова, пробај да го и�клучиш панелот."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Странично лини�киот Панел �е у�пеа"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Странична линија панел"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Содржи �траничен поглед"
 
@@ -6753,147 +7022,180 @@ msgstr "_Додади нов..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Извини но неможеш да ги избришеш %s шарите."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "�еможам да ја избришам шарата"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Извини но емблемот %s неможе да �е избрише."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "�еможам да го от�транам амблемот"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Создади нов емблем: "
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Важен Збор:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Слика:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Избери датотека �лика за новиот емблем:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Создади нова боја:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Име на бојата:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Вредно�т на бојата:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Извини, но \"%s\" не е валидно име за датотека."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Извини, но не вне�е валидно име за датотеката."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "�еможам да ин�талирам шара"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Извини, но неможеш да ја замениш ре�етираната �лика."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�е е �лика"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Извини, но шарата %s неможе да �е ин�талирана."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Избери датотека �лика за да ја додадеш како шара"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Извини, но мораш да �пецифицираш име за новата боја."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "�еможам да ја ин�талирам бојата"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Избери боја за да ја додадеш"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Извини, но '%s' не е и�кори�тлива �лика датотека."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "датотеката '%s' не е валидна �лика"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Избери категорија:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Откажи От�транување"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Додади �ова Шара..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Додади �ова Боја..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Додади �ов Емблем..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Клкикни на шарата да ја от�траниш"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Прити�ни на бојата за да ја от�траниш"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Прити�ни на емблем да го от�траниш"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Шари:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Бои:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Емблеми:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_От�трани Шара..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_От�трани Боја..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_От�трани Емблем..."
 
@@ -7283,34 +7585,39 @@ msgstr "_ЦД Создавач"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Затвори го �ите прозорци"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Забелешки �транична-линија панел"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Оди до И�празни ја ЦД папката"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Оди до корпата"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Локација..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Предмети што �е ]папки"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Шари"
@@ -7340,10 +7647,13 @@ msgid "View Failed"
 msgstr "Погледот е неу�пешен"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Погледот %s наиде на грешка додека �е �тартуваше."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Погледот %s наиде на грешка и не може да продолжи. Можеш да избереш друг "
 "поглед или да преминеш на друга локација."
@@ -7353,101 +7663,133 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Погледот %s наиде на грешка додека �е �тартуваше."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Nautilus �пликацијата заедно �о овој прозорец."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Преглед на �одржина"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Поглед од тековната датотека или папка"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "�еможам да пронајдам \"%s\". Провери го �пелувањето и пробај пак."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "�еможам да вчитам %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "�еможам да вчитам %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "�еможам да прикажам \"%s\", поради тоа што �аутилуи� не може да го препознае "
 "типот на датотека."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus нема ин�талиран прегледувач �по�обен да прикаже \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "�еможам да прикажам \"%s\", поради тоа што Nautilus не може да �е �прави �о %"
 "s: локациите."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "�еможам да прикажам \"%s\", поради тоа што обидот за логирање беше неу�пешен."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�еможам да прикажам \"%s\", поради тоа што при�тапот е одбиен."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "�еможам да прикажам \"%s\", поради тоа што неможам \"%s\" да најдам домаќин. "
 "Провери дали ти е точно �пелувањето и провери ги proxy поде�увањата."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "�еможе да �е прикаже \"%s\". Провери дали твоите поде�увања за proxy �е "
 "точни."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"�еможам да прикажам \"%s\", поради тоа што Nautilus не може да �е �прави �о %"
+"s: локациите."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"�еможам да прикажам \"%s\", поради тоа што Nautilus не може да контактира "
-"главниот прели�тувач на SMB.\n"
-"Провери дали работи SMB �ервер на локалната мрежа."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Барањето е недо�тапно во моментов поради тоа што немате индек� или пак "
 "ребарувачките �ерви�и не �е �тартувани. О�игурајте �е дека го имате "
 "тартувано Medusa пребарувачкиот �ерви�, и дека имате индек�, �тартуван во "
 "Medusa индек�ерот."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Барањето е недо�тапно во моментов поради тоа што немате индек� или пак "
+"ребарувачките �ерви�и не �е �тартувани. О�игурајте �е дека го имате "
+"тартувано Medusa пребарувачкиот �ерви�, и дека имате индек�, �тартуван во "
+"Medusa индек�ерот."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Барањето е �едо�тапно"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus не може да прикаже \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�еможам да ја прикажам локацијата"
 
@@ -7459,7 +7801,7 @@ msgstr "Оди до локацијата �пецефицирана во bookmar
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Сите права �е задржани (C) 1999-2001 Eazel, Inc."
 
@@ -7467,14 +7809,14 @@ msgstr "Сите права �е задржани (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Arangel Angov\n"
 "ufo@linux.net.mk\n"
 "http://www.linux.net.mk"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7490,39 +7832,44 @@ msgstr "Оди назад за неколку �трани"
 msgid "Go forward a number of pages"
 msgstr "Оди нанапред неколку �траници"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Прикажи ја оваа локација �о \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Мрежа"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Ф_онтови"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_ЦД Создавач"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "�пликационо ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "�пликационо ID на прозорецот."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "�пликација"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Nautilus �пликацијата заедно �о овој прозорец."
 
@@ -7558,6 +7905,257 @@ msgstr "Мрежни �ервери"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Гледај ги твоите мрежни �ервери во Nautilus менаџерот �о датотеки"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "�екои од датотеките не можеа да �е додадат како амблеми бидејќи не �е "
+#~ "�лики"
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Фабрика за хардвер�ки преглед"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Хардвер Прегледувач"
+
+#~ msgid "Hardware view"
+#~ msgstr "Хардвер преглед"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Преглед како Хардвер"
+
+#~ msgid "hardware view"
+#~ msgstr "хардвер преглед"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "име на иконата за хардвер�киот преглед"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "хардвер инфо"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K кеш големина"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu ГБ Р�М"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu МБ Р�М"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu ГБ"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu МБ"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Време %d денови, %d ча�ови, %d минути"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Преглед на Хардверот"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ова е ме�то за CPU �траницата."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ова е ме�то за Р�М �траницата."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ова е ме�то за IDE �траницата."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка при копирање во \"%s\".\n"
+#~ "\n"
+#~ "�ема доволно �лободен про�тор."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка при �оздавање на вр�ка во\"%s\".\n"
+#~ "\n"
+#~ "�ема доволно �лободен про�тор."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при поме�тување во \"%s\".\n"
+#~ "\n"
+#~ "�емаш дозвола да запишуваш во оваа папка."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка при шреме�тување во \"%s\".\n"
+#~ "\n"
+#~ "Ди�кот-де�тинација е read-only."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при �одавање на вр�ка во \"%s\".\n"
+#~ "\n"
+#~ "�емаш дозвола да запишуваш во оваа папка."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка при �оздавањето на вр�ка во \"%s\".\n"
+#~ "\n"
+#~ "Ди�кот-де�тинација е read-only."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при копирањето \"%s\".\n"
+#~ "\n"
+#~ "Сакаш ли да продолжиш?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при преме�тувањето \"%s\".\n"
+#~ "\n"
+#~ "Сакаш ли да продолжиш?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при бришењето \"%s\".\n"
+#~ "\n"
+#~ "Дали �акаш да продолжиш?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при копирањето.\n"
+#~ "\n"
+#~ "Дали �акаш да продолжиш? "
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при врзувањето.\n"
+#~ "\n"
+#~ "Дали �акаш да продолжиш?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка \"%s\" при бришењето.\n"
+#~ "\n"
+#~ "Дали �акаш да продложиш?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�еможам да копирам во корпата"
+
+#~ 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 ""
+#~ "Стандардната акција не може да го отвори\"%s\" бидејќи не може да "
+#~ "при�тапи до датотеките на \"%s\"локацијата.�е �е до�тапни други апликации "
+#~ "за прегледување на оваа датотека.�ко ја копираш оваа датотека на твојот "
+#~ "компјутер можеби ќе можеш да ја отвориш.  "
+
+#~ msgid "Searching Disks"
+#~ msgstr "Пребарувам Ди�кови"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr ""
+#~ "Nautilus ги пребарува папките �о отпадотци на твојот на твојот ди�к."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d избраните предмети неможат да �е преме�тат во корпата. Дали �акаш да "
+#~ "ги избришеш веднаш?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d од избраните предмети неможат да бидат преме�тени во корпата за "
+#~ "Отпадоци. Дали �акаш да ги избришеш тие %d предмети веднаш?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Извини, но Medusa пребарувачкиот �ерви� не е до�тапен поради тоа што не е "
+#~ "ин�талиран."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Еднаш дневно твоите датотеки и тек�т �одржини �е индек�ираат за твоите "
+#~ "пребарувања да �е одвиваат побрзо. Твоите датотеки моментално �е "
+#~ "индек�ираат."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" е (не)валидна локација. Провери го �пелувањето и пробај пак."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Извини, но '%s' не е �лика што може да �е и�кори�ти!"
+
+#~ 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 ""
+#~ "�еможам да прикажам \"%s\", поради тоа што Nautilus не може да контактира "
+#~ "главниот прели�тувач на SMB.\n"
+#~ "Провери дали работи SMB �ервер на локалната мрежа."
+
+#~ msgid "file icon"
+#~ msgstr "икона на датотека"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Име:"
+
 #~ msgid "Unknown"
 #~ msgstr "�епознато"
 
@@ -7650,9 +8248,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "_Toolbar"
 #~ msgstr "_Лента �о алатки"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Локацијата \"%s\" не по�тои повеќе."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Оди до �епо�тоечка Локација"
 
@@ -7702,9 +8297,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "Authentication Required"
 #~ msgstr "Потребна е �втентикација "
 
-#~ msgid "_Location:"
-#~ msgstr "_Локација:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Корпата за Отпадоци мора да о�тане на работната околина."
 
@@ -7744,9 +8336,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #, fuzzy
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "И_зврши ги датотеките кога ќе бидат кликнати"
@@ -8285,9 +8874,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "Set Cover Image"
 #~ msgstr "�аправи �а�ловна Слика"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Извини, но '%s' не е и�кори�тлива �лика датотека."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Избери �лика датотека за на�ловната на албумот:"
 
@@ -8377,9 +8963,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "�еможам да вчитам %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Се вчитува %s"
 
@@ -8747,9 +9330,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "Display %s tab in sidebar"
 #~ msgstr "Прикажи %s таб на �траничната линија"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Извини, но �ликата %s неможе да �е ин�талира како емблем."
-
 #~ msgid "Hide _Toolbar"
 #~ msgstr "Сокриј линија �о алатки"
 
@@ -8780,9 +9360,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "Извини, но \"%s\" не е валидна тема папка."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Извини, но \"%s\" темата не може да �е ин�талира."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "�еможам да ја ин�талирам темата"
 
@@ -8799,9 +9376,6 @@ msgstr "Гледај ги твоите мрежни �ервери во Nautilus
 #~ "Извини, но не можеш да ја от�траниш �егашната тема. Те молам �мени ја "
 #~ "тематата пред да ја от�траниш."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Извини, но таа тема не може да �е от�трани!"
-
 #~ msgid "Add New Theme..."
 #~ msgstr "Додади �ова Тема..."
 
diff --git a/po/ml.po b/po/ml.po
index 975334712..61a2dc463 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version:nautilus.HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale@gnu.org.in>\n"
 "Language-Team: Malayalam <locale@gnu.org.in>\n"
@@ -37,8 +37,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "ചിഹ�നങ�ങള�"
 
@@ -51,181 +51,118 @@ msgid "Nautilus Emblem view"
 msgstr "നോട�ടിലസ� ചിഹ�ന കാഴ�ച"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "ചിഹ�നം നീക�കം ചെയ�യാന� കഴിയ�ന�നില�ല."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "ചിഹ�നം നീക�കം ചെയ�യാന� കഴിയ�ന�നില�ല."
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "ചിഹ�നത�തിന�റെ പേര�� മാറ�റാന� കഴിയ�ന�നില�ല"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "ചിഹ�നത�തിന�റെ പേര�� മാറ�റാന� കഴിയ�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "ചിഹ�നത�തിന�റെ പേര�� മാറ�റ�ക"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "പ�രദ�ര�ശിപ�പിച�ചിരിക�ക�ന�ന ചിഹ�നത�തിന�� പ�തിയ പേര�� കൊട�ക�ക�ക:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "പേര��� മാറ�റല�"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "ചിഹ�നങ�ങള� ചേ�ര�ക�ക�ക..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "രചന %s സാധ�തയ�ള�ള ഛായാചിത�രമായി പ�രത�യക�ഷപ�പെട�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "ചിഹ�നങ�ങള� കൂട�ടിച�ചേര�ക�കാന� കഴിയ�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "വലിച�ചിട�ട വാചകം അന�വദനീയമായ സ�ഥാനത�തല�ല."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "ചിഹ�നം കൂട�ടിച�ചേര�ക�കാന� കഴിയ�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "രചന %s സാധ�തയ�ള�ള ഛായാചിത�രമായി പ�രത�യക�ഷപ�പെട�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "വലിച�ച�കൊണ�ട� പോയ രചന സാധ�തയ�ള�ള ചിത�രമായി കാണ�ന�നില�ല"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "മായ��ക�ക�ക"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "ഖരസാമഗ�രി ദൃശ�യമാക�ക�ന�നതിന�ള�ള ശാല"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "ഖരസാമഗ�രി"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "ഖരസാമഗ�രി ദ�ര�ശിനി"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "ഖരസാമഗ�രി കാഴ�ച"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "ഖരസാമഗ�രിയായ� കാണ�ക"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "ഖരസാമഗ�രി കാഴ�ച"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ഖരസാമഗ�രി കാഴ�ചയ�ടെ ചിഹ�ന നാമം"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "ഖരസാമഗ�രി ദൃശ�യമാക�ക�ന�നതിന�ള�ള നിര�മ�മാണ ശാല"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "ഖരസാമഗ�രി  അവലോകനം"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "ചരിത�രം"
@@ -889,6 +826,10 @@ msgstr "ജിനോം.ഓ‌ര�ഗ�"
 msgid "GNU.org"
 msgstr "ജിനൂ.ഓ‌ര�ഗ�"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "ഖരസാമഗ�രി"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "അന�തര�‌രാഷ�ട�രം"
@@ -1166,27 +1107,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1199,8 +1140,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1228,8 +1169,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1263,7 +1204,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1277,7 +1218,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1294,7 +1235,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1320,7 +1261,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1344,7 +1285,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1362,11 +1303,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1384,8 +1325,9 @@ msgid "Reverse sort order in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr ""
+#, fuzzy
+msgid "Show folders first in windows"
+msgstr "ജാലകത�തിന�  യോജിപ�പിക�കാന�‌ ശ�രമിക�ക�ക"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1419,7 +1361,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1427,30 +1369,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1491,8 +1433,9 @@ msgid "Use manual layout in new windows"
 msgstr "നേരിട�ട� ചെയ��ത രീതിയിലാക�ക�ക"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr ""
+#, fuzzy
+msgid "Use tighter layout in new windows"
+msgstr "നേരിട�ട� ചെയ��ത രീതിയിലാക�ക�ക"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1514,7 +1457,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1526,7 +1469,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1684,65 +1627,78 @@ msgstr "പ�നഃസ�ഥാപിക�ക�ക"
 msgid "on the desktop"
 msgstr "പണിയിടത�തില�‌"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "കൂടിന�ള�ളിലേക�ക� അതേ കൂട� ഇടാനാവില�ല."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
-msgstr ""
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
+msgstr "തെരഞ�ഞെട�ത�ത ലക�കം വിട�വിക�ക�ക"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "ചവറ�റ�ക�ട�ട‌"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "ഇങ�ങോട�ട� മാറ�റ�ക"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "ഇവിടെ പക�ര�‌ത�ത�ക"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "ഇവിടെ ബന�ധിപ�പിക�ക�ക"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "ഇതിനെ പശ�ചാത�തലമാക�ക�ക"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "റദ�ദാക�ക�ക"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "ഇതിനെ എല�ലാ കൂട�കള�ടേയ�ം പശ�ചാത�തലമാക�ക�ക"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "ഇതിനെ ഈ കൂടിന�റെ പശ�ചാത�തലമാക�ക�ക"
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+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:276
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "ചിഹ�നം സംസ�ഥാപിക�കാന�‌ കഴിഞ�ഞില�ല"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1751,18 +1707,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "ക�ഷമിക�കൂ, ഇഷ�ടപ�പെട�ട ചിഹ�നനാമം സംരക�ഷിക�കാന�‌ കഴിഞ�ഞില�ല"
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "ചിഹ�നം സംസ�ഥാപിക�കാന�‌ കഴിഞ�ഞില�ല"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "ക�ഷമിക�കൂ, ഇഷ�ടപ�പെട�ട ചിഹ�നം സംരക�ഷിക�കാന�‌ കഴിഞ�ഞില�ല "
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "ക�ഷമിക�കൂ, ഇഷ�ടപ�പെട�ട ചിഹ�നനാമം സംരക�ഷിക�കാന�‌ കഴിഞ�ഞില�ല"
 
@@ -1781,294 +1743,270 @@ msgstr "ഇവിടെ:‌"
 msgid "To:"
 msgstr "വരെ:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr "വായിക�കാന�‌ മാത�രം കഴിയ�ന�ന ഡിസ�ക�കായത�കൊണ�ട� %sനെ മാറ�റ�മ�പോള�‌ പിശക� സംഭവിക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr "വായിക�കാന�‌ മാത�രം കഴിയ�ന�ന ഡിസ�ക�കായത�കൊണ�ട� %sനെ നീക�കം ചെയ�യ��മ�പോള�‌ പിശക� സംഭവിക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr "വായിക�കാന�‌ മാത�രം കഴിയ�ന�ന ഡിസ�ക�കായത�കൊണ�ട� %sനെ നശിപ�പിക�ക�ന�പോള�‌ പിശക� സംഭവിക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr "ഈ കൂട�ടില� എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ലാത�തതിനാല� %s മാറ�റ�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr "വായിക�കാന�‌ മാത�രം കഴിയ�ന�ന ഡിസ�ക�കായത�കൊണ�ട� %sനെ മാറ�റ�മ�പോള�‌ പിശക� സംഭവിക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr "ഈ കൂട�ടില� എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ലാത�തതിനാല� %s മാറ�റ�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr "ഈ കൂട�ടില� എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ലാത�തതിനാല� %s മാറ�റ�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr "ലക�ഷ�യസ�ഥാനത�ത� ആവശ�യത�തിന�� സ�ഥലമില�ല.  %s പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr "ലക�ഷ�യസ�ഥാനത�ത� ആവശ�യത�തിന�� സ�ഥലമില�ല.  %s മാറ�റ�മ�പോള�‌ ‌ തെറ�റ�ന�ന�."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr "ലക�ഷ�യസ�ഥാനത�ത� ആവശ�യത�തിന‌� സ�ഥലമില�ല.  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr "ഈ കൂട�യില�‌ എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല..  %s പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr "ലക�ഷ�യസ�ഥാന ഡിസ�ക� വായിക�കാന�‌ മാത�രം..  %s പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr "ഈ കൂട�യില�‌ എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല..  %s നീക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr "ലക�ഷ�യസ�ഥാന ഡിസ�ക� വായിക�കാന�‌ മാത�രം..  %s ചലിപ�പിക�ക�ന�പോള�‌‌ തെറ�റ�ന�ന�."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr "ഈ കൂട�ടില�‌ എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല..  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr "ലക�ഷ�യസ�ഥാന ഡിസ�ക� വായിക�കാന�‌ മാത�രം..  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"%s പക�ര�ത�ത�മ�പോള�‌‌ തെറ�റ�ന�ന�.%s\n"
-"\n"
-"താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"%s ചലിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�. %s\n"
-"\n"
-"താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
+msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ചലിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "%s നോട� ബന�ധിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�. %s\n"
 "\n"
 "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"%s ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന� %s.\n"
-"\n"
-"താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�ന�ണ�ടോ?"
-
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s പക�ര�ത�ത�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ചലിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ബന�ധിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ഒഴിവാക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "ചലിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "വഴ�ത�ക"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "വീണ�ട�ം ശ�രമിക�ക�ക"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "നിര��ദ�ദേശിച�ച പ�രവ�ര�ത�തനം മ�ഴ�നനാക�കാനായില�ല."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "നിര��ദ�ദേശിച�ച പ�രവ�ര�ത�തനം മ�ഴ�നനാക�കാനായില�ല."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "രചന മാറ�റി സ�ഥാപിക�കാന�‌ കഴിയില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr "രചന %s നിലവില�ണ�ട�.  താങ�കള�‌ അത� മാറ�റി സ�ഥാപിക�കണോ"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "പക�ര�ത�ത�മ�പോള�‌ വൈര�ദ�ധ�യം"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "മാറ�റി എഴ�ത�ക"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "എല�ലാം മാറ�റി എഴ�ത�ക"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s ല�‌ ബന�ധിപ�പിക�ക�ക"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s ല�‌ മറ�റൊര� ബന�ധം"
@@ -2077,25 +2015,25 @@ msgstr "%s ല�‌ മറ�റൊര� ബന�ധം"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d %sല� ബന�ധിപ�പിക�ക�ക"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dമത� %sല�‌ ബന�ധിപ�പിക�ക�ക"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dമത� %sല� ബന�ധിപ�പിക�ക�ക"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d ാമത� ബന�ധനം %s ലേക�ക�"
@@ -2105,555 +2043,594 @@ msgstr "%d ാമത� ബന�ധനം %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr "(പക‌ര�പ�പ�)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr "(മറ�റൊര� പക‌ര�പ�പ�)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "മത� പക�ര�പ�പ�)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "മത� പക�ര�പ�പ�)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "മത� പക�ര�പ�പ�)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "മത� പക�ര�പ�പ�)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (പക�ര�പ�പ�)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (മറ�റൊര� പക�ര�പ�പ�)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dമത� പക�ര�പ�പ�)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dമത� പക�ര�പ�പ�)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dമത� പക�ര�പ�പ�)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr "(%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "രചനകള�‌ ചവറ�റ�ക�ട�ടയിലേക�ക� നീങ�ങ�ന�ന�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "രചനകള�‌‌ പ�റത�ത� കളഞ�ഞ�:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "നീങ�ങ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പോകാന�‌ തയ�യാറാക�ന�ന�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "രചനകള�‌‌ നീങ�ങ�ന�ന�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "നീങ�ങിയ രചനകള�:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "നീങ�ങാന�‌ തയ�യാറെട�ക�ക�ന�ന�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "നീങ�ങ�ന�നത�‌ അവസാനിക�ക�ന�ന�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "രചനയിലേക�ക� ബന�ധങ�ങള�ണ�ടാക�ക�ന�ന�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "ബന�ധിപ�പിച�ച രചനകള�:‌‌"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "ബന�ധിപ�പിക�കല�‌"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "ബന�ധിപ�പിക�കാന�‌ തയ�യാറെട�ക�ക�ന�ന�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "ബന�ധിപ�പിക�കല�‌ അവസാനിക�ക�ന�ന�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "രചന പക�ര�ത�തല�‌"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "പക�ര�ത�തിയ രചനകള�:‌‌"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "പക�ര�ത�ത�ന�ന�‌"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "പക�ര�‌ത�താന�‌ തയ�യാറെട�ക�ക�ന�ന�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "താങ�കള�‌ക�ക� ചവറ�റ�ക�ട�ടയിലേക�ക� ഇനങ�ങള�‌ പക�ര�ത�താന�‌ കഴിയില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പക�ര�ത�താന�‌ കഴിയില�ല"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "താങ�കള�‌ക�ക� ഈ ചവറ�റ�ക�ട�ട ചലിപ�പിക�കാന�‌ കഴിയില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "താങ�കള�‌ക�ക� ഈ ചവറ�റ�ക�ട�ട പക�ര�ത�താന�‌ കഴിയില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "ചവറ�റ�ക�ട�ട സ�ഥാനം മാറ�റാന�‌ കഴിയില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ചവറ�റ�ക�ട�ട പക�ര�ത�താന�‌ കഴിയില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "കൂടിന�ള�ളിലേക�ക� അതേ കൂട� ഇടാനാവില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "താങ�കള�‌ക�ക� ഒര� കൂട� സ�വയം പക�ര�ത�താനാവില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "ഈ കൂടിന�ള�ളില� ഒര� പ�തിയ കൂട� ഉണ�ടാക�ക�ക"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "തന�ന�ള�ളിലേക�ക� നീക�കാനാവില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "തന�ന�ള�ളിലേക�ക� പക�ര�ത�താനാവില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "ഒര� രചന മേല� അതേ രചന പക�ര�ത�താനാവില�ല."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "തന�മേലേക�ക� പക�ര�ത�താനാവില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr "പ�തിയ കൂട നിറ�മ�മിക�ക�ന�പോള�‌ തെറ�റ�ന�ന�.  ലക�ഷ�യസ�ഥാനത�ത� എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr "പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�.  ലക�ഷ�യസ�ഥാനത�ത� സ�ഥലമില�ല"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "%s പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌‌ തെറ�റ�ന�ന�."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "തലക�കെട�ടില�ലാത�ത കൂട"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "%s പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌‌ തെറ�റ�ന�ന�."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "പ�തിയ കൂട ഉണ�ടാക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 à´°à´šà´¨"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "രചനകള�‌‌ നീക�കിക�കളയ�ന�ന�"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "നീക�കിക�കളഞ�ഞ രചനകള�:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "നീക�കിക�കളയ�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "രചനകള�‌‌ മായ��ക�കാന�‌ തയ�യാറെട�ക�ക�ന�ന�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "ചവറ�കള�‌ ഒഴിപ�പിക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "ചവറ�കള�‌ ഒഴിപ�പിക�കാന�‌ തയ�യാറെട�ക�ക�ന�ന�..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "താങ�കള�‌ സന�ദ�ര�ശിച�ച സ�ഥാന-പ�പട�ടിക കളയേണ�ടത�ണ�ടോ?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "കളയ�ക"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo(പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (പക�ര�പ�പ�).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (പക‌ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo...(പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo.(പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (മറ�റൊര� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (മറ�റൊര� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (മറ�റൊര� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (മറ�റൊര� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123മത� പക�ര�പ�പ�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124മത� പക�ര�പ�പ�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124മത� പക�ര�പ�പ�).txt"
 
@@ -2672,64 +2649,64 @@ msgstr "foo (124മത� പക�ര�പ�പ�).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "ഇന�ന� 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "ഇന�ന� %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "ഇന�ന� 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "ഇന�ന� %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "ഇന�ന�, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "ഇന�ന�, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "ഇന�ന�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ഇന�നലെ 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ഇന�നലെ %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ഇന�നലെ 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ഇന�നലെ %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ഇന�നലെ, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ഇന�നലെ, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ഇന�നലെ"
 
@@ -2738,151 +2715,151 @@ msgstr "ഇന�നലെ"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "ബ�ധനാഴ�ച, സെപ�തംബ�ര� 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "തിങ�കള�, ഒക��ടോബ�ര� 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "ബ�ധനാഴ�ച, ഒക��ടോബ�ര� 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "ഒക��ടോബ�ര� 00 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "ഒക��ടോബ�ര� 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 ഇനങ�ങള�‌"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 കൂട�കള�‌"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 രചനകള�‌"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 ഇനം"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 കൂട�"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 à´°à´šà´¨"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u ഇനങ�ങള�‌"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u കൂട�കള�‌"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u രചനകള�‌‌"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? ഇനങ�ങള�‌"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? ബൈറ�റ�സ�"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "അറിയാത�ത ഇനം"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "അറിയാത�ത"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "പ�രയോഗം"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "ബന�ധം"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "ബന�ധം (പൊട�ടിയ)"
 
@@ -3003,11 +2980,13 @@ msgid "Search for files by file name and file properties"
 msgstr "രചനാനാമമന�സരിച�ച�ം ഗ�ണഗണങ�ങളന�സരിച�ച�ം രചനകള�‌‌ തെരയ�ക"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "സൂചക ദൃശ�യം"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "നാമാവലി കാഴ�ച"
@@ -3151,138 +3130,139 @@ msgstr "%s's ആസ�ഥാനം"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "CNET Computers.കോം"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "രചനാ ചിഹ�നം"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "തിര�ത�താവ�ന�ന വാചകം"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "തിര�ത�താവ�ന�ന വാക�ക�കള�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "കൂട�ടിചേ�ര�ത�ത വാക�യം"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ക�ട�തല�‌ ചില വാക�യം"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "തെരഞ�ഞെട�ക�ക�ന�നതിന�വേണ�ടി പ�രസ�ഫ�രണം ചെയ�ത"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "തെരഞ�ഞെട�ക�ക�ന�നതിന�വേണ�ടി പ�രസ�ഫ�രണം ചെയ�‌തെങ�കില�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "തെരഞ�ഞെട�ക�കല� ചത�രം"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "വാചക അറ"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "തെരഞ�ഞെട�ക�കാത�ത വാചകത�തിന�� ച�റ�റ�ം ചട�ടക�ക�ട� വരയ��ക�ക�ക"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "തെരഞ�ഞെട�ക�കല�‌ പെട�ടി നിറം"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "തെരഞ�ഞെട�ക�കല�‌ പെട�ടിയ�ടെ നിറം"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "തെരഞ�ഞെട�ക�കല�‌ പെട�ടി ആല�‌ഫ"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "തെരഞ�ഞെട�ക�കല�‌ പെട�ടിയ�ടെ സ�താര�യത"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "പ�രസ�ഫ�രണ ആല�‌ഫ"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "തിരഞ�ഞെട�ത�ത ചിഹ�നത�തിന� വേണ�ടിയ�ള�ള പ�രസ�ഫ�രണത�തിന�റെ അതാര�യത"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "ഇര�ണ�ട നിറം"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "തെളിഞ�ഞ നിറം"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "നേരിട�ട� ചെയ��ത രീതിയില�?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "വൈദ�യ�തപ�രാവഹനിയമാകം"
 
@@ -3375,119 +3355,119 @@ msgstr "\"%s\" ന�� വേണ�ടിയ�ള�ള മെന�വില
 msgid "Is the default for all \"%s\" items."
 msgstr "\"%s\" ന�� വേണ�ടിയ�ള�ള മെന�വില�.‌"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\" പരിഷ�കരിച�ച"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" ന�� വേണ�ടിയ�ള�ള മെന�വില�.‌"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\"വേണ�ടിയ�ള�ള സ�വതേ"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "\"%s\" ന�� വേണ�ടിയ�ള�ള മെന�വില�.‌"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "\"%s\"വേണ�ടിയ�ള�ള സ�വതേ"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" ന�� വേണ�ടിയ�ള�ള മെന�വില�.‌"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "പേര��"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "അവസ�ഥ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "തെരഞ�ഞെട�ക�ക�ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "ചെയ�യ��ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "പരിഷ�കരിക�ക�ക..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "രചനാ തരങ�ങള�ം നിര��ദ�ദേശ-സംഹിതകള�ം"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "അവിടെ പോക�ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "മറ�റ� അന�പ�രയോഗങ�ങള�ം കൂടി ത�റക�ക�ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "പട�ടികയില� നിന�ന�ം ഒര� പ�രയോഗം പ�രവ�ര�ത�തിക�കാനായി തിരഞ�ഞെട�ക�ക�ക \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "മറ�റ� പ�രയോഗങ�ങള�ം കൂടി ത�റക�ക�ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\": ന�വേണ�ടിയ�ള�ള ഒര� ദൃശ�യം തെരഞ�ഞെട�ക�ക�ക"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" ക�ക� വേണ�ടി ദ‌ര�ശിനികള�‌ ലഭ�യമല�ല."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "ദ‌ര�ശിനികള�‌ ലഭ�യമല�ല"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" മായ� ബന�ധപ�പെട�ട ഒര� പ�രയോഗവ�ം ഇല�ല."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "ബന�ധപ�പെട�ട അന�പ�രയോഗങ�ങളില�ല"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr ""
 
@@ -3495,143 +3475,172 @@ msgstr ""
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "ബന�ധപ�പെട�ട അന�പ�രയോഗം"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
+msgstr "ബന�ധപ�പെട�ട അന�പ�രയോഗം"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr ""
+" നോട�ടിലസിന‌�   %s സ�ഥാനങ�ങള�‌ കൈകാര�യം ചെയ�യാന�‌ കഴിയാത�തത�കൊണ�ട� \"%s\", പ�രദ�ര�ശിപ�പിക�കാന�‌ "
+"കഴിഞ�ഞില�ല"
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "സ�ഥാനം ത�റക�കാന�‌ കഴിയില�ല"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
+" നോട�ടിലസിന‌�   %s സ�ഥാനങ�ങള�‌ കൈകാര�യം ചെയ�യാന�‌ കഴിയാത�തത�കൊണ�ട� \"%s\", പ�രദ�ര�ശിപ�പിക�കാന�‌ "
+"കഴിഞ�ഞില�ല"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "\"%s\" ത�റക�ക�ന�ന�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "ക�ഷമിക�കൂ, പ�നഃക�രമീകരിച�ച ചിത�രം മാറ�റാന�‌ താങ�കള�ക�ക� കഴിയില�ല."
+
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "വിദൂര കണ�ണികള� പ�രവ‌ര�ത�തിപ�പിക�കാനാക�ന�നില�ല"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "പ�രയോഗം ലഭ�യമാക�ക�ന�നതില� തകരാറ�.\n"
 "\n"
 "വിശദാംശങ�ങള�: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "അന�ക�രമ സമാരംഭിക�കലില�‌ തെറ�റ�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "വലിക�ക�ന�നത�ം ഇട�ന�നത�ം പ�രാദേശിക രചനകള�ക�ക� മാത�രമാണ��"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "വലിക�ക�ന�നത�ം ഇട�ന�നത�ം പ�രാദേശിക രചനകള�ക�ക� മാത�രമാണ��"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3877,14 +3886,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "വിവരത�തട�ട� അന�വേഷണം"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "സംവിധാനം"
@@ -4081,96 +4082,106 @@ msgstr "പശ�ചാത�തലം"
 msgid "Empty Trash"
 msgstr "ചവറ� കളയ�ക"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d ജാലകം ത�റക�കണോ?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "താങ�കള�‌ക�ക� എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "താങ�കള�‌ക�ക� എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "താങ�കള�‌ക�ക� %d തെരെഞ�ഞെട�ത�ത ഇനങ�ങള� എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "തെറഞ�ഞെട�ത�ത� എല�ലാ ഇനങ�ങള�ം സ�ഥായിയായി നീക�കം ചെയ�യ��ക"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "നീക�കം ചെയ�യണോ?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "മാതൃകകള�"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "മാതൃകകള�"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" തെരഞ�ഞെട�ത�തൂ"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 കൂട� തെരഞ�ഞെട�ത�തൂ"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d കൂട�കള�‌ തെരഞ�ഞെട�ത�തൂ"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 ഇനങ�ങള�‌ ഉള�‌ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (1 ഇനം ഉള�‌ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d ഇനങ�ങള�‌ ഉള�ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (ആകെ 0 ഇനങ�ങള�‌ ഉള�‌ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (ആകെ 1 ഇനം ഉള�‌ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (ആകെ %d ഇനങ�ങള�‌ ഉള�ക�കൊള�ള�ന�ന�)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" തെരഞ�ഞെട�ത�തൂ (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ഇനങ�ങള�‌ തെരഞ�ഞെട�ത�തൂ(%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 മറ�റ� ഇനങ�ങള� തെരഞ�ഞെട�ത�തൂ(%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d മറ�റ� ഇനങ�ങള� തെരഞ�ഞെട�ത�തൂ(%s)"
@@ -4182,7 +4193,7 @@ msgstr "%d മറàµ�à´±àµ� ഇനങàµ�ങളàµ� തെരഞàµ�ഞെടàµ�à´¤à
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4191,108 +4202,125 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "ധാരാളം രചനകള�‌‌"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
+"തെരെഞ�ഞെട�ത�ത %d ഇനങ�ങള� ചവറ�റ�ക�ട�ടയിലിടാന� കഴിയില�ല. അവയെ പൂര�ണ�ണമായ�ം നീക�കം ചെയ�യട�ടേ?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
 "തെരെഞ�ഞെട�ത�ത %d ഇനങ�ങള� ചവറ�റ�ക�ട�ടയിലിടാന� കഴിയില�ല. അവയെ പൂര�ണ�ണമായ�ം നീക�കം ചെയ�യട�ടേ?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
+"തെരെഞ�ഞെട�ത�ത %d ഇനങ�ങള� ചവറ�റ�ക�ട�ടയിലിടാന� കഴിയില�ല. അവയെ പൂര�ണ�ണമായ�ം നീക�കം ചെയ�യട�ടേ?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "ഉടനെ നീക�കം ചെയ�യണോ?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "താങ�കള�‌ക�ക� ചവറ�റ�ക�ട�ടയില� നിന�ന�ം \"%s\" എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "താങ�കള�‌ക�ക� %d തെരെഞ�ഞെട�ത�ത ഇനങ�ങള� എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "ചവറ�റ�ക�ട�ടയില�‌ നിന�ന� നീക�കം ചെയ�യണോ?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "തെരഞ�ഞെട�ത�ത ഇനങ�ങള�‌ ത�റക�കാന�‌ \"%s\" ഉപയോഗിക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "മറ�റ� അന�പ�രയോഗങ�ങള�‌"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "അന�പ�രയോഗങ�ങള�‌"
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "മറ�റ� ദ�ര�ശിനി..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "ഒര� ദ�ര�ശിനി"
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "നിര��ദ�ദേശിച�ച പ�രവ�ര�ത�തനം മ�ഴ�നനാക�കാനായില�ല: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "നിര��ദ�ദേശിച�ച പ�രവ�ര�ത�തനം മ�ഴ�നനാക�കാനായില�ല."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "\"%s\" തെരഞ�ഞെട�ത�ത ഇനങ�ങളില� പ�രവ�ര�ത�തിക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "നിര��ദ�ദേശ-സംഹിത‌കളെപ�പറ�റി"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4314,18 +4342,18 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "\"%s\" മാറ�റി സ�ഥാപിക�കപ�പെട�ം, നിങ�ങള� ഒട�ടിപ�പ� എന�ന നിര��ദ�ദേശം തെരഞ�ഞെട�ക�ക�കയാണെങ�കില�"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" പക�ര�ത�തപ�പെട�ം, നിങ�ങള� ഒട�ടിപ�പ� എന�ന നിര��ദ�ദേശം തെരഞ�ഞെട�ക�ക�കയാണെങ�കില�"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4333,162 +4361,166 @@ msgstr ""
 "%d തെരെഞ�ഞെട�ത�ത ഇനങ�ങള� മാറ�റി സ�ഥാപിക�കപ�പെട�ം, നിങ�ങള� ഒട�ടിപ�പ� എന�ന നിര��ദ�ദേശം "
 "തെരഞ�ഞെട�ക�ക�കയാണെങ�കില�"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d തെരെഞ�ഞെട�ത�ത ഇനങ�ങള� പക�ര�ത�തപ�പെട�ം, നിങ�ങള� ഒട�ടിപ�പ� എന�ന നിര��ദ�ദേശം തെരഞ�ഞെട�ക�ക�കയാണെങ�കില�"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "ഒട�ട�വലകയില�‌ ഒട�ടിക�കാന�‌ അവിടെ ഒന�ന�മില�ല"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "സംസ�ഥാപിക�ക�ന�നതില�ള�ള തെറ�റ�"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "സംസ�ഥാപിക�ക�ന�നതില�ള�ള തെറ�റ�"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "സംസ�ഥാപിക�ക�ന�നതില�ള�ള തെറ�റ�"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "നിഷ�കാസനം"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "വാല�യം അണ�‌മൌണ�ട� ചെയ�യ�ക"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "പ�തിയ ജാലകത�തില� ത�റക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "%d പ�തിയ ജാലകത�തില� ത�റക�കൂ"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "ആസ�ഥാന-കൂട�"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "ആസ�ഥാന-കൂട�"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "ചവറ�റ�ക�ട�ടയില�‌ നിന�ന� നീക�കം ചെയ�യ��ക"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "തെറഞ�ഞെട�ത�ത� എല�ലാ ഇനങ�ങള�ം സ�ഥായിയായി നീക�കം ചെയ�യ��ക"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� നീക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "തെരഞ�ഞെട�ത�ത ഓരോ ഇനങ�ങള�ം ചവറ�റ�ക�ട�ടയിലേക�ക� നീക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "നീക�കം ചെയ�യ��ക"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "ബന�ധം സ�ഥാപിക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "ബന�ധം സ�ഥാപിക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "ചവറ� കളയ�ക"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "മ�റിപ�പ�"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "മ�റിപ�പ�"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "പക�ര�പ�പ�"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "പക�ര�പ�പ�"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "താങ�കള�‌ സന�ദ�ര�ശിച�ച സ�ഥാന-പ�പട�ടിക കളയേണ�ടത�ണ�ടോ?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "പൊട�ടിയ കണ�ണി"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "സഞ�ചരണം അല�ലെങ�കില�‌ പ�രദ�ര�ശനം?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "പ�രദ�ര�ശനം"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "കല�പ�പനാസ�ഥാനത�ത� പ�രവ�ര�ത�തിക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "പ�രദ�ര�ശനം"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "നടപ�പിലാക�ക�ക"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" ത�റക�ക�ന�ന�"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "ത�റക�ക�ന�നത� റദ�ദാക�കണോ?"
 
@@ -4509,108 +4541,133 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "ക�ഷമിക�കൂ, \"%s\". എല�ലാ ഉള�ളടക�കങ�ങള�ം പ�രദറ�ശിപ�പിക�കാന�‌ കഴിയ"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "കൂട� പ�രദ�ര�ശിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "നിങ�ങള�ക�ക� \"%s\" ന�റെ പേര�� മാറ�റാന� അന�വാദമില�ല."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" ന�റെ പേര�� മാറ�റാന� കഴിയില�ല കാരണം ഇത� വായിക�കാന� മാത�രം പറ�റ�ന�ന തട�ടിലാണ�"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "ക�ഷമിക�കൂ, \"%s\" നെ \"%s\".ലേക�ക� പ�നറ�‌നാമകരണം ചെയ�യാന�‌ കഴിയില�ല"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "പ�നര�നാമകരണ െതറ�റ�"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "നിങ�ങള�ക�ക� \"%s\" ന�റെ പേര�� മാറ�റാന� അന�വാദമില�ല."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\" ന�റെ കൂട�ടത�തെ മാറ�റാന� കഴിയില�ല കാരണം ഇത� വായിക�കാന� മാത�രം പറ�റ�ന�ന തട�ടിലാണ�"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "ക�ഷമിക�ക�, \"%s\". കൂട�ടത�തെ മാറ�റാന�‌ കഴിയില�ല"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "ഉകൂട�ടത�തെ സജ�ജീകരിക�ക�ന�നതില�‌ തകരാറ�"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "\"%s\" ന�റെ ഉടമയെ മാറ�റാന� കഴിയില�ല കാരണം ഇത� വായിക�കാന� മാത�രം പറ�റ�ന�ന തട�ടിലാണ�"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "ക�ഷമിക�കൂ, \"%s\". ഉടമയെ മാറ�റാന�‌ കഴിയില�ല"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "ഉടമയെ നിശ�ചയിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "\"%s\" ന�റെ അന�വാദങ�ങള� മാറ�റാന� കഴിയില�ല കാരണം ഇത� വായിക�കാന� മാത�രം പറ�റ�ന�ന തട�ടിലാണ�"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "ക�ഷമിക�ക�, \"%s\". അന�വാദങ�ങള� മാറ�റാന�‌ കഴിയില�ല."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "അന�വാദങ�ങള�‌ നിശ�ചയിക�ക�ന�നതില� തെറ�റ�ന�ന�"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" നെ \"%s\". ലേക�ക� പ�നര�നാമകരണം ചെയ�യല�‌"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "പ�നറ�മാനകരണം റദ�ദാക�കണോ?"
 
@@ -4668,123 +4725,136 @@ msgstr "à´šà´¿à´¹àµ�നംങàµ�ങളàµ�ടെ യഥാരàµ�à´¤àµ�à´¥ വലà
 msgid "Restore Icon's Original Si_ze"
 msgstr "ചിഹ�നം യഥാര�ത�ഥ വലിപ�പത�തില� കൊണ�ട� വരിക"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" ല� ചൂണ�ടി കാണിച�ചിരിക�ക�ന�ന�"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "വലിക�ക�ന�നത�ം ഇട�ന�നത�ം പ�രാദേശിക രചനകള�ക�ക� മാത�രമാണ��"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "വലിക�ക�ന�നത�ം ഇട�ന�നത�ം പ�രാദേശിക രചനകള�ക�ക� മാത�രമാണ��"
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "വലിക�ക�ന�നത�ം ഇട�ന�നത�ം തകരാറ�"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "ഒര� തെറ�റായ തരമാണ�� ഉപയോഗിച�ചത�."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "രചനാനാമം"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "വലിപ�പം"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "തരം"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "തീയതി പരിഷ�കരിച�ച�"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "ഒന�നില�‌ക�കൂട�തല�‌ ചിത�രം"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "പ�രാദേശിക ചിത�രങ�ങള�‌ മാത�രം"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "ഛായാ ചിത�രങ�ങള�‌ മാത�രം"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "ഗ�ണഗണങ�ങള�‌"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s ഗ�ണഗണങ�ങള�‌"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "കൂട�ടാളി മാറ�റം റദ�ദാക�കണോ?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "കൂട�ടാളി മാറ�റ�ന�ന�‌"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "ഉടമ മാറ�റം റദ�ദാക�കണോ?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "ഉടമ മാറ�റ�ന�ന�‌"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ഒന�ന�മില�ല"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "വായിക�കാന�‌ കഴിയാത�ത"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "%s ഉള�ള, 1 ഇനം"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d ഇനങ�ങള�, %s മ�ഴ�വന�ള�ള"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(വായിക�കാന�‌ കഴിയാത�ത ചില ഉള�ളടക�കങ�ങള�‌)"
 
@@ -4794,193 +4864,193 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "ഉള�ളടക�കങ�ങള�‌:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "അടിസ�ഥാനം"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "പേര��:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "പേര��:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "തരം:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "വലിപ�പം:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "സ�ഥാനം:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "ബന�ദനത�തിന�റെ ലക�ഷ�യസ�ഥാനം:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME തരം:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "പരിഷ�കരിച�ചത�:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "സ�വീകരിച�ച�കഴിഞ�ഞത�:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "ഇഷ�ട ചിഹ�നം തെരഞ�ഞെട�ക�ക�ക..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "ഇഷ�ട ചിഹ�നം നീക�കം ചെയ�യ��ക"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "വായിക�ക�ക"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "എഴ�ത�ക"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "നിര��വ�വഹിക�ക�ക"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "ഉപയോക�തൃ �.ഡി സ�ഥാപിക�ക�ക"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "പ�രത�യേക അടയാള-കൊടികള�:‌"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "കൂട�ടാളി �.ഡി സ�ഥാപിക�ക�ക"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "ഒട�ടിപ�പിടിക�ക�ന�ന"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "അന�വാദങ�ങള�‌"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "നിങ�ങള� യഥാര�ത�ഥ ഉടമയല�ല, അതിനാല� അന�വാദങ�ങള� മാറ�റാന� കഴിയില�ല."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "രചന ഉടമ:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "രചന ഉടമ:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "രചന കൂട�ടം:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "രചന കൂട�ടം"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "ഉടമ:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "കൂട�ടം:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "മറ�റ�ള�ളവ�ര�:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "വാചക കാഴ�ച:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "സംഖ�യാ കാഴ�ച:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "അവസാനം മാറ�റിയത�:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "%s ന�റെ അന�വാദങ�ങള� മനസ�സിലാക�കാന� കഴിയില�ല."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"സഹായം ലഭിക�ക�ന�നതില� തകരാറ�: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "സഹായം ലഭിക�ക�ന�നതില� തകരാറ�: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "സഹായം കാണിക�കാന�‌ കഴിഞ�ഞില�ല"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "ഗ�ണഗണങ�ങള�ടെ കാഴ�ച റദ�ദാക�കണോ?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "ഗ�ണഗണ ജാലകം ഉണ�ടാക�ക�ക"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr ""
 
@@ -4996,81 +5066,104 @@ msgid "Search Results"
 msgstr "അന�വേഷണ ഫലങ�ങള�‌"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "മെഡ�സ തിരച�ചില� സേവനം ലഭ�യമല�ല."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "അന�വേഷണ-സേവനം ലഭ�യമല�ല"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "�റ�റവ�ം പ�തിയി ഇനങ�ങള�‌ക�ക�വേണ�ടിയ�ള�ള തെരയ�ക‌"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "തെരച�ചിലിനിടയില�‌ തെറ�റ�"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "രചനാ സൂചിക വായിക�ക�ന�നതില�‌ പരാജയം"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "കണ�ടെത�തിയ ഈ രചനകള�ടെ ഉള�ളടക�കം കൊണ�ട�വരന�നതില� തകരാറ� : %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "അതിവേഗത�തില�ള�ള തെരച�ചില�‌ ലഭ�യമല�ല"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "ഉള�ളടക�ക അന�വേഷണം ലഭ�യമല�ല"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5079,53 +5172,76 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "സൂചിത-ഉള�ളടക�ക അന�വേഷണം ലഭ�യമല�ല"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "അതിവേഗ തെരച�ചില�‌ താങ�കള�ടെ കംപ�യ�ൂട�ടറില�‌ സജ�ജീകരിച�ചിട�ടല�ല"
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "അതിവേഗ തെരച�ചില�‌ താങ�കള�ടെ കംപ�യ�ൂട�ടറില�‌ സജ�ജീകരിച�ചിട�ടല�ല"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "അതിവേഗത�തില�ള�ള തെരച�ചില�‌ ലഭ�യമല�ല"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "എവിടെ"
 
@@ -5134,7 +5250,7 @@ msgstr "എവിടെ"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "പ�തിയ ജാലകത�തില�‌ ത�റന�ന�കാണിക�ക�ക"
@@ -5145,7 +5261,7 @@ msgstr "à´ªàµ�തിയ ജാലകതàµ�തിലàµ�‌ à´¤àµ�റനàµ�à´¨àµ�à
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d പ�തിയ ജാലകങ�ങളില� ത�റന�ന�കാണിക�ക�ക"
@@ -5154,13 +5270,16 @@ msgstr "%d à´ªàµ�തിയ ജാലകങàµ�ങളിലàµ� à´¤àµ�റനàµ�à´¨à
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr "നോട�ടിലസ� രചനാനിര��വ�വാഹകന� തെരച�ചില� ഫല നാമാവലി കാഴ�ച"
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "വളരയെധികം ചേ�ര�ച�ചകള�‌"
 
@@ -5175,12 +5294,12 @@ msgid "Create L_auncher"
 msgstr "പ�തിയ വലിപ�പ�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "ഒര� പ�തിയ വലിപ�പ�‌ നിര�മ�മിക�ക�ക"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "ചവറ�റ�ക�ട�ടയില�ള�ള എല�ലാ ഇനങ�ങള�ം നശിപ�പിക�ക�ക"
 
@@ -5200,7 +5319,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "സ�വതേയ�ള�ള പശ�ചാത�തലം ഉപയോഗിക�ക�ക"
@@ -5223,184 +5342,203 @@ msgstr "തിരഞ�ഞെട�ത�ത ഇനം കാണാനായി
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "ആസ�ഥാന-കൂട�"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "ആസ�ഥാന-കൂട�"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "ഈ കൂടിന�ള�ളില� ഒര� പ�തിയ കൂട� ഉണ�ടാക�ക�ക"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "ഈ കൂടിന�ള�ളില� ഒര� പ�തിയ കൂട� ഉണ�ടാക�ക�ക"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "ഓരോ തെരഞ�ഞട�ത�ത ഇനത�തിന�ം പ�രതീകാത�മകബന�ധം ഉണ�ടാക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "തനിപ�പക�ര�പ�പ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "തെരഞ�ഞെട�ത�ത ഇനങ�ങള�‌ ചവറ�റ�ക�ട�ടയിലേക�ക� മാറ�റാതെ നശിപ�പിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "തെരഞ�ഞെട�ത�ത എല�ലാ ഇനങ�ങളേയ�ം ഇരട�ടിപ�പിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "വലിപ�പ�‌ ചിട�ടപ�പെട�ത�ത�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "വലിപ�പ�-വിവരങ�ങള� ചിട�ടപ�പെട�ത�ത�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "തെരഞ�ഞെട�ത�ത വ�യാപ�തം "
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "മാധ�യമ ഗ�ണഗണങ�ങള�‌"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "തെരഞ�ഞെട�ത�ത ലക�കം വിട�വിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "ത�റക�ക�ന�നതിനായി"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "ഓരോ തെരഞ�ഞെട�ത�ത ഇനവ�ം പ�തിയ ജാലകത�തില�‌ ത�റക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "പ�തിയ ജാലകത�തില� ത�റക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "തെരഞ�ഞെട�ത�ത ഇനം ഈ ജാലകത�തില�‌ ത�റക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "സ�രക�ഷിത മാക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "തെരഞ�ഞെട�ത�ത ലക�കം സ�രക�ഷിത മാക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "തെരഞ�ഞെട�ത�ത ഇനത�തിന�റെ പേര�� മാറ�റ�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "സ�വതേ അവസ�ഥയിലേക�ക�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "ക�രമീകരണ രീതിയ�ം വലിപ�പവ�ം മ�ന�ഗണന അന�സരിരിച�ചാക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "നിര��ദ�ദേശ സംഹിതകള� പ�രവ�ര�ത�തിപ�പിക�ക�ക/കൈകാര�യം ചെയ�യ��ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "എല�ലാം തെരഞ�ഞെട�ക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "മാതൃകകള�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "ഈ ജാലകത�തിലെ‌ ഇനങ�ങള� എല�ലാം തെരഞ�ഞട�ക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "ഈ ജാലകത�തിലെ‌ ഇനങ�ങള� എല�ലാം തെരഞ�ഞട�ക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "തെരഞ�ഞെട�ത�ത ലക�കത�തിന�റെ മാധ�യമഗ�ണഗണങ�ങള�‌ കാണിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "തെരഞ�ഞെട�ത�ത ലക�കം വിട�വിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "ഈ സ�ഥാനത�തിന�റെ സ�വതേ പശ�ചാത�തലം ഉപയോഗിക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "തിരഞ�ഞെട�ത�തവയ�ടെ ഗ�ണഗണങ�ങള� കാണ�ക/മാറ�റ�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "പക�ര�പ�പ�"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "അട�ക�കിയൊത�ക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "വാല�യം അണ�‌മൌണ�ട� ചെയ�യ�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "ത�റക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "നിര��ദ�ദേശ-സംഹിത-കൂട� ത�റക�ക�ക"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "ഒട�ടിപ�പ�‌"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "ഒട�ടിപ�പ�‌"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "ഗ�ണഗണങ�ങള�‌"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "പേര�� മാറ�റ�ക..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "നിര��ദ�ദേശ-സംഹിത‌"
 
@@ -5485,44 +5623,55 @@ msgstr "നേരിട�ട� ചെയ�യ��ക"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "സൂചികാ അവസ�ഥ"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "നിങ�ങള�ടെ രചനക�ക� ഇപ�പോള� സൂചികയില�ല."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "നിങ�ങള�ടെ രചനക�ക� ഇപ�പോള� സൂചികയില�ല."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "മെഡ�സ തിരച�ചില� സേവനം ലഭ�യമല�ല."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5546,46 +5695,52 @@ msgstr "സൂചികാ അവസ�ഥ കാണിക�ക�ക"
 msgid "Show status of indexing used when searching"
 msgstr "തെരയ�മ�പോള� സൂചികാ അവസ�ഥ ഉപയോഗിച�ചത� കാണിക�ക�ക"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "ആവശ�യമ�ള�ള കൂട� ഉണ�ടാക�കാന� കഴിയ�ന�നില�ല"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "ആവശ�യമ�ള�ള കൂട�കള� ഉണ�ടാക�കാന� കഴിയ�ന�നില�ല"
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "ആവശ�യമ�ള�ള കൂട�കള� ഉണ�ടാക�കാന� കഴിയ�ന�നില�ല"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr ""
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr ""
 
 #. Can't register myself due to trouble locating the
@@ -5598,7 +5753,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5606,7 +5761,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5635,31 +5790,42 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"സഹായം ലഭിക�ക�ന�നതില� തകരാറ�: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "അടയാളം സൂചിപ�പിച�ചിട�ടില�ല"
@@ -5693,36 +5859,46 @@ msgstr "ക�റച�ച� ബദല�കള�‌"
 msgid "Find Them!"
 msgstr "അവയെ കണ�ട�പിടിക�ക�!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "തന�ന�ള�ളിലേക�ക� നീക�കാനാവില�ല"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "ക�ഷമിക�കൂ, പക�ഷേ \"%s\" സാധ�തതയ�ള�ള ഒര� രചനാനാമമല�ല."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"%s സാധ�തയില�ലാത�ത ഒര� സ�ഥാനമാക�ന�ന�.  ദയവായി അക�ഷരവിന�യാസം ശരിയാണോ എന�ന� പരിശോധിച�ച� വീണ�ട�ം "
-"ശ�രമിക�ക�ക"
+"%s കണ�ടെത�താന�‌ കഴിഞ�ഞില�ല.  ദയവായി അക�ഷരവിന�യാസം ശരിയാണോ എന�ന� പരിശോധിച�ച� വീണ�ട�ം ശ�രമിക�ക�ക"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "ശൃംഖലാ സേവനം"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "പേര��:"
+msgid "_Location:"
+msgstr "സ�ഥാനം:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "സംബന�ധിതം"
@@ -5917,6 +6093,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5927,24 +6111,22 @@ msgstr "%s ത�റക�ക�ന�നതിനായി"
 msgid "Open with..."
 msgstr "ത�റക�ക�ന�നതിനായി..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "പ�തിയ വലിപ�പ�"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "ചവറ� കളയ�ക"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5952,114 +6134,126 @@ msgstr ""
 msgid "Go To:"
 msgstr "പോകൂ:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr ""
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
+msgstr "സന�ദ�ര�ശിച�ചവയില�‌ അട�ത�ത സ�ഥാനത�തേക�ക� പോക�ക"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "വിവിധ ജാലകങ�ങളില� കാണിക�ക�ക?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "സ�ഥാനം ത�റക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "തന�നിരിക�ക�ന�ന ജ�യാമിതിയന�സരിച�ച� അദ�യ ജാലകം ഉണ�ടാക�ക�ക"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ജ�യാമിതി"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "നോട�ടിലസ� വിട�ക."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "നോട�ടിലസ� പ�നരാരംഭിക�ക�ക."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr ""
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "നോട�ടിലസ�"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "നോട�ടിലസ�:-- URL ഉപയോഗിച�ച� വിടാന�‌ കഴിയില�ല.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "നോട�ടിലസ�:-- URL ഉപയോഗിച�ച� വിടാന�‌ കഴിയില�ല.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "നോട�ടിലസ�:-- URL ഉപയോഗിച�ച� വിടാന�‌ കഴിയില�ല.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "നോട�ടിലസ�:-- URL ഉപയോഗിച�ച� പ�നരാരംഭിക�കാന�‌ കഴിയില�ല.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "നോട�ടിലസ�:-- ഒന�നില�‌ക�കൂട�തല�‌ URL ലേക�ക� ജ�യാമിതി ഉപയോഗിക�കാന�‌ കഴിയില�ല.\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "താങ�കള�‌ക�ക� എന�നെന�നേക�ക�മായ� നീക�കം ചെയ�യണം എന�ന� ഉറപ�പ�ണ�ടോ \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 " താങ�കള�‌ക�ക�  ചരിത�രം മറക�കേണ�ടത�ണ�ടോ, അങ�ങനെയെങ�കില�‌ താങ�കള�‌ക�ക� വീണ�ട�ം നിര�ഭാഗ�യമായിരിക�ക�ം"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "താങ�കള�‌ സന�ദ�ര�ശിച�ച സ�ഥാന-പ�പട�ടിക കളയേണ�ടത�ണ�ടോ?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "ചരിത�രം മായ��ക�ക�ക"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "%s എന�ന സ�ഥാനം ഇപ�പോള� മ�തല� നിലനില�ക�ക�ന�നില�ല."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "നിലവിലില�ലാത�ത� സ�ഥാനത�തിന�വേണ�ടിയ�ള�ള സ�ഥാനസൂചി"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "നീക�കം ചെയ�യ��ക"
 
@@ -6092,7 +6286,6 @@ msgid "Close _All Windows"
 msgstr "ജാലകങ�ങളെല�ലാം അടയ��ക�ക�ക"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "എല�ലാ നോട�ടിലസ� ജാലകങ�ങള�ം അടയ��ക�ക�ക"
@@ -6115,107 +6308,118 @@ msgid "Forward"
 msgstr "മ�ന�നോട�ട�"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പോക�ക"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "സന�ദ�ര�ശിച�ചവയില�‌ അട�ത�ത സ�ഥാനത�തേക�ക� പോക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "മ�ന�പ� സന�ദ�ര�ശിച�ച സ�ഥാനത�തേക�ക� പോക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പോക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "ആസ�ഥാനം"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "സ�ഥാനപ�പട�ട"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "പ�ത�ക�ക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "രചനയ��ക�ക� വേണ�ടി ഈ കംപ�യ�ൂട�ടറില�‌ തിരയ�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "അവസ�ഥാപ�പട�ട"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "നിര�‌ത�ത�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "മ�കളിേലക�ക�"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "അടയാളപ�പെട�ത�ത�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "പ�റകില�‌"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "അടയാളം"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "ചരിത�രം മായ��ക�ക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "ഇവിടെ പക�ര�‌ത�ത�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "അടയാളം ചിട�ടപ�പെട�ത�ത�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "മ�ന�നോട�ട�"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "പോക�ക"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "ആസ�ഥാനം"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "സ�ഥാനം..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "പാര�ശ�വ-തലം"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "ചവറ�റ�ക�ട�ട"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "മ�കളില�‌"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "കാഴ�ച"
 
@@ -6233,29 +6437,34 @@ msgstr "മറàµ�റൊരàµ� രീതിയിലàµ�‌ കാണികàµ�à´•à
 msgid "File Browser: %s"
 msgstr "രചന ഉടമ:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+#, fuzzy
+msgid "One of the side panels encountered an error and can't continue."
+msgstr " %s ദൃശ�യം പ�രാരംഭത�തില�‌  തെറ�റ�ന�ന�"
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
-#, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+#: src/nautilus-navigation-window.c:1109
+#, fuzzy, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr " %s ദൃശ�യം പ�രാരംഭത�തില�‌  തെറ�റ�ന�ന�"
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "പാര�ശ�വപ�പട�ട ഫലകം പരാജയം"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "പാര�ശ�വ-തലം"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "ഒര� പാര�ശ�വതലകാഴ�ച ഉള�‌ക�കൊള�ള�ന�ന�"
 
@@ -6289,147 +6498,180 @@ msgstr "പ�തിയവ ചേ�ര�ക�ക�ക..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "ക�ഷമിക�കൂ, ഘടന %s  മായ��ക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "ഘടന മായ��ക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "ക�ഷമിക�കൂ, %s ചിഹ�നം മായ��ക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "ചിഹ�നം നീക�കം ചെയ�യാന� കഴിയ�ന�നില�ല."
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "ഒര� പ�തിയ ചിഹ�നം നിര�മ�മിക�ക�ക"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "മൂലപദം"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "ഛായാചിത�രം"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "പ�തിയ ചിഹ�നത�തിന�� വേണ�ടി ഒര� ചിത�രം തെരഞ�ഞെട�ക�ക�ക"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "ഒര� പ�തിയ നിറം സൃഷ�ടിക�ക�ക:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "വറ�ണ നാമം:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "നിറ മൂല�യം:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "ക�ഷമിക�കൂ, പക�ഷേ \"%s\" സാധ�തതയ�ള�ള ഒര� രചനാനാമമല�ല."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "ക�ഷമിക�കൂ, പക�ഷേ താങ�കള�‌ നല�‌കിയത� സാധ�തതയ�ള�ള ഒര� രചനാനാമമല�ല."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "മാതൃക സംസ�ഥാപിക�കാന�‌ കഴിഞ�ഞില�ല"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "ക�ഷമിക�കൂ, പ�നഃക�രമീകരിച�ച ചിത�രം മാറ�റാന�‌ താങ�കള�ക�ക� കഴിയില�ല."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "ഒര� ചിത�രമല�ല"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "ക�ഷമിക�കൂ, മാതൃക %s സംസ�ഥാപിക�കാന�‌ കഴിഞ�ഞില�ല."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "മാതൃകയായ� ചേ�ര�ക�കാന� ഒര� ചിത�രം തിരഞ�ഞെട�ക�ക�ക"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "നിറം സംസ�ഥാപിക�കാന�‌ കഴിയ�ന�നില�ല"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "കൂട�ടിച�ചേ�ര�‌ക�കാന�‌ ഒര� നിറം തെരഞ�ഞെട�ക�ക�ക"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "ക�ഷമിക�കൂ, പക�ഷേ %s ഒര� ഉപയോഗപ�രദമായ ചിത�രമല�ല!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "രചന %s സാധ�തയ�ള�ള ഛായാചിത�രമായി പ�രത�യക�ഷപ�പെട�ന�നില�ല"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "റദ�ദാക�കല�‌ മാറ�റ�ക"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "ഒര� പ�തിയ മാതൃക കൂട�ടിച�ച�രേ‌ക�ക�ക..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "ഒര� പ�തിയ നിറം കൂട�ടിച�ച�രേ‌ക�ക�ക..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "ഒര� പ�തിയ ചിഹ�നം കൂട�ടിച�ച�രേ‌ക�ക�ക..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "മാറ�റേണ�ട മാതൃകയില�‌‌ ക�ളിക�ക� ചെയ�യ��ക"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "മാറ�റേണ�ട നിറത�തില�‌ ക�ളിക�ക� ചെയ�യ��ക"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "നീക�കം ചെയ�യേണ�ട ചിഹ�നത�തില�‌ ക�ളിക�ക� ചെയ�യ��ക"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "മാതൃകകള�‌:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "നിറങ�ങള�:‌"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "ചിഹ�നങ�ങള�:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "മാതൃക മാറ�റ�ക..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "നിറം മായ��ക�ക�ക..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "ചിഹ�നം മായ��ക�ക�ക"
 
@@ -6812,33 +7054,38 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "ജാലകങ�ങളെല�ലാം അടയ��ക�ക�ക"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "പാര�ശ�വ-തലം അടയ��ക�ക�ക"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പോക�ക"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "സ�ഥാനം..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[ആ ഇനങ�ങള�]കൂട�കളാണ‌�"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "മാതൃകകള�"
@@ -6868,10 +7115,12 @@ msgid "View Failed"
 msgstr "കാഴ�ച പരാജയപ�പെട�ട�"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr " %s ദൃശ�യം പ�രാരംഭത�തില�‌  തെറ�റ�ന�ന�"
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6879,95 +7128,123 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr " %s ദൃശ�യം പ�രാരംഭത�തില�‌  തെറ�റ�ന�ന�"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "നോട�ടിലസ� പ�രയോഗം ഈ ജാലകവ�മായി ബന�ധപ�പെട�ടിരിക�ക�ന�ന�"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "ഉള�ളടക�ക കാഴ�ച"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "ഇപ�പോഴ�ള�ള രചനയ�ടെ അല�ലെങ�കില�‌ കൂടിന�റെ കാഴ�ച"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"%s കണ�ടെത�താന�‌ കഴിഞ�ഞില�ല.  ദയവായി അക�ഷരവിന�യാസം ശരിയാണോ എന�ന� പരിശോധിച�ച� വീണ�ട�ം ശ�രമിക�ക�ക"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "ചിഹ�നങ�ങള� കൂട�ടിച�ചേര�ക�കാന� കഴിയ�ന�നില�ല"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "നോട�ടിലസില� %s പ�രദ‌ര�ശിപ�പിക�കാന�‌ കഴിയില�ല"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "%s പ�രദ�ര�ശിപ�പിക�കാന�‌ കഴിയ�ന�നില�ല.  കാരണം ഇത� �ത� തരത�തില�ള�ള രചനയാണെന�ന� നിര�ണ�ണയിക�കാന�‌ "
 "നോട�ടിലസിന� കഴിഞ�ഞില�ല"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "നോട�ടിലസിന‌� \"%s\" പ�രദ�ര�ശിപ�പിക�കാവ�ന�ന സ�ഥാപിത ദ�ര�ശിനിയില�ല."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 " നോട�ടിലസിന‌�   %s സ�ഥാനങ�ങള�‌ കൈകാര�യം ചെയ�യാന�‌ കഴിയാത�തത�കൊണ�ട� \"%s\", പ�രദ�ര�ശിപ�പിക�കാന�‌ "
 "കഴിഞ�ഞില�ല"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "ഉള�‌ച�ചേര�ക�ക�ന�നതില�‌ പരാജയം. \"%s\" പ�രദ�ര�ശിപ�പിക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" രചന ത�റക�കാന�‌ കഴിയ�ന�നില�ല.കാരണം ഇതിന�റെ പ�രവേശനം നിഷേധിച�ചിരക�ക�ന�ന�"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" രചന ത�റക�കാനാവ�ന�നില�ല.  കാരണം അതിന�റെ തലവനെ \"%s\"കണ�ടെത�താനായില�ല.ദയവായി "
 "താങ�കള�‌ കൊട�ത�ത സ�ഥാനം ശരിയാണൊ എന�ന� പ�രോക�സി സജ�ജീകരണത�തില�‌ പരിശോധിച�ച�ശരിയാക�കിയതിന�ശേഷം "
 "വീണ�ട�ം ശ�രമിക�ക�ക."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "%s രചന ത�റക�കാനാവ�ന�നില�ല.  കാരണം അതിന�റെ തലവനാമം ശൂന�യമാണ�.   ദയവായി താങ�കള�ടെ പ�രോക�സീ "
 "സജ�ജീകരണം പരിശോധിച�ച� ശരിയാക�കിയതിന�ശേഷം വീണ�ട�ം ശ�രമിക�ക�ക."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
+" നോട�ടിലസിന‌�   %s സ�ഥാനങ�ങള�‌ കൈകാര�യം ചെയ�യാന�‌ കഴിയാത�തത�കൊണ�ട� \"%s\", പ�രദ�ര�ശിപ�പിക�കാന�‌ "
+"കഴിഞ�ഞില�ല"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "അന�വേഷണം ലഭ�യമല�ല"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "നോട�ടിലസില� %s പ�രദ‌ര�ശിപ�പിക�കാന�‌ കഴിയില�ല"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "സ�ഥാനം പ�രദ�ര�ശിപ�പിക�കാന�‌ കഴിയില�ല"
 
@@ -6979,7 +7256,7 @@ msgstr "ഈ അടയാളം ചൂണ�ടിക�കാട�ടിയ സ
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "പക�ര�‌പ�പവകാശം(C) 1999-2001 Eazel, Inc."
 
@@ -6987,11 +7264,11 @@ msgstr "പക�ര�‌പ�പവകാശം(C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "എഫ�.എസ�.എഫ� - ഇന�ത�യ <gnu@gnu.org.in>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7005,39 +7282,43 @@ msgstr "വളരെ ക�റച�ച� താള�കള�‌ പ�റക
 msgid "Go forward a number of pages"
 msgstr "ധാരാളം താള�കള�‌ മ�ന�നോട�ട�പോക�ക"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "\"%s\"-ല� സ�ഥാനം കാണിക�ക�ക"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "ചെമന�ന� തൊപ�പിശൃംഖല"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "ബിന�ദ�‌"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പോക�ക"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "പ�രയോഗ �.ഡി"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ജാലകത�തിന�റെ പ�രയോഗ �.ഡി."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "പ�രയോഗം"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "നോട�ടിലസ� പ�രയോഗം ഈ ജാലകവ�മായി ബന�ധപ�പെട�ടിരിക�ക�ന�ന�"
 
@@ -7073,6 +7354,133 @@ msgstr "ശൃംഖലാ സേവനം"
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "ഖരസാമഗ�രി ദൃശ�യമാക�ക�ന�നതിന�ള�ള ശാല"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "ഖരസാമഗ�രി ദ�ര�ശിനി"
+
+#~ msgid "Hardware view"
+#~ msgstr "ഖരസാമഗ�രി കാഴ�ച"
+
+#~ msgid "View as Hardware"
+#~ msgstr "ഖരസാമഗ�രിയായ� കാണ�ക"
+
+#~ msgid "hardware view"
+#~ msgstr "ഖരസാമഗ�രി കാഴ�ച"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ഖരസാമഗ�രി കാഴ�ചയ�ടെ ചിഹ�ന നാമം"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "ഖരസാമഗ�രി ദൃശ�യമാക�ക�ന�നതിന�ള�ള നിര�മ�മാണ ശാല"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "ഖരസാമഗ�രി  അവലോകനം"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr "ലക�ഷ�യസ�ഥാനത�ത� ആവശ�യത�തിന�� സ�ഥലമില�ല.  %s പക�ര�‌ത�ത�മ�പോള�‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr "ലക�ഷ�യസ�ഥാനത�ത� ആവശ�യത�തിന‌� സ�ഥലമില�ല.  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr "ഈ കൂട�യില�‌ എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല..  %s നീക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr "ലക�ഷ�യസ�ഥാന ഡിസ�ക� വായിക�കാന�‌ മാത�രം..  %s ചലിപ�പിക�ക�ന�പോള�‌‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr "ഈ കൂട�ടില�‌ എഴ�ത�വാന�‌ താങ�കള�‌ക�ക� അന�വാദമില�ല..  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr "ലക�ഷ�യസ�ഥാന ഡിസ�ക� വായിക�കാന�‌ മാത�രം..  %s ബന�ധിപ�പിക�ക�മ�പോള�‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "%s പക�ര�ത�ത�മ�പോള�‌‌ തെറ�റ�ന�ന�.%s\n"
+#~ "\n"
+#~ "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "%s ചലിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�. %s\n"
+#~ "\n"
+#~ "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "%s ഒഴിവാക�ക�മ�പോള�‌ തെറ�റ�ന�ന� %s.\n"
+#~ "\n"
+#~ "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�ന�ണ�ടോ?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s പക�ര�ത�ത�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ബന�ധിപ�പിക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr "താങ�കള�‌ ത�ടര�വാന�‌ ആഗ�രഹിക�ക�ന�നോ. %s ഒഴിവാക�ക�മ�പോള�‌‌‌ തെറ�റ�ന�ന�."
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "ചവറ�റ�ക�ട�ടയിലേക�ക� പക�ര�ത�താന�‌ കഴിയില�ല"
+
+#~ msgid "Searching Disks"
+#~ msgstr "വിവരത�തട�ട� അന�വേഷണം"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "%s സാധ�തയില�ലാത�ത ഒര� സ�ഥാനമാക�ന�ന�.  ദയവായി അക�ഷരവിന�യാസം ശരിയാണോ എന�ന� പരിശോധിച�ച� "
+#~ "വീണ�ട�ം ശ�രമിക�ക�ക"
+
+#~ msgid "file icon"
+#~ msgstr "രചനാ ചിഹ�നം"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "പേര��:"
+
 #~ msgid "Unknown"
 #~ msgstr "അറിയപ�പെടാത�ത"
 
@@ -7139,8 +7547,5 @@ msgstr ""
 #~ msgid "_Toolbar"
 #~ msgstr "ഉപകരണപ�പട�ട"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "%s എന�ന സ�ഥാനം ഇപ�പോള� മ�തല� നിലനില�ക�ക�ന�നില�ല."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "നിലവിലില�ലാത�ത സ�ഥാനത�ത� പോക�ക"
diff --git a/po/mn.po b/po/mn.po
index 0ee3f6dbe..38b0a53a8 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -1,22 +1,27 @@
+# translation of nautilus.gnome-2-4.po to Mongolian
+# translation of nautilus.gnome-2-4.mn.po to Mongolian
 # translation of nautilus.gnome-2-2.mn.po to Mongolian
 # translation of nautilus.HEAD.mn.po to Mongolian
 # translation of nautilus.HEAD.po to mongolian
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# Ochirbat Batzaya <buuvei@yahoo.com>, 2003
-# Sanlig Badral <badral@chinggis.com>, 2003
+# Copyright (C) 2003
+# Ochirbat Batzaya <buuvei@yahoo.com>, 2003.
+# Sanlig Badral <badral@chinggis.com>, 2003.
+# Sanlig Badral <badral@users.sf.net>, 2003.
+# Sanlig Badral <badral@openmn.org>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus.gnome-2-2.mn\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-04-22 23:42+0200\n"
-"Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
-"Language-Team: Mongolian <openmn-gnome@lists.sourceforge.net>\n"
+"Project-Id-Version: nautilus.gnome-2-4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-26 02:56+0100\n"
+"PO-Revision-Date: 2003-12-27 03:23+0100\n"
+"Last-Translator: Sanlig Badral <badral@openmn.org>\n"
+"Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.1\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -43,7 +48,7 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() -д алдаа гарч зог�лоо."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
+#: src/file-manager/fm-properties-window.c:2383
 #: src/file-manager/fm-search-list-view.c:500
 msgid "Emblems"
 msgstr "Эмблемүүд"
@@ -114,46 +119,44 @@ msgstr ""
 "Эмблемд�� н�рийг нь оруулж өгнө үү. Эн�хүү н�рийн ту�ламжтайгаар та дараа нь "
 "�н� �мблемийг таньж болно."
 
-#: components/emblem/nautilus-emblem-view.c:739
+#: components/emblem/nautilus-emblem-view.c:740
 msgid ""
 "Some of the files could not be added as emblems because they did not appear "
 "to be valid images."
-msgstr ""
-"Зарим файлууд зургийн файл м�т танигдаагүйн улмаа� �мблем болж чадахгүй нь."
+msgstr "Зарим файлууд зургийн файл м�т танигдаагүйн улмаа� �мблем болж чадахгүй нь."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:740
+#: components/emblem/nautilus-emblem-view.c:742
 msgid "Couldn't add emblems"
 msgstr "Эмблем н�мж чад�ангүй"
 
-#: components/emblem/nautilus-emblem-view.c:741
+#: components/emblem/nautilus-emblem-view.c:742
 msgid ""
 "None of the files could be added as emblems because they did not appear to "
 "be valid images."
-msgstr ""
-"�ль ч файлууд зургийн файл м�т танигдаагүйн улмаа� �мблем болж чадахгүй нь."
+msgstr "�ль ч файлууд зургийн файл м�т танигдаагүйн улмаа� �мблем болж чадахгүй нь."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:763
 msgid "The dragged text was not a valid file location."
 msgstr "Чирж аваач�ан тек�т нь хаа н�гт�� оршин буй файлын байрлал биш байна."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
+#: components/emblem/nautilus-emblem-view.c:763
+#: components/emblem/nautilus-emblem-view.c:788
+#: components/emblem/nautilus-emblem-view.c:838
 msgid "Couldn't add emblem"
 msgstr "Эмблемийг н�мж чад�ангүй."
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:783
+#: components/emblem/nautilus-emblem-view.c:837
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Файл »%s« зураг биш юм шиг байна."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:786
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Чирж аваач�ан файл нь зургийн файл г�ж танигдахгүй байна."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
+#: components/emblem/nautilus-emblem-view.c:902 data/browser.xml.h:35
 #: src/nautilus-property-browser.c:1731
 msgid "Erase"
 msgstr "У�тгах"
@@ -170,7 +173,7 @@ msgstr "Техник хангамж"
 
 #: components/hardware/Nautilus_View_hardware.server.in.in.h:3
 msgid "Hardware Viewer"
-msgstr "Техник хангамжийн харагч программ"
+msgstr "Техник хангамжийн харагч програм"
 
 #: components/hardware/Nautilus_View_hardware.server.in.in.h:4
 msgid "Hardware view"
@@ -269,59 +272,11 @@ msgstr "Зургийн агуулгын утгыг үзүүл�х бүр�лдх
 msgid "Nautilus Image Properties view"
 msgstr "�аутилу�аар зургийн агуулгын үзүүл�х"
 
-#: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
-msgid "Camera Brand"
-msgstr "Г�р�л зургийн аппарат"
-
-#: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
-msgid "Camera Model"
-msgstr "Г�р�л зургийн аппарат"
-
-#: components/image_properties/nautilus-image-properties-view.c:194
-msgid "Date Taken"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:195
-msgid "Exposure Time"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
-msgid "Exposure Program"
-msgstr "Программ"
-
-#: components/image_properties/nautilus-image-properties-view.c:197
-msgid "Aperture Value"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:198
-msgid "Metering Mode"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:199
-msgid "Flash Fired"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:200
-msgid "Focal Lenght"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:201
-msgid "Shutter Speed"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:202
-msgid "ISO Speed Rating"
-msgstr ""
-
-#: components/image_properties/nautilus-image-properties-view.c:203
-#: data/static_bookmarks.xml.h:36
-msgid "Software"
-msgstr "Software"
+#: components/image_properties/nautilus-image-properties-view.c:93
+msgid "Failed to load image information"
+msgstr "Зургийн м�д��ллийг ачаалж бол�онгүй"
 
-#: components/image_properties/nautilus-image-properties-view.c:222
+#: components/image_properties/nautilus-image-properties-view.c:145
 #, c-format
 msgid ""
 "<b>Image Type:</b> %s (%s)\n"
@@ -330,15 +285,11 @@ msgstr ""
 "<b>Зургийн төрөл:</b> %s (%s)\n"
 "<b>�арийвчлал (ширх�г):</b> %dx%d ц�гүүд\n"
 
-#: components/image_properties/nautilus-image-properties-view.c:235
-msgid "Failed to load image information"
-msgstr "Зургийн м�д��ллийг ачаалж бол�онгүй"
-
-#: components/image_properties/nautilus-image-properties-view.c:423
+#: components/image_properties/nautilus-image-properties-view.c:255
 msgid "loading..."
 msgstr "ачаалж байна..."
 
-#: components/image_properties/nautilus-image-properties-view.c:439
+#: components/image_properties/nautilus-image-properties-view.c:268
 msgid "URI currently displayed"
 msgstr "одоо д�лг�н харуулж буй URI"
 
@@ -384,7 +335,7 @@ msgid "Copy the selected text to the clipboard"
 msgstr "Сонго�он тек�тийг клипборд (түр �анах-д) хуулах"
 
 #: components/text/nautilus-text-view-ui.xml.h:2
-#: libnautilus/nautilus-clipboard-ui.xml.h:10 src/nautilus-shell-ui.xml.h:36
+#: libnautilus/nautilus-clipboard-ui.xml.h:10 src/nautilus-shell-ui.xml.h:64
 msgid "_Copy Text"
 msgstr "Тек�т х_уулах"
 
@@ -445,25 +396,25 @@ msgstr "(Хоо�он)"
 msgid "Loading..."
 msgstr "�чаалж байна..."
 
-#: components/tree/nautilus-tree-view.c:529 nautilus-home.desktop.in.h:1
+#: components/tree/nautilus-tree-view.c:532 nautilus.desktop.in.h:1
 msgid "Home Folder"
-msgstr "Г�рийн х�ргийн хавта�"
+msgstr "Г�р хавта�"
 
-#: components/tree/nautilus-tree-view.c:531
+#: components/tree/nautilus-tree-view.c:534
 msgid "Filesystem"
-msgstr ""
+msgstr "Файлын �и�тем"
 
-#: components/tree/nautilus-tree-view.c:533
+#: components/tree/nautilus-tree-view.c:536
 msgid "Network Neighbourhood"
-msgstr ""
+msgstr "Сүлж��ний хөрш"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
-msgstr "Х. программууд"
+msgstr "Х. програмууд"
 
 #: data/applications.desktop.in.h:2
 msgid "Browse available software"
-msgstr "Байгаа программуудыг хайх"
+msgstr "Байгаа програмуудыг хайх"
 
 #: data/browser.xml.h:1
 msgid "Apparition"
@@ -583,13 +534,11 @@ msgstr "�оорог"
 
 #: data/browser.xml.h:30
 msgid "Drag a color to an object to change it to that color"
-msgstr ""
-"Заа�ан өнгөөр будахын тулд �онго�он өнгөө будах объект д��р�� чирч тавина уу"
+msgstr "Заа�ан өнгөөр будахын тулд �онго�он өнгөө будах объект д��р�� чирч тавина уу"
 
 #: data/browser.xml.h:31
 msgid "Drag a pattern tile to an object to change it"
-msgstr ""
-"Заа�ан х��г��р х��л�хийн тулд �онго�он загвараа объект д��р�� чирч тавина уу"
+msgstr "Заа�ан х��г��р х��л�хийн тулд �онго�он загвараа объект д��р�� чирч тавина уу"
 
 #: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
@@ -827,7 +776,7 @@ msgstr "_Загварууд"
 
 #: data/favorites.desktop.in.h:1
 msgid "Favorite applications"
-msgstr "Дуртай программууд"
+msgstr "Дуртай програмууд"
 
 #: data/favorites.desktop.in.h:2
 msgid "Favorites"
@@ -868,7 +817,7 @@ msgstr "Binary Freedom"
 
 #: data/static_bookmarks.xml.h:3
 msgid "Borland"
-msgstr "Borland"
+msgstr "Борланд"
 
 #: data/static_bookmarks.xml.h:4
 msgid "CNET Computers.com"
@@ -876,7 +825,7 @@ msgstr "CNET: Computers.com"
 
 #: data/static_bookmarks.xml.h:5
 msgid "CNET Linux Center"
-msgstr "CNET: Linux Төв"
+msgstr "CNET: Линук� Төв"
 
 #: data/static_bookmarks.xml.h:6
 msgid "CollabNet"
@@ -884,15 +833,15 @@ msgstr "CollabNet"
 
 #: data/static_bookmarks.xml.h:7
 msgid "Compaq"
-msgstr "Compaq"
+msgstr "Компак"
 
 #: data/static_bookmarks.xml.h:8
 msgid "Conectiva"
-msgstr "Conectiva"
+msgstr "Коннектива"
 
 #: data/static_bookmarks.xml.h:9
 msgid "Covalent"
-msgstr "Covalent"
+msgstr "Ковалент"
 
 #: data/static_bookmarks.xml.h:10
 msgid "Debian.org"
@@ -900,7 +849,7 @@ msgstr "Debian.org"
 
 #: data/static_bookmarks.xml.h:11
 msgid "Dell"
-msgstr "Dell"
+msgstr "Делл"
 
 #: data/static_bookmarks.xml.h:12
 msgid "Freshmeat.net"
@@ -920,23 +869,23 @@ msgstr "Олон ул�ын"
 
 #: data/static_bookmarks.xml.h:17
 msgid "Linux Documentation Project"
-msgstr "Linux-ийн баримтжуулах тө�өл"
+msgstr "Линук� баримтжуулах тө�өл"
 
 #: data/static_bookmarks.xml.h:18
 msgid "Linux One"
-msgstr "Linux One"
+msgstr "Лину� Оне"
 
 #: data/static_bookmarks.xml.h:19
 msgid "Linux Online"
-msgstr "Linux Online"
+msgstr "Линук� Онлайн"
 
 #: data/static_bookmarks.xml.h:20
 msgid "Linux Resources"
-msgstr "Linux-Эх үү�в�рүүд"
+msgstr "Линук� нөөцүүд"
 
 #: data/static_bookmarks.xml.h:21
 msgid "Linux Weekly News"
-msgstr "Linux Долоо хоногийн шин� м�д��"
+msgstr "Линук� Долоо хоногийн шин� м�д��"
 
 #: data/static_bookmarks.xml.h:22
 msgid "LinuxNewbie.org"
@@ -948,15 +897,15 @@ msgstr "LinuxOrbit.com"
 
 #: data/static_bookmarks.xml.h:24
 msgid "MandrakeSoft"
-msgstr "MandrakeSoft"
+msgstr "МандракеСофт"
 
 #: data/static_bookmarks.xml.h:25
 msgid "Netraverse"
-msgstr "Netraverse"
+msgstr "��травер�е"
 
 #: data/static_bookmarks.xml.h:26
 msgid "News and Media"
-msgstr "Шин� м�д�� медиа"
+msgstr "М�д�� ба медиа"
 
 #: data/static_bookmarks.xml.h:27
 msgid "O'Reilly"
@@ -968,55 +917,59 @@ msgstr "OSDN"
 
 #: data/static_bookmarks.xml.h:29
 msgid "Open Source Asia"
-msgstr "Open Source Asia"
+msgstr "Опен Соур� �зи"
 
 #: data/static_bookmarks.xml.h:30
 msgid "OpenOffice"
-msgstr "OpenOffice"
+msgstr "ОпенОфи�"
 
 #: data/static_bookmarks.xml.h:31
 msgid "Penguin Computing"
-msgstr "Penguin Computing"
+msgstr "Пенгвин Компютинг"
 
 #: data/static_bookmarks.xml.h:32
 msgid "Rackspace"
-msgstr "Rackspace"
+msgstr "Рак�пе��"
 
 #: data/static_bookmarks.xml.h:33
 msgid "Red Hat"
-msgstr "Red Hat"
+msgstr "Ред Хат"
 
 #: data/static_bookmarks.xml.h:34
 msgid "Red Hat Network"
-msgstr "Red Hat Network"
+msgstr "Ред Хат ��творк"
 
 #: data/static_bookmarks.xml.h:35
 msgid "RedFlag Linux"
-msgstr "Red Flag Linux"
+msgstr "Ред Флаг Линук�"
+
+#: data/static_bookmarks.xml.h:36
+msgid "Software"
+msgstr "Програм хангамж"
 
 #: data/static_bookmarks.xml.h:37
 msgid "SourceForge"
-msgstr "SourceForge"
+msgstr "Соур�Форж"
 
 #: data/static_bookmarks.xml.h:38
 msgid "SuSE"
-msgstr "SuSE"
+msgstr "СүйСЭ"
 
 #: data/static_bookmarks.xml.h:39
 msgid "Sun StarOffice"
-msgstr "Sun StarOffice"
+msgstr "Сан СтарОфи�"
 
 #: data/static_bookmarks.xml.h:40
 msgid "Sun Wah Linux"
-msgstr "Sun Wah Linux"
+msgstr "Сан Вах Линук�"
 
 #: data/static_bookmarks.xml.h:41
 msgid "Web Services"
-msgstr "Web-үйлчилг��"
+msgstr "В�б-үйлчилг��"
 
 #: data/static_bookmarks.xml.h:42
 msgid "Ximian"
-msgstr "Ximian"
+msgstr "К�имиан"
 
 #: data/static_bookmarks.xml.h:43
 msgid "ZDNet Linux Hardware Database"
@@ -1024,7 +977,7 @@ msgstr "ZDNet-Linux-Техник хангамжийн мÑ�дÑ�Ñ�ллийн баÐ
 
 #: data/static_bookmarks.xml.h:44
 msgid "ZDNet Linux Resource Center"
-msgstr "ZDNet-Linux-�өөцийн төв"
+msgstr "ZDNet-Линук�-�өөцийн төв"
 
 #: data/static_bookmarks.xml.h:45
 msgid "Zero-Knowledge"
@@ -1102,365 +1055,396 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
+"Эмблем харагдалт ба ажлын талбар д��рхи �мблемийн доохи тек�түүдийн "
+"жаг�аалт. Бич��� харагдалтын тоо томруулалтын төвшингөө� хамаарна. Боломжит "
+"утгууд: »size« (Х�мж��), »type« (Төрөл), »date_modified« (Өөрчилөгд�өн "
+"огноо), »date_changed« (Өөрчилөгд�өн огноо), »date_accessed« (Ханд�ан "
+"огноо), »owner« (Эз�мшигч), »group« (Бүл�г), »permissions« (Хандалтын �рх), "
+"»octal_permissions« (�аймт хандалтын �рх) болон »mime_type« (MIME-төрөл)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
 msgid "Add Nautilus to session"
-msgstr ""
+msgstr "�аутилу�ыг �уулт руу н�м�х"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Bring up a new window for every opened file"
-msgstr ""
+msgstr "���лтт�й файл ту� бүрийн хувьд шин� цонх гаргах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-msgid "Computer icon visible on desktop"
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
-msgstr ""
+msgstr "Хайх �амбарын хайлтын шалгуур"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: 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. "
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 msgstr ""
+"Хайлтын �амбарын ту�ламжтай файл хайхад х�р�гл�х шалгуур. Боломжит утгууд: "
+"»search_by_text« (Зөвхөн файлын н�р��р хайх) болон "
+"»search_by_text_and_properties« (Файлын н�р ба файлын онцлогоорхайх)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid "Current Nautilus theme (deprecated)"
-msgstr ""
+msgstr "Ид�вхит�й �аутилу� загвар (Муушаагд�ан)"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Custom Background Set"
-msgstr "Д�в�г�р"
+msgstr "Х�вшм�л д�в�г�р тогтоох"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Custom Side Pane Background Set"
-msgstr "_�рын д�в�г�р болгох"
+msgstr "Х�вшм�л хажуугийн �амбарын д�в�г�р болгох"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Default Background Color"
-msgstr "Ст_андарт д�в�г�рийг х�р�гл�х"
+msgstr "Стандарт д�в�г�р өнгө"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Filename"
-msgstr "Ст_андарт д�в�г�рийг х�р�гл�х"
+msgstr "Стандарт д�в�г�р файлын н�р"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid "Default Side Pane Background Color"
-msgstr "Ст_андарт д�в�г�рийг х�р�гл�х"
+msgstr "Стандарт хажуугийн �амбарын д�в�г�р өнгө"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Default Side Pane Background Filename"
-msgstr ""
+msgstr "Стандарт хажуугийн �амбарын д�в�г�р файлын н�р"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default folder viewer"
-msgstr "_Томруулахад ашиглах �тандарт х�мж���үүд :"
+msgstr "Стандарт хавта� харагч"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid "Default icon zoom level"
-msgstr "_Томруулахад ашиглах �тандарт х�мж���үүд :"
+msgstr "Эмбл�м томруулах �тандарт төвшин"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Default list zoom level"
-msgstr "_Томруулахад ашиглах �тандарт х�мж���үүд :"
+msgstr "Томруулах �тандарт төвшин"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Default sort order"
-msgstr "�н� файлд зориулан өмнө нь тохируулга хий��н"
+msgstr "Стандарт �р�мб� дараалал"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Default zoom level used by the icon view."
-msgstr "Одоогоор ид�вхт�й байгаа томруулах х�мж��г тохируулах"
+msgstr "Эмблем харагдалтад х�р�гл�гл�ж буй томруулах �тандарт х�мж��."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default zoom level used by the list view."
-msgstr "Одоогоор ид�вхт�й байгаа томруулах х�мж��г тохируулах"
+msgstr "Жаг�аалт харагдалтад х�р�гл�гд�ж буй томруулах �тандарт х�мж��."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Desktop font"
-msgstr "Д�лг�ц"
+msgstr "Д�лг�цийн бичиг"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Desktop home icon name"
-msgstr ""
+msgstr "Д�лг�цийн г�р �мблемийн н�р"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Desktop trash icon name"
-msgstr ""
+msgstr "Д�лг�цийн хогийн �ав �мблемийн н�р"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid ""
 "Directories 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 massive directories. A negative value denotes no limit. The "
 "limit is approximate due to the reading of directories chunk-wise."
 msgstr ""
+"Эн� х�мж��н��� д��ш х�мж��т�й лавлахууд �н� х�мж�����р та�лагдана. Үүний "
+"зорилго нь х�т их өгөгдлийн улмаа� �аутилу�ын �анам�аргүй гарч болох "
+"гацаанаа� зайл�хийх юм. Сөрөг утга х�згааргүй г���н үг. Лавлахууд том "
+"өгөгдлийн н�гж��р ушигдаж буй учир х�згаарын х�мж�� ойролцоогоор гарна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Enable 'special' flags in file preferences dialog"
-msgstr ""
+msgstr "Файлын тохируулга диалог дахь 'ту�гай' төлвүүдийг н��х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
 "Filename for the default directory background. Only used if background_set "
 "is true."
 msgstr ""
+"Стандарт лавлахын д�в�г�р файлын н�р. Зөвхөн »background_set«үн�н үед "
+"х�р�гл�гд�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
+"Стандарт лавлахын д�в�г�р файлын н�р. Зөвхөн »side_pane_background_set«үн�н "
+"үед х�р�гл�гд�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Hide default bookmarks in the bookmark menu"
-msgstr ""
+msgstr "Хавчуурга ц���н дахь �тандарт хавчуургуудыг далдлах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Home icon visible on desktop"
-msgstr ""
+msgstr "Г�р �мблемийг д�лг�ц�нд харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid ""
 "If set to true, Nautilus will only show directories in the tree side pane. "
 "Otherwise it will show both directories and files."
 msgstr ""
+"Х�рв�� утга үн�н бол �аутилу� хажуугийн мод �амбарт зөвхөн лавлахууд "
+"харуулна. Үгүй бол лавлах болон файлуудыг харуулна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
-msgid ""
-"If set to true, newly opened windows will have the location bar visible."
-msgstr ""
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+msgid "If set to true, newly opened windows will have the location bar visible."
+msgstr "Х�рв�� утга үн�н бол шин��р н��гд��н цонхнуудад ха�гийн �амбар харагдана. "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr ""
+msgstr "Х�рв�� утга үн�н бол шин��р н��гд��н цонхнуудад хажуугийн �амбар харагдана. "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr ""
+msgstr "Х�рв�� утга үн�н бол шин��р н��гд��н цонхнуудад төлвийн �амбар харагдана. "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr ""
+msgstr "Х�рв�� утга үн�н бол шин��р н��гд��н цонхнуудад багаж �амбар харагдана. "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 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 ""
+"Х�рв�� утга үн�н бол �аутилу� танд файлын тодруулга диалогт илүү х�цүү "
+"нарийн тохируулга тогтооно."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid ""
 "If set to true, then Nautilus shows directories prior to showing files in "
 "the icon and list views."
 msgstr ""
+"Х�рв�� утга үн�н бол �аутилу� лавлахуудыг файлуудын өмнө �мблем ба жаг�аалт "
+"х�лб�р��р харуулна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
 msgstr ""
+"Х�рв�� утга үн�н бол таныг файл хогийн �ав руу чулуудахад �аутилу� "
+"баталгаажуулалт а�ууна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
 "If set to true, then Nautilus will bring up a new Nautilus window by default "
 "whenever an item is opened."
 msgstr ""
+"Х�рв�� утга үн�н бол �аутилу� �тандартаар бүх н��лтт�й объектуудыг шин� "
+"�аутилу� цонхонд харуулна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Хогийн �ав д�лг�ц�н д��р үлд�х ё�той"
+msgstr "Х�р�в утга үн�н бол �аутилу� �мблемүүдийг д�лг�ц д��р зурна."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 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 "
 "feature can be dangerous, so use caution."
 msgstr ""
+"Х�рв�� утга үн�н бол, �аутилу� хогоо� зайл�хийхийн тулд файл ул мөргүй "
+"у�тгахыг таньд зөвшөөрнө. Эн� функ� о�олтой тул анхааралтай х�р�гл�н� үү."
 
-#: 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 will just show the user's bookmarks in the "
 "bookmark menu."
 msgstr ""
+"Х�рв�� утга үн�н бол �аутилу� х�р�гл�гчийн хавчуургуудыг хавчуурга ц���нд "
+"харуулна."
 
-#: 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 will use the user's home directory as the "
 "desktop. If it is false, then it will use ~/Desktop as the desktop."
 msgstr ""
+"Х�рв�� утга үн�н бол �аутилу� х�р�гл�гчийн г�р лавлахыг д�лг�ц��р х�р�гл�н�. "
+"Х�р�в худал бол ~/Desktop лавлахыг д�лг�ц��р х�р�гл�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 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 "
 "files."
 msgstr ""
+"Х�рв�� утга үн�н бол Емак�аар үү�г�гд��н нөөц файлууд харагдана. Одоогоор "
+"зөвхөн тилд�-г��р (~) төг��өн файлуудыг нөөц файл г�ж авч байгаа."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the directory's .hidden file."
 msgstr ""
+"Х�рв�� утга үн�н бол далдлагд�ан файлууд файл менежерт харагдана. Далд "
+"файлуудад ц�г��р �х�л��н ��в�л .hidden ��р �х�л��н файлууд орно."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 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 ""
+"Х�рв�� утга үн�н бол �аутилу� �хл�хд�� �уулт руу өөрийгөө н�мн�. Эн� нь "
+"таныг дараагийн удаа н�втр�нгүүт автоматаар �хл�н� г���н үг. "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-msgid ""
-"If this is set to true, an icon linking to the computer location will be put "
-"on the desktop."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "If this is set to true, an icon linking to the home directory will be put on "
 "the desktop."
 msgstr ""
+"Х�рв�� утга үн�н бол �мблем г�р лавлах руу холбоод д�лг�цийн нүүр�н д��р "
+"тавина."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
 msgstr ""
+"Х�рв�� утга үн�н бол �мблем хогийн �ав лавлах руу холбоод д�лг�цийн нүүр�н "
+"д��р тавина."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 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 "
 "sorted from \"z\" to \"a\"."
 msgstr ""
+"Х�рв�� утга үн�н бол, шин��р н��гд��н цонхнууд дахь файлууд �рг���н "
+"дарааллаар �р�мб�л�гд�н�. Х�рв�� т�д н�р���р�� �р�мб�л�гд��н бол файлууд »a« "
+"аа� »z« хүрт�л биш харин »z« ��� »a« г�ж �р�мб�л�гд�н� г���н үг."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 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 "
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 msgstr ""
+"Х�рв�� утга үн�н бол, шин��р н��гд��н цонхнууд дахь файлууд �рг���н "
+"дарааллаар �р�мб�л�гд�н�. Х�рв�� т�д н�р���р�� �р�мб�л�гд��н бол файлууд »a« "
+"аа� »z« хүрт�л биш харин »z« ��� »a« г�ж �р�мб�л�гд�н� г���н үг.Х�рв�� "
+"х�мж��г��р бол н�м�гд�х��р бай�ан бол ха�агдахаар �р�мбл�гд�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid "If true, icons will be layed out tighter by default in new windows."
 msgstr ""
+"Х�рв�� утга үн�н бол, шин��р н��гд��н цонхнууд дахь �мблемүүд �тандартаар "
+"нарийн �мхл�гд�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid ""
-"If true, labels will be placed beside icons rather than underneath them."
-msgstr ""
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+msgid "If true, labels will be placed beside icons rather than underneath them."
+msgstr "Х�рв�� утга үн�н бол бич���үүд �мблемийн доор нь байрлана."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid "If true, new windows will use manual layout by default."
-msgstr ""
+msgstr "Х�р�в үн�н бол шин� цонхнууд �тандартаар гар харагдац х�р�гл�н�."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 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 "
 "load or use lots of memory."
 msgstr ""
+"Эн� х�мж��н��� (байтаар) илүү х�мж��т�й зургуудыг мини харагдацаар "
+"харуулахгүй. Учир нь том х�мж��т�й зургуудын хувьд хамаг цаг идд�г."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "List of possible captions on icons"
-msgstr ""
+msgstr "Эмблемүүдийн боломжит тайлбарын жаг�аалт"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid "Maximum handled files in a directory"
-msgstr ""
+msgstr "Лавлах доторхи хамгийн их файлын х�мж��"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid "Maximum image size for thumbnailing"
-msgstr ""
+msgstr "Мини харагдалтын зургийн хамгийн их х�мж��"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
+"�аутилу�ын н�р загварыг х�р�гл�х. Эн� нь �аутилу�-2.2 -т буруушаагд�ан. "
+"Үүний оронд �мблем загвар х�р�гл�н� үү."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Nautilus handles drawing the desktop"
-msgstr "�аутилу�ын файл менежерийн өөрийн �лг�ц�н д��р харагдах"
+msgstr "Д�лг�ц зурахад �аутилу�ыг х�р�гл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+msgstr "�аутилу� х�р�гл�гчийн г�р лавлахыг д�лг�ц�д х�р�гл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "Only show directories in the tree sidebar"
-msgstr ""
+msgstr "Зөвхөн хажуугийн мод �амбарт лавлахууд харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
 msgstr ""
+"Боломжит утгууд нь н�г товшилтоор файл ажилуулах \"дан\" , давхар товшилтоор "
+"ажиллуулах \"давхар\"."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "Put labels beside icons"
-msgstr ""
+msgstr "Эмблемийн хажуугаар тайлбар тавих"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid "Reverse sort order in new windows"
-msgstr "Шин� цонхонд н��х."
+msgstr "Шин� цонхонд �г�х �р�мб� дарааллаар"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid "Show directories first in windows"
-msgstr "Цонхонд тааруулах"
+msgstr "Цонхонд лавлахуудыг �хл�н харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid "Show location bar in new windows"
-msgstr "Цонхны программ ID"
+msgstr "Шин� цонхонд байрлал �амбар харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 msgid "Show side pane in new windows"
-msgstr "Цонхны программ ID"
+msgstr "Шин� цонхонд хажуугийн �амбар харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show status bar in new windows"
-msgstr ""
+msgstr "Шин� цонхонд төлвийн �амбар харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid "Show toolbar in new windows"
-msgstr ""
+msgstr "Шин� цонхонд багаж �амбар харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid "Side pane view"
-msgstr "Хажуугийн �амбар"
+msgstr "Хажуугийн �амбар харагдац"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 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 filesystems. If set to \"never\" then it never previews sound."
 msgstr ""
+"Хулгана �мблем д��гүүр нь гүйх�д х�з�� ауди файлуудын урьд. харагдалт "
+"харуулахыг тогтоох. Боломжит утгууд: »always« (т�р файл ал�ын �ервер д��р "
+"бай�ан ч хамаагүй үрг�лж тоглуулах), »local_only« (зөвхөн дотоод файлын "
+"�и�темд байгааг тоглуулах) болон »never« (огт тоглуулахгүй)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
 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 "
@@ -1468,8 +1452,12 @@ msgid ""
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
+"Х�з�� тек�т файлуудын агуулгыг �мблемд урьд. харуулах ���хийг тогтоох. "
+"Боломжит утгууд: »always« (т�р ал�ын �ервер д��р бай�ан ч хамаагүй үрг�лж "
+"харуулана), »local_only« (зөвхөн дотоод файлын �и�темд байгааг харуулна) "
+"болон »never« (харуулахгүй)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the directory is on a remote "
@@ -1477,138 +1465,148 @@ msgid ""
 "filesystems. If set to \"never\" then never bother to thumbnail images, just "
 "use a generic icon."
 msgstr ""
+"Х�з�� зургийн файлуудыг мини харагдацаар харуулах ���хийг тогтоох. Боломжит "
+"утгууд: »always« (т�р ал�ын �ервер д��р бай�ан ч хамаагүй үрг�лж харуулана), "
+"»local_only« (зөвхөн дотоод файлын �и�темд байгааг харуулна) болон "
+"»never« (харуулахгүй)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 msgid ""
 "Speed tradeoff for when to show the number of items in a directory. If set "
 "to \"always\" then always show item counts, even if the directory is on a "
 "remote 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 ""
+"Х�з�� лавлах доторх объектуудын тоог харуулах ���хийг тогтоох. Боломжит "
+"утгууд: »always« (т�р ал�ын �ервер д��р бай�ан ч хамаагүй үрг�лж объектуудын "
+"тоог харуулана), »local_only« (зөвхөн дотоод файлын �и�темд байгааг "
+"харуулна) болон »never« (харуулахгүй)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", \"emblems\"."
 msgstr ""
+"Эмблем харагдацтай объектуудын �тандарт �р�мбийн дараалал. Боломжит утгууд "
+"нь: »name« (��р), »size« (Х�мж��), »type« (Төрөл), "
+"»modification_date« (Өөрчил�өн огноо) болон »emblems« (Эмблем)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
 "The default sort-order for the item in the list view. Possible values are "
 "name, size, type, and modification_date."
 msgstr ""
+"Жаг�аалт харагдацтай объектуудын �тандарт �р�мбийн дараалал. Боломжит утгууд "
+"нь: »name« (��р), »size« (Х�мж��), »type« (Төрөл), болон "
+"»modification_date« (Өөрчил�өн огноо)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid "The default width of the side pane in new windows."
-msgstr ""
+msgstr "Шин� цонхон дахь хажуугийн �амбарын �тандарт өргөн"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid "The font description used for the icons on the desktop."
-msgstr "Хогийн �ав д�лг�ц�н д��р үлд�х ё�той"
+msgstr "Д�лг�ц д��рхи �мблемүүдийн бич���т х�р�гл�х бичгийн тодорхойлолт."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The side pane view to show in newly opened windows."
-msgstr ""
+msgstr "Шин� н��гд��н цонхнуудад хажуу �амбар харагдац харуулах."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "Хогийн �ав д�лг�ц�н д��р үлд�х ё�той"
+msgstr "Д�лг�ц д��рхи г�р лавлахдаа өөрөө н�р өгөх бол �нд өгнө үү."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "Хогийн �ав д�лг�ц�н д��р үлд�х ё�той"
+msgstr "Д�лг�ц д��рхи хогийн �ав лавлахдаа өөрөө н�р өгөх бол �нд өгнө үү."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
 msgid "Trash icon visible on desktop"
-msgstr ""
+msgstr "Хогийн �ав д�лг�ц�нд харуулах"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid "Type of click used to launch/open files"
-msgstr ""
+msgstr "Файл ажиллуулах/н��х�д х�р�гл�х товшилтын төрөл"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid "Use manual layout in new windows"
-msgstr "_Гарын хуваарийг х�р�гл�х"
+msgstr "Шин� цонхонд гар хуваарийг х�р�гл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Use tighter Layout in new windows"
-msgstr "Сонго�он объект бүрийг шин� цонхонд _н��х"
+msgstr "Шин� цонхонд нарийн хуваарь х�р�гл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid "What to do with executable text files when activated"
-msgstr "�жлын тек�т файлуудыг товшиход _харуулах"
+msgstr "Х�рв�� ажлын тек�т файлууд ид�вхиж��н бол �ах в�?"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 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, "
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
 msgstr ""
+"Х�рв�� ажлын тек�т файлууд ид�вхиж��н бол �ах в�? (дан ��в�л давхар "
+"товшилт). Боломжит утгууд: »launch« (рограм ажиллуулах шиг), »ask« (Диалог "
+"дуудагдана) болон »display« (Тек�т өгөгдлөөр харуулах)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 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\" "
 "and \"icon_view\"."
 msgstr ""
+"Хавта�уудын харагдалтад х�р�гл�х �тандарт харагдац. Боломжит утгууд: "
+"»list_view« (Жаг�аалт харагдалт) болон »icon_view« (Эмблем харагдац)."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid "When to show number of items in a directory"
-msgstr ""
+msgstr "Лавлах доторхи елементүүдийн тоог х�з�� үзүүл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid "When to show preview text in icons"
-msgstr "Тек_�тийг �мблем дотор үзүүл�х"
+msgstr "Тек�тийг �мблем дотор х�з�� үзүүл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
 msgid "When to show thumbnails of image files"
-msgstr ""
+msgstr "Зургийн файлуудын мини харагдацыг х�з�� үзүүл�х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "Whether a custom default directory background has been set."
-msgstr "Д�лг�цийн �т_андарт д�в�г�рийг х�р�гл�х"
+msgstr "Х�р�гл�гчийн тод. �тандарт лавлахын д�в�г�рийг х�р�гл�х ���хийг тогтоо."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "Whether a custom default side pane background has been set."
-msgstr ""
+msgstr "Х�р�гл�гчийн тод. �тандарт хажуу �амбарын д�в�г�рийг х�р�гл�х ���хийг тогтоо."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 msgid "Whether to ask for confirmation when moving files to trash"
-msgstr ""
+msgstr "Файлуудыг ха�х үед баталгаажуулалт а�уух ���х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether to enable immediate deletion"
-msgstr ""
+msgstr "Шууд у�тгалт зөвшөөрөх ���х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr ""
+msgstr "Эмблем д��гүүр хулгана гүйлг�х�д чим�� өгөх ���х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Whether to show backup files"
-msgstr ""
+msgstr "�өөц файлуудыг харуулах ���х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "Whether to show hidden files"
-msgstr ""
+msgstr "Далд файлуудыг харуулах ���х"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
-#, fuzzy
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid "Width of the side pane"
-msgstr "Хажуугийн �амбарыг хаах"
+msgstr "Хажуугийн �амбарын өргөн"
 
 #: libnautilus-private/filesystem-attributes.xml.h:1
 msgid "AFFS Volume"
@@ -1624,7 +1622,7 @@ msgstr "�втоматаар таниул�ан хуваалт"
 
 #: libnautilus-private/filesystem-attributes.xml.h:4
 msgid "CD Digital Audio"
-msgstr "CD-Digital-Audio"
+msgstr "КД-Дижитал-�удио"
 
 #: libnautilus-private/filesystem-attributes.xml.h:5
 msgid "CD-ROM Drive"
@@ -1736,21 +1734,22 @@ msgstr "дахин �хн���"
 msgid "on the desktop"
 msgstr "�жлын талбар д��р"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:102
 msgid ""
 "You cannot delete a volume icon. 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:113
-#, fuzzy
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
 msgid "Can't delete volume"
-msgstr "Сонго�он хуваалтыг форматлах"
+msgstr "Ди�к у�тгаж чадахгүй"
 
-#: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
-#: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-desktop-link.c:139
+#: libnautilus-private/nautilus-file.c:5623
+#: libnautilus-private/nautilus-global-preferences.c:545
+#: libnautilus-private/nautilus-trash-directory.c:383
 msgid "Trash"
 msgstr "Хогийн �ав"
 
@@ -1797,8 +1796,7 @@ msgid "Couldn't install emblem"
 msgstr "Эмблемийг �уулгаж чад�ангүй."
 
 #: libnautilus-private/nautilus-emblem-utils.c:201
-msgid ""
-"Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
 "Өршөөгөөр�й, шин� �мблемийн түлхүүр үг�нд зөвхөн ү��г, хоо�он зай болон тоо "
 "л оруулж болно."
@@ -1818,8 +1816,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:255
 msgid "Sorry, unable to save custom emblem."
-msgstr ""
-"Харам�алтай нь х�р�гл�гчийн тохируулж өг�өн �мблемийг хадгалж бол�онгүй."
+msgstr "Харам�алтай нь х�р�гл�гчийн тохируулж өг�өн �мблемийг хадгалж бол�онгүй."
 
 #: libnautilus-private/nautilus-emblem-utils.c:270
 msgid "Sorry, unable to save custom emblem name."
@@ -2200,7 +2197,7 @@ msgstr "Бүгдийг орлуулах."
 
 #. appended to new link file
 #: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file.c:4443
 #, c-format
 msgid "link to %s"
 msgstr "Дараах ха�г руу линк холболт хийх %s"
@@ -2244,13 +2241,13 @@ msgstr "%d-дугаар линк холболтыг %s-тийш "
 #.
 #. localizers: tag used to detect the first copy of a file
 #: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:2337
 msgid " (copy)"
 msgstr " (Хуулах)"
 
 #. localizers: tag used to detect the second copy of a file
 #: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:2337
 msgid " (another copy)"
 msgstr " (өөр н�г�н Хуулбар)"
 
@@ -2525,281 +2522,282 @@ msgstr "Хогийн �авыг хоо�олж байна."
 msgid "Preparing to Empty the Trash..."
 msgstr "Хогийн �авыг хоо�лоход б�лтг�ж байна..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
-msgid "Are you sure you want to empty all of the items from the trash?"
+#: libnautilus-private/nautilus-file-operations.c:2265
+#: src/file-manager/fm-desktop-icon-view.c:1016
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
+msgid "Empty Trash"
+msgstr "Хогийн �ав хоо�лох"
+
+#: libnautilus-private/nautilus-file-operations.c:2281
+msgid "Are you sure you want to permanently delete all of the items in the Trash?"
 msgstr ""
 "Та хогийн �аванд байгаа бүх объектуудыг �рг�лт буцалтгүй у�тгахыг хү�ч байна "
 "уу?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
-msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2291
 msgid "_Empty"
 msgstr "_Хоо�лох"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2338
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2338
+#: libnautilus-private/nautilus-file-operations.c:2348
 msgid "foo (copy)"
 msgstr "foo (Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2339
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2339
 msgid ".bashrc (copy)"
 msgstr ".bashrc (Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2340
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2340
 msgid ".foo (copy).txt"
 msgstr ".foo (Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2341
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2341
 msgid "foo foo (copy)"
 msgstr "foo foo (Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2342
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2342
+#: libnautilus-private/nautilus-file-operations.c:2349
 msgid "foo (copy).txt"
 msgstr "foo (Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2343
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2343
+#: libnautilus-private/nautilus-file-operations.c:2365
 msgid "foo foo (copy).txt"
 msgstr "foo foo (Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2344
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2344
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (Хуулбар).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2345
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2345
 msgid "foo.. (copy).txt"
 msgstr "foo.. (Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2346
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2346
 msgid "foo... (copy)"
 msgstr "foo... (Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2347
 msgid "foo. (copy)"
 msgstr "foo. (Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2347
 msgid "foo. (another copy)"
 msgstr "foo. (ба� н�г�н Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2348
+#: libnautilus-private/nautilus-file-operations.c:2350
 msgid "foo (another copy)"
 msgstr "foo (ба� н�г�н Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2349
+#: libnautilus-private/nautilus-file-operations.c:2351
 msgid "foo (another copy).txt"
 msgstr "foo (ба� н�г�н Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2350
 msgid "foo (3rd copy)"
 msgstr "foo (3-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2351
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2352
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ба� н�г�н Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2352
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2353
+#: libnautilus-private/nautilus-file-operations.c:2370
 msgid "foo (13th copy)"
 msgstr "foo (13-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2353
 msgid "foo (14th copy)"
 msgstr "foo (14-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2354
+#: libnautilus-private/nautilus-file-operations.c:2371
 msgid "foo (13th copy).txt"
 msgstr "foo (13-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2354
 msgid "foo (14th copy).txt"
 msgstr "foo (14-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2355
 msgid "foo (21st copy)"
 msgstr "foo (21-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2355
+#: libnautilus-private/nautilus-file-operations.c:2357
 msgid "foo (22nd copy)"
 msgstr "foo (22-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2356
 msgid "foo (21st copy).txt"
 msgstr "foo (21-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2356
+#: libnautilus-private/nautilus-file-operations.c:2358
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2357
+#: libnautilus-private/nautilus-file-operations.c:2359
 msgid "foo (23rd copy)"
 msgstr "foo (23-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2358
+#: libnautilus-private/nautilus-file-operations.c:2360
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2359
+#: libnautilus-private/nautilus-file-operations.c:2361
 msgid "foo (24th copy)"
 msgstr "foo (24-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2360
+#: libnautilus-private/nautilus-file-operations.c:2362
 msgid "foo (24th copy).txt"
 msgstr "foo (24-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2361
 msgid "foo (25th copy)"
 msgstr "foo (25-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2362
 msgid "foo (25th copy).txt"
 msgstr "foo (25-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2363
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2363
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2364
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2364
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2365
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2366
 msgid "foo (10th copy)"
 msgstr "foo (10-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2368
 msgid "foo (11th copy)"
 msgstr "foo (11-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2367
 msgid "foo (10th copy).txt"
 msgstr "foo (10 дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2369
 msgid "foo (11th copy).txt"
 msgstr "foo (11-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2370
 msgid "foo (12th copy)"
 msgstr "foo (12-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2371
 msgid "foo (12th copy).txt"
 msgstr "foo (12-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2372
 msgid "foo (110th copy)"
 msgstr "foo (110-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2372
 msgid "foo (111th copy)"
 msgstr "foo (111-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2373
 msgid "foo (110th copy).txt"
 msgstr "foo (111-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2373
 msgid "foo (111th copy).txt"
 msgstr "foo (111-д�х Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2374
 msgid "foo (122nd copy)"
 msgstr "foo (122-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2376
 msgid "foo (123rd copy)"
 msgstr "foo (123-дахь Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2375
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2377
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-дахь Хуулбар).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2376
 msgid "foo (124th copy)"
 msgstr "foo (124-д�х Хуулбар)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2377
 msgid "foo (124th copy).txt"
 msgstr "foo (124-д�х Хуулбар).txt"
 
@@ -2818,64 +2816,64 @@ msgstr "foo (124-д�х Хуулбар).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2669
 msgid "today at 00:00:00 PM"
 msgstr "өнөөдөр 00:00:00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2670
 msgid "today at %-I:%M:%S %p"
 msgstr "өнөөдөр %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2672
 msgid "today at 00:00 PM"
 msgstr "өнөөдөр 00.00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2673
 msgid "today at %-I:%M %p"
 msgstr "өнөөдөр %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2675
 msgid "today, 00:00 PM"
 msgstr "өнөөдөр, 00.00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2676
 msgid "today, %-I:%M %p"
 msgstr "өнөөдөр, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2678
+#: libnautilus-private/nautilus-file.c:2679
 msgid "today"
 msgstr "өнөөдөр"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2688
 msgid "yesterday at 00:00:00 PM"
 msgstr "өчигдөр 00:00:00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2689
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "өчигдөр %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2691
 msgid "yesterday at 00:00 PM"
 msgstr "өчигдөр 00:00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2692
 msgid "yesterday at %-I:%M %p"
 msgstr "өчигдөр %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2694
 msgid "yesterday, 00:00 PM"
 msgstr "өчигдөр, 00.00 (Орой)"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2695
 msgid "yesterday, %-I:%M %p"
 msgstr "өчигдөр, %-I.%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2697
+#: libnautilus-private/nautilus-file.c:2698
 msgid "yesterday"
 msgstr "өчигдөр"
 
@@ -2884,133 +2882,133 @@ msgstr "өчигдөр"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2709
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Лхагва гариг, 0000 е�өн �арын 00 ны оройн 00:00:00-д "
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2710
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %Y %B %-d ны %-I:%M:%S-д %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2712
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Даваа, 0000 �рван �арын 00 ны 00:00:00-д"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2713
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %Y %b %-d ны %-I:%M:%S-д %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2715
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Даваа, 0000 �рван �арын 00 ны 00:00-д"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2716
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %Y %b %-d ны %-I:%M-д %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2718
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 �рван �арын 00 ны оройн 00:00-д"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2719
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y %b %-d ны %-I:%M-д %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2721
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 арван �арын 00 ны 00:00 (орой)"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2722
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y %b %-d ны %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2724
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00.00 (орой)"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2725
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y.%m.%-d, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2727
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2728
 msgid "%m/%d/%y"
 msgstr "%y.%m.%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4023
 msgid "0 items"
 msgstr "0 Объект"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4023
 msgid "0 folders"
 msgstr "0 Хавта�"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4024
 msgid "0 files"
 msgstr "0 Файл"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4028
 msgid "1 item"
 msgstr "1 Объект"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4028
 msgid "1 folder"
 msgstr "1 Хавта�"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4029
 msgid "1 file"
 msgstr "1 Файл"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4032
 #, c-format
 msgid "%u items"
 msgstr "%u Объект"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4032
 #, c-format
 msgid "%u folders"
 msgstr "%u Хавта�"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4033
 #, c-format
 msgid "%u files"
 msgstr "%u Файл"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4345
+#: libnautilus-private/nautilus-file.c:4361
 msgid "? items"
 msgstr "? Объект"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4351
 msgid "? bytes"
 msgstr "? Бит"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4366
 msgid "unknown type"
 msgstr "Үл м�д�х төрөл"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4369
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4375
+#: src/file-manager/fm-properties-window.c:1128
 msgid "unknown"
 msgstr "үл м�д�х"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4407
 msgid "program"
-msgstr "Программ"
+msgstr "Програм"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4419
 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 "
@@ -3020,7 +3018,7 @@ msgstr ""
 "gnome-vfs.keys файл буруу байрлалд орших ��в�л �мар н�г�н шалтгаанаа� болж "
 "олдохгүй байна г���н үг."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4423
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3029,261 +3027,261 @@ msgstr ""
 "MIME-Type »%s«-ийн тайлбарыг олж чадахгүй байна. (Файл нь »%s«), Үүнийх�� "
 "тухай gnome-vfs-И-М�йлийн жаг�аалтад оруулна уу."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4437
 msgid "link"
 msgstr "Холбоо�"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4457
 msgid "link (broken)"
 msgstr "Линк (�вдр�лт�й)"
 
-#: libnautilus-private/nautilus-global-preferences.c:102
+#: libnautilus-private/nautilus-global-preferences.c:101
 msgid "_Always"
 msgstr "_Үрг�лжийн"
 
-#: libnautilus-private/nautilus-global-preferences.c:103
+#: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Local File Only"
 msgstr "Зөвхөн _дотоод файл"
 
-#: libnautilus-private/nautilus-global-preferences.c:104
+#: libnautilus-private/nautilus-global-preferences.c:103
 msgid "_Never"
 msgstr "_Never"
 
-#: libnautilus-private/nautilus-global-preferences.c:110
+#: libnautilus-private/nautilus-global-preferences.c:109
 #: src/nautilus-file-management-properties.glade.h:14
 #, no-c-format
 msgid "25%"
 msgstr "25%"
 
-#: libnautilus-private/nautilus-global-preferences.c:112
+#: libnautilus-private/nautilus-global-preferences.c:111
 #: src/nautilus-file-management-properties.glade.h:20
 #, no-c-format
 msgid "50%"
 msgstr "50%"
 
-#: libnautilus-private/nautilus-global-preferences.c:114
+#: libnautilus-private/nautilus-global-preferences.c:113
 #: src/nautilus-file-management-properties.glade.h:23
 #, no-c-format
 msgid "75%"
 msgstr "75%"
 
-#: libnautilus-private/nautilus-global-preferences.c:116
+#: libnautilus-private/nautilus-global-preferences.c:115
 #: src/nautilus-file-management-properties.glade.h:8
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: libnautilus-private/nautilus-global-preferences.c:118
+#: libnautilus-private/nautilus-global-preferences.c:117
 #: src/nautilus-file-management-properties.glade.h:10
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: libnautilus-private/nautilus-global-preferences.c:120
+#: libnautilus-private/nautilus-global-preferences.c:119
 #: src/nautilus-file-management-properties.glade.h:12
 #, no-c-format
 msgid "200%"
 msgstr "200%"
 
-#: libnautilus-private/nautilus-global-preferences.c:122
+#: libnautilus-private/nautilus-global-preferences.c:121
 #: src/nautilus-file-management-properties.glade.h:17
 #, no-c-format
 msgid "400%"
 msgstr "400%"
 
-#: libnautilus-private/nautilus-global-preferences.c:127
+#: libnautilus-private/nautilus-global-preferences.c:126
 msgid "100 K"
 msgstr "100 kБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:128
+#: libnautilus-private/nautilus-global-preferences.c:127
 msgid "500 K"
 msgstr "500 kБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:129
+#: libnautilus-private/nautilus-global-preferences.c:128
 #: src/nautilus-file-management-properties.glade.h:3
 msgid "1 MB"
 msgstr "1 MБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:130
+#: libnautilus-private/nautilus-global-preferences.c:129
 #: src/nautilus-file-management-properties.glade.h:15
 msgid "3 MB"
 msgstr "3 MБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:131
+#: libnautilus-private/nautilus-global-preferences.c:130
 #: src/nautilus-file-management-properties.glade.h:18
 msgid "5 MB"
 msgstr "5 MБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:132
+#: libnautilus-private/nautilus-global-preferences.c:131
 #: src/nautilus-file-management-properties.glade.h:4
 msgid "10 MB"
 msgstr "10 MБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:133
+#: libnautilus-private/nautilus-global-preferences.c:132
 #: src/nautilus-file-management-properties.glade.h:6
 msgid "100 MB"
 msgstr "100 MБ"
 
-#: libnautilus-private/nautilus-global-preferences.c:139
+#: libnautilus-private/nautilus-global-preferences.c:138
 msgid "Activate items with a _single click"
 msgstr "Объектуудыг дан товшилтоор ид�вхжүүл�х"
 
-#: libnautilus-private/nautilus-global-preferences.c:143
+#: libnautilus-private/nautilus-global-preferences.c:142
 msgid "Activate items with a _double click"
 msgstr "Объектуудыг давхар (double click) товшилтоор ид�вхжүүл�х"
 
-#: libnautilus-private/nautilus-global-preferences.c:151
+#: libnautilus-private/nautilus-global-preferences.c:150
 msgid "E_xecute files when they are clicked"
 msgstr "Файлын д��р товшиход шууд _ажиллуулах"
 
-#: libnautilus-private/nautilus-global-preferences.c:155
+#: libnautilus-private/nautilus-global-preferences.c:154
 msgid "Display _files when they are clicked"
 msgstr "Файлын д��р товшиход шууд _үзүүл�х"
 
-#: libnautilus-private/nautilus-global-preferences.c:159
+#: libnautilus-private/nautilus-global-preferences.c:158
 #: src/nautilus-file-management-properties.glade.h:65
 msgid "_Ask each time"
 msgstr "Цаг бүрийг _а�уух"
 
-#: libnautilus-private/nautilus-global-preferences.c:167
+#: libnautilus-private/nautilus-global-preferences.c:166
 msgid "Search for files by file name only"
 msgstr "Файлыг зөвхөн н�р��р нь хайх"
 
-#: libnautilus-private/nautilus-global-preferences.c:171
+#: libnautilus-private/nautilus-global-preferences.c:170
 msgid "Search for files by file name and file properties"
 msgstr "Файлыг зөвхөн н�р��р нь болон түүний агуулгаар нь хайх"
 
-#: libnautilus-private/nautilus-global-preferences.c:178
+#: libnautilus-private/nautilus-global-preferences.c:177
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Эмблем��р харах"
 
-#: libnautilus-private/nautilus-global-preferences.c:179
+#: libnautilus-private/nautilus-global-preferences.c:178
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Жаг�аалт х�лб�р��р харах"
 
-#: libnautilus-private/nautilus-global-preferences.c:184
+#: libnautilus-private/nautilus-global-preferences.c:183
 msgid "Manually"
 msgstr "Гарнаа�"
 
-#: libnautilus-private/nautilus-global-preferences.c:186
-#: libnautilus-private/nautilus-global-preferences.c:195
+#: libnautilus-private/nautilus-global-preferences.c:185
+#: libnautilus-private/nautilus-global-preferences.c:194
 #: src/nautilus-file-management-properties.glade.h:41
 msgid "By Name"
 msgstr "��р��р нь "
 
-#: libnautilus-private/nautilus-global-preferences.c:187
-#: libnautilus-private/nautilus-global-preferences.c:196
+#: libnautilus-private/nautilus-global-preferences.c:186
+#: libnautilus-private/nautilus-global-preferences.c:195
 #: src/nautilus-file-management-properties.glade.h:42
 msgid "By Size"
 msgstr "Х�мж��г��р нь"
 
-#: libnautilus-private/nautilus-global-preferences.c:188
-#: libnautilus-private/nautilus-global-preferences.c:197
+#: libnautilus-private/nautilus-global-preferences.c:187
+#: libnautilus-private/nautilus-global-preferences.c:196
 #: src/nautilus-file-management-properties.glade.h:43
 msgid "By Type"
 msgstr "Төрлөөр нь"
 
-#: libnautilus-private/nautilus-global-preferences.c:189
-#: libnautilus-private/nautilus-global-preferences.c:198
+#: libnautilus-private/nautilus-global-preferences.c:188
+#: libnautilus-private/nautilus-global-preferences.c:197
 #: src/nautilus-file-management-properties.glade.h:40
 msgid "By Modification Date"
 msgstr "Сайжруул�ан огноогоор нь"
 
-#: libnautilus-private/nautilus-global-preferences.c:190
-#: libnautilus-private/nautilus-global-preferences.c:199
+#: libnautilus-private/nautilus-global-preferences.c:189
+#: libnautilus-private/nautilus-global-preferences.c:198
 #: src/nautilus-file-management-properties.glade.h:39
 msgid "By Emblems"
 msgstr "Таних т�мдг��р нь"
 
-#: libnautilus-private/nautilus-global-preferences.c:204
+#: libnautilus-private/nautilus-global-preferences.c:203
 msgid "8"
 msgstr "8"
 
-#: libnautilus-private/nautilus-global-preferences.c:205
+#: libnautilus-private/nautilus-global-preferences.c:204
 msgid "10"
 msgstr "10"
 
-#: libnautilus-private/nautilus-global-preferences.c:206
+#: libnautilus-private/nautilus-global-preferences.c:205
 msgid "12"
 msgstr "12"
 
-#: libnautilus-private/nautilus-global-preferences.c:207
+#: libnautilus-private/nautilus-global-preferences.c:206
 msgid "14"
 msgstr "14"
 
-#: libnautilus-private/nautilus-global-preferences.c:208
+#: libnautilus-private/nautilus-global-preferences.c:207
 msgid "16"
 msgstr "16"
 
-#: libnautilus-private/nautilus-global-preferences.c:209
+#: libnautilus-private/nautilus-global-preferences.c:208
 msgid "18"
 msgstr "18"
 
-#: libnautilus-private/nautilus-global-preferences.c:210
+#: libnautilus-private/nautilus-global-preferences.c:209
 msgid "20"
 msgstr "20"
 
-#: libnautilus-private/nautilus-global-preferences.c:211
+#: libnautilus-private/nautilus-global-preferences.c:210
 msgid "22"
 msgstr "22"
 
-#: libnautilus-private/nautilus-global-preferences.c:212
+#: libnautilus-private/nautilus-global-preferences.c:211
 msgid "24"
 msgstr "24"
 
-#: libnautilus-private/nautilus-global-preferences.c:217
-#: src/nautilus-file-management-properties.glade.h:81
+#: libnautilus-private/nautilus-global-preferences.c:216
+#: src/nautilus-file-management-properties.glade.h:82
 msgid "size"
 msgstr "х�мж��"
 
-#: libnautilus-private/nautilus-global-preferences.c:218
-#: src/nautilus-file-management-properties.glade.h:82
+#: libnautilus-private/nautilus-global-preferences.c:217
+#: src/nautilus-file-management-properties.glade.h:83
 msgid "type"
 msgstr "төрөл"
 
-#: libnautilus-private/nautilus-global-preferences.c:219
-#: src/nautilus-file-management-properties.glade.h:75
+#: libnautilus-private/nautilus-global-preferences.c:218
+#: src/nautilus-file-management-properties.glade.h:76
 msgid "date modified"
 msgstr "�айжруулагд�ан огноо"
 
-#: libnautilus-private/nautilus-global-preferences.c:220
+#: libnautilus-private/nautilus-global-preferences.c:219
 msgid "date changed"
 msgstr "өөрчлөгд�өн өдөр"
 
-#: libnautilus-private/nautilus-global-preferences.c:221
-#: src/nautilus-file-management-properties.glade.h:74
+#: libnautilus-private/nautilus-global-preferences.c:220
+#: src/nautilus-file-management-properties.glade.h:75
 msgid "date accessed"
 msgstr "ханд�ан огноо"
 
-#: libnautilus-private/nautilus-global-preferences.c:222
-#: src/nautilus-file-management-properties.glade.h:79
+#: libnautilus-private/nautilus-global-preferences.c:221
+#: src/nautilus-file-management-properties.glade.h:80
 msgid "owner"
 msgstr "�з�мшигч"
 
-#: libnautilus-private/nautilus-global-preferences.c:223
-#: src/nautilus-file-management-properties.glade.h:76
+#: libnautilus-private/nautilus-global-preferences.c:222
+#: src/nautilus-file-management-properties.glade.h:77
 msgid "group"
 msgstr "бүл�г"
 
-#: libnautilus-private/nautilus-global-preferences.c:224
-#: src/nautilus-file-management-properties.glade.h:80
+#: libnautilus-private/nautilus-global-preferences.c:223
+#: src/nautilus-file-management-properties.glade.h:81
 msgid "permissions"
 msgstr "�рх"
 
-#: libnautilus-private/nautilus-global-preferences.c:225
-#: src/nautilus-file-management-properties.glade.h:78
+#: libnautilus-private/nautilus-global-preferences.c:224
+#: src/nautilus-file-management-properties.glade.h:79
 msgid "octal permissions"
 msgstr "октал (наймт) �рх"
 
-#: libnautilus-private/nautilus-global-preferences.c:226
+#: libnautilus-private/nautilus-global-preferences.c:225
 #: src/nautilus-file-management-properties.glade.h:53
 msgid "MIME type"
 msgstr "MIME-төрөл"
 
-#: libnautilus-private/nautilus-global-preferences.c:227
-#: src/nautilus-file-management-properties.glade.h:77
+#: libnautilus-private/nautilus-global-preferences.c:226
+#: src/nautilus-file-management-properties.glade.h:78
 msgid "none"
 msgstr "аль нь ч үгүй (none)"
 
@@ -3295,17 +3293,10 @@ msgstr "аль нь ч үгүй (none)"
 #. * 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:543
+#: libnautilus-private/nautilus-global-preferences.c:539
 #, c-format
 msgid "%s's Home"
-msgstr "%s-ийн хувийн х�ргийн Хавта�"
-
-#: libnautilus-private/nautilus-global-preferences.c:549
-#: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
-msgid "Computer"
-msgstr "Лангууны �л�гд��н өнгө"
+msgstr "%s-ийн г�р"
 
 #: libnautilus-private/nautilus-icon-canvas-item.c:2149
 msgid "file icon"
@@ -3351,56 +3342,56 @@ msgstr "орхихоор �онгох"
 msgid "whether we are highlighted for a D&D drop"
 msgstr "D&D-орхих үйлдлийг ил�рхийл�хийн тулд биднийг �онго�он ���х"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2023
 msgid "The selection rectangle"
 msgstr "Сонголтын т�гш өнцөгт"
 
 # !! CHECK !!
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4083
 msgid "Frame Text"
 msgstr "Хүр��ний тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4084
 msgid "Draw a frame around unselected text"
 msgstr "Сонгоогүй тек�тийг хүр��л�х"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4090
 msgid "Selection Box Color"
 msgstr "Сонголтын т�гш өнцөгт Өнгө"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4091
 msgid "Color of the selection box"
 msgstr "Сонголтын т�гш өнцөгтийн өнгө"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4096
 msgid "Selection Box Alpha"
 msgstr "Сонголтын т�гш өнцөгт �льфа"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4097
 msgid "Opacity of the selection box"
 msgstr "Сонголтын т�гш өнцөгтийн өнгөний ид�вх"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4104
 msgid "Highlight Alpha"
 msgstr "�льфа �онголт"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4105
 msgid "Opacity of the highlight for selected icons"
 msgstr "Сонго�он файлуудын өнгөний ид�вх"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4111
 msgid "Light Info Color"
 msgstr "Цайвар Info-Өнгө"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4112
 msgid "Color used for information text against a dark background"
 msgstr "Бараан д�в�г�р д��р гарах м�д��ллийн тек�тийн өнгө"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4117
 msgid "Dark Info Color"
 msgstr "Бараан Info-Өнгө"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4118
 msgid "Color used for information text against a light background"
 msgstr "Цайвар д�в�г�р д��р гарах м�д��ллийн тек�тийн өнгө"
 
@@ -3612,7 +3603,7 @@ msgstr "_Өөрчлөх..."
 #. Framed area with button to launch mime type editing capplet.
 #: libnautilus-private/nautilus-program-chooser.c:1439
 msgid "File Types and Programs"
-msgstr "Файлын төрлүүд ба программууд"
+msgstr "Файлын төрлүүд ба програмууд"
 
 #: libnautilus-private/nautilus-program-chooser.c:1451
 msgid "_Go There"
@@ -3623,17 +3614,17 @@ msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
-"Та дараах »Файлын төрөл болон программууд«-диалог-цонхонд �мар программуудыг "
+"Та дараах »Файлын төрөл болон програмууд«-диалог-цонхонд �мар програмуудыг "
 "аль фалйын төрөлд х�р�гл�х��р �анал болгохыг тохируулна"
 
 #: libnautilus-private/nautilus-program-chooser.c:1493
 msgid "Open with Other Application"
-msgstr "Өөр н�г�н х.программын ту�ламжтайгаар н��х..."
+msgstr "Өөр н�г�н х.програмын ту�ламжтайгаар н��х..."
 
 #: libnautilus-private/nautilus-program-chooser.c:1494
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
-msgstr "»%s«-ийг н��х х. программын н�рийг �онгоно уу:"
+msgstr "»%s«-ийг н��х х. програмын н�рийг �онгоно уу:"
 
 #: libnautilus-private/nautilus-program-chooser.c:1498
 msgid "Open with Other Viewer"
@@ -3647,37 +3638,36 @@ msgstr "Дараах жаг�аалтаа� »%s«-д тохирох н�г�н
 #: libnautilus-private/nautilus-program-chooser.c:1601
 #, c-format
 msgid "No viewers are available for \"%s\"."
-msgstr "»%s«-д тохирох �мар н�г�н харагч-программ алга."
+msgstr "»%s«-д тохирох �мар н�г�н харагч-програм алга."
 
 #: libnautilus-private/nautilus-program-chooser.c:1602
 msgid "No Viewers Available"
-msgstr "Ямар ч харагч-программ алга."
+msgstr "Ямар ч харагч-програм алга."
 
 #: libnautilus-private/nautilus-program-chooser.c:1604
 #, c-format
 msgid "There is no application associated with \"%s\"."
-msgstr "»%s«-тай �мар ч программ холбогдоогүй байна."
+msgstr "»%s«-тай �мар ч програм холбогдоогүй байна."
 
 #: libnautilus-private/nautilus-program-chooser.c:1605
 msgid "No Application Associated"
-msgstr "Ямар ч программ холбогдоогүй байна"
+msgstr "Ямар ч програм холбогдоогүй байна"
 
 #: libnautilus-private/nautilus-program-chooser.c:1607
-#, fuzzy, c-format
+#, c-format
 msgid "There is no action associated with \"%s\"."
-msgstr "»%s«-тай �мар ч программ холбогдоогүй байна."
+msgstr "»%s«-тай �мар ч үйлд�л холбогдоогүй байна."
 
 #: libnautilus-private/nautilus-program-chooser.c:1608
-#, fuzzy
 msgid "No Action Associated"
-msgstr "Ямар ч программ холбогдоогүй байна"
+msgstr "Ямар ч үйлд�л холбогдоогүй байна"
 
 #. Note: This might be misleading in the components case, since the
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
 #: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -3686,45 +3676,43 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Та программуудыг файлын төрөлт�й харъ�алуулан холбоход GNOME-ийг тохируулж "
-"болно.Та одоо �н� файлын төрөлт�й аль н�г программыг харъ�алуулахыг хү�ч "
-"байна у?"
+"Та програмуудыг файлын төрөлт�й харъ�алуулан холбоход GNOME-ийг тохируулж "
+"болно.Та одоо �н� файлын төрөлт�й аль н�г програмыг харъ�алуулахыг хү�ч "
+"байна уу?"
 
 #: libnautilus-private/nautilus-program-chooser.c:1622
 msgid "Associate Application"
-msgstr "Программыг харъ�алуулах"
+msgstr "Програм харъ�алуулах"
 
 #: libnautilus-private/nautilus-program-chooser.c:1648
-#, fuzzy, c-format
+#, c-format
 msgid "The viewer associated with \"%s\" is invalid."
-msgstr "»%s«-тай �мар ч программ холбогдоогүй байна."
+msgstr "»%s«-тай холбогд�он харагч хүчингүй байна."
 
 #: libnautilus-private/nautilus-program-chooser.c:1649
 msgid "Invalid Viewer Associated"
-msgstr ""
+msgstr "Хүчингүй харагч харъ�алагдж��"
 
 #: libnautilus-private/nautilus-program-chooser.c:1651
-#, fuzzy, c-format
+#, c-format
 msgid "The application associated with \"%s\" is invalid."
-msgstr "»%s«-тай �мар ч программ холбогдоогүй байна."
+msgstr "»%s«-тай холбогд�он програм хүчингүй байна."
 
 #: libnautilus-private/nautilus-program-chooser.c:1652
-#, fuzzy
 msgid "Invalid Application Associated"
-msgstr "Ямар ч программ холбогдоогүй байна"
+msgstr "Хүчингүй програм холбогд�он байна"
 
 #: libnautilus-private/nautilus-program-chooser.c:1654
-#, fuzzy, c-format
+#, c-format
 msgid "The action associated with \"%s\" is invalid."
-msgstr "»%s«-тай �мар ч программ холбогдоогүй байна."
+msgstr "»%s«-тай холбогд�он үйлд�л хүчингүй."
 
 #: libnautilus-private/nautilus-program-chooser.c:1655
-#, fuzzy
 msgid "Invalid Action Associated"
-msgstr "Ямар ч программ холбогдоогүй байна"
+msgstr "Хүчингүй үйлд�л холбогд�он байна"
 
 #: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -3734,14 +3722,13 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Та программуудыг файлын төрөлт�й харъ�алуулан холбоход GNOME-ийг тохируулж "
-"болно.Та одоо �н� файлын төрөлт�й аль н�г программыг харъ�алуулахыг хү�ч "
-"байна у?"
+"Та програмуудыг файлын төрөлт�й харъ�алуулан холбоход GNOME-ийг тохируулж "
+"болно.Та одоо �н� файлын төрөлт�й аль н�г програм ��в�л харагч "
+"харъ�алуулахыг хү�ч байна уу?"
 
 #: libnautilus-private/nautilus-program-chooser.c:1665
-#, fuzzy
 msgid "Associate Action"
-msgstr "Программыг харъ�алуулах"
+msgstr "Үйлд�л харъ�алуулах"
 
 #: libnautilus-private/nautilus-program-choosing.c:504
 #, c-format
@@ -3750,16 +3737,16 @@ msgid ""
 "locations.  Would you like to choose another application?"
 msgstr ""
 "»%s« дараах файл »%s«-ийг н��ж чадахгүй байна. Учир нь »%s« төрлийн "
-"файлуудыг »%s«-байршилд н��ж чадахгүй байна. Та өөр программ х�р�гл�х үү?"
+"файлуудыг »%s«-байршилд н��ж чадахгүй байна. Та өөр програм х�р�гл�х үү?"
 
 #: libnautilus-private/nautilus-program-choosing.c:509
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
 "locations.  Would you like to choose another action?"
 msgstr ""
-"»%s« дараах файл »%s«-ийг н��ж чадахгүй байна. Учир нь »%s« төрлийн "
-"файлуудыг »%s«-байршилд н��ж чадахгүй байна. Та өөр программ х�р�гл�х үү?"
+"Стандарт үйлд�л »%s« -г н��ж чадахгүй байна. Учир нь т�р »%s« байрлал дахь "
+"файлууд руу хандаж чадахгүй байна. Та өөр үйлд�л �онгохыг хү��ж байна уу?"
 
 #: libnautilus-private/nautilus-program-choosing.c:515
 #: libnautilus-private/nautilus-program-choosing.c:546
@@ -3775,26 +3762,26 @@ msgid ""
 msgstr ""
 "»%s« дараах файл »%s«-ийг н��ж чадахгүй байна. Учир нь »%s« төрлийн "
 "файлуудыг »%s«-байршилд н��ж чадахгүй байна. Эн� файлыг н��ж харах чадвартай "
-"�мар ч программ алга. х�р�в та �н� файлыг өөрийнхөө компьютер д��р "
+"�мар ч програм алга. х�р�в та �н� файлыг өөрийнхөө компьютер д��р "
 "хуулбарлавал уншиж магад."
 
 #: libnautilus-private/nautilus-program-choosing.c:540
-#, fuzzy, c-format
+#, c-format
 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 ""
-"»%s« дараах файл »%s«-ийг н��ж чадахгүй байна. Учир нь »%s« төрлийн "
-"файлуудыг »%s«-байршилд н��ж чадахгүй байна. Эн� файлыг н��ж харах чадвартай "
-"�мар ч программ алга. х�р�в та �н� файлыг өөрийнхөө компьютер д��р "
-"хуулбарлавал уншиж магад."
+"Стандарт үйлд�л »%s« -г н��ж чадахгүй байна. Учир нь т�р »%s« байрлал дахь "
+"файлууд руу хандаж чадахгүй байна. Эн� файлыг н��ж харах чадвартай �мар ч "
+"програм алга. х�р�в та �н� файлыг өөрийнхөө компьютер д��р хуулбарлавал "
+"уншиж магад."
 
 #: libnautilus-private/nautilus-program-choosing.c:800
 #: libnautilus-private/nautilus-program-choosing.c:1017
-#, fuzzy, c-format
+#, c-format
 msgid "Opening %s"
-msgstr "»%s«-ийг н��х"
+msgstr "»%s«-ийг н��ж байна"
 
 #: libnautilus-private/nautilus-program-choosing.c:1161
 msgid ""
@@ -3815,14 +3802,14 @@ msgid ""
 "\n"
 "Details: "
 msgstr ""
-"Программ �хл�х�д алдаа гарлаа.\n"
+"Програм �хл�х�д алдаа гарлаа.\n"
 "\n"
 "Тайлбар: "
 
 #: libnautilus-private/nautilus-program-choosing.c:1177
 #: libnautilus-private/nautilus-program-choosing.c:1243
 msgid "Error launching application"
-msgstr "Программ �хл�х�д алдаа гарлаа"
+msgstr "Програм �хл�х�д алдаа гарлаа"
 
 #: libnautilus-private/nautilus-program-choosing.c:1205
 msgid ""
@@ -3909,7 +3896,7 @@ msgstr "Тек�т файл -[Объектууд]"
 
 #: libnautilus-private/nautilus-search-uri.c:253
 msgid "[Items that are ]applications"
-msgstr "Х�р�гл��ний программ -[Объектууд ]"
+msgstr "Х�р�гл��ний програм -[Объектууд ]"
 
 #: libnautilus-private/nautilus-search-uri.c:256
 msgid "[Items that are ]folders"
@@ -4091,8 +4078,7 @@ msgstr "Ð�Ñ�Ñ€Ñ�ндÑ�Ñ� »stuff« -ийг агуулÑ�ан болоод байÐ
 msgid ""
 "Items containing \"stuff\" in their names, that are regular files and "
 "smaller than 2000 bytes"
-msgstr ""
-"��р�нд�� »stuff« -ийг агуул�ан болоод 2000 Бит��� бага байнгын файл-Объектууд"
+msgstr "��р�нд�� »stuff« -ийг агуул�ан болоод 2000 Бит��� бага байнгын файл-Объектууд"
 
 #: libnautilus-private/nautilus-search-uri.c:713
 msgid "Items containing \"medusa\" in their names and that are folders"
@@ -4134,9 +4120,95 @@ msgstr "%s-р харах"
 #: libnautilus-private/nautilus-view-identifier.c:68
 #, c-format
 msgid "%s Viewer"
-msgstr "%s-харагч программ"
+msgstr "%s-харагч програм"
+
+#: libnautilus-private/nautilus-volume-monitor.c:901
+msgid "Unknown"
+msgstr "Үл м�д�х"
+
+#. Populate table with items we know localized names for.
+#: libnautilus-private/nautilus-volume-monitor.c:1074
+msgid "Floppy"
+msgstr "У�н ди�к"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1075
+#: libnautilus-private/nautilus-volume-monitor.c:1104
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1076
+msgid "Zip Drive"
+msgstr "Zip-уншигч"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1091
+#: libnautilus-private/nautilus-volume-monitor.c:1135
+msgid "Audio CD"
+msgstr "Дууны-CD"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1126
+msgid "Root Volume"
+msgstr "Үнд��н хуваалт (Partition)"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1805
+msgid "Mount Error"
+msgstr "Төхөөргийг таньж холбоход алдаа гарлаа"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1805
+msgid "Unmount Error"
+msgstr "Төхөөргийн холбоо�ыг �алгахад алдаа гарлаа"
+
+#. Handle floppy case
+#: libnautilus-private/nautilus-volume-monitor.c:1878
+msgid ""
+"Nautilus was unable to mount the floppy drive. There is probably no floppy "
+"in the drive."
+msgstr ""
+"�аутилу� у�н ди�к уншигчийг холбож чад�ангүй. Магадгүй, дотор нь �мар ч у�н "
+"ди�к байхгүй байж болох"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
+#. All others
+#: libnautilus-private/nautilus-volume-monitor.c:1882
+msgid ""
+"Nautilus was unable to mount the volume. There is probably no media in the "
+"device."
+msgstr ""
+"�аутилу� хуваалтыг тань�ангүй. Магадгүй, дотор нь �мар ч м�д��л�л "
+"зөөгүүрбайхгүй байж болох"
+
+#: libnautilus-private/nautilus-volume-monitor.c:1888
+msgid ""
+"Nautilus was unable to mount the floppy drive. The floppy is probably in a "
+"format that cannot be mounted."
+msgstr ""
+"�аутилу� у�н ди�к уншигчийг холбож чад�ангүй. Магадгүй, дотор нь буй у�н "
+"ди�кийн байж болох формат нь таньж холболт хийх боломжгүй байж болох."
+
+#: libnautilus-private/nautilus-volume-monitor.c:1891
+msgid ""
+"Nautilus was unable to mount the selected volume. The volume is probably in "
+"a format that cannot be mounted."
+msgstr ""
+"�аутилу� хуваалтыг тань�ангүй. Магадгүй, дотор нь буй у�н ди�кийн байж болох "
+"формат нь таньж холболт хийх боломжгүй байж болох."
+
+#: libnautilus-private/nautilus-volume-monitor.c:1896
+msgid "Nautilus was unable to mount the selected floppy drive."
+msgstr "�аутилу� таны �онго�он ди�к уншигчийг холбож чад�ангүй."
+
+#: libnautilus-private/nautilus-volume-monitor.c:1898
+msgid "Nautilus was unable to mount the selected volume."
+msgstr "�аутилу� таны �онго�он хуваалтыг тань�ангүй."
+
+#. FIXME: Should we parse this message and report something more meaningful?
+#: libnautilus-private/nautilus-volume-monitor.c:1903
+msgid "Nautilus was unable to unmount the selected volume."
+msgstr "�аутилу� таны �онго�он хуваалтыг �алгаж чад�ангүй."
+
+#: libnautilus-private/nautilus-volume-monitor.c:2148
+msgid "ISO 9660 Volume"
+msgstr "ISO-9660-М�д��л�л агуулах"
+
+#: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:3
 msgid "C_lear Text"
 msgstr "Тек�тийг _у�тгах"
 
@@ -4144,7 +4216,7 @@ msgstr "Тек�тийг _у�тгах"
 msgid "Cut Text"
 msgstr "Тек�тийг та�лах авах"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:4
+#: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:13
 msgid "Cut _Text"
 msgstr "Тек�тийг та�алж _авах"
 
@@ -4160,7 +4232,7 @@ msgstr "Клипборд (түр Ñ�анах-д) Ñ�ануулÑ�ан текÑ�тиÐ
 msgid "Remove the selected text without putting it on the clipboard"
 msgstr "Сонго�он тек�тийг clipboard (түр �анах-д) хуулалгүйг��р у�тгах"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:19
+#: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:39
 msgid "Select _All"
 msgstr "Бүгдийг �_онгох"
 
@@ -4168,14 +4240,10 @@ msgstr "Бүгдийг �_онгох"
 msgid "Select all the text in a text field"
 msgstr "Баримтанд буй бүх тек�тийг �онгох"
 
-#: libnautilus/nautilus-clipboard-ui.xml.h:11 src/nautilus-shell-ui.xml.h:40
+#: libnautilus/nautilus-clipboard-ui.xml.h:11 src/nautilus-shell-ui.xml.h:74
 msgid "_Paste Text"
 msgstr "Тек�т _буулгах"
 
-#: nautilus-computer.desktop.in.h:2
-msgid "View your computer storage"
-msgstr ""
-
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
 msgstr "Файлууд х�рх�н зохицуулагдахыг �нд тодорхойлж өгч болно"
@@ -4184,18 +4252,9 @@ msgstr "Файлууд х�рх�н зохицуулагдахыг �нд тод
 msgid "File Management"
 msgstr "Файлуудыг зохицуулах"
 
-#: nautilus-home.desktop.in.h:2
-msgid "View your home folder in the Nautilus file manager"
-msgstr "Хувийн г�рийн хавт�ын агуулгыг файл-менежер- �аутилу�аар харах"
-
-#: nautilus.desktop.in.h:1
-#, fuzzy
-msgid "Browse Filesystem"
-msgstr "Г�рийн х�ргийн хавта�"
-
 #: nautilus.desktop.in.h:2
-msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgid "View your home folder in the Nautilus file manager"
+msgstr "Г�р хавт�ын агуулгыг файл-менежер- �аутилу�аар харах"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4301,108 +4360,106 @@ msgstr "_Эмблем��р харах"
 msgid "View as _List"
 msgstr "_Жаг�аалт х�лб�р��р харах"
 
-#: src/file-manager/fm-desktop-icon-view.c:582
+#: src/file-manager/fm-desktop-icon-view.c:596
 msgid "Background"
 msgstr "Д�в�г�р"
 
-#: src/file-manager/fm-desktop-icon-view.c:655
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
-msgid "Empty Trash"
-msgstr "Хогийн �ав хоо�лох"
+#: src/file-manager/fm-desktop-icon-view.c:766
+#, c-format
+msgid "Error executing utility program '%s': %s"
+msgstr "ту�лах програм »%s«-ийг ажиллуулахад алдаа гарлаа: %s"
+
+#: src/file-manager/fm-desktop-icon-view.c:1034
+msgid "E_ject"
+msgstr "Г_аргах"
+
+#: src/file-manager/fm-desktop-icon-view.c:1134
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:20
+msgid "_Unmount Volume"
+msgstr "_Хуваалтыг �алгах"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:489
 #, c-format
 msgid "This will open %d separate windows. Are you sure you want to do this?"
 msgstr ""
 "Инг��н��р %d ширх�г �алангид цонх н��гд�н�. Та �н� үйлдлийг хийхд�� итг�лт�й "
 "байна уу?"
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:491
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d ширх�г онгойлгох уу?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:844
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Та »%s« -ийг бүрмө�өн у�тгахдаа итг�л төг� байна уу?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:848
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
-msgstr ""
-"Та %d ширх�г �онгож ав�ан объектуудыг бүрмө�өн у�тгахдаа итг�л төг� байна уу?"
+msgstr "Та %d ширх�г �онгож ав�ан объектуудыг бүрмө�өн у�тгахдаа итг�л төг� байна уу?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:854
 msgid "Delete?"
 msgstr "У�тгах уу?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
-msgid "Select Pattern"
-msgstr "Категор-оо �онгоно уу:"
-
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
-msgid "_Pattern:"
-msgstr "_Загварууд"
-
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1537
 #, c-format
 msgid "\"%s\" selected"
 msgstr "»%s« �онгогд�он"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1539
 msgid "1 folder selected"
 msgstr "1 Хавта� �онгогд�он"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1542
 #, c-format
 msgid "%d folders selected"
 msgstr "%d Хавта� �онгогд�он"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1549
 msgid " (containing 0 items)"
 msgstr " (0 объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1551
 msgid " (containing 1 item)"
 msgstr " (1 объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1553
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1560
 msgid " (containing a total of 0 items)"
 msgstr " (нийт 0 объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1562
 msgid " (containing a total of 1 item)"
 msgstr " (нийт 1 объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1564
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (нийт %d объект агуулагд�ан)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1577
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "»%s« �онгогд�он (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1581
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d объект �онгогд�он (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1588
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "өөр н�г�н объект �онгогд�он (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1591
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d өөр объект �онгогд�он (%s)"
@@ -4414,7 +4471,7 @@ msgstr "%d өөр объект �онгогд�он (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1620
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4423,7 +4480,7 @@ msgstr "%s%s, %s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1793
+#: src/file-manager/fm-directory-view.c:1745
 #, c-format
 msgid ""
 "The folder \"%s\" contains more files than Nautilus can handle. Some files "
@@ -4432,25 +4489,23 @@ msgstr ""
 "Хавта� »%s« �аутилу�ын даацаа� х�т�р��н тооны файл агуулж байна. Тийм��� "
 "зарим файлууд харадахгүй байгааг болгооно уу."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1752
 msgid "Too Many Files"
 msgstr "Х�т�рхий олон тооны файлууд байна"
 
-#: src/file-manager/fm-directory-view.c:3032
+#: src/file-manager/fm-directory-view.c:2984
 #, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+msgid "\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
 msgstr "Таны �онго�он »%s« -ийг хогийн �аванд ха�ж чад�ангүй. Шууд у�тгах уу?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:2989
 #, c-format
 msgid ""
 "The %d selected items cannot be moved to the Trash. Do you want to delete "
 "them immediately?"
-msgstr ""
-"Таны �онго�он %d объектыг хогийн �аванд ха�ж чад�ангүй. Шууд у�тгах уу?"
+msgstr "Таны �онго�он %d объектыг хогийн �аванд ха�ж чад�ангүй. Шууд у�тгах уу?"
 
-#: src/file-manager/fm-directory-view.c:3041
+#: src/file-manager/fm-directory-view.c:2993
 #, c-format
 msgid ""
 "%d of the selected items cannot be moved to the Trash. Do you want to delete "
@@ -4459,16 +4514,16 @@ msgstr ""
 "Таны �онго�он объектуудаа� %d-ийг хогийн �аванд ха�ж чад�ангүй.%d объектыг "
 "шууд у�тгах уу?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3001
 msgid "Delete Immediately?"
 msgstr "Шууд у�тгах уу?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3033
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
 msgstr "Та »%s« -ийг хогийн �авнаа� бүрмө�өн у�тгаж зайлуулахыг хү�ч байна уу?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3037
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
@@ -4477,49 +4532,49 @@ msgstr ""
 "Та �онго�он %d-объектыг хогийн �авнаа� бүрмө�өн у�тгаж зайлуулахыг хү�ч "
 "байна уу?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3043
 msgid "Delete From Trash?"
 msgstr "Хогийн �авнаа� у�тгаж зайлуулах уу?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3321
+#: src/file-manager/fm-directory-view.c:3363
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "»%s«-ийг �онгож ав�ан объектийг н��х�д х�р�гл�х"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3444
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid "Other _Application..."
-msgstr "Өөр Х._Программ..."
+msgstr "Өөр Х._Програм..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3444
 msgid "An _Application..."
-msgstr "Х._Программ..."
+msgstr "Х._Програм..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
 msgid "Other _Viewer..."
 msgstr "өөр н�г�н _Харагч..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3449
 msgid "A _Viewer..."
 msgstr "_Харагч..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3531
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Зааж өг�өн үйлдлийг гүйц�тг�ж чад�ангүй: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3555
 msgid "Could not complete specified action."
 msgstr "Зааж өг�өн үйлдлийг гүйц�тг�ж чад�ангүй."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4064
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "»%s« -ийг �онго�он бүх объектууд д��р үйлд�х"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4281
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
@@ -4529,11 +4584,11 @@ msgstr ""
 "ц��н��� �онго�он �крипт нь түүний хамтаар �онгогд�он өгөгдлүүдийн хамтаар "
 "ажиллагаанд орно."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4284
 msgid "About Scripts"
 msgstr "Скриптүүдийн тухай"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4285
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4575,132 +4630,101 @@ msgstr ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: Одоо ид�вхт�й байгаа цонхны байршил болоод "
 "х�мж��"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4406
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "»Буулгах«-командыг �онгоход »%s« зөөгдөнө"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "»Буулгах«-командыг �онгоход »%s« хуулагдана"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4417
 #, c-format
-msgid ""
-"The %d selected items will be moved if you select the Paste Files command"
+msgid "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d �онгогд�он объект »Буулгах«-командыг �онгоход зөөгдөнө"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4421
 #, c-format
-msgid ""
-"The %d selected items will be copied if you select the Paste Files command"
+msgid "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d �онгогд�он объектууд »Буулгах«-командыг �онгоход хуулагдана"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:4500
 msgid "There is nothing on the clipboard to paste."
 msgstr "Клипбордоо� (cipboard) буулгах юу ч алга"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
-msgid "Mount Error"
-msgstr "Төхөөргийг таньж холбоход алдаа гарлаа"
-
-#: src/file-manager/fm-directory-view.c:4737
-msgid "Unmount Error"
-msgstr "Төхөөргийн холбоо�ыг �алгахад алдаа гарлаа"
-
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
-msgid "Eject Error"
-msgstr "Төхөөргийг таньж холбоход алдаа гарлаа"
-
-#: src/file-manager/fm-directory-view.c:4961
-msgid "E_ject"
-msgstr "Г_аргах"
-
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
-msgid "_Unmount Volume"
-msgstr "_Хуваалтыг �алгах"
+#: src/file-manager/fm-directory-view.c:4757
+msgid "Open _in This Window"
+msgstr "�н� цонхон _дотор н��х"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
-msgid "Open in New Window"
+#: src/file-manager/fm-directory-view.c:4760
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+msgid "Open _in New Window"
 msgstr "Шин� _цонхонд н��х"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
-msgid "Open in %d New Windows"
+#: src/file-manager/fm-directory-view.c:4762
+#, c-format
+msgid "Open _in %d New Windows"
 msgstr "%d цонхнууд  _дотор н��х"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
-msgid "Browse Folder"
-msgstr "Г�рийн х�ргийн хавта�"
-
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
-msgid "Browse Folders"
-msgstr "Г�рийн х�ргийн хавта�"
-
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:4780
 msgid "_Delete from Trash"
 msgstr "Хогийн �авнаа� _у�тгах "
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:4782
 msgid "Delete all selected items permanently"
 msgstr "Бүх �оно�он объектуудыг бүрмө�өн у�тгах"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:4785
+#: src/file-manager/fm-directory-view.c:5066
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Mo_ve to Trash"
 msgstr "_Хогийн �аванд хийх"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:4787
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Move each selected item to the Trash"
 msgstr "Сонго�он объект болгоныг хогийн �аванд хийх"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:4811
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "_Delete"
 msgstr "_У�тгах"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:4831
 msgid "Ma_ke Links"
 msgstr "_Холбоо�ууд тогтоох"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:4832
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Ma_ke Link"
 msgstr "_Холбоо� тогтоох"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:4845
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "_Empty Trash"
 msgstr "Хогийн �авыг хо_о�лох"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:4858
 msgid "Cu_t File"
 msgstr "Файлыг �а_лгаж авах"
 
-#: src/file-manager/fm-directory-view.c:5155
+#: src/file-manager/fm-directory-view.c:4859
 #: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Cu_t Files"
 msgstr "Файлуудыг �а_лгаж авах"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:4868
 msgid "_Copy File"
 msgstr "Файлыг х_уулах"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:4869
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "_Copy Files"
 msgstr "Файлуудыг х_уулах"
 
-#: src/file-manager/fm-directory-view.c:5357
+#: src/file-manager/fm-directory-view.c:5057
 msgid ""
 "This link can't be used, because it has no target. Do you want to move this "
 "link to the Trash?"
@@ -4708,7 +4732,7 @@ msgstr ""
 "Эн� холбоо�ыг ашиглах боломжгүй. Учир нь заа�ан тодорхой �мар ч байршил алга."
 "Хогийн �аванд хийх үү? "
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5060
 #, c-format
 msgid ""
 "This link can't be used, because its target \"%s\" doesn't exist. Do you "
@@ -4717,11 +4741,11 @@ msgstr ""
 "Эн� холбоо�ыг ашиглах боломжгүй. Учир нь заа�ан тодорхой �мар ч »%s« байршил "
 "алга.Хогийн �аванд хийх үү?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5066
 msgid "Broken Link"
 msgstr "Эвдр�лт�й холбоо�"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5123
 #, c-format
 msgid ""
 "\"%s\" is an executable text file. Do you want to run it, or display its "
@@ -4730,35 +4754,34 @@ msgstr ""
 "»%s« нь ажлын (exe) файл байна. Та үүнийг ажиллуулах ��в�л дотоод агуулгыг "
 "харуулах уу?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5129
 msgid "Run or Display?"
 msgstr "�жиллуулах ��в�л дотоод агуулгыг нь харуулах уу?"
 
-#: src/file-manager/fm-directory-view.c:5430
+#: src/file-manager/fm-directory-view.c:5130
 msgid "_Display"
 msgstr "_�гуулга харуулах"
 
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5131
 msgid "Run in _Terminal"
 msgstr "_Терминал дотор ажиллуулах"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5134
 msgid "_Run"
 msgstr "_�жиллуулах"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:5344
 #, c-format
 msgid "Opening \"%s\""
 msgstr "»%s«-ийг н��х"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:5350
 msgid "Cancel Open?"
 msgstr "���х үйлдлийг зог�оох уу?"
 
 #: src/file-manager/fm-error-reporting.c:57
 #, c-format
-msgid ""
-"You do not have the permissions necessary to view the contents of \"%s\"."
+msgid "You do not have the permissions necessary to view the contents of \"%s\"."
 msgstr "Танд »%s«-ийн агуулгыг үз�х �рх алга."
 
 #: src/file-manager/fm-error-reporting.c:61
@@ -4777,16 +4800,14 @@ msgstr "Хавт�ыг харуулахад алдаа гарлаа."
 
 #: src/file-manager/fm-error-reporting.c:102
 #, c-format
-msgid ""
-"The name \"%s\" is already used in this folder. Please use a different name."
+msgid "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "��р »%s« �н� хавта�т аль х�дийн� х�р�гл�гд�ж байна. Өөр �мар н�г�н н�р "
 "ашиглана уу."
 
 #: src/file-manager/fm-error-reporting.c:107
 #, c-format
-msgid ""
-"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "Эн� хавта�т »%s« байхгүй байна. Магадгүй т�р��р �а�хан у�тгагд�ан��в�л өөр "
 "байрлал руу зөөгд�өн байж болох."
@@ -4801,8 +4822,7 @@ msgstr "Танд »%s«-ийн н�рийг өөрчлөх �рх байхгүй
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
-msgstr ""
-"��р »%s« нь »/« г���н тамд�гт агуул�ан учир хүчингүй. Өөр н�р ашиглана уу."
+msgstr "��р »%s« нь »/« г���н тамд�гт агуул�ан учир хүчингүй. Өөр н�р ашиглана уу."
 
 #: src/file-manager/fm-error-reporting.c:121
 #, c-format
@@ -4827,8 +4847,7 @@ msgstr "��р �олиход алдаа гарлаа."
 
 #: src/file-manager/fm-error-reporting.c:163
 #, c-format
-msgid ""
-"You do not have the permissions necessary to change the group of \"%s\"."
+msgid "You do not have the permissions necessary to change the group of \"%s\"."
 msgstr "Танд »%s«-ийн бүлгийг өөрчлөн �рх байхгүй байна."
 
 #: src/file-manager/fm-error-reporting.c:167
@@ -4865,8 +4884,7 @@ msgstr "Эз�мшигчийг өөрчлөхөд алдаа гарлаа"
 
 #: src/file-manager/fm-error-reporting.c:233
 #, c-format
-msgid ""
-"Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Бичих��� хамгаалагд�ан ди�к�н д��р байгаа тул »%s«-д хандах зөвшөөрлийн "
 "тохируулгыг өөрчилж чад�ангүй"
@@ -4943,43 +4961,43 @@ msgstr "Эмблемүүдийг оригинал Ñ…Ñ�м_жÑ�Ñ�нд нь оруÑ
 msgid "Restore Icon's Original Si_ze"
 msgstr "Эмблемүүдийг оригинал х�м_ж��нд нь оруулах"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1945
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "»%s«-ийг заа�ан"
 
-#: src/file-manager/fm-icon-view.c:2544
+#: src/file-manager/fm-icon-view.c:2526
 msgid "Drag and drop is only supported to local file systems."
 msgstr "Чирч ха�х (drag and drop) үйлдлийг зөвхөн дотоод файл �и�темд х�р�гл�х"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
+#: src/file-manager/fm-icon-view.c:2527 src/file-manager/fm-icon-view.c:2546
 msgid "Drag and Drop error"
 msgstr "Чирч ха�х(drag and drop)-д алдаа гарлаа"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2545
 msgid "An invalid drag type was used."
 msgstr "Чирч ха�х(drag and drop)-ын утгагүй үйлд�л хийгдл��"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:733
 msgid "File name"
 msgstr "Файлын н�р"
 
-#: src/file-manager/fm-list-view.c:786
+#: src/file-manager/fm-list-view.c:757
 #: src/file-manager/fm-search-list-view.c:512
 msgid "Size"
 msgstr "Х�мж��"
 
-#: src/file-manager/fm-list-view.c:797
+#: src/file-manager/fm-list-view.c:768
 #: src/file-manager/fm-search-list-view.c:518
 msgid "Type"
 msgstr "Төрөл"
 
-#: src/file-manager/fm-list-view.c:808
+#: src/file-manager/fm-list-view.c:779
 #: src/file-manager/fm-search-list-view.c:524
 msgid "Date Modified"
 msgstr "Өөрчил�өн огноо"
 
-#: src/file-manager/fm-properties-window.c:479
+#: src/file-manager/fm-properties-window.c:458
 #: src/nautilus-information-panel.c:506
 msgid ""
 "You can't assign more than one custom icon at a time! Please drag just one "
@@ -4988,12 +5006,12 @@ msgstr ""
 "Та н�г��� илүү өөрийн �мблемийг гаргаж болохгүй. Эмблемд�� зориуланганц л "
 "зургийг чирч тавина уу."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:460
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "��г��� илүү тооны зураг"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:469
 #: src/nautilus-information-panel.c:527
 msgid ""
 "The file that you dropped is not local.  You can only use local images as "
@@ -5002,12 +5020,12 @@ msgstr ""
 "Таны �нд орхи�он файл тань дотоод биш юм байна. өөрийн �мблемд зөвхөн дотоод "
 "зургуудаа� л ашиглах боломжтой."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:471
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Зөвхөн дотоод зургууд"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:476
 #: src/nautilus-information-panel.c:534
 msgid ""
 "The file that you dropped is not an image.  You can only use local images as "
@@ -5016,56 +5034,55 @@ msgstr ""
 "Таны �нд орхи�он файл тань зураг биш юм байна. Өөрийн �мблемд зөвхөн дотоод "
 "зургуудаа� л ашиглах боломжтой."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:478
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Зөвхөн зургууд"
 
-#: src/file-manager/fm-properties-window.c:916
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:895
 msgid "Properties"
-msgstr "Ши_нжүүд"
+msgstr "Тодруулга"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:898
 #, c-format
 msgid "%s Properties"
 msgstr "%s-ийн шинж чанарууд"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1359
 msgid "Cancel Group Change?"
 msgstr "Бүлгийн өөрчлөлтийг та�лан зог�оох уу?"
 
-#: src/file-manager/fm-properties-window.c:1381
+#: src/file-manager/fm-properties-window.c:1360
 msgid "Changing group"
 msgstr "Бүл�г өөрчилж байна..."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1521
 msgid "Cancel Owner Change?"
 msgstr "Эз�мшигчийн өөрчлөлтийг та�лан зог�оох уу?"
 
-#: src/file-manager/fm-properties-window.c:1543
+#: src/file-manager/fm-properties-window.c:1522
 msgid "Changing owner"
 msgstr "Эз�мшигчийг өөрчилж байна..."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1727
 msgid "nothing"
 msgstr "юу ч байхгүй"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1729
 msgid "unreadable"
 msgstr "унших боломжгүй"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1740
 #, c-format
 msgid "1 item, with size %s"
 msgstr "%s-х�мж��т�й н�г объект"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1743
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d -объект, нийтд�� %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1751
 msgid "(some contents unreadable)"
 msgstr "(зарим агуулгуудыг унших боломжгүй)"
 
@@ -5075,172 +5092,168 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1768
 msgid "Contents:"
 msgstr "�гуулга:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2159
 msgid "Basic"
 msgstr "Суурь"
 
-#: src/file-manager/fm-properties-window.c:2208
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2187
 msgid "_Names:"
-msgstr "_��р:"
+msgstr "_��р�:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2189
 msgid "_Name:"
 msgstr "_��р:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2238
 msgid "Type:"
 msgstr "Төрөл:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
-#: src/file-manager/fm-properties-window.c:2288
+#: src/file-manager/fm-properties-window.c:2240
+#: src/file-manager/fm-properties-window.c:2250
+#: src/file-manager/fm-properties-window.c:2256
+#: src/file-manager/fm-properties-window.c:2263
+#: src/file-manager/fm-properties-window.c:2267
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
+#: src/file-manager/fm-properties-window.c:2290
 #: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2874
+#: src/file-manager/fm-properties-window.c:2956
+#: src/file-manager/fm-properties-window.c:2960
+#: src/file-manager/fm-properties-window.c:2964
 msgid "--"
-msgstr ""
+msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2248
 msgid "Size:"
 msgstr "Х�мж��:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2254 src/nautilus-location-bar.c:61
 msgid "Location:"
 msgstr "Байршил:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2261
 msgid "Volume:"
 msgstr "Эз�лхүүн"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2265
 msgid "Free space:"
 msgstr "Сул зай:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Link target:"
 msgstr "Линкийн ха�г:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2279
 msgid "MIME type:"
 msgstr "MIME-Төрөл:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2288
 msgid "Modified:"
 msgstr "Өөрчлөгд�өн:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2294
 msgid "Accessed:"
 msgstr "Ханд�ан:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2310
 msgid "_Select Custom Icon..."
 msgstr "Өөрийн �мблемийг �онгох..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2316
 msgid "_Remove Custom Icon"
 msgstr "Өөрийн �мблемийг зохиох"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2644
 msgid "_Read"
 msgstr "_Унших"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2646
 msgid "_Write"
 msgstr "_Бичих"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2648
 msgid "E_xecute"
 msgstr "Г_үйц�тг�х"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2725
 msgid "Set _user ID"
 msgstr "Х�_р�гл�гчийн ID-ийг тохируулах"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2730
 msgid "Special flags:"
 msgstr "Онцгой үзүүл�лт:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2733
 msgid "Set gro_up ID"
 msgstr "Бү_лгийн ID-ийг тохируулах"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2735
 msgid "_Sticky"
 msgstr "�а_алдамхай"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2819
 msgid "Permissions"
 msgstr "Зөвшөөрөл"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2829
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Та �з�мшигч нь биш тул �дг��р зөвшөөрлийг өөрчлөх �рх байхгүй"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2842
 msgid "File owner:"
 msgstr "Файлын �з�н:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2859
 msgid "_File group:"
 msgstr "_Файлын бүл�г:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2868
 msgid "File group:"
 msgstr "Файлын бүл�г:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2880
 msgid "Owner:"
 msgstr "Эз�мшигч:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2881
 msgid "Group:"
 msgstr "Бүл�г:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2882
 msgid "Others:"
 msgstr "Бу�ад:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:2955
 msgid "Text view:"
 msgstr "Тек�т:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:2959
 msgid "Number view:"
 msgstr "Тоо:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:2963
 msgid "Last changed:"
 msgstr "Хамгийн �үүлд өөрчил�өн:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:2969
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "»%s«-ийн зөвшөөрөл �рхийг тодорхойлж бол�онгүй"
 
-#: src/file-manager/fm-properties-window.c:3006
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2972
 msgid "The permissions of the selected file could not be determined."
-msgstr "»%s«-ийн зөвшөөрөл �рхийг тодорхойлж бол�онгүй"
+msgstr "Сонго�он файлын хандах �рхийг тодорхойлж бол�онгүй."
 
-#: src/file-manager/fm-properties-window.c:3322
+#: src/file-manager/fm-properties-window.c:3288
 #: src/nautilus-bookmarks-window.c:146
 #: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
+#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:769
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -5249,22 +5262,21 @@ msgstr ""
 "Ту�ламж тайлбарыг үзүүл�х �вцад алдаа гарлаа: \n"
 "%s"
 
-#: src/file-manager/fm-properties-window.c:3324
+#: src/file-manager/fm-properties-window.c:3290
 msgid "Couldn't show help"
 msgstr "Ту�лалцаа зааврыг үзүүлж чад�ангүй"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3627
 msgid "Cancel Showing Properties Window?"
 msgstr "Шинж байдлыг харуулах �вцыг зог�оох уу?"
 
-#: src/file-manager/fm-properties-window.c:3662
+#: src/file-manager/fm-properties-window.c:3628
 msgid "Creating Properties window"
 msgstr "Шинж байдлыг харуулах цонхыг зохиож байна"
 
-#: src/file-manager/fm-properties-window.c:3788
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3754
 msgid "Select an icon"
-msgstr "��г �мблем �онгоно уу:"
+msgstr "��г �мблем �онгоно уу"
 
 #: src/file-manager/fm-search-list-view.c:124
 #, c-format
@@ -5358,7 +5370,7 @@ msgid ""
 "Find can't access your index right now. "
 msgstr ""
 "�гуулгын хайлт хийхийн тулд Хайлт таны �и�темд файлын индек� шаардлагатай. "
-"Хайх программ таны индек��д хандаж чадахгүй байна."
+"Хайх програм таны индек��д хандаж чадахгүй байна."
 
 #: src/file-manager/fm-search-list-view.c:253
 msgid "Fast searches are not available"
@@ -5494,61 +5506,93 @@ msgstr "Д�лг�цийн _д�в�г�рийг өөрчилөх"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-#, fuzzy
 msgid "Create L_auncher"
-msgstr "Шин��р �т_артер"
+msgstr "_Эхлүүл�гч үү�г�х"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
 #: src/file-manager/nautilus-directory-view-ui.xml.h:7
 msgid "Create a new launcher"
-msgstr "Шин� �тартер зохиох"
+msgstr "Шин� �хлүүл�гч үү�г�х"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 #: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Delete all items in the Trash"
 msgstr "Хогийн �аван дахь бүх объектуудыг у�тгах"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
-#, fuzzy
-msgid "Open T_erminal"
-msgstr "Шин� Те_рминал"
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:5
+msgid "Dis_ks"
+msgstr "_Ди�күүд"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
+msgid "Format the selected volume"
+msgstr "Сонго�он хуваалтыг форматлах"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
+msgid "Medi_a Properties"
+msgstr "М�_д��л�л т��гчийн шинжүүд"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
+msgid "Mount or unmount disks"
+msgstr "Ди�күүдийг холбох ��в�л �алгах"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+msgid "Open T_erminal"
+msgstr "Те_рминал н��х"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:11
 msgid "Open a new GNOME terminal window"
 msgstr "Шин� GNOME-Терминал цонх н��х"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
-msgid ""
-"Show a window that lets you set your desktop background's pattern or color"
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:12
+msgid "Prot_ect"
+msgstr "Хам_гаалах"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:13
+msgid "Protect the selected volume"
+msgstr "Сонго�он хуваалтыг хамгаалах"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:14
+msgid "Show a window that lets you set your desktop background's pattern or color"
 msgstr "Таны д�лг�цийн д�в�г�рийн өнгө болон х��г тохируулах цонх харуулах"
 
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:15
+msgid "Show media properties for the selected volume"
+msgstr "Сонго�он хуваалтын м�д��л�л т��гчийн шинжийг харуулах"
+
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:16
+msgid "Unmount the selected volume"
+msgstr "Сонго�он хуваалтыг �алгах"
+
 #. add the reset background item, possibly disabled
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:17
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Ст_андарт д�в�г�рийг х�р�гл�х"
 
-#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:18
 msgid "Use the default desktop background"
 msgstr "Д�лг�цийн �т_андарт д�в�г�рийг х�р�гл�х"
 
+#: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:19
+msgid "_Format"
+msgstr "_Форматлах"
+
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
 msgid "Choose a program with which to open the selected item"
-msgstr "Сонго�он объектоо н��х программаа �онгоно уу"
+msgstr "Сонго�он объектоо н��х програмаа �онгоно уу"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
-msgstr "Сонго�он объектоо н��х ба� н�г программаа �онгоно уу"
+msgstr "Сонго�он объектоо н��х ба� н�г програмаа �онгоно уу"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
-msgstr "Сонго�он объектоо харах программаа �онгоно уу"
+msgstr "Сонго�он объектоо харах програмаа �онгоно уу"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-#, fuzzy
 msgid "Create _Folder"
-msgstr "Г�рийн х�ргийн хавта�"
+msgstr "_Хавта� үү�г�х"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create a new empty folder inside this folder"
@@ -5578,158 +5622,101 @@ msgstr "Стартерын тохиргоо хийх"
 msgid "Edit the launcher information"
 msgstr "Стартерын м�д��ллийг болов�руулах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-msgid "Format the selected volume"
-msgstr "Сонго�он хуваалтыг форматлах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
-msgid "Medi_a Properties"
-msgstr "М�_д��л�л т��гчийн шинжүүд"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
-msgid "Mount the selected volume"
-msgstr "Сонго�он хуваалтыг �алгах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
-msgid ""
-"Move or copy files previously selected by a Cut Files or Copy Files command"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+msgid "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "»Файл та�алж авах« ��в�л »Файл хуулбарлах«-аар �онго�он файлуудыг зөөх ��в�л "
 "хувилах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
-"»Файл та�алж авах« ��в�л »Файл хуулбарлах«-аар �онго�он файлуудыг зөөх ��в�л "
-"хувилах"
+"»Файл та�алж авах« ��в�л »Файл хуулбарлах« тушаалаар �онго�он файлуудыг зөөх "
+"��в�л хуулах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Open Wit_h"
 msgstr "_-��р хамт н��х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
-msgid "Open each selected item in a navigation window"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+msgid "Open each selected item in a new window"
 msgstr "Стартерын тохиргоо хийх"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
-msgid "Open in Navigation Window"
-msgstr "Шин� _цонхонд н��х"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid "Open the selected item in this window"
 msgstr "Сонго�он объектыг �н� цонхонд н��х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Сонго�он файлуудыг буулгах (оруулах)-командаар хуулбарлах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Сонго�он файлуудыг буулгах командаар зөөх"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
-msgid "Prot_ect"
-msgstr "Хам_гаалах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
-msgid "Protect the selected volume"
-msgstr "Сонго�он хуваалтыг хамгаалах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Rename selected item"
 msgstr "Сонго�он объектын н�рийг өөрчлөх"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Reset View to _Defaults"
 msgstr "Стандарт харагдалтад оруулах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Эн� байдлаар харахад зориулан дарааллыг болон х�мж��г дахин шин�чл�х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "~/Nautilus/scripts д�х �криптүүдийг ажиллуулах буюу болов�руулах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Select _All Files"
 msgstr "Бүх файлуудыг �_онгох"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
-msgid "Select _Pattern"
-msgstr "_Загварууд"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Select all items in this window"
 msgstr "Эн� цонхон даь бүх объектуудыг �онгох"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
-msgid "Select items in this window matching a given pattern"
-msgstr "Эн� цонхон даь бүх объектуудыг �онгох"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-msgid "Show media properties for the selected volume"
-msgstr "Сонго�он хуваалтын м�д��л�л т��гчийн шинжийг харуулах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Эн� ц���н д�х �криптүүдийг дотроо агуул�ан хавт�ыг харуулах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
-msgid "Unmount the selected volume"
-msgstr "Сонго�он хуваалтыг �алгах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Use the default background for this location"
 msgstr "Эн� байрлалд �тандарт д�в�г�рийг х�р�гл�х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "View or modify the properties of each selected item"
 msgstr "Сонго�он бүх объектуудын шинжүүдийг харах буюу өөрчлөх"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
-msgid "_Format"
-msgstr "_Форматлах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
-msgid "_Mount Volume"
-msgstr "_Хуваалтыг �алгах"
-
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "_Open"
 msgstr "��_�х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "_Open Scripts Folder"
 msgstr "Скриптийн хавт�уудыг ��_�х"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "_Paste Files"
 msgstr "Файл _буулгах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "_Paste Files Into Folder"
-msgstr "Файл _буулгах"
+msgstr "Файлыг лавлах руу _буулгах"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "_Properties"
 msgstr "Ши_нжүүд"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "_Rename..."
 msgstr "��р �о_лих..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 msgid "_Scripts"
 msgstr "Скр_иптууд"
 
@@ -5770,9 +5757,8 @@ msgid "Display icons in the opposite order"
 msgstr "Эмблемүүдийг ��р�г дарааллаар харуулах"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:10
-#, fuzzy
 msgid "Keep icons lined up on a grid"
-msgstr "Эмблемүүдийг мөрөн д�х н�р��р нь �р�мб�л�х"
+msgstr "Эмблемүүдийг мөрөн д�х н�р��р нь за�варлах"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Leave icons wherever they are dropped"
@@ -5806,7 +5792,7 @@ msgstr "Хоорондоо ойрхон х�лб�рийг �онгох/буца
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "_Keep Aligned"
-msgstr ""
+msgstr "Ц�гцл�лт _за�варлах"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "_Manually"
@@ -5886,11 +5872,11 @@ msgstr "_Индек�жүүл�лтийн төвшнийг харуулах"
 msgid "Show status of indexing used when searching"
 msgstr "Хайх хооронд индек�жүүл�лтийн төвшнийг харуулах"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:221
 msgid "Couldn't Create Required Folder"
 msgstr "Шаардлагатай хавт�ыг зохиож чад�ангүй"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:222
 #, c-format
 msgid ""
 "Nautilus could not create the required folder \"%s\". Before running "
@@ -5901,11 +5887,11 @@ msgstr ""
 "ажиллуулахын өмнө �н� хавт�ыг шин��р зохиох ��в�л наутилу�т өөрт нь ийм "
 "үйлд�л хийх зөвшөөрөл з�ргийг олгож тохируулах х�р�гт�й."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:227
 msgid "Couldn't Create Required Folders"
 msgstr "Шаардлагатай хавт�уудыг зохиож чад�ангүй"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:228
 #, c-format
 msgid ""
 "Nautilus could not create the following required folders:\n"
@@ -5922,21 +5908,23 @@ msgstr ""
 "Та наутилу�ыг ажиллуулахын өмнө �н� хавт�ыг шин��р зохиох ��в�л наутилу�т "
 "өөрт нь ийм үйлд�л хийх зөвшөөрөл з�ргийг олгож тохируулах х�р�гт�й."
 
-#: src/nautilus-application.c:334
-#, fuzzy
+#: src/nautilus-application.c:300
 msgid "Link To Old Desktop"
-msgstr "�жлын талбар д��р"
+msgstr "Хуучин ажлын талбар руу холбох"
 
-#: src/nautilus-application.c:350
+#: src/nautilus-application.c:316
 msgid ""
 "The location of the desktop directory has changed in GNOME 2.4. A link "
 "called \"Link To Old Desktop\" has been created on the desktop. You can open "
 "this to move over the files you want, then delete the link."
 msgstr ""
+"Г�ОМЕ 2.4-т ажлын талбарын лавлах хадгалах байрлал өөрчилөгд�өн. �жлын "
+"талбар д��р »хуучин ажлын талбарын холбоо�« г�ж үү�г�гд��н.Та үүнийг н��ж "
+"хү���н файлуудаа зөөж аваад холбоо�ыг у�тгаж болно."
 
-#: src/nautilus-application.c:353
+#: src/nautilus-application.c:319
 msgid "Migrated old desktop"
-msgstr ""
+msgstr "Хуучин ажлийн талбар луу шилжүүл�х"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5948,7 +5936,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:487
 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 "
@@ -5959,7 +5947,7 @@ msgstr ""
 "�уулгах л үлд�ж байна."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:493
 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 "
@@ -5987,7 +5975,7 @@ msgstr ""
 "болно. Э�в�л анх �уулгахдаа �аутилу�ын Nautilus_Shell.server файлыг дутуу "
 "�уулга�ан байж болох.\n"
 "\n"
-"»bonobo-slay« командыг өг�нөөр өөр бу�ад программуудад х�р�гл�гд�ж болох "
+"»bonobo-slay« командыг өг�нөөр өөр бу�ад програмуудад х�р�гл�гд�ж болох "
 "Bonobo-ийн бүх ид�вхжүүл�лтийн болон GConf-проце��уудыг хүч��р та�лан "
 "зог�ооно.\n"
 "\n"
@@ -6005,12 +5993,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:523 src/nautilus-application.c:541
+#: src/nautilus-application.c:548
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Г�н�тийн алдаанаа� болж �аутилу�ыг одоогоор ашиглах боломжгүй."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:524
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6018,7 +6006,7 @@ msgstr ""
 "Файл менежерийн харах �ерверийг бүртг�х үед Bonobo-д гар�ан г�н�тийн "
 "алдаанаа� болж �аутилу�ыг одоогоор ашиглах боломжгүй."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:542
 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 "
@@ -6028,7 +6016,7 @@ msgstr ""
 "одоогоор ашиглах боломжгүй. Bonobo ид�вхжүүл�лтийг хаагаад �аутилу�ыг шин��р "
 "н��в�л доголдол арилж магад."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:549
 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 "
@@ -6043,18 +6031,16 @@ msgid "No bookmarks defined"
 msgstr "Ямар ч т�мд�гл�г�� алга"
 
 #: src/nautilus-bookmarks-window.glade.h:1
-#, fuzzy
 msgid "<b>_Bookmarks</b>"
-msgstr "Т�м_д�гл�г��"
+msgstr "<b>_Хавчуурага</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:2
-#, fuzzy
 msgid "<b>_Location</b>"
-msgstr "_Байршил (Ха�г):"
+msgstr "<b>_Байршил (Ха�г)</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
-msgstr ""
+msgstr "<b>_��р</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:4
 msgid "Edit Bookmarks"
@@ -6073,44 +6059,6 @@ msgstr "Цөөн �онголтууд"
 msgid "Find Them!"
 msgstr "Т�днийг ол!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
-
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Өөр лүү нь зөөж бол�онгүй"
-
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"»%s« нь утга төгөлдөр ха�г биш байна. Зөв бич��н ���х�� шалгаад дахин "
-"оролдоно уу."
-
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
-msgid "Connect to Server"
-msgstr "Сүлж��ний �ерверүүд"
-
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_��р:"
-
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
-msgid "Connect"
-msgstr "Conectiva"
-
-#: src/nautilus-desktop-window.c:356
-msgid "Desktop"
-msgstr "Д�лг�ц"
-
 #: src/nautilus-file-management-properties.glade.h:1
 msgid "    "
 msgstr "    "
@@ -6272,22 +6220,26 @@ msgid "_Only for files smaller than:"
 msgstr "_Зөвхөн дараахаа� бага файлууд:"
 
 #: src/nautilus-file-management-properties.glade.h:69
+msgid "_Open activated item in a new window"
+msgstr "Сонго�он объект бүрийг шин� цонхонд _н��х"
+
+#: src/nautilus-file-management-properties.glade.h:70
 msgid "_Run executable text files when they are clicked"
 msgstr "�жлын тек�т файлуудыг давхар товшиход гүйц�тг�х"
 
-#: src/nautilus-file-management-properties.glade.h:70
+#: src/nautilus-file-management-properties.glade.h:71
 msgid "_Single click to activate items"
 msgstr "Объект ид�вхижүүл�хд�� _н�г товшино"
 
-#: src/nautilus-file-management-properties.glade.h:71
+#: src/nautilus-file-management-properties.glade.h:72
 msgid "_Text beside icons"
-msgstr ""
+msgstr "Эмблемийн �ацуух _тек�т"
 
-#: src/nautilus-file-management-properties.glade.h:72
+#: src/nautilus-file-management-properties.glade.h:73
 msgid "_Use compact layout"
 msgstr "_�арийн гарын хуваарь ашиглах"
 
-#: src/nautilus-file-management-properties.glade.h:73
+#: src/nautilus-file-management-properties.glade.h:74
 msgid "_View executable text files when they are clicked"
 msgstr "�жлын тек�т файлуудыг товшиход _харуулах"
 
@@ -6312,16 +6264,18 @@ msgstr "%s -т�й н��х "
 msgid "Open with..."
 msgstr "Үүг��р н��х..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
+#: src/nautilus-information-panel.c:994 src/nautilus-window-menus.c:229
 #, c-format
 msgid ""
 "Unable to launch the cd burner application:\n"
 "%s"
 msgstr ""
+"КД шарагч програм ажиллуулах боломжгүй:\n"
+"%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
+#: src/nautilus-information-panel.c:996 src/nautilus-window-menus.c:231
 msgid "Can't launch cd burner"
-msgstr ""
+msgstr "КД шарагчийг ажиллуулж чад�ангүй"
 
 #. FIXME: We don't use spaces to pad labels!
 #: src/nautilus-information-panel.c:1042
@@ -6331,7 +6285,7 @@ msgstr "Хог_ийн �авыг хоо�лох"
 #. FIXME: We don't use spaces to pad labels!
 #: src/nautilus-information-panel.c:1058
 msgid "_Write contents to CD"
-msgstr ""
+msgstr "КД рүү агуулга _бичих"
 
 #: src/nautilus-location-bar.c:62
 msgid "Go To:"
@@ -6346,321 +6300,70 @@ msgstr "Та дараах %d байршлуудыг туÑ�гай цонхнууÐ
 msgid "View in Multiple Windows?"
 msgstr "Олон цонхонд харуулах уу?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
-msgid "Open Location"
-msgstr "Байршил руу н�вт�рч чад�ангүй"
-
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:149
 msgid "Perform a quick set of self-check tests."
 msgstr "Өөрийгөө оношлох багц хурдан те�т �вуулах."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:152
 msgid "Create the initial window with the given geometry."
 msgstr "Гараа� өг�өн х�лб�р х�мж��ний анхны цонх н��х."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:152
 msgid "GEOMETRY"
 msgstr "Х�лб�р х�мж��"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:154
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Зөвхөн ту�гай зааж өг�өн URI-уудад цонх зохиох."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:156
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "�жлын д�лг�цийг удирдахгүй (тохируулгын тухай м�д��ллийг үл тоох)."
 
-#: src/nautilus-main.c:196
-msgid "open a browser window."
-msgstr ""
-
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:158
 msgid "Quit Nautilus."
 msgstr "�аутилу�аа� гарах..."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:160
 msgid "Restart Nautilus."
 msgstr "�аутилу�ыг шин��р �хлүүл�х."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:191
 msgid "File Manager"
 msgstr "Файл менежер"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:197 src/nautilus-window-manage-views.c:232
+#: src/nautilus-window-menus.c:729 src/nautilus-window.c:181
 msgid "Nautilus"
 msgstr "�аутилу�"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:214
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "�аутилу�: --Ш�ЛГ�Х нь URIs-ийн хамт х�р�гл�гд�ж болохгүй байна.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:218
 msgid "nautilus: --check cannot be used with other options.\n"
-msgstr ""
-"�аутилу�: --Ш�ЛГ�Х нь бу�ад �онголтуудын хамт х�р�гл�гд�ж болохгүй байна.\n"
+msgstr "�аутилу�: --Ш�ЛГ�Х нь бу�ад �онголтуудын хамт х�р�гл�гд�ж болохгүй байна.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:222
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "�аутилу�: --Гаралт нь URI-ийн хамт х�р�гл�гд�ж болохгүй байна.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:226
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 "�аутилу�: --Дахин Эхлүүл�х үйлд�л нь URI-ийн хамт х�р�гл�гд�ж болохгүй "
 "байна.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:230
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "�аутилу�: --Х�лб�р х�мж�� нь н�г��� олон тооны 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Та түүх�� мартмаар байна уу? Т�гв�л дараа дахин дахин хийх ё�той болно "
-"г�дгийг анхаараарай."
-
-#: src/nautilus-navigation-window-menus.c:189
-msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "Та өөрийн зочил�он (ачаал�ан) ха�гуудын жаг�аалтыг ц�в�рл�х үү?"
-
-#: src/nautilus-navigation-window-menus.c:194
-msgid "Clear History"
-msgstr "Үйл �вцын хураангуй"
-
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
-msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
-msgstr ""
-"Байршил %s үл оршино. Та �н� байршилтай холбоотой бүх т�мд�гл�г��г "
-"жаг�аалтаа�аа ха�ах уу?"
-
-#: src/nautilus-navigation-window-menus.c:428
-msgid "Bookmark for Nonexistent Location"
-msgstr "Байхгүй байршлын т�мд�гл�г��"
-
-#: src/nautilus-navigation-window-menus.c:429
-msgid "Remove"
-msgstr "У�тгах"
-
-#: src/nautilus-navigation-window-ui.xml.h:1
-msgid "Add a bookmark for the current location to this menu"
-msgstr "Одоо байгаа �н� ха�гийг (байршлыг) ц���нд�� н�мж  өгөх"
-
-#: src/nautilus-navigation-window-ui.xml.h:2
-msgid "Back"
-msgstr "Буцаад"
-
-#: src/nautilus-navigation-window-ui.xml.h:3
-msgid "Change the visibility of this window's location bar"
-msgstr "Эн� цонхны ха�г заадаг �амбарын үз�мжийг өөрчлөх"
-
-#: src/nautilus-navigation-window-ui.xml.h:4
-msgid "Change the visibility of this window's sidebar"
-msgstr "Эн� цонхны хажуугийн �амбарын үз�мжийг өөрчлөх"
-
-#: src/nautilus-navigation-window-ui.xml.h:5
-msgid "Change the visibility of this window's statusbar"
-msgstr "Эн� цонхны �тату� харуулдаг �амбарын үз�мжийг өөрчлөх"
-
-#: src/nautilus-navigation-window-ui.xml.h:6
-msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr ""
-"Очих байршлын ц�� болон Урагшлах/Ухрах командад хадгалагд�ан жаг�аалтыг "
-"ц�в�рл�х"
-
-#: src/nautilus-navigation-window-ui.xml.h:7
-msgid "Close _All Windows"
-msgstr "_Бүх цонхыг хаах"
-
-#: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
-msgid "Close all Navigation windows"
-msgstr "Бүх �аутилу�ын цонхыг хаах"
-
-#: src/nautilus-navigation-window-ui.xml.h:10
-#: src/nautilus-spatial-window-ui.xml.h:4
-msgid "Connect to _Server..."
-msgstr ""
-
-#: src/nautilus-navigation-window-ui.xml.h:11
-msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr ""
-"Эн� ц���н д�х ха�гийн т�мд�гл�г��нүүдийг тохируулж за�варлахад ашигладаг "
-"цонхыг үзүүл�х"
-
-#: src/nautilus-navigation-window-ui.xml.h:12 src/nautilus-shell-ui.xml.h:10
-msgid "Find"
-msgstr "Хайх"
-
-#: src/nautilus-navigation-window-ui.xml.h:13
-msgid "Forward"
-msgstr "Урагш"
-
-#: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
-msgstr "Дараагийн оч�он ха�г (байршил) руу очих"
-
-#: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
-msgstr "Яг өмнө оч�он ха�г руу �г�ж очих"
-
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
-msgstr "Хогийн �авны хавт�анд очих"
-
-#: src/nautilus-navigation-window-ui.xml.h:17
-msgid "Home"
-msgstr "Хувийн х�ргийн хавта�"
-
-#: src/nautilus-navigation-window-ui.xml.h:18
-msgid "Location _Bar"
-msgstr "_Ха�гийн(байршлын) цонх"
-
-#: src/nautilus-navigation-window-ui.xml.h:19
-msgid "Reload"
-msgstr "Шин��р ачаалах"
-
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
-msgid "Search this computer for files"
-msgstr "Эн� компьютер дотор файл хайх"
-
-#: src/nautilus-navigation-window-ui.xml.h:21
-msgid "St_atusbar"
-msgstr "Ст_ату� харуулах �амбар"
-
-#: src/nautilus-navigation-window-ui.xml.h:22
-msgid "Stop"
-msgstr "Зог�"
-
-#: src/nautilus-navigation-window-ui.xml.h:23
-msgid "Up"
-msgstr "Д��ш��"
-
-#: src/nautilus-navigation-window-ui.xml.h:24
-msgid "Write to CD"
-msgstr ""
-
-#: src/nautilus-navigation-window-ui.xml.h:25
-msgid "_Add Bookmark"
-msgstr "Т�мд�гл�г��(�ануулах) _н�м�х"
-
-#: src/nautilus-navigation-window-ui.xml.h:26
-msgid "_Back"
-msgstr "_Эг�н"
-
-#: src/nautilus-navigation-window-ui.xml.h:27
-msgid "_Bookmarks"
-msgstr "Т�м_д�гл�г��"
-
-#: src/nautilus-navigation-window-ui.xml.h:28
-msgid "_Clear History"
-msgstr "Үйл �вдлын жаг�аалтыг ц�в_�рл�х"
-
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
-msgid "_Computer"
-msgstr "_Courier"
-
-#: src/nautilus-navigation-window-ui.xml.h:30
-msgid "_Edit Bookmarks"
-msgstr "Хавчуурга _тохируулах"
-
-#: src/nautilus-navigation-window-ui.xml.h:31
-msgid "_Forward"
-msgstr "Ура_гш"
-
-#: src/nautilus-navigation-window-ui.xml.h:32
-msgid "_Go"
-msgstr "Тий_ш очих"
-
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
-msgid "_Home"
-msgstr "_Г�р"
-
-#: src/nautilus-navigation-window-ui.xml.h:34
-msgid "_Location..."
-msgstr "Бай_ршил..."
-
-#: src/nautilus-navigation-window-ui.xml.h:35
-msgid "_Side Pane"
-msgstr "Хаж_уугийн �амбар"
-
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
-msgid "_Trash"
-msgstr "Х_ог"
-
-#: src/nautilus-navigation-window-ui.xml.h:37
-msgid "_Up"
-msgstr "_Д��ш"
-
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
-msgid "_View"
-msgstr "_Харах"
-
-#: src/nautilus-navigation-window.c:338
-msgid "Information"
-msgstr "М�д��л�л"
-
-#. Add "View as..." extra bonus choice.
-#: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
-msgid "View as..."
-msgstr "Дараах х�лб�р��р харах:..."
-
-#: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
-msgid "File Browser: %s"
-msgstr "Файлын �з�н:"
-
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"�ль н�г хажуугийн �амбар алдаатай тулгаран цааш үрг�лжлүүл�н ажиллах "
-"боломжгүй байна. Харам�алтай нь аль г�д�г нь үл м�д�гд�н�."
-
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Хажуугийн %s �амбар алдаатай тулгаран цааш үрг�лжлүүл�н ажиллах боломжгүй "
-"байна. Х�р�в �н� олон дахин давтагдвал �амбараа хаа�ан нь д��р."
-
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
-msgid "Side Panel Failed"
-msgstr "Хажуугийн �амбарын ажиллагаа алдаатай."
-
-#: src/nautilus-navigation-window.c:1239
-msgid "Side Pane"
-msgstr "Хажуугийн �амбар"
-
-#: src/nautilus-navigation-window.c:1241
-msgid "Contains a side pane view"
-msgstr "Хажуугийн �амбарын үз�мж."
-
 #: src/nautilus-profiler.c:209
 msgid "Print"
 msgstr "Х�вл�х"
@@ -6780,13 +6483,12 @@ msgid "Sorry, but '%s' is not a usable image file!"
 msgstr "Уучлаарай, харам�алтай нь %s х�р�гл�ж болохуйц зургийн файл биш байна."
 
 #: src/nautilus-property-browser.c:2041
-#, fuzzy
 msgid "Select a Category:"
-msgstr "Категор-оо �онгоно уу:"
+msgstr "�нгилалаа �онгоно уу:"
 
 #: src/nautilus-property-browser.c:2050
 msgid "C_ancel Remove"
-msgstr "У�тгах үйлдлийг та�_лан зог�оохLöschen a_bbrechen"
+msgstr "У�тгахыг _болих"
 
 #: src/nautilus-property-browser.c:2056
 msgid "_Add a New Pattern..."
@@ -6925,7 +6627,7 @@ msgstr "[Файлын төрөл бол ] тек�т Файл"
 
 #: src/nautilus-search-bar-criterion.c:111
 msgid "[File type is] application"
-msgstr "[Файлын төрөл бол ] программ"
+msgstr "[Файлын төрөл бол ] програм"
 
 #: src/nautilus-search-bar-criterion.c:112
 msgid "[File type is] folder"
@@ -7014,13 +6716,12 @@ msgid ""
 "Glade file for the connect to server program is missing.\n"
 "Please check your installation of nautilus"
 msgstr ""
-"Сервер программтай холбодог Glade-ийн файл алга байна.\n"
+"Сервер програмтай холбодог Glade-ийн файл алга байна.\n"
 "�аутилу�ынхаа �уу�ан байдлыг шалгана уу"
 
 #: src/nautilus-server-connect.desktop.in.h:1
 msgid "Add a new server to your Network Servers and connect to it"
-msgstr ""
-"Сүлж��ний �ерверүүдд�� н�г шин� �ервеер н�мж өгөн түүнийг�� холбож өгөх"
+msgstr "Сүлж��ний �ерверүүдд�� н�г шин� �ервеер н�мж өгөн түүнийг�� холбож өгөх"
 
 #: src/nautilus-server-connect.desktop.in.h:2
 #: src/nautilus-server-connect.glade.h:2
@@ -7032,27 +6733,70 @@ msgid "*"
 msgstr "*"
 
 #: src/nautilus-server-connect.glade.h:3
-#, fuzzy
 msgid "_Connect"
-msgstr "Conectiva"
+msgstr "_Холболт"
+
+#: src/nautilus-shell-ui.xml.h:1
+msgid "Add a bookmark for the current location to this menu"
+msgstr "Одоо байгаа �н� ха�гийг (байршлыг) ц���нд�� н�мж  өгөх"
 
 #: src/nautilus-shell-ui.xml.h:2
+msgid "Back"
+msgstr "Буцаад"
+
+#: src/nautilus-shell-ui.xml.h:4
+msgid "Change the visibility of this window's location bar"
+msgstr "Эн� цонхны ха�г заадаг �амбарын үз�мжийг өөрчлөх"
+
+#: src/nautilus-shell-ui.xml.h:5
+msgid "Change the visibility of this window's sidebar"
+msgstr "Эн� цонхны хажуугийн �амбарын үз�мжийг өөрчлөх"
+
+#: src/nautilus-shell-ui.xml.h:6
+msgid "Change the visibility of this window's statusbar"
+msgstr "Эн� цонхны �тату� харуулдаг �амбарын үз�мжийг өөрчлөх"
+
+#: src/nautilus-shell-ui.xml.h:7
+msgid "Change the visibility of this window's toolbar"
+msgstr "Эн� цонхны багажийн �амбарын үз�мжийг өөрчлөх"
+
+#: src/nautilus-shell-ui.xml.h:8
 msgid "Choose a view for the current location, or modify the set of views"
 msgstr "Одоо таны байгаа ха�гийн(байршлын) таарах үз�мжийг �онгох өөрчлөх"
 
-#: src/nautilus-shell-ui.xml.h:3
+#: src/nautilus-shell-ui.xml.h:9
+msgid "Clear contents of Go menu and Back/Forward lists"
+msgstr ""
+"Очих байршлын ц�� болон Урагшлах/Ухрах командад хадгалагд�ан жаг�аалтыг "
+"ц�в�рл�х"
+
+#: src/nautilus-shell-ui.xml.h:10
+msgid "Close _All Windows"
+msgstr "_Бүх цонхыг хаах"
+
+#: src/nautilus-shell-ui.xml.h:11
+msgid "Close all Nautilus windows"
+msgstr "Бүх �аутилу�ын цонхыг хаах"
+
+#: src/nautilus-shell-ui.xml.h:12
 msgid "Close this window"
 msgstr "Эн� цонхыг хаах"
 
-#: src/nautilus-shell-ui.xml.h:5
+#: src/nautilus-shell-ui.xml.h:14
 msgid "Display Nautilus help"
 msgstr "�аутилу�тай ажиллахад ту�ламж заавар"
 
-#: src/nautilus-shell-ui.xml.h:6
+#: src/nautilus-shell-ui.xml.h:15
+msgid "Display a window that allows editing the bookmarks in this menu"
+msgstr ""
+"Эн� ц���н д�х ха�гийн т�мд�гл�г��нүүдийг тохируулж за�варлахад ашигладаг "
+"цонхыг үзүүл�х"
+
+#: src/nautilus-shell-ui.xml.h:16
 msgid "Display credits for the creators of Nautilus"
 msgstr "�аутилу�ыг зохиогчдын тухай м�д��ллийг үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:7
+#: src/nautilus-shell-ui.xml.h:17
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
@@ -7060,155 +6804,287 @@ msgstr ""
 "Д�лг�цийн үз�мжийг тохируулахад ашиглаж болохуйц х��, өнгө, �мблемүүдийг "
 "үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:8
+#: src/nautilus-shell-ui.xml.h:18
 msgid "Display the latest contents of the current location"
 msgstr "Эн� ха�г д��р шин�чл�гд��н зүйл байвал үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:9
+#: src/nautilus-shell-ui.xml.h:19
 msgid "Edit Nautilus preferences"
 msgstr "�аутилу�ын тохируулгыг өөрчлөх"
 
-#: src/nautilus-shell-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-shell-ui.xml.h:20
+msgid "Find"
+msgstr "Хайх"
+
+#: src/nautilus-shell-ui.xml.h:21
+msgid "Forward"
+msgstr "Урагш"
+
+#: src/nautilus-shell-ui.xml.h:22
 msgid "Go to Empty CD folder"
-msgstr "Хогийн �авны хавт�анд очих"
+msgstr "Хоо�он КД хавт�анд очих"
 
-#: src/nautilus-shell-ui.xml.h:12
+#: src/nautilus-shell-ui.xml.h:23
+msgid "Go to the Start Here folder"
+msgstr "Э�ДЭЭС ЭХЛЭХ н�рт�й хавта� руу очих"
+
+#: src/nautilus-shell-ui.xml.h:24
 msgid "Go to the home location"
-msgstr "Хувийн х�ргийн хавта�т очих"
+msgstr "Г�р хавта�т очих"
 
-#: src/nautilus-shell-ui.xml.h:13
+#: src/nautilus-shell-ui.xml.h:25
+msgid "Go to the next visited location"
+msgstr "Дараагийн оч�он ха�г (байршил) руу очих"
+
+#: src/nautilus-shell-ui.xml.h:26
+msgid "Go to the previous visited location"
+msgstr "Яг өмнө оч�он ха�г руу �г�ж очих"
+
+#: src/nautilus-shell-ui.xml.h:27
+msgid "Go to the trash folder"
+msgstr "Хогийн �авны хавт�анд очих"
+
+#: src/nautilus-shell-ui.xml.h:28
 msgid "Go up one level"
 msgstr "��г шатаар д��шл�х"
 
-#: src/nautilus-shell-ui.xml.h:14
+#: src/nautilus-shell-ui.xml.h:29
+msgid "Home"
+msgstr "Г�р"
+
+#: src/nautilus-shell-ui.xml.h:30
+msgid "Location _Bar"
+msgstr "_Ха�гийн(байршлын) цонх"
+
+#: src/nautilus-shell-ui.xml.h:31
 msgid "Normal Si_ze"
 msgstr "�ормал х�_мж��"
 
-#: src/nautilus-shell-ui.xml.h:15
+#: src/nautilus-shell-ui.xml.h:32
+msgid "Open New _Window"
+msgstr "Шин� _цонх н��х"
+
+#: src/nautilus-shell-ui.xml.h:33
+msgid "Open another Nautilus window for the displayed location"
+msgstr "Үзүүлж буй ха�г(байршилд) зориулан шин� �аутилу�ын цонх н��х"
+
+#: src/nautilus-shell-ui.xml.h:34
 msgid "Prefere_nces"
 msgstr "Тох_иргоо"
 
-#: src/nautilus-shell-ui.xml.h:16
+#: src/nautilus-shell-ui.xml.h:35
+msgid "Reload"
+msgstr "Шин��р ачаалах"
+
+#: src/nautilus-shell-ui.xml.h:36
 msgid "Report Profiling"
 msgstr "Profiling-ийн тайлан"
 
-#: src/nautilus-shell-ui.xml.h:17
+#: src/nautilus-shell-ui.xml.h:37
 msgid "Reset Profiling"
 msgstr "Profiling шин��р �хлүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:20
+#: src/nautilus-shell-ui.xml.h:38
+msgid "Search this computer for files"
+msgstr "Эн� компьютер дотор файл хайх"
+
+#: src/nautilus-shell-ui.xml.h:40
 msgid "Show the contents at the normal size"
 msgstr "�гуулгыг ангийн х�мж��г��р үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:21 src/nautilus-zoom-control.c:96
+#: src/nautilus-shell-ui.xml.h:41 src/nautilus-zoom-control.c:96
 msgid "Show the contents in less detail"
 msgstr "Бага детальчилж үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:22 src/nautilus-zoom-control.c:95
+#: src/nautilus-shell-ui.xml.h:42 src/nautilus-zoom-control.c:95
 msgid "Show the contents in more detail"
 msgstr "�гуулгыг н�гд г�н�гүй үзүүл�х"
 
-#: src/nautilus-shell-ui.xml.h:23
+#: src/nautilus-shell-ui.xml.h:43
+msgid "St_atusbar"
+msgstr "Ст_ату� харуулах �амбар"
+
+#: src/nautilus-shell-ui.xml.h:44
 msgid "Start Profiling"
 msgstr "Profiling �хл�х"
 
-#: src/nautilus-shell-ui.xml.h:24
+#: src/nautilus-shell-ui.xml.h:45
+msgid "Stop"
+msgstr "Зог�"
+
+#: src/nautilus-shell-ui.xml.h:46
 msgid "Stop Profiling"
 msgstr "Profiling дуу�гах"
 
-#: src/nautilus-shell-ui.xml.h:25
+#: src/nautilus-shell-ui.xml.h:47
 msgid "Stop loading this location"
 msgstr "Эн� ха�г руу орохоо болих"
 
-#: src/nautilus-shell-ui.xml.h:26
+#: src/nautilus-shell-ui.xml.h:48
 msgid "Undo the last text change"
 msgstr "Тек�т�нд хий��н �үүлийн за�вараа буцаах"
 
-#: src/nautilus-shell-ui.xml.h:28
+#: src/nautilus-shell-ui.xml.h:49
+msgid "Up"
+msgstr "Д��ш��"
+
+#. Add "View as..." extra bonus choice.
+#: src/nautilus-shell-ui.xml.h:50 src/nautilus-window.c:522
+#: src/nautilus-window.c:1506
+msgid "View as..."
+msgstr "Дараах х�лб�р��р харах:..."
+
+#: src/nautilus-shell-ui.xml.h:51
 msgid "Write contents to a CD"
-msgstr ""
+msgstr "�гуулгыг КД рүү бичих"
 
-#: src/nautilus-shell-ui.xml.h:29
+#: src/nautilus-shell-ui.xml.h:52
+msgid "Write to CD"
+msgstr "КД рүү бичих"
+
+#: src/nautilus-shell-ui.xml.h:53
 msgid "Zoom _In"
 msgstr "Татаж ой_ртуулах"
 
-#: src/nautilus-shell-ui.xml.h:30
+#: src/nautilus-shell-ui.xml.h:54
 msgid "Zoom _Out"
 msgstr "Баг_а�гах"
 
-#: src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-shell-ui.xml.h:55
 msgid "_About"
 msgstr "_Тухай"
 
-#: src/nautilus-shell-ui.xml.h:32
+#: src/nautilus-shell-ui.xml.h:56
+msgid "_Add Bookmark"
+msgstr "Т�мд�гл�г��(�ануулах) _н�м�х"
+
+#: src/nautilus-shell-ui.xml.h:57
+msgid "_Back"
+msgstr "_Эг�н"
+
+#: src/nautilus-shell-ui.xml.h:58
 msgid "_Backgrounds and Emblems"
 msgstr "_Д�в�г�р болон �мблемүүд"
 
-#: src/nautilus-shell-ui.xml.h:33
+#: src/nautilus-shell-ui.xml.h:59
+msgid "_Bookmarks"
+msgstr "Т�м_д�гл�г��"
+
+#: src/nautilus-shell-ui.xml.h:60
 msgid "_CD Creator"
-msgstr ""
+msgstr "_КД үү�г�гч"
 
-#: src/nautilus-shell-ui.xml.h:34
+#: src/nautilus-shell-ui.xml.h:61
+msgid "_Clear History"
+msgstr "Үйл �вдлын жаг�аалтыг ц�в_�рл�х"
+
+#: src/nautilus-shell-ui.xml.h:62
 msgid "_Close Window"
 msgstr "Цонхыг хаа_х"
 
-#: src/nautilus-shell-ui.xml.h:35
+#: src/nautilus-shell-ui.xml.h:63
 msgid "_Contents"
 msgstr "�г_уулга"
 
-#: src/nautilus-shell-ui.xml.h:37
+#: src/nautilus-shell-ui.xml.h:65
 msgid "_Edit"
 msgstr "_Болов�руулах"
 
-#: src/nautilus-shell-ui.xml.h:38
+#: src/nautilus-shell-ui.xml.h:66
+msgid "_Edit Bookmarks"
+msgstr "Хавчуурга _тохируулах"
+
+#: src/nautilus-shell-ui.xml.h:67
 msgid "_File"
 msgstr "_Файл"
 
-#: src/nautilus-shell-ui.xml.h:39
+#: src/nautilus-shell-ui.xml.h:68
+msgid "_Find"
+msgstr "Хай_х"
+
+#: src/nautilus-shell-ui.xml.h:69
+msgid "_Forward"
+msgstr "Ура_гш"
+
+#: src/nautilus-shell-ui.xml.h:70
+msgid "_Go"
+msgstr "Тий_ш очих"
+
+#: src/nautilus-shell-ui.xml.h:71
 msgid "_Help"
 msgstr "_Ту�ламж"
 
-#: src/nautilus-shell-ui.xml.h:41
+#: src/nautilus-shell-ui.xml.h:72
+msgid "_Home"
+msgstr "_Г�р"
+
+#: src/nautilus-shell-ui.xml.h:73
+msgid "_Location..."
+msgstr "Бай_ршил..."
+
+#: src/nautilus-shell-ui.xml.h:75
 msgid "_Profiler"
 msgstr "_Profiler"
 
-#: src/nautilus-shell-ui.xml.h:42
+#: src/nautilus-shell-ui.xml.h:76
 msgid "_Reload"
 msgstr "С_�рг��х"
 
-#: src/nautilus-shell-ui.xml.h:43
+#: src/nautilus-shell-ui.xml.h:77
 msgid "_Report Profiling"
 msgstr "Profiling-_тайлагнах"
 
-#: src/nautilus-shell-ui.xml.h:44
+#: src/nautilus-shell-ui.xml.h:78
 msgid "_Reset Profiling"
 msgstr "Profiling _буцаах"
 
-#: src/nautilus-shell-ui.xml.h:45
+#: src/nautilus-shell-ui.xml.h:79
+msgid "_Side Pane"
+msgstr "Хаж_уугийн �амбар"
+
+#: src/nautilus-shell-ui.xml.h:80
+msgid "_Start Here"
+msgstr "�нд��� �х_л�х"
+
+#: src/nautilus-shell-ui.xml.h:81
 msgid "_Start Profiling"
 msgstr "Profiling �хл�х"
 
-#: src/nautilus-shell-ui.xml.h:46
+#: src/nautilus-shell-ui.xml.h:82
 msgid "_Stop"
 msgstr "_Зог�"
 
-#: src/nautilus-shell-ui.xml.h:47
+#: src/nautilus-shell-ui.xml.h:83
 msgid "_Stop Profiling"
 msgstr "Profiling дуу�гах"
 
-#: src/nautilus-shell-ui.xml.h:48
+#: src/nautilus-shell-ui.xml.h:84
+msgid "_Toolbar"
+msgstr "_Багажийн �амбар"
+
+#: src/nautilus-shell-ui.xml.h:85
+msgid "_Trash"
+msgstr "Х_ог"
+
+#: src/nautilus-shell-ui.xml.h:86
 msgid "_Undo"
 msgstr "_Эрг��д"
 
-#: src/nautilus-shell-ui.xml.h:50
+#: src/nautilus-shell-ui.xml.h:87
+msgid "_Up"
+msgstr "_Д��ш"
+
+#: src/nautilus-shell-ui.xml.h:88
+msgid "_View"
+msgstr "_Харах"
+
+#: src/nautilus-shell-ui.xml.h:89
 msgid "_View as..."
 msgstr "Дараах ма�гаар ха_рах..."
 
-#: src/nautilus-shell-ui.xml.h:51
-#, fuzzy
+#: src/nautilus-shell-ui.xml.h:90
 msgid "_Write to CD"
-msgstr "_Бичих"
+msgstr "КД рүү _бичих"
 
 #: src/nautilus-side-pane.c:395
 msgid "Close the side pane"
@@ -7219,69 +7095,32 @@ msgstr "Хажуугийн �амбарыг хаах"
 msgid "Show %s"
 msgstr "%s үзүүл�х"
 
-#: src/nautilus-spatial-window-ui.xml.h:1
-msgid "CD _Creator"
-msgstr ""
-
-#: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "_Бүх цонхыг хаах"
-
-#: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
-msgid "Go to Computer"
-msgstr "Хогийн �авны хавт�анд очих"
-
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
-msgid "Go to the CD Creator"
-msgstr "Хогийн �авны хавт�анд очих"
-
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
-msgid "Open _Location..."
-msgstr "Бай_ршил..."
-
-#: src/nautilus-spatial-window-ui.xml.h:9
-msgid "Open _Pa_rent"
-msgstr ""
-
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
-msgid "Open the parent folder"
-msgstr "Хавта� -[Объектууд ]"
-
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
-msgid "_Places"
-msgstr "_Загварууд"
-
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
 msgstr "Хайх:"
 
-#: src/nautilus-view-frame.c:595
+#: src/nautilus-view-frame.c:557
 msgid "a title"
 msgstr "Гарчиг"
 
-#: src/nautilus-view-frame.c:604
+#: src/nautilus-view-frame.c:566
 msgid "the browse history"
 msgstr "Хөтөчийн а�л�ан ха�гийн м�д��л�л"
 
-#: src/nautilus-view-frame.c:613
+#: src/nautilus-view-frame.c:575
 msgid "the current selection"
 msgstr "Одоо байгаа �онголт"
 
-#: src/nautilus-view-frame.c:622
-msgid "the type of window the view is embedded in"
-msgstr ""
+#. Special Desktop window title (displayed in the Ctrl-Alt-Tab window)
+#: src/nautilus-window-manage-views.c:192
+msgid "Desktop"
+msgstr "Д�лг�ц"
 
-#: src/nautilus-window-manage-views.c:817
+#: src/nautilus-window-manage-views.c:863
 msgid "View Failed"
 msgstr "Харах �вцад алдаа гарлаа"
 
-#: src/nautilus-window-manage-views.c:828
+#: src/nautilus-window-manage-views.c:874
 #, c-format
 msgid ""
 "The %s view encountered an error and can't continue. You can choose another "
@@ -7290,25 +7129,53 @@ msgstr ""
 "Харах �вц %s �хл�хд�� алдаатай тулгарч цааш �вахгүй боллоо. Та өөр н�г�н "
 "үз�х х�лб�рийг �онгох ��в�л өөр ха�гийг �онгож болно."
 
-#: src/nautilus-window-manage-views.c:839
+#: src/nautilus-window-manage-views.c:885
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Харах �вц %s �хл�хд�� алдаатай тулгарлаа"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:1042
 msgid "Content View"
 msgstr "�гуулгыг харах"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:1043
 msgid "View of the current file or folder"
 msgstr "Одоогоор байгаа файл болон т�дг��рийн хавт�ууд"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1066
+msgid ""
+"One of the sidebar panels encountered an error and can't continue. "
+"Unfortunately I couldn't tell which one."
+msgstr ""
+"�ль н�г хажуугийн �амбар алдаатай тулгаран цааш үрг�лжлүүл�н ажиллах "
+"боломжгүй байна. Харам�алтай нь аль г�д�г нь үл м�д�гд�н�."
+
+#: src/nautilus-window-manage-views.c:1070
+#, c-format
+msgid ""
+"The %s sidebar panel encountered an error and can't continue. If this keeps "
+"happening, you might want to turn this panel off."
+msgstr ""
+"Хажуугийн %s �амбар алдаатай тулгаран цааш үрг�лжлүүл�н ажиллах боломжгүй "
+"байна. Х�р�в �н� олон дахин давтагдвал �амбараа хаа�ан нь д��р."
+
+#: src/nautilus-window-manage-views.c:1075
+msgid "Sidebar Panel Failed"
+msgstr "Хажуугийн �амбарын ажиллагаа алдаатай."
+
+#: src/nautilus-window-manage-views.c:1328
 #, c-format
 msgid "Couldn't find \"%s\". Please check the spelling and try again."
 msgstr "»%s« ха�г олд�онгүй. Зөв бич��н ���х�� шалгаад дахин оролдоно уу."
 
-#: src/nautilus-window-manage-views.c:1259
+#: src/nautilus-window-manage-views.c:1334
+#, c-format
+msgid "\"%s\" is not a valid location. Please check the spelling and try again."
+msgstr ""
+"»%s« нь утга төгөлдөр ха�г биш байна. Зөв бич��н ���х�� шалгаад дахин "
+"оролдоно уу."
+
+#: src/nautilus-window-manage-views.c:1348
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot determine what type of file "
@@ -7317,29 +7184,28 @@ msgstr ""
 "�аутилу� файлын төрлийг нь тодорхойлж чадаагүй тул »%s«-ийг харуулж чадахгүй "
 "байна."
 
-#: src/nautilus-window-manage-views.c:1267
+#: src/nautilus-window-manage-views.c:1356
 #, c-format
 msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "�аутилу� »%s«-ийг харуулах чадвартай программ �уулгаагүй байна."
+msgstr "�аутилу� »%s«-ийг харуулах чадвартай програм �уулгаагүй байна."
 
 #. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
+#: src/nautilus-window-manage-views.c:1368
 #, c-format
 msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr ""
-"�аутилу� %s:ха�гуудтай харьцах чадваргүйтул »%s«-ийг харуулж чадахгүй байна."
+msgstr "�аутилу� %s:ха�гуудтай харьцах чадваргүйтул »%s«-ийг харуулж чадахгүй байна."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1374
 #, c-format
 msgid "Couldn't display \"%s\", because the attempt to log in failed."
 msgstr "Хандалт алдаатай бол�он тул »%s«-ийг харуулж чадахгүй байна."
 
-#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1379
 #, c-format
 msgid "Couldn't display \"%s\", because access was denied."
 msgstr "Хандалт н�цаагд�ан тул »%s«-ийг харуулж чадахгүй байна."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1390
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
@@ -7348,14 +7214,14 @@ msgstr ""
 "Хо�т »%s« олдоогүй тул »%s«-ийг харуулж чадахгүй байна. Таны Proxy-"
 "тохируулгууд бүр�н зөв болоод хо�тын н�р зөв бичигд��н ���хийг шалгана уу."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
+#: src/nautilus-window-manage-views.c:1398
+#, c-format
 msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
 msgstr ""
-"Хо�тын н�р хоо�он бай�ан тул »%s«-ийг харуулж чадахгүй байна. Таны Proxy-"
-"тохируулгууд бүр�н зөв ���хийг шалгана уу."
+"»%s«-ийг харуулж чадахгүй байна. Таны итг�мжил�гчийн тохируулгууд бүр�н зөв "
+"���хийг шалгана уу."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1405
 #, c-format
 msgid ""
 "Couldn't display \"%s\", because Nautilus cannot contact the SMB master "
@@ -7366,7 +7232,7 @@ msgstr ""
 "байна.\n"
 "Дотоод �үлж��нд SMB-Server ажиллаж байгаа ���хийг шалгана уу."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1417
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
 "search service isn't running. Be sure that you have started the Medusa "
@@ -7378,28 +7244,51 @@ msgstr ""
 "�хлүүл��н ���х ��в�л индек�гүй бол Медузагийн индек�чл�л �вагдаж буй ���хийг "
 "шалгана уу."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1421
 msgid "Searching Unavailable"
 msgstr "Хайлт хийх боломжгүй"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1426
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "�аутилу� »%s«-ийг харуулж чадахгүй байна."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1431
 msgid "Can't Display Location"
 msgstr "Байршлыг харуулж чадахгүй байна."
 
-#: src/nautilus-window-menus.c:214
-msgid "Go to the location specified by this bookmark"
-msgstr "Эн� т�мд�гл�г��нд зааж өг�өн байршилд очих"
+#: src/nautilus-window-manage-views.c:1687
+msgid "Side Pane"
+msgstr "Хажуугийн �амбар"
+
+#: src/nautilus-window-manage-views.c:1689
+msgid "Contains a side pane view"
+msgstr "Хажуугийн �амбарын үз�мж."
+
+#. This is a little joke, shows up occasionally. I only
+#. * implemented this feature so I could use this joke.
+#.
+#: src/nautilus-window-menus.c:417
+msgid ""
+"Are you sure you want to forget history? If you do, you will be doomed to "
+"repeat it."
+msgstr ""
+"Та түүх�� мартмаар байна уу? Т�гв�л дараа дахин дахин хийх ё�той болно "
+"г�дгийг анхаараарай."
+
+#: src/nautilus-window-menus.c:420
+msgid "Are you sure you want to clear the list of locations you have visited?"
+msgstr "Та өөрийн зочил�он (ачаал�ан) ха�гуудын жаг�аалтыг ц�в�рл�х үү?"
+
+#: src/nautilus-window-menus.c:425
+msgid "Clear History"
+msgstr "Үйл �вцын хураангуй"
 
 #. Localize to deal with issues in the copyright
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:719
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7407,13 +7296,13 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:726 src/nautilus-window-menus.c:727
 msgid "Translator Credits"
 msgstr ""
 "Монгол хөрвүүл�г (анхны оролдлого):\n"
 "Очирбатын. Батза�а <buuvei@chinggis.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:732
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7421,49 +7310,68 @@ msgstr ""
 "�аутилу� бол таны файлуудыг болоод таны �и�темийн удирдлагыг х�лбарчлах "
 "GNOME-ийн график Shell бүрхүүл юм."
 
-#: src/nautilus-window-toolbars.c:361
+#: src/nautilus-window-menus.c:809
+#, c-format
+msgid ""
+"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
+"this location from your list?"
+msgstr ""
+"Байршил %s үл оршино. Та �н� байршилтай холбоотой бүх т�мд�гл�г��г "
+"жаг�аалтаа�аа ха�ах уу?"
+
+#: src/nautilus-window-menus.c:813
+msgid "Bookmark for Nonexistent Location"
+msgstr "Байхгүй байршлын т�мд�гл�г��"
+
+#: src/nautilus-window-menus.c:814
+msgid "Remove"
+msgstr "У�тгах"
+
+#: src/nautilus-window-menus.c:825
+#, c-format
+msgid "The location \"%s\" no longer exists."
+msgstr "Байршил »%s« байхгүй болж��."
+
+#: src/nautilus-window-menus.c:826
+msgid "Go to Nonexistent Location"
+msgstr "Үл орших байршилд очих"
+
+#: src/nautilus-window-menus.c:895
+msgid "Go to the location specified by this bookmark"
+msgstr "Эн� т�мд�гл�г��нд зааж өг�өн байршилд очих"
+
+#: src/nautilus-window-toolbars.c:367
 msgid "Go back a few pages"
 msgstr "Тодорхой тооны хууд�аар ухрах"
 
-#: src/nautilus-window-toolbars.c:364
+#: src/nautilus-window-toolbars.c:370
 msgid "Go forward a number of pages"
 msgstr "Тодорхой тооны хууд�аар урагшлах"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:678
+msgid "Information"
+msgstr "М�д��л�л"
+
+#: src/nautilus-window.c:1212
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Эн� байршлыг »%s«-р ил�рхийл�х"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
-msgid "Network"
-msgstr "Red Hat Network"
-
-#: src/nautilus-window.c:1175
-#, fuzzy
-msgid "Fonts"
-msgstr "_Бичиг"
-
-#: src/nautilus-window.c:1178
-#, fuzzy
-msgid "CD Creator"
-msgstr "Хогийн �авны хавт�анд очих"
-
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:2278
 msgid "Application ID"
-msgstr "Программын ID"
+msgstr "Програмын ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:2279
 msgid "The application ID of the window."
-msgstr "Цонхны программ ID"
+msgstr "Цонхны програм ID"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:2285
 msgid "Application"
-msgstr "Программ"
+msgstr "Програм"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:2286
 msgid "The NautilusApplication associated with this window."
-msgstr "�аутилу�ын программ �н� цонхтой холбоотой."
+msgstr "�аутилу�ын програм �н� цонхтой холбоотой."
 
 #: src/nautilus-zoom-control.c:83
 msgid "Zoom In"
@@ -7497,73 +7405,6 @@ msgstr "Сүлж��ний �ерверүүд"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "�аутилу�ын файл менежер��р дамжуулан Сүлж��ний �ерверүүдийг харах."
 
-#~ msgid "Unknown"
-#~ msgstr "Үл м�д�х"
-
-#~ msgid "Floppy"
-#~ msgstr "У�н ди�к"
-
-#~ msgid "CD-ROM"
-#~ msgstr "CD-ROM"
-
-#~ msgid "Zip Drive"
-#~ msgstr "Zip-уншигч"
-
-#~ msgid "Audio CD"
-#~ msgstr "Дууны-CD"
-
-#~ msgid "Root Volume"
-#~ msgstr "Үнд��н хуваалт (Partition)"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. There is probably no "
-#~ "floppy in the drive."
-#~ msgstr ""
-#~ "�аутилу� у�н ди�к уншигчийг холбож чад�ангүй. Магадгүй, дотор нь �мар ч "
-#~ "у�н ди�к байхгүй байж болох"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the volume. There is probably no media in "
-#~ "the device."
-#~ msgstr ""
-#~ "�аутилу� хуваалтыг тань�ангүй. Магадгүй, дотор нь �мар ч м�д��л�л "
-#~ "зөөгүүрбайхгүй байж болох"
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
-#~ "a format that cannot be mounted."
-#~ msgstr ""
-#~ "�аутилу� у�н ди�к уншигчийг холбож чад�ангүй. Магадгүй, дотор нь буй у�н "
-#~ "ди�кийн байж болох формат нь таньж холболт хийх боломжгүй байж болох."
-
-#~ msgid ""
-#~ "Nautilus was unable to mount the selected volume. The volume is probably "
-#~ "in a format that cannot be mounted."
-#~ msgstr ""
-#~ "�аутилу� хуваалтыг тань�ангүй. Магадгүй, дотор нь буй у�н ди�кийн байж "
-#~ "болох формат нь таньж холболт хийх боломжгүй байж болох."
-
-#~ msgid "Nautilus was unable to mount the selected floppy drive."
-#~ msgstr "�аутилу� таны �онго�он ди�к уншигчийг холбож чад�ангүй."
-
-#~ msgid "Nautilus was unable to mount the selected volume."
-#~ msgstr "�аутилу� таны �онго�он хуваалтыг тань�ангүй."
-
-#~ msgid "Nautilus was unable to unmount the selected volume."
-#~ msgstr "�аутилу� таны �онго�он хуваалтыг �алгаж чад�ангүй."
-
-#~ msgid "ISO 9660 Volume"
-#~ msgstr "ISO-9660-М�д��л�л агуулах"
-
-#~ msgid "Error executing utility program '%s': %s"
-#~ msgstr "ту�лах программ »%s«-ийг ажиллуулахад алдаа гарлаа: %s"
-
-#~ msgid "Dis_ks"
-#~ msgstr "_Ди�күүд"
-
-#~ msgid "Mount or unmount disks"
-#~ msgstr "Ди�күүдийг холбох ��в�л �алгах"
-
 #, fuzzy
 #~ msgid "Default zoom level used by the icon view"
 #~ msgstr "Одоогоор ид�вхт�й байгаа томруулах х�мж��г тохируулах"
@@ -7572,9 +7413,6 @@ msgstr "�аутилу�ын файл менежер��р дамжуулан С
 #~ msgid "Default zoom level used by the list view"
 #~ msgstr "Одоогоор ид�вхт�й байгаа томруулах х�мж��г тохируулах"
 
-#~ msgid "Open _in This Window"
-#~ msgstr "�н� цонхон _дотор н��х"
-
 #~ msgid "_New Folder"
 #~ msgstr "Шин� Хав_та�"
 
@@ -7584,36 +7422,9 @@ msgstr "�аутилу�ын файл менежер��р дамжуулан С
 #~ msgid "Use _manual layout"
 #~ msgstr "_Гарын хуваарийг х�р�гл�х"
 
-#~ msgid "_Open activated item in a new window"
-#~ msgstr "Сонго�он объект бүрийг шин� цонхонд _н��х"
-
-#~ msgid "Change the visibility of this window's toolbar"
-#~ msgstr "Эн� цонхны багажийн �амбарын үз�мжийг өөрчлөх"
-
-#~ msgid "Go to the Start Here folder"
-#~ msgstr "Э�ДЭЭС ЭХЛЭХ н�рт�й хавта� руу очих"
-
 #~ msgid "New _Window"
 #~ msgstr "Шин� _цонх"
 
-#~ msgid "Open another Nautilus window for the displayed location"
-#~ msgstr "Үзүүлж буй ха�г(байршилд) зориулан шин� �аутилу�ын цонх н��х"
-
-#~ msgid "_Find"
-#~ msgstr "Хай_х"
-
-#~ msgid "_Start Here"
-#~ msgstr "�нд��� �х_л�х"
-
-#~ msgid "_Toolbar"
-#~ msgstr "_Багажийн �амбар"
-
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Байршил »%s« байхгүй болж��."
-
-#~ msgid "Go to Nonexistent Location"
-#~ msgstr "Үл орших байршилд очих"
-
 #~ msgid "Your HTTP Proxy requires you to log in.\n"
 #~ msgstr "Та өөрийгөө HTTP-Proxy-д�� бүртгүүл�х шаардлагатай .\n"
 
@@ -7642,6 +7453,9 @@ msgstr "�аутилу�ын файл менежер��р дамжуулан С
 #~ msgid "You cannot copy the Trash."
 #~ msgstr "Та хогийн �авыг хуулбарлаж болохгүй."
 
+#~ msgid "F_onts"
+#~ msgstr "_Бичиг"
+
 #~ msgid "Lucida"
 #~ msgstr "Lucida"
 
@@ -7666,6 +7480,9 @@ msgstr "�аутилу�ын файл менежер��р дамжуулан С
 #~ msgid "Use the Times Font"
 #~ msgstr "Бичиг Times-ийг ашиглах"
 
+#~ msgid "_Courier"
+#~ msgstr "_Courier"
+
 #~ msgid "_Fixed"
 #~ msgstr "_Хүр��т�й"
 
@@ -7677,3 +7494,4 @@ msgstr "�аутилу�ын файл менежер��р дамжуулан С
 
 #~ msgid "_Times"
 #~ msgstr "_Times"
+
diff --git a/po/ms.po b/po/ms.po
index b8ab177cf..8272a36eb 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-13 01:09+0800\n"
-"PO-Revision-Date: 2003-11-13 01:08+0800\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-27 17:24+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() gagal."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblem"
 
@@ -54,47 +54,53 @@ msgstr "Paparan Emblem Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Tak dapat membuang emblem bernama '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Tak dapat membuang emblem dengan nama '%s'. Ini mungkin kerana emblem adalah "
-"kekal, dan bukan yang ditambah oleh anda."
+"Ini mungkin kerana emblem adalah kekal, dan bukan yang ditambah oleh anda."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
-msgstr "Tak dapat membuang emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
+msgstr "Tak Dapat Membuang Emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Tak dapat menukarnama emblem dengan nama '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Tak dapat membuang emblem dengan nama '%s'. Ini mungkin kerana emblem adalah "
-"kekal, dan bukan yang ditambah oleh anda."
+"Ini mungkin kerana emblem adalah kekal, dan bukan yang ditambah oleh anda."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
-msgstr "Tak dapat menukarnama emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
+msgstr "Tak Dapat Menukarnama Emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Tukarnama Emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Masukkan nama baru bagi emblem yg dipaparkan:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Tukarnama"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Tambah Emblem..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -102,7 +108,7 @@ msgstr ""
 "Masukkan nama di sebelah emblem. Nama ini akan digunakan di tempat lain "
 "untuk mengenalpasti emblem."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -110,139 +116,55 @@ msgstr ""
 "Masukkan nama di sebelah emblem. Nama ini akan digunakan di tempat lain "
 "untuk mengenalpasti emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Terdapat fail yang tidak boleh ditambah sebagai emblem kerana ia bukanlah "
-"imej yang sah."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Terdapat fail yang tidak boleh ditambah sebagai emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
-msgstr "Tak dapat menambah emblem"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Emblem nampaknya bukan fail imej yang sah."
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr "Tak Dapat Menambah Emblem"
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Tiada fail yang boleh ditambah sebagai emblem."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
-"Tiada fail yang boleh ditambah sebagai emblem kerana ia nampaknya bukanlah "
-"imej yang sah."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Teks diheret bukan lokasi fail yang sah."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
-msgstr "Tak dapat menambah emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
+msgstr "Tak Dapat Menambah Emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Fail '%s' nampaknya bukan fail imej yang sah."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Fail diheret nampaknya bukan fail imej yang sah."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Padam"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Kilang bagi pelihat perkakasan"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Perkakasan"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Pelihat Perkakasan"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Paparan perkakasan"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Lihat sebagai perkakasan"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "paparan perkakasan"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nama ikon untuk paparan perkakasan"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "Ringkasan maklumat perkakasan"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K saiz cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Uptime adalah %d hari, %d jam, %d minit"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Gambaran Perkakasan"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Inilah tempat letak bagi page CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Inilah tempat letak bagi page RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ini adalah tempat letak bagi halaman IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Sejarah"
@@ -906,6 +828,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Perkakasan"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "AntaraBangsa"
@@ -1181,26 +1107,18 @@ msgid "Desktop trash icon name"
 msgstr "nama ikon sampah desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Hidupkan flag 'special' pada dialog keutamaan fail"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Namafail bagi latarbelakang direktori default. Hanya digunakan jika "
+"Namafail bagi latarbelakang folder default. Hanya digunakan jika "
 "background_set adalah benar."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1208,6 +1126,14 @@ msgstr ""
 "Namafail bagi latarbelakang jendela tepi default. Hanya digunakan jika "
 "side_pane_background adalah benar."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Sorok tandabuku default pada menu tandabuku"
@@ -1218,11 +1144,11 @@ msgstr "Ketampakan ikon rumah pada desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
-"Jika ditetapkan sebagai benar, Nautilus akan memapar direktori pada pepohon "
-"jendela tepi. Sebaliknya ia akan memapar kedua-dua direktori dan fail."
+"Jika ditetapkan sebagai benar, Nautilus akan memapar folder pada pepohon "
+"jendela tepi. Sebaliknya ia akan memapar kedua-dua folder dan fail."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
@@ -1259,10 +1185,10 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
-"Jika ditetapkan sebagai benar, Nautilus akan memapar direktori dahulu drpd "
+"Jika ditetapkan sebagai benar, Nautilus akan memapar folder dahulu drpd "
 "memapar fail pada paparan ikon dan senarai."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1301,9 +1227,11 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+"Jika ditetapkan sebagai benar, Nautilus akan melukis ikon pada desktop. Jika "
+"palsu, ia akan menggunakan ~/Desktop sebagai desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1315,7 +1243,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1332,7 +1260,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1358,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1382,7 +1310,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1400,30 +1328,32 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Pengendali Nautilus melukis desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus mengguna folder rumah sebagai desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr ""
+msgid "Only show folders in the tree sidebar"
+msgstr "Hanya papar folder pada bar tepi pepohon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
 msgstr ""
+"Nilai yang boleh adalah \"single\" untuk melancarkan fail pada klik tunggal, "
+"atau \"double\" untuk melancarkan ia pada dwi klik."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid "Put labels beside icons"
-msgstr ""
+msgstr "Letak label sebelah ikon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid "Reverse sort order in new windows"
 msgstr "Turutan songsang isihan pada tetingkap baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr "Papar direktori dahulu pada tetingkap"
+msgid "Show folders first in windows"
+msgstr "Papar folder dahulu pada tetingkap"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1457,7 +1387,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1465,30 +1395,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1532,7 +1462,7 @@ msgid "Use manual layout in new windows"
 msgstr "Guna susunatur manual pada tetingkap baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Guna susunatur padat pada tetingkap baru"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1555,8 +1485,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
-msgstr "Bila memapar bilangan item pada direktori"
+msgid "When to show number of items in a folder"
+msgstr "Bila memapar bilangan item pada folder"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "When to show preview text in icons"
@@ -1567,8 +1497,8 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
-msgstr "Samada latarbelakang desktop default tersendiri ditetapkan."
+msgid "Whether a custom default folder background has been set."
+msgstr "Samada latarbelakang folder default tersendiri ditetapkan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
@@ -1576,7 +1506,7 @@ msgstr "Samada jendela tepi default tersendiri telah ditetapkan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Whether to ask for confirmation when moving files to trash"
-msgstr ""
+msgstr "Samada bertanyakan kepastian bila memindah fail ke sampah"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Whether to enable immediate deletion"
@@ -1724,67 +1654,77 @@ msgstr "ulangtetap"
 msgid "on the desktop"
 msgstr "pada desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Anda tak boleh memadam ikon volum."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Anda tak boleh padam ikon volum. Jika anda ingin melentingkan volum, sila "
-"guna Lenting pada menu klik-kanan bagi volum itu."
+"Jika anda ingin melentingkan volum, sila guna Lenting pada menu klik-kanan "
+"bagi volum itu."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
-msgstr "Tak dapat memadam volum"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Tak Dapat Memadam volum"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Sampah"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Pindah ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Salin ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Pautkan ke sini"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Tetapkan sebagai Latar _Belakang"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Batal"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Tetapkan sebagai latarbelakang bagi _semua folder"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Tetapkan sebagai latarbelakang bagi folder _ini"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Maaf anda mesti nyatakan katakunci bukan-kosong untuk emblem baru."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
-msgstr "Tak dapat memasang emblem"
+#: 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 "Tak Dapat Memasang Emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1794,18 +1734,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr "Maaf, \"%s\" adalah emblem tersedia ada. Sila pilih nama lain baginya."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Maaf, sudah ada emblem bernama \"%s.\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Sila pilih emblem dengan nama lain."
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Tak dapat memasang emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Maaf, tak dapat menyimpan emblem tersendiri."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Maaf, tak dapat mencimpan nama emblem tersendiri."
 
@@ -1824,369 +1770,265 @@ msgstr "Dari:"
 msgid "To:"
 msgstr "Ke:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Ralat bila memindah."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Ralat bila memindah.\n"
-"\n"
-"\"%s\" tak dapat dipindah kerana ianya pada cakera baca-sahaja."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "\"%s\" tak dapat dipindah kerana ianya pada cakera baca-sahaja."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Ralat bila memadam."
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Ralat ketika memadam.\n"
-"\n"
 "\"%s\" tak dapat dipadam kerana anda tiada keizinan mengubahsuai folder "
-"pangkalnya."
+"induknya."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Ralat ketika memadam.\n"
-"\n"
-"\"%s\" tak dapat dipadam kerana ianya berada di cakera baca-sahaja."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "\"%s\" tak dapat dipadam kerana ianya berada di cakera baca-sahaja."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Ralat bila memindah.\n"
-"\n"
 "\"%s\" tak boleh dipindah kerana anda tidak mempunyai keizinan untuk menukar "
-"ia atau folder pangkalnya."
+"ia atau folder induknya."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Ralat bila memindah."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Ralat bila memindah.\n"
-"\n"
-"\"%s\" tak dapat dipindah kerana folder ibubapanya terdapat  pada destinasi."
+"Tak dapat memindah \"%s\" kerana folder induknya terdapat  pada destinasi."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Ralat bila memindah.\n"
-"\n"
-"\"%s\" tak boleh dipindah ke Sampah kerana anda tiada keizinan untuk menukar "
-"ia dan folder pangkalnya."
+"Tak dapat memindah \"%s\" ke sampah kerana anda tiada keizinan untuk menukar "
+"ia dan folder induknya."
+
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Ralat bila menyalin."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Ralat bila menyalin.\n"
-"\n"
 "\"%s\" tak dapat disalin kerana anda tidak mempunyai keizinan untuk "
 "membacanya."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Ralat ketika menyalin ke \"%s\".\n"
-"\n"
-"Tidak cukup ruang pada destinasi."
+msgid "Error while copying to \"%s\"."
+msgstr "Ralat bila menyalin ke \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Ralay bila memindah ke \"%s\".\n"
-"\n"
-"Tidak cukup ruang pada destinasi."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Tidak cukup ruang pada destinasi."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Ralat bila mencipta pautan pada \"%s\".\n"
-"\n"
-"Tidak cukup ruang pada destinasi."
+msgid "Error while moving to \"%s\"."
+msgstr "Ralat bila memindahi ke \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Ralat bila menyalin ke  \"%s\".\n"
-"\n"
-"Anda tidak mempunyai keizinan untuk menulis ke folder ini."
+msgid "Error while creating link in \"%s\"."
+msgstr "Ralat bila mencipta pautan pada \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Ralat bila menyalin ke  \"%s\".\n"
-"\n"
-"Cekara destinasi adalah baca-saja."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "Anda tidak mempunyai keizinan untuk menulis ke folder ini."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Ralat bila memindah item ke \"%s\".\n"
-"\n"
-"Anda tidak mempunyai keizinan untuk menulis ke folder ini."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "Cakera destinasi adalah baca-saja."
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Ralat bila memindah item ke \"%s\".\n"
-"\n"
-"Cakera destinasi adalah baca-sahaja."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Ralat bila mencipta pautan pada \"%s\".\n"
-"\n"
-"Anda tidak mempunyai keizinan untuk menulis ke folder ini."
+msgid "Error while moving items to \"%s\"."
+msgstr "Ralat bila memindah item ke \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"Cakera destinasi adalah baca-sahaja."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila menyalin \"%s\".\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Ralat bila mencipta pautan pada \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila memindah \"%s\".\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Ralat \"%s\" bila menyalin \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Adakah anda ingin teruskan?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila mencipta pautan ke  \"%s\".\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Ralat \"%s\" bila memindah \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila memadam  \"%s\".\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Ralat \"%s\" ketika mencipta pautan ke \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila menyalin.\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Ralat \"%s\" bila memadam \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila memindah.\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while copying."
+msgstr "Ralat \"%s\" bila menyalin."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila memaut.\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while moving."
+msgstr "Ralat \"%s\" bila memindah."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Ralat \"%s\" bila memadam.\n"
-"\n"
-"Adakah anda ingin teruskan?"
+msgid "Error \"%s\" while linking."
+msgstr "Ralat \"%s \" bila memaut."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Ralat bila menyalin."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Ralat \"%s\" bila memadam."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Ralat bila memindah."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Ralat Bila Menyalin."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Ralat bila memaut."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Ralat Bila Memindah."
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Ralat bila memadam."
+msgid "Error While Linking"
+msgstr "Ralat Bila Memaut."
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Ralat Bila Memadam."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Langkah"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Langkah"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Ulangi"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Ulangi"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Tak dapat mmemindah \"%s\" me lokasi baru."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" tak dapat dialih ke lokasi baru, kerana namanya sudah digunakan bagi "
-"item istimewa yang tak boleh dibuang atau diganti.\n"
-"\n"
-"Jika anda ingin mengalih \"%s\", tukarnama dan cuba lagi."
+"Namanya sudah digunakan bagi item istimewa yang tak boleh dibuang atau "
+"diganti. Jika anda ingin mengalih item, tukarnama dan cuba lagi."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Tak dapat menyalin \"%s\" ke lokasi baru."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" tak dapat disalin ke lokasi baru, kerana namanya sudah digunakan bagi "
-"item istimewa yang tak boleh dibuang atau diganti.\n"
-"\n"
-"Jika anda ingin menyalin \"%s\", tukarnama dan cuba lagi."
+"Nama ini sudah digunakan bagi item istimewa yang tak boleh dibuang atau "
+"diganti.Jika anda ingin menyalin \"%s\", tukarnama dan cuba lagi."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Tak dapat mengganti fail."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "Tak Dapat Mengganti Fail"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"Fail \"%s\"  tersedia ada.\n"
-"\n"
-"Anda ingin menggantikannya?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Fail \"%s\"  tersedia ada.Anda ingin menggantikannya?"
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Jika anda menggantikan fail sedia ada, kandungannya akan ditindih."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
-msgstr "Konflik bila menyalin"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
+msgstr "Konflik Bila Menyalin"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Ganti"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Ganti"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Gantikan Semua"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Gantikan _Semua"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "Pautan ke %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "pautan lain ke %s"
@@ -2195,25 +2037,25 @@ msgstr "pautan lain ke %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "pautan %d ke %ss"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "pautan ke%d ke %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "pautan ke%d ke %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "pautan ke%d ke %s"
@@ -2227,560 +2069,584 @@ msgstr "pautan ke%d ke %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (salinan)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (salinan lain)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " salinan)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr " salinan)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr " salinan)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr " salinan)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (salinan)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (salinan lain)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (salinan ke %d)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (salinan ke %d)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (salinan ke %d)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (salinan ke %d)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d tak diketahui"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Memindah fail ke Sampah"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Fail dilempar keluar:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Pindah"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Bersedia untuk pindah ke Sampah"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Memindah fail"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Fail dipindahkan:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Bersedia untuk Pindah..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Selesai Memindah..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Cipta pautan ke fail"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Fail dipaut:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Berpaut"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Bersedia untuk Mencipta Pautan..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Selesai Mencipta Pautan..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Menyalin fail"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Fail disalin:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Menyalin"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Bersedia untuk Menyalin..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Anda tak boleh salin item ke Sampah."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Anda tak boleh salin item ke sampah."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Tak boleh Salin ke Sampah"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Anda tak boleh pindahkan folder sampah."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Anda tak boleh salin folder Sampah ini."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Tak dapat Tukar Lokasi Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Tak dapat salin Trash"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Anda tak boleh pindah folder ke dirinya."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Anda tak boleh salin folder ke dirinya."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "Folder destinasi berada dalam folder sumber."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Tak boleh Pindah ke Dirinya"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Tak dapat Salin ke Dirinya"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Anda tak boleh salin fail ke atas dirinya."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "Destinasi dan sumber adalah fail yang sama."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Tak dapat Salin ke Dirinya"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Ralat mencipta folder baru.\n"
-"\n"
-"Anda tidak mempunyai keizinan untuk menulis ke destinasi."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "Anda tidak mempunyai keizinan untuk menulis ke destinasi."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Ralat mencipta folder baru.\n"
-"\n"
-"Tiada ruang kosong pada destinasi."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "Tiada ruang kosong pada destinasi."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Ralat \"%s\" mencipta folder baru."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
-msgstr "Ralat mencipta folder baru"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Ralat mencipta folder baru."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
+msgstr "Ralat Mencipta Folder Baru"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "folder tak bertajuk"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Ralat \"%s\" mencipta dokumen baru."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Ralat mencipta dokumen baru."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Ralat Mencipta Dokumen Baru"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "fail baru"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Memadam fail"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Fail dipadam:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Memadam"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Bersedia untuk Memadam fail..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Mengosongkan Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Bersedia untuk Mengosongkan Sampah"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Anda pasti untuk mengosongkan semua item di dalam sampah?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Jika anda mengosongkan sampah, item akan dipadam selama-lamanya."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Kosong"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "gitu"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "gitu (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".gitu.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".gitu (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "gitu gitu"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "gitu gitu (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "gitu.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "gitu (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "gitu gitu.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "gitu gitu (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "gitu gitu.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "gitu gitu (salinan).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "gitu...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "gitu.. (salinan).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "gitu..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "gitu... (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "gitu. (salinan)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "gitu. (salinan lain)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "gitu (salinan lain)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "gitu (salinan lain).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "gitu (salinan ke 3)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "gitu (salinan ke 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "gitu gitu (salinan lain).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "gitu gitu (salina ke 3).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "gitu (salinan ke 13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "gitu (salinan ke 14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "gitu (salinan ke 13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "gitu (salinan ke 14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "gitu (salinan ke 21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "gitu (salinan ke 22)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "gitu (salinan ke 21).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "gitu (salinan ke 22).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "gitu (salinan ke 23)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "gitu (salinan ke 23).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "gitu (salinan ke 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "gitu (salinan ke 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "gitu (salinan ke 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "gitu (salinan ke 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "gitu gitu (salinan ke 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "gitu gitu (salinan ke 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "gitu gitu (salinan ke 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "gitu gitu (salinan ke 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "gitu gitu (salinan ke 100000000000000).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "gitu (salinan ke 10)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "gitu (salinan ke 11)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "gitu (salinan ke 10).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "gitu (salinan ke 11).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "gitu (salinan ke 12)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "gitu (salinan ke 12).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "gitu (salinan ke 110)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "gitu (salinan ke 111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "gitu (salinan ke 110).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "gitu (salinan ke 111).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "gitu (salinan ke 122)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "gitu (salinan ke 123)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "gitu (salinan ke 122).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "gitu (salinan ke 123).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "gitu (salinan ke 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "gitu (salinan ke 124).txt"
 
@@ -2799,64 +2665,64 @@ msgstr "gitu (salinan ke 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hari ini pada 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hari ini pada %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hari ini pada 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hari ini pada %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hari ini, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hari ini, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hari ini"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "semalam pada 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "semalam pada %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "semalam pada 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "semalam pada %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "semalam, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "semalam, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "semalam"
 
@@ -2865,134 +2731,134 @@ msgstr "semalam"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Rabu, September 00 0000 pada 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Isn, Okt 00 0000 pada 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Isn, Okt 00 0000 pada 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y pada %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Okt 00 0000 pada 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y pada %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Okt 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 item"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 folder"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fail"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 folder"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fail"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u item"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u Folder"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fail"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? item"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "Jenis entah"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "Jenis _MIME tidak diketahui"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "entah"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
 # lom
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3002,7 +2868,7 @@ msgstr ""
 "fail nome-vfs.keys anda berada di tempat slaha atau tidak dijumpai atas "
 "sebab lain."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3011,11 +2877,11 @@ msgstr ""
 "Tiada huraian dijumpai bagi jenis mime  \"%s\" (fail adalah \"%s\"), sila "
 "beritahu senarai emel gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "pautan"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "pautan (rosak)"
 
@@ -3136,11 +3002,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Cari fail mengikut nama fail dan ciri-ciri fail"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Paparan Ikon"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Paparan Senarai"
@@ -3284,147 +3152,146 @@ msgstr "Rumah %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Komputer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikon fail"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "teks boleh edit"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "label boleh edit"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "teks tambahan"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "lebih teks"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "terserlah bagi pilihan"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "samada ianya terserlah bagi pilihan"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "terserlah sebagai fokus papankekunci"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "samada ianya terserlah untuk merender fokus papankekunci"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "terserlah bagi jatuhan"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "samada terserlah bagi jatuhan DND"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Segi empat pilihan"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Teks Kerangka"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Lukis Kerangka sekeliling tek tak dipilih"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Warna Kotak Pilihan"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Warna bagi kotak pilihan"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa Kotak Pilihan"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacity kotak pilihan"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Serlah alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacity bagi serlahan bagi ikon dipilih"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Warna Maklumat Cerah"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Warna digunakan bagi maklumat teks berlawanan dengan latar gelap"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Warna Maklumat Gelap"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Warna digunakan bagi maklumat teks berlawanan dengan latar cerah"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
+msgstr ""
+"Adakah anda ingin menukar ke susunatur manual dan biarkan item ini dimana "
+"anda jatuhkannya? Ia akan selerakkan susunatur manual yang tersimpan."
+
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
-"Folder ini menggunakan susunatur automatik. Adakah anda ingin menukar ke "
-"susunatur manual dan biarkan item ini dimana anda jatuhkannya? Ia akan "
-"melanyak susunatur manual yang tersimpan."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Folder ini menggunakan susunatur automatik. Adakah anda ingin menukar ke "
-"susuna tur manual dan biarkan item ini dimana anda jatuhkannya? Ia akan "
-"melanyak susunatur manual yang tersimpan."
+"Adakah anda ingin menukar ke susunatur manual dan biarkan item ini dimana "
+"anda jatuhkannya? Ia akan selerakkan susunatur manual yang tersimpan."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Folder ini menggunakan susunatur automatik. Adakah anda ingin menukar ke "
-"susunatur manual dan biarkan item ini dimana anda jatuhkannya?"
+"Adakah anda ingin menukar ke susunatur manual dan biarkan item ini dimana "
+"anda jatuhkannya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Folder ini menggunakan susunatur automatik. Adakah anda ingin menukar ke "
-"susunatur manual dan biarkan item ini dimana anda jatuhkannya?"
+"Adakah anda ingin menukar ke susunatur manual dan biarkan item ini dimana "
+"anda jatuhkannya?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Tukar ke Susunatur Manual?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Tukar"
 
@@ -3517,72 +3384,72 @@ msgstr "Adalah default bagi item \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Adalah default bagi semua item \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Ubahsuai \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Disertakan pada menu bagi item \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Guna default bagi \"%s\" item"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Disertakan pada menu bagi item \"%s\" sahaja"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Guna default bagi \"%s\" sahaja"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Jangan sertakan pada menu bagi item \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nama"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Pilih"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Selesai"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Ubahsuai..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Jenis Fail dan Program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Pergi Sana"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3590,48 +3457,48 @@ msgstr ""
 "Anda boleh konfigurasikan program yang ditawarkan untuk jenis fail pada "
 "dialog Jenis Fail dan Program."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Buka dengan Aplikasi Lain"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Pilih aplikasi untuk membuka \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Buka dengan Pelihat Lain"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Pilih paparan bagi \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Tiada pelihat bagi \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Tiada Pelihat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Tiada aplikasi dikaitkan dengan \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Tiada Aplikasi yang dikaitkan"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Tiada aksi dikaitkan dengan \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Tiada Aksi yang dikaitkan"
 
@@ -3640,176 +3507,182 @@ msgstr "Tiada Aksi yang dikaitkan"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
 "Anda boleh mengkonfigurasikan GNOME untuk mengkaitkan aplikasi dengan jenis "
 "fail. Adakah anda ingin mengkaitkan aplikasi dengan jenis fail ini sekarang?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Aplikasi Dikaitkan"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Kaitkan Aplikasi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Pelihat dikaitkan dengan \"%s\" adalah tidak sah."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Pelihat yg dikaitkan adalah tidak sah."
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplikasi dikaitkan dengan \"%s\" adalah tidak sah."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplikasi yang dikaitkan tidak sah"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Aksi dikaitkan dengan \"%s\" adalah tidak sah."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Aksi Dikaitkan tidak sah"
 
 # libnautilus-private/nautilus-program-chooser.c:1542
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
 "Anda boleh mengkonfigurasikan GNOME untuk mengkaitkan aplikasi atau pelihat "
 "dengan jenis fail ini. Adakah anda ingin mengkaitkan aplikasi atau pelihat "
 "dengan jenis fail ini sekarang?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Kaitkan Aksi"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Kaitkan Aksi"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Gagal Membuka. Adakah anda ingin memilih aplikasi lain?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" tak dapat membuka \"%s\" kerana \"%s\" tak boleh mengakses fail di "
-"lokasi \"%s\". Adakah anda ingin memilih aplikasi lain?"
+"lokasi \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Gagal membuka, adakah anda ingin memilih aplikasilain?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Aksi default tak dapat membuka \"%s\" kerana ia tak boleh mengakses fail di "
-"lokasi \"%s\". Adakah anda ingin memilih aplikasi lain?"
+"lokasi \"%s\"."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Tak dapat membuka Lokasi"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" tak dapat membuka \"%s\" kerana \"%s\" tak boleh mengakses fail di "
+"lokasi \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
-"\"%s\" tak dapat membuka \"%s\" kerana \"%s\" tak dpaat mengakses fail pada "
-"lokasi \"%s\".Tiada aplikasi yang ada untuk melihat fail ini. JIka anda "
-"menyalin fail ini ke komputer anda, anda mungkin boleh membukanya."
+"Tiada aplikasi yang ada untuk melihat fail ini. Jika anda menyalin fail ini "
+"ke komputer anda, anda mungkin boleh membukanya."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Aksi default tak dapat membuka \"%s\" kerana ia tak dapat mengakses fail "
-"pada lokasi \"%s\".Tiada aplikasi yang ada untuk melihat fail ini. Jika anda "
-"menyalin fail ini ke komputer anda, anda mungkin boleh membukanya."
+"Aksi default tak dapat membuka \"%s\" kerana ia tak boleh mengakses fail di "
+"lokasi \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Tiada aplikasi yang ada untuk melihat fail ini. Jika anda menyalin fail ini "
+"ke komputer anda, anda mungkin boleh membukanya."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Membuka %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Maaf, anda tak boleh laksanakan arahan dari tapak jauh kerana sebab "
-"keselamatan"
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Maaf, anda tak boleh laksanakan arahan dari tapak."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "Tak boleh laksanakan pautan jauh"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Ia dimatikan kerana sebab keselamatan."
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Terdapat ralat melancarkan aplikasi.\n"
-"\n"
-"Perincian: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "Tak Dapat Laksanakan Pautan Jauh"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Perincian: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
-msgstr "Ralat melancarkan aplikasi"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Terdapat ralat melancarkan aplikasi."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
+msgstr "Ralat Melancarkan Aplikasi"
+
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Sasaran jatuh hanya menyookong fail lokal."
 
 # libnautilus-private/nautilus-program-choosing.c:705
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Sasaran jatuh ini hanya menyokong fail lokal.\n"
-"\n"
 "Untuk membuka fail bukan-lokal, salin ia ke folder lokal dan jatuhkan ia "
 "lagi."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
-msgstr "Sasaran jatuh hanya disokong pada sistemfail lokal."
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "Sasaran Jatuh Hanya Menyokong Fail Llokal."
 
 # libnautilus-private/nautilus-program-choosing.c:717
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Sasaran jatuh hanya menyokong fail lokal\n"
-"\n"
 "Untuk membuka fail bukan-lokal, salin ia ke folder lokal dan jatuhkan ia "
 "semula. Fail lokal yang anda jatuhkan akan sedia dibuka."
 
@@ -4059,14 +3932,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Item mengandungi \"medusa\" pada namanya dan ianya folder"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Cari di Cakera"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus mencari folder sampah di disk anda."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Edit"
@@ -4265,95 +4130,102 @@ msgstr "LatarBelakang"
 msgid "Empty Trash"
 msgstr "Kosngkan Sampah"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Ianya kan membuka %d tetingkpa berasingan. Anda pasti untuk melakukannya?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Buka %d Tetingkap?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Anda pasti untuk membuka semua fail?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Ini akan membuka %d tetingkap berasingan."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Anda pasti untuk padam \"%s\" buat selamanya?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Anda pasti untuk memadam %d item dipilih buat selamanya?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Jika anda memadam item, ia akan dihilang selama-lamanya."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Padam?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Pilih Corak"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "_Corak:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" dipilih"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 folder dipilih"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d folder dipilih"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " ( mengandungi 0 item)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (mengandungi 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (mengandungi %d item)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (semuanya mengandungi 0 item)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (semuanya mengandungi 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (semuanya mengandungi %d item)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" dipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d item dipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 item lain dipilih (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d item lain dipilih (%s)"
@@ -4365,7 +4237,7 @@ msgstr "%d item lain dipilih (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s,  %s"
@@ -4374,116 +4246,126 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Folder ini \"%s\" mengandungi lebih fail daripada yang Nautilus boleh "
-"kendali. terdapat fail yang tidak akan dipaparkan."
+"kendali."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Terdapat fail yang tak dapat dipaparkan."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Terlalu Banyak Fail"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
-"\"%s\" tak dapat dipindahkan ke Sampah. Adakah anda ingin memadamnya terus?"
+"Tak dapat memindah fail ke Sampah, adakah anda ingin memadamnya serta-merta?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr ""
-"%d item dipilih tak dapat dipindah ke Sampah. Anda ingin memadamnya terus?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Fail \"%s\" tak dapat dipindahkan ke sampah."
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Tak dapat memindah item ke sampah, adakah anda ingin memadamnya terus?"
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d dari item dipilih tak dpaat dipindahkan ke Sampah. Anda ingin memadam %d "
-"item itu terus?"
+"Tak dapat memindahkan item ke sampah, adakah anda ingin memadamnya terus?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Padam Serta merta?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "Anda pasti untuk memadam  \"%s\" selamanya dari Sampah?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Anda pasti untuk memadam  \"%s\" selamanya dari sampah?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
-msgstr "Anda pasti untuk memadam  \"%d\" item dipilih selamanya dari Sampah?"
+"trash?"
+msgstr "Anda pasti untuk memadam  \"%d\" item dipilih selamanya dari sampah?"
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Jika anda memadam item,ia akan hilang selama-lamanya."
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Padam Dari Sampah?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Guna \"%s\" untuk membuka item dipilih"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Aplikasi _lain..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Satu _Aplikasi..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "_Pelihat Lain..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Satu _Pelihat..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Tak dapat menyempurnakan aksi dinyatakan: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Tak dapat menyempurnakan aksi dinyatakan"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Laksanakan \"%s\" pada item dipilih"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr "Semua fail bolehlaksana pada folder ini akan ada pada menu Skrip."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Semua fail bolehlaksana pada folder ini akan ada pada menu Skrip. Memilih "
-"skrip pada menu akan melaksanakan skrip dengan item dipilih sebagai inputnya."
+"Memilih skrip pada menu akan melaksanakan skrip dengan item dipilih sebagai "
+"inputnya."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Perihal Skrip"
 
 # lom
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4505,179 +4387,176 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" akan dipindah jika anda pilih arahan Fail Tepek"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" akan disalin jika anda pilih Arahan Fail Tepek"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d item dipilih akan dipindahkan jika anda pilih arahan Fail Tepek"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d item dipilih akan disalin jika anda pilih arahan Fail Tepek"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Tiada apa-apa pada papanklip untuk ditepek."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Ralat Lekapan"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Ralat NyahLekap"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr "Ralat Lentingan"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Lenting"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_NyahLekap Volum"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Buka di Tetingkap Baru"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Buka di %d Tetingkap Baru"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Lungsuri Folder"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Lungsuri Folder"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Pa_dam daripada Sampah"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Padam semua item dipilih selamanya"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Pi_ndah ke Sampah"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Pindahkan setiap item dipilih ke Sampah"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Pa_dam"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Buat _Pautan"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Buat _Pautan"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Kosongkan Sampah"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Potong Fail"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Potong Fail"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Salin Fail"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Salin Fail"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Pautan ini tak boleh digunakan, kerana ia tiada sasaran. Adalah anda ingin "
-"memindahkan pautan ini ke Sampah?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Pautan ini rosak, Adalah anda ingin memindahkan pautan ini ke Sampah?"
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Pautan ini tak boleh digunakan, kerana ia tiada sasaran."
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Pautan ini tak dapat digunakan, kerana sasarannya \"%s\" tidak wujud. Adakah "
-"anda ingin memindahkan pautan ini ke Sampah?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Pautan ini tak dapat digunakan, kerana sasarannya \"%s\" tidak wujud."
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Pautan Rosak"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"\"%s\" adalah fail teks bolehlaksana. Adakah anda inging melaksanakannya, "
-"atau papar kandunganya?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Adakah anda ingin melaksanakan \"%s\" atau papar kandunganya?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "\"%s\" bukan fail bolehlaksana."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Laksana atau Papar?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Papar"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Laksana di _Terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Papar"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Laksana"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Membuka \"%s\""
+msgid "Opening \"%s\"."
+msgstr "Membuka \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Batal Buka?"
 
@@ -4699,28 +4578,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Maaf, tak dapat memapar semua kandungan bagi \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "Kandungan folder tak dapat dipaparkan."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Ralat Memapar Folder"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 "Nama  \"%s\" sudah digunakan dalam folder ini. Sila guna nama lain."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 ""
 "Tiada  \"%s\" di dalam folder ini. Mungkin ianya telah dipindah atau dipadam?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Anda tidak mempunyai keizinan diperlukan untuk menukarnama \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4729,85 +4612,101 @@ msgstr ""
 "Nama \"%s\" adalah tidak sah kerana ia mengandungi aksara \"/\". Sila guna "
 "nama lain."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nama \"%s\" adalah tidak sah. Sila guna nama lain."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Tak dapat menukar nama bagi \"%s\" kerana ianya pada cakera baca-sahaja"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Maaf, tak dapat menukarnama \"%s\" ke \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Item tak dapat ditukarnama."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Ralat menukarnama"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Anda tidak mempunyai keizinan mencukupi untuk menukar kumpulan bagi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Tak dapat menukar kumpulan bagi \"%s\" kerana ianya pada cakera baca-sahaja"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Maaf, tak dapat menukar kumbulan bagi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Kumpulan tak dapat diubah."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Ralat Menetapkan Kumpulan"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Tak dapat tukar pemilik bagi \"%s\" kerana ianya pada cakera baca-sahaja"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Maaf, tak dapat menukar pemilik bagi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Pemilik tak dapat ditukar."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Ralat Menetapkan Pemilik"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Tak dapat menukar keizinan bagi \"%s\" kerana ianya pada cakera baca-sahaja"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Maaf, tak dapat menukar keizinan bagi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Keizinan tak dapat ditukar."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Ralat Menetapkan Keizinan"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Menukarnama \"%s\" ke \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Batal Tukarnama?"
 
@@ -4865,129 +4764,132 @@ msgstr "Pulihkan Sai_z Asal Ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Pulihkan Sai_z Asal Ikon"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "menuding ke \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr "Heret dan jatuh hanya disokong pada sistemfail lokal."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Heret dan jatuh hanya disokong."
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Heret dan jatuh hanya disokong pada sistem fail lokal."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Ralat Heret dan Jatuh"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Jenis heretan tidak sah digunakan."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nama fail"
 
 # Saiz bra
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Saiz"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Jenis"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Tarikh Ubahsuai"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Anda tak boleh menetapkan lebih daripada satu ikon sendiri pada satu masa! "
-"Sila heret 1 imej untuk menetapkan ikon sendiri."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Sila heret 1 imej untuk menetapkan ikon sendiri."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Lebih Drpd Satu Imej"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Fail yang anda heretkan itu bukan lokal. Anda hanya boleh gunakan imej lokal "
-"sebagai ikon sendiri."
+msgid "The file that you dropped is not local."
+msgstr "Fail yang anda heretkan itu bukan lokal."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Anda hanya boleh gunakan imej lokal sebagai ikon sendiri."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Imej lokal Sahaja"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Fail yang anda jatuhkan adalah bukan imej. Anda hanya boleh guna imej lokal "
-"sebagai ikon sendiri."
+msgid "The file that you dropped is not an image."
+msgstr "Fail yang anda jatuhkan itu adalah bukan imej."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Imej Sahaja"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Ciri-ciri"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Ciri-ciri %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Batal Penukaran Kumpulan?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "Menukar Kumpulan"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Menukar kumpulan."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Batal Penukaran Pemilik"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "Menukar pemilik"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Menukar pemilik."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "tiada apa-apa"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "takboleh dibaca"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, dengan saiz %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d item, menjumlahkan %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(terdapat kandunga takboleh dibaca"
 
@@ -4997,191 +4899,187 @@ msgstr "(terdapat kandunga takboleh dibaca"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Kandungan:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Asas"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nama:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Jenis:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Saiz:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volum:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Ruang bebas:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Sasaran pautan:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Jenis MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Diubahsuai:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "DiAkses:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Pilih Ikon Tersendiri..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Buang Ikon Tersendiri"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Baca"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Tulis"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Laksana"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Tetapkan ID _Pengguna"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Tanda istimewa:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Tetapkan ID _kumpulan"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Lekat"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Keizinan"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Anda bukan pemiliknya, jadi anda tak boleh menukar keizinannya."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Pe_milik fail:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Pemilik fail:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Kumpulan _fail:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Kumpulan fail:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Pemilik:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Kumpulan:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Lain-lain:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Paparan teks:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Paparan nombor:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Terkahir diubah:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Keizinan bagi \"%s\" tak dapat ditentukan."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Keizinan bagi fail dipilih tak dapat ditentukan."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Terdapat ralat memapar bantuan: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Terdapat ralat memapar bantuan."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
-msgstr "Tak dapat memapar bantuan"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "Tak Dapat Memapar Bantuan"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Batal Papar Tetingkap Ciri-ciri?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "Mencipta Tetingkap Ciri-ciri"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Mencipta Tetingkap Ciri-ciri."
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Pilih satu ikon"
 
@@ -5199,96 +5097,112 @@ msgid "Search Results"
 msgstr "Hasil pencarian"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Maaf, Servis pencarian Medusa tidak ada kerana ianya tidak dipasang."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Maaf, servis pencarian Medusa tidak ada."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa tidak dipasang."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Servis Pencarian Tidak Ada"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "Carian yang anda pilih adalah lebih baru daripada yang diindeks pada sistem "
-"anda. Pencarian tidak akan memulangkan hasil sekarang. Anda boleh cipta "
-"indeks baru dengan melaksanakan  \"medusa-indexd\" sebagai root pada arahan "
-"baris."
+"anda. Pencarian tidak akan memulangkan hasil sekarang."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
-msgstr "Cari item yang terlalu baru"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+" Anda boleh mencipta indeks baru dengan melaksanakan \"medusa-indexd\" "
+"sebagai root pada arahan baris."
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr "Cari Item Yang Terlalu Baru"
+
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Setiap fail terindeks pada komputer padan dengan kriteria yang anda pilih. "
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Setiap fail terindeks pada komputer padan dengan kriteria yang anda pilih. "
 "Anda boleh semak ejaan pada pilihan atau tambah lebih kriteria untuk "
 "menyempitkan hasilnya."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
-msgstr "Ralat ketika mencari"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
+msgstr "Ralat Ketika Mencari"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Faind tidak dapat menjumpai indeks sistem fail. Indeks anda mungkin hilang "
-"atau rosak. Anda boleh mencipta indeks baru dengan melaksanakan \"medusa-"
-"indexd\" sebagai root pada arahan baris."
+"Find tidak dapat menjumpai indeks sistem fail. Indeks anda mungkin hilang "
+"atau rosak."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "Ralat membaca indeks fail"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Ralat Membaca Indeks Fail"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Terdapat ralat berlaku bila memuatkan kandungan carian ini: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Terdapat ralat berlaku bila memuatkan kandungan carian ini."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Untuk melakukan carian pantas, Carian memerlukan satu indeks bagi fail pada "
-"sistem anda. Carian kini tak dapat mengakses indeks , jadi carian perlahan "
-"yang tak menggunakan indeks akan dilakukan"
+"Untuk melakukan carian kandungan, Carian memerlukan indeks bagi fail pada "
+"sistem anda."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
 "Untuk melakukan carian kandungan, Carian memerlukan indeks bagi fail pada "
-"sistem anda. Carian tak dapat mengakses indeks anda sekarang."
+"sistem anda."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
-msgstr "Carian Pantas tidak ada"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Find kini tak dapat mengakses indeks jadi carian perlahan yang tak "
+"menggunakan indeks akan dilakukan"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
-msgstr "Carian Kandungan tidak ada"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Find tak dapat mengakses indeks anda sekarang."
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Carian Pantas Tidak Ada"
+
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Carian Kandungan Tidak Ada"
+
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5302,63 +5216,89 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Untuk melakukan carian pantas, Find memerlukan indeks bagi fail pada sistem "
-"anda. Komputer anda sedang mencipta indeks itu. Oleh kerana Find tidak "
-"menggunakan indeks, carian ini mengambil masa beberapa minit."
+"anda. Komputer anda sedang mencipta indeks itu."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Untuk melakukan carian kandungan, Find memerlukan indeks bagi kandungan "
-"sistem anda. Komputer anda sedang mencipta indeks itu. Carian kandungan akan "
-"ada setelah pengindeksan selesai."
+"sistem anda. Komputer anda sedang mencipta indeks itu."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"Kerana Find tak dapat menggunakan indeks, carian ini mengambil masa beberapa "
+"minit"
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Carian kandungan akan ada bila pengindeksan selesai."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Carian terindeks tidak ada"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Carian Terindeks Tidak Ada"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 "Untuk melakukan carian pantas, Find memerlukan indeks bagi fail pada sistem "
-"anda. Tiada indeks sekarang. Anda boleh mencipta indeks dengan melaksanakan "
-"\"medusa-indexd\" sebagai root pada arahan baris. Selagi pengindeksai belum "
-"selesai, carian akan mengambil masa beberapa minit."
+"anda. Tiada indeks buat masa sekarang."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
+"Untuk melakukan carian pantas, Find memerlukan indeks bagi fail pada sistem "
+"anda. Tiada indeks buat masa sekarang."
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Anda boleh mencipta indeks dengan melaksanakan \"medusa-indexd\" sebagai "
+"root pada arahan baris. Selagi pengindeksan belum selesai, carian akan "
+"mengambil masa beberapa minit."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Anda boleh mencipta indeks dengan melaksanakan \"medusa-indexd\" sebagai "
+"root pada arahan baris. Selagi pengindeksan belum selesai, carian akan "
+"mengambil masa beberapa minit."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Carian pantas tidak dihiupkan pada komputer anda."
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Carian pantas tidak dihiupkan pada kompuer anda"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Carian Pantas Tidak Dihidupkan"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Dimana"
 
@@ -5368,7 +5308,7 @@ msgstr "Dimana"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Buka di Tetingkap Baru"
@@ -5379,7 +5319,7 @@ msgstr "_Buka di Tetingkap Baru"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Buka di %d Tetingkap _Baru"
@@ -5388,15 +5328,17 @@ msgstr "Buka di %d Tetingkap _Baru"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus menjumpai terlalu banyak hasil pencarian daripada yang ia boleh "
-"paparkan. Terdapat item yang padan tidak akan dipaparkan."
+"paparkan."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Terdapat item yang padan tidak akan dipaparkan."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Terlalu Banyak Padanan"
 
@@ -5410,12 +5352,12 @@ msgid "Create L_auncher"
 msgstr "Cipta Pe_lancar"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Cipta pelancar baru"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Pilih semua item di dalam Sampah"
 
@@ -5436,7 +5378,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Guna Latarbelakang _Default"
@@ -5458,57 +5400,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Pilih pelihat lain untuk melihat item dipilih"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "Cipta _Dokumen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "Cipta _Folder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Cipta fail kosong baru di dalam folder ini"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Cipta folder kosong baru di dalam folder ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Cipta pautan simbolik untuk setiap item dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Gandakan"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Padam setiap item dipilih, tanpa memindahnya ke Sampah"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Gandakan setiap item dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Edit Pelancar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Edit maklumat pelancar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Format volum dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Ciri-ciri Medi_a"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr "Lekapkan  volum dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Pindah atau salin fail yang dipilih oleh arahan Potong Fail atau Salin Fail "
 "sebelum ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5516,125 +5466,133 @@ msgstr ""
 "Pindah atau salin fail yang dipilih oleh arahan Potong Fail atau Salin Fail "
 "ke folder dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Buka _Dengan"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Buka setiap item dipilih pada tetingkap navigasi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Buka di Tetingkap Navigasi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Buka item dipilih di tetingkap ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Menyedia fail dipilih untuk disalinkan dengan arahan Tepek Fail"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Menyedia fail dipilih untuk dipindahkan dengan arahan Tepek Fail"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Li_ndung"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Lindung volum dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Tukarnama item dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Ulangtetap Paparan ke _Default"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ulangtetap turutan isihan dan aras zoom supaya padan keutamaan bagi paparan "
 "ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Laksana atau urus skrip dari ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Pilih Semu_a Fail"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Pilih _Corak"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Pilih semua item pada tetingkap ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr "Pilih item pada tetingkap ini yg padan dengan corak diberi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Papar ciri-ciri media bagi volum  dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Papar folder mengandungi skrip yang tampak pada menu ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Nyahlekap  volum dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Guna latarbelakang default bagi lokasi ini"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Lihat atau ubahsuai ciri-ciri setiap item dipilih"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "Fail _Kosong"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Format"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr "_Lekap Volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Buka"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Buka Folder Skrip"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Tepek Fail"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Tepek Fail Ke Folder"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Ciri-ciri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Tukarnama..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skrip"
 
@@ -5719,7 +5677,12 @@ msgstr "Secara _Manual"
 msgid "Indexing is %d%% complete."
 msgstr "Pengindeksan %d%% selesai."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Fail anda terakhir diindeks pada %s."
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5727,38 +5690,46 @@ msgstr ""
 "Sekali sehari fail dan kandungan teks anda diindeks supaya pencarian menjadi "
 "pantas."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Status Pengindeksan"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Fail anda terakhir diindeks pada %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Fail anda kini sedang  diindeks."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
+"Sekali sehari fail dan kandungan teks anda diindeks supaya pencarian menjadi "
+"pantas."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Tiada indeks bagi fail anda sekarang."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Tiada indeks bagi fail anda sekarang."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Maaf, Servis pencarian Medusa tidak ada."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5782,59 +5753,61 @@ msgstr "Papar Status Peng_Indeksan"
 msgid "Show status of indexing used when searching"
 msgstr "Papar status bila pengindeksan digunakan bila mencari"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Tidak Dapat Cipta Folder yang Diperlukan"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus tidak dDapat mencipta folder yang Diperlukan \"%s\"."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus tak dapat mencipta folder diperlukan \"%s\". Sebelum melaksanakan "
-"Nautilus, Sila cipta folder ini, atau tetapkan keizinan dimana Nautilus "
-"boleh menciptanya."
+"Sebelum melaksanakan Nautilus, Sila cipta folder ini, atau tetapkan keizinan "
+"dimana Nautilus boleh menciptanya."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Tidak Dapat Cipta Folder yang Diperlukan"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus tak dapat mencipta folder yg diperlukan berikut: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus tak dapat mencipta folder yg diperlukan berikut:\n"
-"\n"
-"%s\n"
-"\n"
 "Sebelum melaksanakan Nautilus, Sila cipta folder ini, atau tetapkan keizinan "
 "supaya Nautilus boleh menciptanya."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Pautan ke Desktop Lama"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Satu pautan bernama \"Pautan ke Desktop Lama\" telah dicipta pada desktop "
+"anda."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Lokasi bagi direkori dekstop telah berubah pada GNOME 2.4. Satu pautan "
-"bernama \"Link To Old Desktop\" telah dicipta üada desktop anda. Anda boleh "
-"buka ia untuk memindahkan fail yang anda mahu dan kemudian padam pautan itu."
+"Lokasi bagi direkori dekstop telah berubah pada GNOME 2.4. Anda boleh buka "
+"pautan dan pindahkan fail yang anda mahu dan kemudian padam pautan itu."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr "Migrasikan desktop lama"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "Migrasikan Desktop Lama"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5846,7 +5819,7 @@ msgstr "Migrasikan desktop lama"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5857,7 +5830,7 @@ msgstr ""
 "ulangboot komputer atau memasng Nautilus semula."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5886,12 +5859,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus tak dapat digunakan sekarang, kerana ralat luardugaan."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5899,7 +5872,7 @@ msgstr ""
 "Nautilus tak dpaat digunakan sekarang, kerana ralat luardugaan dari Bonobo "
 "bila cuba mendaftar pelayan paparan pengurus fail."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -5909,7 +5882,7 @@ msgstr ""
 "bila cuba mencari kilang. Bunuh bonobo-activation-server dan ulanghidup "
 "Nautilus mungkin boleh membetulkan masalah"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -5919,6 +5892,17 @@ msgstr ""
 "bila mencari objek shell.  Bunuh  bonobo-activation-server dan ulanghidup "
 "Nautilus bleh memperbetulkan masalah ini."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Terdapat ralat memapar bantuan: \n"
+"%s"
+
 # src/nautilus-bookmarks-window.c:170
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
@@ -5953,31 +5937,41 @@ msgstr "Kurang Opsyen"
 msgid "Find Them!"
 msgstr "Cari Ia!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr "Anda mesti masukkan nama bagi pelayan"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Anda mesti masukkan nama bagi pelayan."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
-msgstr "Tak dapat menyambung ke pelayan"
+msgid "Please enter a name and try again."
+msgstr "Sila masukkan nama dan cuba lagi."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Tak Dapat Menyambung ke Pelayan"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" adalah bukan lokasi yang sah. Sila semak ejaan dan cuba lagi."
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" adalah bukan lokasi yang sah."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Sila semak ejaan dan cuba lagi."
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Sambune ke Pelayan"
+msgstr "Sambung ke Pelayan"
 
-#: src/nautilus-connect-server-dialog.c:185
-msgid "Name:"
-msgstr "Nama:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Lokasi:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
 msgstr "Sambung"
 
@@ -6177,6 +6171,15 @@ msgstr ""
 " \n"
 "Anda boleh memadam fail ini untuk mempersembahkan druid lagi.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Anda tak boleh menetapkan lebih daripada satu ikon sendiri pada satu masa."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Anda hanya boleh gunakan imej sebagai ikon sendiri."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6187,24 +6190,21 @@ msgstr "Buka dengan %s"
 msgid "Open with..."
 msgstr "_Buka dengan..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr "Tak dapat melancar aplikasi pembakar cd:n%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Tak dapat melancar aplikasi pembakar cd."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "Tak dapat melancarkan pembakar cd"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
+msgstr "Tak Dapat Melancarkan Pembakar CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Kosongkan Sampah"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Tulis kandungan ke CD"
 
@@ -6212,117 +6212,126 @@ msgstr "_Tulis kandungan ke CD"
 msgid "Go To:"
 msgstr "Pergi Ke:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Adakah anda ingin melihat lokais %d pada tetingkap berasingan?"
+msgid "Do you want to view %d locations?"
+msgstr "Adakah anda ingin melihat lokasi %d?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Lihat pada Beraneka tetingkap?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "BukaTa Lokasi"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Lakukan set ujian pantas semak-sendiri."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Cipta tetingkap permulaan pada geometri diberi."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Hanya cipta tetingkap khas untuk URL dinyatakan."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Jangan urus desktop (abaikan set keutamaan pada dialof keutamaan)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr "Buka tetingkap pelungsur."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Keluar Nautilus"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Ulanghidup Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Pengurus Fail"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check tak boleh diguna dengan URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check tak boleh digunakan dengan opsyen lain.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit tak boleh diguna dengan URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart tak boleh diguna dengan URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry tak boleh diguna dengan lebih drpd 1 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Adakah anda pasti untuk melupakan sejarah? jika ya, anda akan bermasalah "
-"untuk mengulanginya."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Anda pasti untuk melupakan sejarah?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Jika ya, anda akan bermasalah untuk mengulanginya."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Anda pasti mahu mengosongkan senarai lokasi mana yang telah dilawati?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+"Jika anda mengosongkan senarai lokasi, item akan dipadam selama-lamanya."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Kosongkan Sejarah"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"Lokasi \"%s\" tidak wujud. Adakah anda ingin membuang sebarang tandabuku "
-"berkaitan lokasi ini dari senarai anda?"
+"Adakah anda ingin membuang sebarang tandabuku dengan lokasi tak-wujud dari "
+"senarai anda?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Tandabuku bagi lokasi tidak wujud"
 
 # libgnomeui/gnome-dentry-edit.c:422 libgnomeui/gnome-stock.c:828
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Buang"
 
@@ -6355,7 +6364,6 @@ msgid "Close _All Windows"
 msgstr "Tutup Semu_a Tetingkap"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Tutup semua tetingkap Navigas"
 
@@ -6377,106 +6385,116 @@ msgid "Forward"
 msgstr "Maju"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Pergi ke folder templat"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Pergi ke lokasi dilawati seterusnya"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Pergi ke lokasi dilawati terdahulu"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Pergi ke folder sampah"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Rumah"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Bar Lokasi"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Ulangmuat"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Cari fail di komputer ini"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Bar _Status"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Henti"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Naik"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Tulis ke CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Tambah TandaBuku"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Undur"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "Ta_ndaBuku"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Kosogkan Sejarah"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr "_Komputer"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Edit TandaBuku"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Maju"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Pergi"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Rumah"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lokasi..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Jendela _Tepi"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Templat"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Sampah"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Naik"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Lihat"
 
@@ -6494,32 +6512,32 @@ msgstr "Lihat sebagai..."
 msgid "File Browser: %s"
 msgstr "Pelungsur Fail: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Salah satu panel tepi mengalami ralat dan tak dapat diteruskan."
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
-"Salah satu panel tepi mengalami ralat dan tak dapat diteruskan. Malangnya "
-"saya tak dapat memberitahu yang mana satu."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Panel tepi %s mengalami ralat dan tak dpaat diteruskan. Jika ianya terus "
-"berlaku, anda mungkin terpaksa mematikan panel ini."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Panel tepi %s mengalami ralat dan tak dapat diteruskan."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Jika ianya terus berlaku, anda mungkin terpaksa mematikan panel ini."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "Panel Tepi Gagal"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Jendela Tepi"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Mengandungi paparan jendela tepi"
 
@@ -6553,149 +6571,177 @@ msgstr "_Tambah..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Maaf, corak %s tak dapat dipadam."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
-msgstr "Tak dapat padam corak"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
+msgstr "Tak Dapat Padam Corak"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Maaf, emblem %s tak dapat dipadam."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Tak Dapat Memadam Emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Cipta Emblem Baru:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Katakunci:"
 
 # ui/galeon.glade.h:176
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imej:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Pilih fail imej bagi emblem baru:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Cipta Warna Baru:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nama warna:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Ni_lai warna:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Maaf,  \"%s\" bukannya nama fail yang sah."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Maaf, anda tidak membekalkan nama fail yang sah."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
-msgstr "Tak dapat memasang corak"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Sila cuba lagi."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr "Tak Dapat memasang Corak"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Maaf, anda tak boleh menggantikan imej ulangtetap."
 
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Reset adalah imej istimewa yg tak dapat dipadam."
+
 # ui/galeon.glade.h:176
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Bukan Imej"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Maaf, tapi corak %s tak dapat dipasang."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Pilih fail imej untuk ditambah sebagai corak"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Warna tak dapat dipasang."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Maaf, anda mesti nyatakan nama bukan-kosong bagi warna baru."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
-msgstr "Tak dapat memasang warna"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "Tak Dapat Memasang Warna"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Pilih warna untuk ditambah"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Maaf, '%s' bukanlah fail imej yang boleh digunakan!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Maaf, \"%s\" bukanlah fail imej yang boleh digunakan."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Fail '%s'  adalah bukan fail imej."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Pilih Kategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "B_atal Buang"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Tambah Corak Baru..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Tambah Warna Baru,,,"
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Tambah Emblem Baru..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klik pada corak untuk membuangnya"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klik pada warna untuk membuangnya"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klik pada emblem untuk membuangnya"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Corak:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Warna:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblem:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Buang Corak..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Buang Warna..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Buang Emblem..."
 
@@ -7085,30 +7131,34 @@ msgid "CD _Creator"
 msgstr "Pencipta _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
-msgstr "Tutup Semu_a Ibubapa"
+msgid "Close P_arent Folders"
+msgstr "Tutup Semua _Ibu"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Tutup induk bagi folder ini"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
-msgstr "Pergi ke Komputer Kosong"
+msgstr "Pergi ke Komputer"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Pergi ke Pencipta CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "Buka _Lokasi..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Buka _Ibubapa"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "Buka folder ibubapa"
+msgstr "Buka folder induk"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Tempat"
 
@@ -7138,105 +7188,120 @@ msgstr "Paparan Gagal"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"Paparan %s mengalami ralat dan tak dapat diteruskan. Anda boleh pilih "
-"paparan lain atau pergi ke lokasi lain."
+msgid "The %s view encountered an error and can't continue."
+msgstr "Paparan %s mengalami ralat dan tak dapat diteruskan."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Anda boleh pilih paparan lain atau pergi ke lokasi lain."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "paparan %s mengalami ralat bila dimulakan."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Lokasi tak dapat dipaparkan dengan pelihat ini."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Paparan Kandungan"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Lihat fail atau folder semasa"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Tak menjumpai \"%s\". Sila semak ejaan dan cuba lagi."
+msgid "Couldn't find \"%s\"."
+msgstr "Tidak menjumpai fail \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Tak dapat memapar \"%s\", kerana Nautilus tak dapat menentikan jenis fail "
-"apakah ia."
+msgid "Couldn't display \"%s\"."
+msgstr "Tak dapat memapar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus tidak dipasang dengan pelihat yang boleh memapar \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus tak dapat menentukan jenis fail apakah ia."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr ""
-"Tak dapat memapar \"%s\", kerana Nautilus tak dapat mengendali %s: lokasi."
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "Nautilus tidak dipasang dengan pelihat yang boleh memapar fail ini ."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "Tak dapat memapar \"%s\", kerana cubaan log masuk gagal."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus tak dapat mengendali lokasi %s: ."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Tak dapat memapar \"%s\", kerana akses dinafikan."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Cubaan log masuk gagal."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Akses dinafikan."
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Tak dapat memapar \"%s\", kerana hos \"%s\" tak dapat dijumpai."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
-"Tak dapat memapar \"%s\", kerana tiada hos \"%s\" dijumpai. Pastikan ejaan "
-"dan tetapan proksi adalah betul."
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr "Pastikan ejaan dan tetapan proksi adalah betul."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr "Tak dapat memapar \"%s\". Pastikan tetapan proksi adalah betul."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Pastikan tetapan proksi adalah betul."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
+msgstr ""
+"Tak dapat memapar \"%s\", kerana Nautilus tak dapat menghubungi pelungsur "
+"induk SMB."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Tak dapat memapar \"%s\", kerana Nautilus tak dapat menghubungi pelayar "
-"induk SMB.\n"
-"Pastikan pelayan SMB dilaksanakan pada rangkaian lokal."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Pencarian tidak ada"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus tak dapat memapar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Tak dapat Memapar Lokasi"
 
@@ -7248,7 +7313,7 @@ msgstr "Pergi ke lokasi dinyatakan oleg tandabuku ini"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Hakcipta (C) 1999-2001 Eazel, Inc."
 
@@ -7256,11 +7321,11 @@ msgstr "Hakcipta (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Hasbullah Bin Pit <sebol@ikhlas.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7276,36 +7341,40 @@ msgstr "Undur beberapa laman"
 msgid "Go forward a number of pages"
 msgstr "Maju beberapa halaman"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Papar lokasi ini dengan \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 msgid "Network"
 msgstr "Rangkaian"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Font"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Tema"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr "Pencipta CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID Aplikasi"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID aplikasi bagi tetingkap"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplikasi"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Aplikasi Nautilus dikaitkan dengan tetingkpa ini."
 
diff --git a/po/ne.po b/po/ne.po
index f750c02d5..4b63ae4f2 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.x\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-11-01 10:53NST\n"
 "Last-Translator: Pawan Chitrakar <pawan@nplinux.org>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -34,8 +34,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "बानोबो यूआई इनिट() असफल भयो"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "चिन�हहरू"
 
@@ -48,184 +48,119 @@ msgid "Nautilus Emblem view"
 msgstr "नटिलस �मब�लेम दृश�य"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "चिन�ह हटाउन सकि�न"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "चिन�ह हटाउन सकि�न"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "चिन�हको नाम परिनत गर�न सकि�न"
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "चिन�हको नाम परिनत गर�न सकि�न"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "चिन�हको नाम परिनत गर"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "देखि�को चिन�हको नया नाम देउ"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "प�न नामाकरण"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "नया चिन�ह थप"
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "चिन�हको ब��िने नाम राख । यो नामले अर� ठाउमा चिन�हको पहिचान गर�छ"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "चिन�हको ब��िने नाम राख । यो नामले अर� ठाउमा चिन�हको पहिचान गर�छ"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr "केहि फाइल मान�य चित�र नभ�कोले चिन�हमा थप�न सकि�न"
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "माफ करें पर छवि %s चिन�ह की तरह इन�स�टाल नहीं हो सकती"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "'%s' फाइल मान�य चित�र होइन"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "चिन�ह थप�न सकि�न"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "मान�य चित�र नभ�कोले चिन�हमा थप�न सकि�न"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "तानि�को पाठ�य  मान�य फाइल लोकेसन होइन"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "चिन�ह थप�न सकि�न"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'%s' फाइल मान�य चित�र होइन"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "तानि�को फाइल मान�य चित�र होइन"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "मेट�न�"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "हार�डवेयर दृश�यको लागि कारखाना"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "हार�डवेयर"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "हार�डवेयर दृश�य देखाउने"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "हार�डवेयर दृश�य"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "हार�डवेयर जस�तै हेर�ने"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "हार�डवेयर दृश�य"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "हार�डवेयर दृश�यको लागि आइकन को नाम"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "हार�डवेयर जानकारीको सारांश"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s सीपीयू \n"
-"%s MHz \n"
-" %s K क�यास साइज"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu जीबी  RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu �मबी रयाम"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu जीबी"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu �मबी"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "%d दिन, %d घण�टा, %d मिनेट चलेको छ"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "हार�डवेयर ओभरभीउ"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "यो CPU पृष�ठको लागि ठाउ हो"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "यो RAM पृष�ठको लागि ठाउ हो"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "यो IDE पृष�ठको लागि ठाउ हो"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "इतिहास"
@@ -891,6 +826,10 @@ msgstr "जीनोम डट ओआरजी"
 msgid "GNU.org"
 msgstr "जी�नयू डट ओआरजी"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "हार�डवेयर"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "अंतर�राष�ट�रिय"
@@ -1167,27 +1106,27 @@ msgid "Desktop trash icon name"
 msgstr "डेस�कटप ट�रेश आईकनको नाम"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1200,8 +1139,8 @@ msgstr "डेस�कटपमा होम आईकन देखाउ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1229,8 +1168,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1264,7 +1203,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1278,7 +1217,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1295,7 +1234,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1321,7 +1260,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1345,7 +1284,8 @@ msgid "List of possible captions on icons"
 msgstr "आईकनमा राख�न सकिने क�याप�सनको स�चि"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "फोल�डरमा राख�न सकिने अघिकतम फाईल"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1363,11 +1303,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "डेस�कटप नटिलसले बनाउन सक�छ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "नटिलसले यूजरको होम फोल�डरलाई डेस�कटप बनाउछ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "किनाराको बारमा फोल�डर मात�र देखाउ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1385,7 +1327,8 @@ msgid "Reverse sort order in new windows"
 msgstr "नया विन�डोमा उल�टो क�रममा देखाउ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "फोल�डर पहिला देखाउ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1420,7 +1363,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1428,30 +1371,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1491,7 +1434,8 @@ msgid "Use manual layout in new windows"
 msgstr "नया विन�डोमा manual layout प�रयोग गर"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "नया विन�डोमा कसि�को layout प�रयोग गर"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1514,7 +1458,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "फोल�डरमा भ�को आइटम�स देखाउ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1527,7 +1472,8 @@ msgid "When to show thumbnails of image files"
 msgstr "छवि फाइलों के लि� थम�बनेल�स दिखा��"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "पूर�वनिर�धारित पार�श�व डेस�कटपको प�रयोग गर"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1684,66 +1630,79 @@ msgstr "फेरी श�रू गर"
 msgid "on the desktop"
 msgstr "डेस�कटपमा"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "वर�तमान थीम मेट�न सकी�न "
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "वर�तमान थीम मेट�न सकी�न "
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "ट�रेश"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "यहा� ल�याउ"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "यहा कपी गर"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "यहा� लीङ�क गर"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "पार�श�व जस�तै सेट गर "
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "रद�द गर�न�स"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "सबै फोल�डर पार�श�व जस�तै सेट गर"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "माफ करें, पर \"%s\" थीम इन�सटाल नहीं हो सका"
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "माफ करें, परन�त� न� चिन�ह के लि� बिना ब�लैंक (खाली स�थान) वाला नाम देना होगा"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "चिन�ह इन�सटल ह�न सकेन"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "माफ करें, परन�त� चिन�ह कीवर�ड में केवल लेटर, खाली स�थान अंक ही हो सकता है"
@@ -1752,18 +1711,24 @@ msgstr "माफ करें, परनà¥�तà¥� चिनà¥�ह कीवरà
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, fuzzy, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "इस फोल�डर में नाम \"%s\" पहले से उपयोग हो रहा है। कपया दूसरा नाम उपयोग करें"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "चिन�ह इन�सटल ह�न सकेन"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1782,187 +1747,154 @@ msgstr "द�वारा:"
 msgid "To:"
 msgstr "प�रति:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "हटाते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "डिलीट करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:561
 #, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 "डीलीट करते ह�� गलती \n"
 " \"%s\" नहीं डिलीट कर सका क�योंकि आपके पास इसे बदलने की आग�या नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "डीलीट करते ह�� गलती \n"
 " \"%s\" नहीं डिलीट कर सका क�योंकि आपके पास इसे बदलने की आग�या नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "हटाते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "कापी करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, fuzzy, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "हटाते ह�� गलती \n"
 " \"%s\" नहीं हटा सकते क�योंकि यह सिर�फ पढ़ने योग�य डिस�क है"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" पर कापी करते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "कापी करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, fuzzy, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "\"%s\" पर कापी करते ह�� गलती \n"
 "\n"
 " गन�तव�य पर जगह नहीं"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" पर लिंक बनाते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
-
-#: libnautilus-private/nautilus-file-operations.c:673
 #, fuzzy, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr "नया फोल�डर बनाने में गलती"
+msgid "Error while moving to \"%s\"."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:665
 #, fuzzy, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" पर कापी करते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
+msgid "Error while creating link in \"%s\"."
+msgstr "लिंक करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, fuzzy, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr "नया फोल�डर बनाने में गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:688
-#, fuzzy, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "\"%s\" पर कापी करते ह�� गलती \n"
 "\n"
 " गन�तव�य पर जगह नहीं"
 
-#: libnautilus-private/nautilus-file-operations.c:695
+#: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, fuzzy, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr "नया फोल�डर बनाने में गलती"
+msgid "Error while moving items to \"%s\"."
+msgstr "हटाते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, fuzzy, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" पर लिंक बनाते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, fuzzy, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"फाइल \"%s\" पहले से है\n"
-"\n"
-"क�या आप बदलना चाहते हैं"
+msgid "Error while creating links in \"%s\"."
+msgstr "लिंक करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "कापी करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
 "फाइल \"%s\" पहले से है\n"
 "\n"
@@ -1970,153 +1902,141 @@ msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" पर लिंक बनाते ह�� गलती \n"
-"\n"
-" गन�तव�य पर जगह नहीं"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"फाइल \"%s\" पहले से है\n"
+"\"%s\" पर लिंक बनाते ह�� गलती \n"
 "\n"
-"क�या आप बदलना चाहते हैं"
+" गन�तव�य पर जगह नहीं"
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"फाइल \"%s\" पहले से है\n"
-"\n"
-"क�या आप बदलना चाहते हैं"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "डिलीट करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"फाइल \"%s\" पहले से है\n"
-"\n"
-"क�या आप बदलना चाहते हैं"
+msgid "Error \"%s\" while copying."
+msgstr "कापी करते ह�� गलती"
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"फाइल \"%s\" पहले से है\n"
-"\n"
-"क�या आप बदलना चाहते हैं"
+msgid "Error \"%s\" while moving."
+msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, fuzzy, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"फाइल \"%s\" पहले से है\n"
-"\n"
-"क�या आप बदलना चाहते हैं"
+msgid "Error \"%s\" while linking."
+msgstr "लिंक करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "डिलीट करते ह�� गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "कापी करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "हटाते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "लिंक करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "डिलीट करते ह�� गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "छोड़ दो"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "फिर कोशिश करें"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "घर स�थानमा जाउ"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "घर स�थानमा जाउ"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "फाइल को बदलने में असमर�थ"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "फाइल \"%s\" पहले से है\n"
 "\n"
 "क�या आप बदलना चाहते हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "कपीगर�दा बाधा "
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "बदलना"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "सभी बलदना"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s के लि� कड़ी"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s के लि� �क और कड़ी"
@@ -2125,25 +2045,25 @@ msgstr "%s के लि� �क और कड़ी"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst लिङ�क %s को लागि"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd लिङ�क %s को लागि"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd लिङ�क %s को लागि"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth लिङ�क %s को लागि"
@@ -2153,555 +2073,594 @@ msgstr "%dth लिङ�क %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr "कपी"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr "अर�को कपी"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "th कपी"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st कपी"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd कपी"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd कपी"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s कपी %s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (हर�को कपी) %s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth कपी) %s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst कपी) %s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd कपी) %s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd कपी) %s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr "%s (% डीआरडी कापी) %s"
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, fuzzy, c-format
 msgid " (%d"
 msgstr "%s (% डीआरडी कापी) %s"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "अग�यात जीनोम वी�फ �स �क�स प�रगति स�वर %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "फाइल�स को ट�रेश में भेज रहा है"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "फाइल बाहर फेंक दी"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "भेज रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "ट�रेश में भेजने की तैयारी"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "फाइल�स भेज रहे हैं"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "फाइल�स भेज दी"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "भेजने की तैयारी"
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "भेजना समाप�त"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "फाइल�स को लागी लिंक�स� बनीराखेको छ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "फाइल�स ज�ड़ गई"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "जोड़ रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "लिंक बनाने की तैयारी हो रही है"
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "लिंक�स बनाना समाप�त"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "फाइल�स कपी ह��दैछ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "फाइल�स कापी हो गई"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "कपी ह��दैछ"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "कापी करने की तैयारी हो रही है"
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "आप आयटम�स को ट�रेश में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "ट�रेशमा कपी गर�न सक�तैन"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "आप इस ट�रेश फोल�डर को नहीं हटा सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "आप इस ट�रेश फोल�डर को कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "ट�रेश को स�थान परिवर�तन गर�न मिल�दैन"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ट�रेशलाई कपी गर�न सक�तैन "
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "आप �क फोल�डर को स�वयं उसमें ही भेज नहीं सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "आप �क फोल�डर को उसी में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "यो फोल�डरभीत�र नया फोल�डर बनाउन�होस�"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "आफैंमा जान सक�तैन"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "आफैंमा कपी गर�न सक�तैन"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "आप �क फाइल को उसी में कापी नहीं कर सकते"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "आफैंमा कपी गर�न सक�तैन"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr "नया फोल�डर बनाने में गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr "स�थान पर कोई स�थान नहीं है"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "नया फोल�डर बनाने ें %s गलती"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "नया फोल�डर बनाने में गलती"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "बिना शीर�षकको फोल�डर"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "नया फोल�डर बनाने ें %s गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "नया फोल�डर बनाने में गलती"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 फाईल"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "फाइल�स मेटीरहेको छ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "फाइल�स डिलीट कर दी"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "मेटीरहेको छ"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "फाइल�स को डिलीट करने की तैयारी"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "ट�रेश को खाली कर रहे हैं"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "ट�रेश को खाली करने की तैयारी"
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "के तपाईं ट�रेशबाट सबै आईटमहरू स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "खाली"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "फू"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "फू (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (कपी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (कपी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "फू फू"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "फू फू (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "फू.टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "फू (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "फू फू.टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "फू फू (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "फू फू.टी�क�सटी टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "फू फू (कापी).txt टी�क�सटी"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "फू...(टी�क�सटी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "फू.. (कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "फू..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "फू... (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "फू. (कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "फू. (अन�य प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "फू. (अन�य प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "फू. (अन�य प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "फू. (तीसरी कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "फू. (तीसरी कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "फू फू (अन�य कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "फू फू (तीसरी कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "फू (तेरहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "फू (चौदहवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "फू (तेरहवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "फू (चौदहवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "फू (इक�कीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "फू (बाईसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "फू (इक�कीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "फू (बाईसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "फू (तेईसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "फू (तेईसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "फू (चौबीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "फू (चौबीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "फू (पच�चीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "फू (पच�चीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "फू फू (चौबीस प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "फू फू (पच�चीसवीं प�रति)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "फू फू (चौबीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "फू फू (पच�चीसवीं प�रति).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "फू फू (100000000000000) कापी.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "फू (दसवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "फू (ग�यारहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "फू (दसवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "फू (ग�यारहवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "फू (बारहवीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "फू (बारहवीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "फू (110बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "फू (111बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "फू (110बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "फू (111बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "फू (122बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "फू (123बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "फू (122बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "फू (123बीं कापी).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "फू (124बीं कापी)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "फू (124बीं कापी).txt"
 
@@ -2720,64 +2679,64 @@ msgstr "फू (124बीं कापी).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "आज दिउसो 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "आज %-l:%M:%S %p बजे"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "आज दिउसो 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "आज %-l :%M %p बजे"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "आज दिउसो 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "आज %-l:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "आज"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "हिजोको दिउसो 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "हिजोको दिउसो %-l:%M:%S%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "हिजोको दिउसो 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "हिजोको दिउसो %-l:%M%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "हिजो, दिउसो 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "हिजो, %l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "हिजो"
 
@@ -2786,133 +2745,133 @@ msgstr "हिजो"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "ब�धवार, सितम�बर 00 0000 अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A,%B%-d%Y को %-l:%M%S%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "सोमवार, अक�टूबर 00 0000 को अपरान�ह 00:00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a,%b%-d%Y %-l:%M%S%p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "सोमवार, अक�टूबर 00 0000 को अपरान�ह 00:00 बजे"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a,%b%-d%Y को %-l:%M%p बजे"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "अक�टूबर 00 0000 को अपरान�ह 00:00 पर"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b,%-d%Y %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "अक�टूबर 00 0000, 00:00 अपरान�ह"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b,%-d%Y, %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 अपरान�ह"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m,%-d%y, %-l:%M%p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 आईटमहरू"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 फोल�डरहरू"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 फाईलहरू"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 आईटम"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 फोल�डर"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 फाईल"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u आईटमहरू"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u फोल�डर�स"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u फाईल�स"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr " आईटमहरू ?"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? बाइट�स"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "अपरिचित प�रकार"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "अपरिचित"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "प�रोग�राम"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -2921,7 +2880,7 @@ msgstr ""
 "�क�स-डायरेक�टरी/नारमलका भी विवरण नहीं मिल पा रहा। शायद इसका मतलब है कि आपकी जीनोम "
 "बी �फ �स की फाइल गलत जगह पर है या किसी अन�य कारण से नहीं मिल रही"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2930,11 +2889,11 @@ msgstr ""
 "�म आई �म ई प�रकार \"%s\" (फाइल है\"%s\") का विवरण नहीं मिल रहा। कपया जीनोम "
 "वी�फ�स मेलिंग लिस�ट से बता�ं।)"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "कड़ी"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "कड़ी (टूट गई)"
 
@@ -3055,11 +3014,13 @@ msgid "Search for files by file name and file properties"
 msgstr "फाइल को उनके नाम व विशेषताओं से खोजें"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "आयकान दिखा�ं"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "सूची दिखा�ं"
@@ -3204,149 +3165,154 @@ msgstr "%s को होम"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "काउण�टरटप"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "फाइल आयकान"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "�डीटेबल टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "द �डीटेबल लेबल"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "�ड़ीशनल टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "अरू केहि पाठ�य"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "सिलेक�शन के लि� हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "क�या च�नने के लि� हमने हाइलाइटेड किया है"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "की-बोर�ड फोकस के हमने हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "क�या रेंडर की-बोर�ड फोकस को लमने हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "ड�राव के लि� हाइलाइट करें"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "क�या हमने डी और डी ड�राप को हाइलाइट किया है"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "सिलेक�शन आयत"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "फ�रेम टेक�स�ट"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "अच�नित टेक�स�ट के चारों ओर फ�रेंम खींचें"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 #, fuzzy
 msgid "Color of the selection box"
 msgstr "जा�� घर की स�थिति पर"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 #, fuzzy
 msgid "Opacity of the highlight for selected icons"
 msgstr "सिलेक�शन के लि� हाइलाइट किया"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 #, fuzzy
 msgid "Dark Info Color"
 msgstr "डार�क कर�क"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "यह फोल�डर आटोमेटिक लेआउट उपयोग करता है। क�या आप मेन�अल पर जाना चाहते हैं तथा इस आयटम "
 "को वहां छोड़ें जहां आपने उसे ड�राप किया था"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "यह फोल�डर आटोमेटिक लेआउट उपयोग करता है। क�या आप मेन�अल लेआउट पर जाना चाहती है तथा अन�य "
 "आयटम को वहां छोड़ना चाहते हैं जहां आपने उन�हें ड�राप किया है।"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "मेन�अल लेआउट पर जा�"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "स�विच"
 
@@ -3449,119 +3415,119 @@ msgstr "पूर�वनिर�धारित \"%s\" आइटम हो"
 msgid "Is the default for all \"%s\" items."
 msgstr "सबै पूर�वनिर�धारित \"%s\" आइटम हो"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "स�धारें \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" आयटम�स को मेन�यू में शामिल करें"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "\"%s\" आयटम�स के लि� पूर�वनिर�धारित का उपयोग करें"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "\"%s\" के लि� मेन�यू में शामिल करें"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "केवल \"%s\" के लि� पूर�वनिर�धारित का उपयोग करें"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "\"%s\" आयटम�स के लि� मेन�यू में शामिल न करें"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "नाम"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "स�तर"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "छान�न�स"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "भयो"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "संसोधन..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "फाइल प�रकार र प�रोग�रामहरू"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "त�याहा जाउ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr "क�न फाइल क�न प�रोग�रामले खोल�ने हो भनेर कन�फिगर गर"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "अर� �प�लीकेशनले खोल�न�स"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\" खोल�नको लागी प�रोग�राम छान�न�होस�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "अर� प�रोग�रामले(viewer) खोल�न�स"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\" को लागी दृश�य छान�नूहोस�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\"  हेर�ने प�रोग�राम उपलब�ध छैन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "क�नै हेर�ने प�रोग�राम उपलब�ध छैन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" संग क�नै �प�लीकेशन संबंधित छैन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "क�नै �प�लीकेशन संबंधित छैन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\" संग क�नै प�रक�रिया संबंधित छैन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "क�नै प�रक�रिया संबंधित छैन"
 
@@ -3569,11 +3535,9 @@ msgstr "क�नै प�रक�रिया संबंधित छैन
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3581,43 +3545,42 @@ msgstr ""
 "\n"
 "फाइलको प�रकारसंग �प�लीकेशनको सम�बन�ध राख�नको लागि तपाई ग�नोमलाई कनफिगर गर�न सक�न� ह�न�छ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "संबंधित �प�लीकेशन"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" संग संबंधित �प�लीकेशन अबैध हो"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "संबंधित �प�लीकेशन अबैध छ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" संग संबंधित �प�लीकेशन अबैध छ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "संबंधित �प�लीकेशन अबैध छ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\" से कोई �प�लीकेशन संबंधित नहीं है"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "कोई �प�लीकेशन संबंधित नहीं"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3626,92 +3589,124 @@ msgstr ""
 "\n"
 "फाइलको प�रकारसंग �प�लीकेशनको सम�बन�ध राख�नको लागि तपाई ग�नोमलाई कनफिगर गर�न सक�न� ह�न�छ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "संबंधित प�रक�रिया"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr "\"%s\" देखाउन सक�तैन किनकी नटिलस %s स�थिति समाल�न सक�तैन"
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr " स�थान खोल�न सकेन"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr "\"%s\" देखाउन सक�तैन किनकी नटिलस %s स�थिति समाल�न सक�तैन"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "\"%s\" ख�ल रहा है"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "आप स�रछा के कारणों रिमोट साइट से कमांड नहीं चला सकते"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "रिमोट लिंक�स� ख�ल�न सकेन "
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr "�प�लीकेशन को लांच करने में गलती विवरण"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "�प�लीकेशन लांच करने में गलती"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "ड�राप टारगेट केवल स�थानीय फाइल�स को सपोर�ट करता है"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "अस�थानीय फाइल�स को खोलने के लि� पहले इन�हें स�थायी फोल�डर में कापी करे फिर उन�हें फिर से ड�राप "
 "करें"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "ड�राप टारगेट केवल स�थानीय फाइल�स को सपोर�ट करता है"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3960,15 +3955,6 @@ msgstr "आयटमà¥�स जिसके नाम में सà¥�टफ आà
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "आयटम�स जिसके नाम में मोड�यूल आ� तथा जो फोल�डर हैं।"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-#, fuzzy
-msgid "Searching Disks"
-msgstr "खोज की सूची"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "नोटिलस ट�रेश फोल�डर के लि� आपके डिस�क को खोज रहा है"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "बदलाव"
@@ -4167,96 +4153,106 @@ msgstr "पार�श�व"
 msgid "Empty Trash"
 msgstr "खाली ट�रेश"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "यह %d अलग विंडो खोलेगा क�या आप निश�चित हैं कि आप �सा करना चाहते हैं"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d विंडो को खोलें"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "के तपाईं   \"%s\"  स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "यह %d अलग विंडो खोलेगा क�या आप निश�चित हैं कि आप �सा करना चाहते हैं"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "के तपाईं   \"%s\"  स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "के तपाईं  %d छानी�को सबै आईटमहरू स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "छानी�को सबै बस�त�हर� सधैंको लागी मेट�न�होस�"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "मेट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "समूह छान�न�स"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "ब�ट�टा"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" छानि�को"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 फोल�डर छानियो"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d फोल�डर छानियो"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "(0 आईटम छ)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr "(1 आईटम छ)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr "(%d आईटमहरू छ)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr "(क�ल 0 आईटम छ)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr "(क�ल 1 आईटम छ)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr "(क�ल %d आईटमहरू छ)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "क�ल \"%s\" छानि�को (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d आईटम छानियो (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "१ अन�य आईटम छानियो (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d अन�य आईटमहरू छानियो (%s)"
@@ -4268,7 +4264,7 @@ msgstr "%d अन�य आईटमहरू छानियो (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4277,115 +4273,132 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, fuzzy, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "जितने परिणाम दिखा� जा सकते हैं। उससे अधिक खोज परिणाम आ ग� हैं क�छ खोज परिणाम नहीं "
 "दिखा� जा�ंगे।"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "धेरै फाइल�स"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" ट�रेशमा राख�न सकि�न के तपाई मेट�न चाहन� ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d च�ने ह�� आइटम�स को ट�रेश में नहीं भेजा जा सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" ट�रेशमा राख�न सकि�न के तपाई मेट�न चाहन� ह�न�छ"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d छानि�का आईटमहरू ट�रेशमा राख�न सकि�न के तपाई  %d आईटमलाई त�रन�त मेट�न चाहन� ह�न�छ"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" ट�रेशमा राख�न सकि�न के तपाई मेट�न चाहन� ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "त�र�न�त मेट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "के तपाईं \"%s\"  ट�रेशबाट स�थायी तरीकाले डिलीट गर�न चाहन�ह�न�छ "
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "के तपाईं  %d छानी�को आईटमहरू ट�रेशबाट मेट�न चाहन�ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "ट�रेशबाट मेट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "च�ने ह�� आयटम को खोलने के लि� \"%s\" का उपयोग करें"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "अन�य �प�लीकेशन�स"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "�उटा �प�लीकेशन"
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 #, fuzzy
 msgid "Other _Viewer..."
 msgstr "अन�य वीवर से खोलें"
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 #, fuzzy
 msgid "A _Viewer..."
 msgstr "देखें जैसे... (V)"
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "\"%s\" को किसी च�ने ह�� आयटम�स पर चला�ं"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"यस फोल�डरको सबै �क�जीक�यूटेबल फाईल स�क�रिप�ट मेन�मा देखिन�छ। मेन�बाट क�नै स�क�रिप�ट छानि�मा त�यो "
+"स�क�रिप�ट छानि�को आईटमसंग इनप�ट "
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "यस फोल�डरको सबै �क�जीक�यूटेबल फाईल स�क�रिप�ट मेन�मा देखिन�छ। मेन�बाट क�नै स�क�रिप�ट छानि�मा त�यो "
 "स�क�रिप�ट छानि�को आईटमसंग इनप�ट "
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "स�क�रिप�टको बारेमा"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4416,177 +4429,181 @@ msgstr ""
 "आई नॉटिलिस स�क�रिप�ट करेंट यू आर आई करेंट ठाउ� ली�र यू आर आई नटिलस स�क�रिप�ट विंडो "
 "जियोमेंट�री करेंट विंडो को स�थान र आकार"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "यदि तपाईले फाइल तास�ने निर�देश छानेमा \"%s\" फाइल मूव ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "यदि तपाईले फाइल तास�ने निर�देश छानेमा \"%s\" कपी ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल निर�देश च�नें तो %d च�ने ह�� आयटम�स मूव हो जा�ंगे।"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "यदि आप पेस�ट फाइल�स निर�देश च�नें तो %d च�ने ह�� आयटम�स कापी हो जा�ंगे"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "क�लिप बोर�ड पर पेस�ट करने के लि� क�छ भी नहीं है"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "गल�ती माउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "गलती अनमाउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "गल�ती माउण�ट करें"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "इजेक�ट"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "अनमाउण�ट वाल�यूम"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "नया विन�डोमा खोल�न�स"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "%d नया विन�डोमा खोल�न�स"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "होम फोल�डर"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "होम फोल�डर"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "ट�रेशबाट हटाउन�स"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "छानी�को सबै बस�त�हर� सधैंको लागी मेट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ट�रेशमा राख�न�स"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "छानेको आइटमहरू ट�रेशमा राख�न�स"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "मेट�न�स"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "लीङ�क बनाउ"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "लीङ�क बनाउ"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "ट�रेश खाली गर�न�स"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "फाइल काट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "फाइल काट�न�होस�"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "फाइल कपी गर�न�स"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "फाइलहरू कपी गर�न�स"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "के तपाईं ट�रेशबाट सबै आईटमहरू स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "छ�ट�टि�को लिंक"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "\"%s\" �क �क�सक�यूटेबल पाठ�य फाइल हो ÷ यसलाई चलाउन या हेर�न चाहन� ह�न�छ"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "चला�ं या प�रदर�शित करें?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "प�रदर�शित करें"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "टर�मिनल में चला�ं"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "प�रदर�शित करें"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "चला�ं"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" ख�ल रहा है"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "खोल�ने काम रद�द गर�न�"
 
@@ -4607,108 +4624,133 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "छमा करें \"%s\" के सभी सामान को प�रदर�शित नहीं कर सकते"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "फोल�डर के प�रदर�शन में गलती"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "इस फोल�डर में नाम \"%s\" पहले से उपयोग हो रहा है। कपया दूसरा नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "इस फोल�डर में कोई \"%s\" नहीं शायद यह वहां से हटा दी गई है या डिलीट कर दी गई है"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "\"%s\" का नाम बदलने के लि� जरूरी अन�मति आपके पास नहीं"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "\"%s\" नाम योग�य नहीं क�योंकि इसमें \"/\"अक�षर है कपया अलग नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" का नाम योग�य नहीं कपया अलग नाम उपयोग करें"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" को नाम परिवर�तन ह�नसक�तैन किनकी यो पढ�न मात�र मिल�ने डिस�कमा छ"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "छमा करें, \"%s\" का नाम \"%s\" में नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "माफ करें, पर वो थीम हटाया न जा सक"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "नाम परिवर�तन में गलती"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "\"%s\" का समूह नहीं बदल सकते इसके लि� जरूरी अन�मति आपके पास नहीं है"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\" को समूह परिवर�तन ह�नसक�तैन किनकी यो पढ�न मात�र मिल�ने डिस�कमा छ"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "छमा करें \"%s\" का ग�र�प नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "ग�र�प सेट करने में गलती"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "\"%s\" को साहू परिवर�तन ह�नसक�तैन किनकी यो पढ�न मात�र मिल�ने डिस�कमा छ। "
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "छमा करें \"%s\" का स�वामी नहीं बदला जा सकता"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "ओनर सेट करने में गलती"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: src/file-manager/fm-error-reporting.c:235
 #, fuzzy, c-format
 msgid ""
 "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" को समूह परिवर�तन ह�नसक�तैन किनकी यो पढ�न मात�र मिल�ने डिस�कमा छ"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "छमा करें %s की अन�मतियां नहीं बदल सकते"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "गलती सेट करने की अन�मतियां"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "\"%s\" को \"%s\" नाम से बदलें"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "नाम परिवर�तन रद�द गर�न�"
 
@@ -4766,129 +4808,151 @@ msgstr "आईकन�सलाई आफ�नो आकारमा राख
 msgid "Restore Icon's Original Si_ze"
 msgstr "आईकन�सलाई आफ�नो आकारमा राख"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" मा देखाउ"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "स�थानीय फाईल सिस�टम में ही ड�रैग और ड�राप की स�विधा उपलब�ध है"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "स�थानीय फाईल सिस�टम में ही ड�रैग और ड�राप की स�विधा उपलब�ध है"
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "ड�रैग और ड�राप त�र�टि"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "नाकाम ड�रैग प�रकार प�रयोग भ�को छ"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "फाईल नाम"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "आकार"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "प�रकार"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "तारीखमा परीवर�तन"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
 "कस�टम आईकन के लि� छवि निश�चित करें"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
+"कस�टम आईकन के लि� छवि निश�चित करें"
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "�क से ज�यादा छवि"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
 "आईकन�स"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "सिर�फ स�थानीय छविया�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"जो फाईल आपने छोड़ी है वह छवि नहीं है। आप सिर�फ स�थानीय छवि ही उपयोग कर सकते हैं कस�टम "
-"आईकन�स की तरह"
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "सिर�फ छवियां"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "विशेषता��"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s विशेषताहरू"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "सम�हको परिवर�तन रद�द गर�न�?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "समूह परिवर�तन गरिंदैछ"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "साह�को परिवर�तन रद�द गर�न�"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "साहू परीवर�तन ह��दैछ"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "केहि छैन"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "पढन सकि�न"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 आईटम, %s साईज"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d आईटम, क�ल %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "केहि अंश पढ़न सकि�न"
 
@@ -4898,193 +4962,193 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "अंश"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "साधारण"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "नाम"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "नाम"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "प�रकार"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "आकार"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "लोकेशन"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 #, fuzzy
 msgid "Volume:"
 msgstr "डीवीडी भोल�यूम"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "सम�बन�ध करें लछ�य"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "�मआई�मई प�रकार"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "बदलाव किया गया"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "प�गियो:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "कस�टम आईकन छान�न�स"
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "कस�टम आईकन हटाउन�स"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "पढ"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "लेख"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "चलाउने"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "उपयोगकर�ता निर�धारित गर"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "विशेष चिन�ह"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "समूह निर�धारित गर"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "चिपचिपा"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "अन�मति"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "आप मालिक नहीं हैं, कारणवश आप इन अन�मतियों को बदल नहीं सकते"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "फाइल धनी"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "फाइल धनी"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "फाइल समूह"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "फाईल समूह"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "मालिक"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "समूह"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "अन�य"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "पाठ�य दृश�य"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "अंक दृश�य"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "आखिरी बार बदला गया"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "\"%s\" की अन�मतियां पता नहीं लगाई जा सकीं"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"मदद दर�शाने में त�र�टि: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "सहायता दिखाने में कोई गलती है : %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "सहायता देखाउन सकियन"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "विंडोको प�रोपर�टिज देखाउन रद�द गर�न�स"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "प�रोपर�टिज विन�डो बनीराखेको छ"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "आईकन छान�न�स"
 
@@ -5101,91 +5165,128 @@ msgid "Search Results"
 msgstr "खोजेको रिजल�त "
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "माफ कीजि�गा परन�त� मिडेस�वा खोज सेवा उपलब�ध नहीं है क�योंकि ये इंस�टाल नहीं की गई है"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "माफ करें, पर मेड�य�सा खोज स�विधा उपलब�ध नहीं है"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "खोज स�विधा उपलब�ध छैन"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "जो खोज आपने च�नी है वो आपके सिस�टम के इन�डेक�स से नई है खोज अभी कोई परिणाम नहीं दे सकेगी "
 "आप नया इन�डेक�स बना सकते हैं मिडेस�य�आ इन�डेक�स�ड को कमान�ड हाईन पर रूट की तरह चला सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"आप अपनी फाईल सिस�टम का इन�डेक�स नहीं खोल सकते। आपका इन�डेक�स उपस�थित नहीं है या खराब है। "
+"आप नया इन�डेक�स बना सकते हैं। मिडेउसा इन�डेक�स को कमांड लाईन पर रूट की तरह चला सकते हैं"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "नया आईटम�स खोज�न�स"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"कम�प�यूटर पर सभी सूचीबद�ध फाइलें आपके द�वारा दिये गये मापदण�डों के अन�सार हैं, आप अपने च�नावों "
+"की मात�राओं को जा�च सकते हैं, या और मापदण�डों को दे सकते हैं। अपनी खोज को और अधिक कम कर "
+"सकते हैं"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "कम�प�यूटर पर सभी सूचीबद�ध फाइलें आपके द�वारा दिये गये मापदण�डों के अन�सार हैं, आप अपने च�नावों "
 "की मात�राओं को जा�च सकते हैं, या और मापदण�डों को दे सकते हैं। अपनी खोज को और अधिक कम कर "
 "सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "खोज�दा त�र�टि"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "आप अपनी फाईल सिस�टम का इन�डेक�स नहीं खोल सकते। आपका इन�डेक�स उपस�थित नहीं है या खराब है। "
 "आप नया इन�डेक�स बना सकते हैं। मिडेउसा इन�डेक�स को कमांड लाईन पर रूट की तरह चला सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "फाईल इन�डेक�स बनाने में त�र�टि"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "खोज को सामग�री लोड गर�ने बेला केहि त�र�टि भयो: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "खोज शीघ�र ही इसके लि� फाईलों की सूची सिस�टम पर उपस�थित होना अनिवार�य है फाईन�ड इस समय "
 "खोज सूची ढूंढने में असमर�थ है कारणवश धीमी खोज होगी जो सूची का उपयोग न करे"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "तेज खोज उपलब�ध नहीं"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "अंश खोज�ने उपलब�ध छैन"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5197,53 +5298,80 @@ msgstr ""
 "रहा है। इसे चलाने के लि� रूट में लाग इन करें और इस कमाण�ड को कमाण�ड हाईन पर �न�टर करें "
 "मेड�यूसा सर�चड"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "जल�दी खोज के लि� खोज को फाईलों की सूची चालि�। आपका कम�प�यूटर अभी सूची बना रहा है "
 "क�योंकि खोज सूची का उपयोग नहीं ककर सकता, इस में कई मिनट लग सकते हैं."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 #, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "जल�दी खोज के लि� खोज को फाईलों की सूची चालि�। आपका कम�प�यूटर अभी सूची बना रहा है "
 "क�योंकि खोज सूची का उपयोग नहीं ककर सकता, इस में कई मिनट लग सकते हैं."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "सूचीबद�ध खोज उपलब�ध नहीं है"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 #, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"अंश के लि� खोज को आपके सिस�टम पर सूची फाईल की आवश�यकता है। अभी सूची नहीं मिल सकी।"
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "जल�दी खोज के लि� खोज को फाईलों की सूची चालि�। आपका कम�प�यूटर अभी सूची बना रहा है "
 "क�योंकि खोज सूची का उपयोग नहीं ककर सकता, इस में कई मिनट लग सकते हैं."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
 #, fuzzy
 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."
+"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 ""
 "जो खोज आपने च�नी है वो आपके सिस�टम के इन�डेक�स से नई है खोज अभी कोई परिणाम नहीं दे सकेगी "
 "आप नया इन�डेक�स बना सकते हैं मिडेस�य�आ इन�डेक�स�ड को कमान�ड हाईन पर रूट की तरह चला सकते हैं"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "तेज खोज आपके सिस�टम पर उपलब�ध नहीं है"
+
+#: src/file-manager/fm-search-list-view.c:330
 #, fuzzy
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
@@ -5253,11 +5381,12 @@ msgstr ""
 "जल�दी खोज के लि� खोज को फाईलों की सूची चालि�। आपका कम�प�यूटर अभी सूची बना रहा है "
 "क�योंकि खोज सूची का उपयोग नहीं ककर सकता, इस में कई मिनट लग सकते हैं."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "तेज खोज आपके सिस�टम पर उपलब�ध नहीं है"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "तेज खोज उपलब�ध नहीं"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "कहा�"
 
@@ -5266,7 +5395,7 @@ msgstr "कहा�"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "नया विन�डोमा देखाउन�स"
@@ -5277,7 +5406,7 @@ msgstr "नया विन�डोमा देखाउन�स"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d नया विन�डोमा देखाउन�स"
@@ -5286,15 +5415,21 @@ msgstr "%d नया विन�डोमा देखाउन�स"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "जितने परिणाम दिखा� जा सकते हैं। उससे अधिक खोज परिणाम आ ग� हैं क�छ खोज परिणाम नहीं "
 "दिखा� जा�ंगे।"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"जितने परिणाम दिखा� जा सकते हैं। उससे अधिक खोज परिणाम आ ग� हैं क�छ खोज परिणाम नहीं "
+"दिखा� जा�ंगे।"
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "काफी अधिक मिलान"
 
@@ -5308,12 +5443,12 @@ msgid "Create L_auncher"
 msgstr "नया लान�चर"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "नया लन�चर बनाउन�होस�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "ट�रेशबाट सबै बस�त�हर� मेट�न�होस�"
 
@@ -5332,7 +5467,7 @@ msgstr "à¤�क खिड़की दिखाà¤�à¤� जो डेसà¥�कटà¤
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "पूर�वनिर�धारित बैकग�राउण�ड प�रयोग गर"
@@ -5354,185 +5489,204 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "छान�निइको आईटम हेर�नको लागी अर�कै प�रोग�राम छान�न�होस�"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "फोल�डर बनाउन�स"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "फोल�डर बनाउन�स"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "यो फोल�डरभीत�र नया फोल�डर बनाउन�होस�"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "यो फोल�डरभीत�र नया फोल�डर बनाउन�होस�"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "हरेक छान�नी�को वस�त�को लागी सांकेतीक लिंक बनाउन�होस�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "नक�कली"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "छानी�को हरेक बस�त�हर� ट�रेशमा नलगीकन मेट�न�होस�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "हरेक छानेको आईटम�सको नक�कल बनाउन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "सम�पादक लान�चर"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "लान�चर सूचना संसोधन गर�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "खोजें सन�सकरण को फारमेट करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "मीडिया ग�ण"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "छानि�को भोल�य�म हताउन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "हटा�� या कापी करें पहले निश�चित की गई कट फाईल या कापी फाईल कमान�ड द�वारा"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr "हटा�� या कापी करें पहले निश�चित की गई कट फाईल या कापी फाईल कमान�ड द�वारा"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "यसले खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "हरेक छानेको वस�त�लाई नया विन�डोमा खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "नया विन�डोमा खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "छानी�को हरेक बस�त�हर� यस विन�डोमा खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "निश�चित फाईलों को तैयार करें पेस�ट फाईल कमान�ड द�वारा कापी के लि� तैयार करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "निश�चित फाईलों को पेस�ट फाईल कमान�ड से हटाने के लि� तैयार करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "बचाउन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "छानि�को भोल�य�म बचाउन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "छानी�को बस�त�हर�लाई नाम दिन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "पूर�वनिर�धारित दृष�यमा राख"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "सार�टिंग क�रम और जूम लेवल को इस व�यू की प�राथमिकता�� के अन�सार चला�ं या प�रबंध करें स�क�रिप�ट से "
 "सभी फाइल निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "सभी फाइलें निश�चित करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "सबै फाइल छान�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "ब�ट�टा"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "उस फोल�डर को दिखा�� जो उन सभी स�क�रिप�टों को रखता है जो इस मीनू में दिखाई गई है"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "उस फोल�डर को दिखा�� जो उन सभी स�क�रिप�टों को रखता है जो इस मीनू में दिखाई गई है"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "निर�धारित संस�करण की मीडिया विशेषता�� दिखा��।"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "इस स�थान के बैक ग�राउण�ड के लि� पूर�वनिर�धारित उफयोग करें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "छानि�को भोल�य�म हताउन�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "सभी निश�चित वस�त�ओं को देखें या बदलें"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "नया फोल�डर"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "फाइल कपी गर�न�स"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "फरमाट"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "अनमाउण�ट वाल�यूम"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "स�क�रिप�ट फोल�डर खोल�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "फाइल पेस�ट गर�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "फाइल फोल�डरमा पेस�ट गर�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "विशेषताहरू"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "प�नः नाम राख�न�स"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "स�क�रिप�ट"
 
@@ -5617,45 +5771,57 @@ msgstr "मानवकत"
 msgid "Indexing is %d%% complete."
 msgstr "%d%% सूचीबद�ध पूर�ण ह�ई"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "आपकी फाईलें आखिरी बार %s पर सूचीबद�ध की गई है"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "दिन में �क बार फाईल �वं पाठ�य सामग�री सूचीबद�ध की जाती है जिससे खोज तेज हो"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "सूचीबद�ध करने का स�तर"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "आपकी फाईलें आखिरी बार %s पर सूचीबद�ध की गई है"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 #, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr "दिन में �क बार फाईल �वं पाठ�य सामग�री सूचीबद�ध की जाती है जिससे खोज तेज हो"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "आपकी फाईलों की सूची अभी नहीं है"
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "आपकी फाईलों की सूची अभी नहीं है"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "माफ करें, पर मेड�य�सा खोज स�विधा उपलब�ध नहीं है"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%आई:%�म %पी, %�क�स"
 
@@ -5679,50 +5845,57 @@ msgstr "दिखाà¤�à¤� सूचीबदà¥�ध करने का सà¥�à¤
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 #, fuzzy
 msgid "Couldn't Create Required Folder"
 msgstr "फोल�डर पढ�न मिलेन"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "फोल�डर पढ�न मिलेन"
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 #, fuzzy
 msgid "Couldn't Create Required Folders"
 msgstr "फोल�डर पढ�न मिलेन"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "डेस�कटपमा"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "डेस�कटपमा"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5734,7 +5907,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5742,7 +5915,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5771,12 +5944,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "असंभावित त�र�टि के कारण नोटिल�य का उपयोग अभी नहीं हो सकेगा"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5784,14 +5957,14 @@ msgstr ""
 "जब फाईल मैनेजर व�यू सर�वर को रजिस�टर किया जा रहा तब ह�ई असंभावित त�र�टि के कारण नटिलस "
 "का उपयोग अब नहीं हो सकता"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr "�क अनअपेछित त�र�टि के कारण जब फैक�टरी स�थित करने की कोशिश हो रही थी"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 #, fuzzy
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
@@ -5799,6 +5972,17 @@ msgid ""
 "restarting Nautilus may help fix the problem."
 msgstr "�क अनअपेछित त�र�टि के कारण जब फैक�टरी स�थित करने की कोशिश हो रही थी"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"मदद दर�शाने में त�र�टि: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "क�नै ब�कमार�कस छैन"
@@ -5832,34 +6016,45 @@ msgstr "कम विकल�प"
 msgid "Find Them!"
 msgstr "खोज�न�स"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "आफैंमा जान सक�तैन"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "माफ गर�न�स, यो \"%s\" वैध फाईल होईन"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" वैध स�थान होईन कृपया हिज�जे प�न जा�च गरेर कोशिश गर�न�स"
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "\"%s\" पाउन सकेन, हिज�जे जा�चेर फेरी कोशीश गर�न�होस�"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "नेट�रावर�स"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "नाम"
+msgid "_Location:"
+msgstr "लोकेशन"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "कनेक�टिवा"
@@ -6059,6 +6254,20 @@ msgstr ""
 "इन फाईलों की उपस�थिति दर�शाती है कि नटिलस कन�फिगरेशन डूईड प�रेजेन�ट किया गया है। आप ख�द "
 "इन फाइलों को मिटा सकते हैं फिर दिखाने के लि�\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"आप �क से अधिक कस�टम आईकन को �क समय निश�चित नहीं कर सकते। कपया ड�रैग करें सिर�फ �क को "
+"कस�टम आईकन के लि� छवि निश�चित करें"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"जो फाईल आपने छोड़ी है स�थानीय नहीं है आप सिर�फ स�थानीय छवि ही उपयोग में ला सकते हैं कस�टम "
+"आईकन�स"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6069,24 +6278,22 @@ msgstr "%s ले खोल�न�स"
 msgid "Open with..."
 msgstr "...ले खोल�न�स"
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "नया लान�चर"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "ट�रेश खाली गर�न�स"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6094,114 +6301,127 @@ msgstr ""
 msgid "Go To:"
 msgstr "जाउ:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "%d स�थानलाई नया विन�डोमा हेर�न चाहन� ह�न�छ"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr " स�थान खोल�न सकेन"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "ख�द जा�चने वाले परीछणों के समूह को करें"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "श�र�को विन�डो दिई�को रेखागणितको अन�सार बनाउन�होस�"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "रेखागणित"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "सिर�फ खिड़की बना�� अलग से दर�शा�� यू आर �ल के लि�"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "डेस�कटाप का प�रबंधन न करें (प�रिफरेन�सेज डायलाग के प�रिफरेन�सेस पर ध�यान न दें)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "नटिलसबाट बाहिर जान�स"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "नटिलस फेरि श�र� गर�नस"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "फाईल मानेजर"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "नटिलस"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "नटिलस - यूआरआइलाई जाच�न सकिदैन\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "नटिलस जा�चना दूसरे विकल�पों के साथ सम�भव नहीं\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "नटिलस - URIसंग बाहिरिन सकि�न\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "URIसंग नटिलस प�न श�र�आत गर�न सकि�न\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "नटिलस - रेखागणित ईस यूआर �ल के साथ उपयोग नहीं हो सकता\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "के तपाईं   \"%s\"  स�थायी तरीकाले मेट�न चाहन�ह�न�छ"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "के तपाइ ईतीहास भ�ल�न चाहन�ह�न�छ।"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "के तपाईले हेर�न�भ�को स�थानको सूचीहरू मेट�न चाहन�ह�न�छ"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "इतिहास मेट�न�होस�"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" स�थिति उपस�थित नहीं है। क�या आप अपनी सूची से किसी ब�कमार�क को हटाना चाहते हैं"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "स�थिति %s अब उपस�थित नहीं है"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "नभ�को स�थानकोलागी ब�कमार�ग"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "हटा��"
 
@@ -6234,7 +6454,6 @@ msgid "Close _All Windows"
 msgstr "सबै विन�डो बन�द गर�न�होस�"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "सबै नटिलस विन�डो बन�द गर�न�होस�"
@@ -6257,107 +6476,119 @@ msgid "Forward"
 msgstr "अगाडि"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "कचरे वाले फोल�डर में जा��"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "जा�� अगली स�थिति पर जहां पहले जा च�के हैं"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "जा�� पिछली स�थिति पर"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "घर"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "स�थिति बार"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "फेरी लोड गर"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "इस कम�प�यूटर में फाईलें खोजें"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "स�टेटसबार"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "रोक"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "माथि"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "ब�कमार�क थप�न�स"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "अघिल�लो"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "ब�कमार�क�स"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "इतिहास मेट�ने"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "क�रियर"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "ब�कमार�क�स संसोधन"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "अगाडि"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "जाउ"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "घर"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "स�थान..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "साइड पेन"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "थीम�स"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "ट�रेश"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "माथि"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "दृष�य"
 
@@ -6376,34 +6607,39 @@ msgstr "जस�तो हेर�ने..."
 msgid "File Browser: %s"
 msgstr "फाइल धनी"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "साईडबार के �क पैनल में त�र�टि है कारणवश आगे नहीं बड़ सके। द�र�भाग�यवश कौन सा मैं बता नहीं "
 "सकता।"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s साइडबार पैनल में त�र�टि मिली है कारणवश आगे नहीं बड़ सके। अगर �सा आगे  भी होता है तो "
 "आप इस पैनल को बन�द करना चाहेंगे"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "साइडबार पैनल असफल भयो"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "किनारे का पैन"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "साईड पेन दृष�य समाबेस छ"
 
@@ -6437,148 +6673,181 @@ msgstr "नया थप�न�स"
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "माफ करें, पर %s प�रकार मिटाया न जा सका"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "प�रकार (प�याटर�न) मेटाउन सकेन"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "माफ करें, पर चिन�ह %s मिटाया नहीं जा सका"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "चिन�ह हटाउन सकि�न"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "नया चिन�ह बनाउन�होस�"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "कीवर�ड"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "चित�र"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "नया चिन�हको लागि चित�र छान�न�स"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "नया रंग बनाउन�होस�"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "रंगको नाम"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "रंगको मूल�य"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "माफ गर�न�स, यो \"%s\" वैध फाईल होईन"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "माफ गर�न�स, वैध फाईल नाम दिइ�न"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "ब�ट�टा इन�सटल ह�न सकेन"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "माफ गर�न�स, चित�र बदल�न सकिदैन"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "चित�र होईन"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "माफ गर�न�स, ब�ट�टा %s  इन�सटल ह�न सकेन"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "ब�ट�टा बनाउने चित�र फाइल छान�न�स"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "माफ करें, परन�त� न� रंग के लि� �क �सा नाम देना होगा जिसमें ब�लैंक (खाली स�थान) नहीं"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "नया रंग इन�सटल ह�न सकेन"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "थप�ने रंग छान�न�स"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "माफ कीजि�, परंत� %s �क उपयोग चित�र फाइल नहीं है"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "'%s' फाइल मान�य चित�र होइन"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "समूह छान�न�स"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 #, fuzzy
 msgid "C_ancel Remove"
 msgstr "हटाउन�"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "नया ब�ट�टा  थप�न�स..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "नया रंग थप�न�स..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "नया चिन�ह थप�न�स..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "ब�ट�टा हटाउनको लागी ब�ट�टामा क�लिक गर�न�होस�"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "रंग हटाउनको लागी रंगमा क�लिक गर�न�होस�"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "हटाउनको लागी चिन�हमा पर क�लिक गर�न�होस�"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "ब�ट�टा"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "रंग"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "चिन�ह"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "ब�ट�टा हटा��"
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "रंग हटा��"
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "चिन�ह हटा��"
 
@@ -6963,34 +7232,39 @@ msgstr "सिडि निर�माता"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "सबै विन�डो बन�द गर�न�होस�"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "साईड पेन बन�द गर"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "कचरे वाले फोल�डर में जा��"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "स�थान..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "आयटम�स जो कि फोल�डर हैं"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "ब�ट�टा"
@@ -7020,10 +7294,13 @@ msgid "View Failed"
 msgstr "दृष�यमा त�र�टि"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s व�यू में त�र�टि है और आगे नहीं बढ़ सकता। आप अन�य व�यू निश�चित करें या दूसरे स�थान पर जा सकते हैं"
 
@@ -7032,94 +7309,124 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "श�रू करते समय %s व�यू में त�र�टि मिली"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "इस विन�डो के साथ निर�धारित करें नटिलस उफयोग के योग�य"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "सामाग�री दृष�य"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "वर�तमान फाईल या फोल�डरको दृष�य"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "\"%s\" पाउन सकेन, हिज�जे जा�चेर फेरी कोशीश गर�न�होस�"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "चिन�ह थप�न सकि�न"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "नटिलस \"%s\" नहीं दिखा सका"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "\"%s\" देखाउन सक�तैन किनकी नटिलसले फाइलको प�रकार छ�ट�याउन सकेन"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "\"%s\" दिखाने की शक�ति रखने वाला कोई व�यूवर नटिलस के पास नहीं है"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "\"%s\" देखाउन सक�तैन किनकी नटिलस %s स�थिति समाल�न सक�तैन"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\" देखाउन सक�तैन किनकी लग इन गर�ने प�रयास असफल भयो"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" देखाउन सक�तैन किनकी प�रवेशको अन�मति छैन"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" देखाउन सक�तैन किनकी क�नै पनी \"%s\" होस�ट पत�ता लागेन।  जा�च�न�होस�की हिज�जे र "
 "प�रोक�सी सर�वर सेटिंग�स ठीक छ की छैन"
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "\"%s\" देखाउन सक�तैन किनकी होस�ट को नाम खाली थियो। जा�च�न�होस�की तपाईको प�रोक�सी सर�वर "
 "सेटिंग�स ठीक छ की छैन"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "\"%s\" देखाउन सक�तैन किनकी नटिलस %s स�थिति समाल�न सक�तैन"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"\"%s\" देखाउन सक�तैन किनकी नटिलस �स�मबी मूख�य ब�राउजरस�ग सम�पर�क गर�न सकेन। जांच�नूहोस� कि "
-"�स�मबी सर�वर लोकल नेटवर�कमा चलीराखेको छ भनेर"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"अभी खोज नहीं हो सकती क�योंकि या तो इन�डेक�स नहीं है, या खोज स�विधा उपलब�ध नहीं है। ये "
+"पक�का कर लें कि आपने मेड�यूसा खोज स�विधा श�रू की या नहीं। और यदि इन�डेक�स नहीं है तो मेड�य�सा "
+"इन�डेक�सर चल रहा है या नहीं।"
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "अभी खोज नहीं हो सकती क�योंकि या तो इन�डेक�स नहीं है, या खोज स�विधा उपलब�ध नहीं है। ये "
 "पक�का कर लें कि आपने मेड�यूसा खोज स�विधा श�रू की या नहीं। और यदि इन�डेक�स नहीं है तो मेड�य�सा "
 "इन�डेक�सर चल रहा है या नहीं।"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "खोज स�विधा उपलब�ध नहीं"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "नटिलस \"%s\" नहीं दिखा सका"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "स�थान देखाउन सक�तैन"
 
@@ -7131,7 +7438,7 @@ msgstr "उस स�थल पर जा�� जो इस ब�कमार
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "कपीराइट (c) 1999-2001Eazel, inc"
 
@@ -7139,11 +7446,11 @@ msgstr "कपीराइट (c) 1999-2001Eazel, inc"
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "अन�वादकलाई श�रेय"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7158,39 +7465,43 @@ msgstr "क�छ पन�ने पीछे जा��"
 msgid "Go forward a number of pages"
 msgstr "कई पन�ने आगे जा��"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "यस स�थानलाई %s स�ग देखाऊ"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "रेडहेट नेटवर�क"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "बिन�द�"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "थीम�स"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "सिडि निर�माता"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "�प�लीकेशन ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "विन�डो की उपयोग के योग�य आई डी"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "�प�लीकेशन"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "इस विन�डो के साथ निर�धारित करें नटिलस उफयोग के योग�य"
 
@@ -7228,6 +7539,243 @@ msgstr "नेट�रावर�स"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "अपने होम फोल�डर को नटिलस फाइल मैनेजर में देखें"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr "केहि फाइल मान�य चित�र नभ�कोले चिन�हमा थप�न सकि�न"
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "हार�डवेयर दृश�यको लागि कारखाना"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "हार�डवेयर दृश�य देखाउने"
+
+#~ msgid "Hardware view"
+#~ msgstr "हार�डवेयर दृश�य"
+
+#~ msgid "View as Hardware"
+#~ msgstr "हार�डवेयर जस�तै हेर�ने"
+
+#~ msgid "hardware view"
+#~ msgstr "हार�डवेयर दृश�य"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "हार�डवेयर दृश�यको लागि आइकन को नाम"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "हार�डवेयर जानकारीको सारांश"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s सीपीयू \n"
+#~ "%s MHz \n"
+#~ " %s K क�यास साइज"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu जीबी  RAM"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu �मबी रयाम"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu जीबी"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu �मबी"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "%d दिन, %d घण�टा, %d मिनेट चलेको छ"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "हार�डवेयर ओभरभीउ"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "यो CPU पृष�ठको लागि ठाउ हो"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "यो RAM पृष�ठको लागि ठाउ हो"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "यो IDE पृष�ठको लागि ठाउ हो"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" पर कापी करते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" पर लिंक बनाते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr "नया फोल�डर बनाने में गलती"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\" पर कापी करते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr "नया फोल�डर बनाने में गलती"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\" पर लिंक बनाते ह�� गलती \n"
+#~ "\n"
+#~ " गन�तव�य पर जगह नहीं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "फाइल \"%s\" पहले से है\n"
+#~ "\n"
+#~ "क�या आप बदलना चाहते हैं"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "ट�रेशमा कपी गर�न सक�तैन"
+
+#, fuzzy
+#~ msgid "Searching Disks"
+#~ msgstr "खोज की सूची"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "नोटिलस ट�रेश फोल�डर के लि� आपके डिस�क को खोज रहा है"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d च�ने ह�� आइटम�स को ट�रेश में नहीं भेजा जा सकता क�या आप इसे त�रंत डिलीट करना चाहते हैं"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d छानि�का आईटमहरू ट�रेशमा राख�न सकि�न के तपाई  %d आईटमलाई त�रन�त मेट�न चाहन� ह�न�छ"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "जो फाईल आपने छोड़ी है वह छवि नहीं है। आप सिर�फ स�थानीय छवि ही उपयोग कर सकते हैं "
+#~ "कस�टम आईकन�स की तरह"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "माफ कीजि�गा परन�त� मिडेस�वा खोज सेवा उपलब�ध नहीं है क�योंकि ये इंस�टाल नहीं की गई है"
+
+#, fuzzy
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr "दिन में �क बार फाईल �वं पाठ�य सामग�री सूचीबद�ध की जाती है जिससे खोज तेज हो"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" वैध स�थान होईन कृपया हिज�जे प�न जा�च गरेर कोशिश गर�न�स"
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "माफ गर�न�स,  %s उपयोग गर�न योग�य चित�र फाईल होईन"
+
+#~ 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 ""
+#~ "\"%s\" देखाउन सक�तैन किनकी नटिलस �स�मबी मूख�य ब�राउजरस�ग सम�पर�क गर�न सकेन। जांच�नूहोस� "
+#~ "कि �स�मबी सर�वर लोकल नेटवर�कमा चलीराखेको छ भनेर"
+
+#~ msgid "file icon"
+#~ msgstr "फाइल आयकान"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "नाम"
+
 #~ msgid "Unknown"
 #~ msgstr "अग�यात"
 
@@ -7321,9 +7869,6 @@ msgstr "अपने होम फोलà¥�डर को नटिलस फाà
 #~ msgid "_Toolbar"
 #~ msgstr "टूलबार"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "स�थिति %s अब उपस�थित नहीं है"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "अन�पस�थित स�थल पर जा��"
 
@@ -7933,18 +8478,6 @@ msgstr "अपने होम फोलà¥�डर को नटिलस फाà
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "माफ करें, पर \"%s\" �क वैध थीम फोल�डर नहीं है"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "माफ कीजि�, परंत� %s �क उपयोग चित�र फाइल नहीं है"
-
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "माफ करें, पर वो थीम हटाया न जा सक"
-
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "माफ करें, पर \"%s\" थीम इन�सटाल नहीं हो सका"
-
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "माफ करें पर छवि %s चिन�ह की तरह इन�स�टाल नहीं हो सकती"
-
 #~ msgid "Sorry, but the music view can't play non-local files yet."
 #~ msgstr ""
 #~ "माफ कीजि�, परंत� ध�वनि दश�य अभी उन फाइलों को नहीं चला सकता जो स�थानीय नहीं हैं"
@@ -8018,9 +8551,6 @@ msgstr "अपने होम फोलà¥�डर को नटिलस फाà
 #~ msgid "Terror"
 #~ msgstr "भय"
 
-#~ msgid "Themes"
-#~ msgstr "थीम�स"
-
 #~ msgid "Thrash Metal"
 #~ msgstr "थ�रैस मेटल"
 
diff --git a/po/nl.po b/po/nl.po
index 942c51008..f2d637dd2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-08-21 18:30+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-08 23:40+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,8 +47,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() niet gelukt."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemen"
 
@@ -58,51 +58,63 @@ msgstr "Nautilus embleem-zijpaneel"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:3
 msgid "Nautilus Emblem view"
-msgstr "Nautilus embleemvenster"
+msgstr "Nautilus embleemweergave"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Kan het embleem niet verwijderen"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Kan het embleem met de naam '%s' niet verwijderen. Waarschijnlijk komt dit "
 "doordat het een permanent embleem is, en niet één die u zelf hebt toegevoegd."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Kan het embleem niet verwijderen"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kan het embleem niet hernoemen"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Kan het embleem met de naam '%s' niet hernoemen. Waarschijnlijk komt dit "
 "doordat het een permanent embleem is, en niet één die u zelf hebt toegevoegd."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Kan het embleem niet hernoemen"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Embleem hernoemen"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Geef een nieuwe naam voor het weergegeven embleem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Emblemen toevoegen..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -110,7 +122,7 @@ msgstr ""
 "Geef een beschrijvende naam bij elk embleem. Deze naam wordt op andere "
 "plaatsen gebruikt om het embleem te identificeren."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -118,140 +130,64 @@ msgstr ""
 "Geef een beschrijvende naam bij het embleem. Deze naam wordt op andere "
 "plaatsen gebruikt om het embleem te identificeren."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Sommige van de bestanden kunnen niet als emblemen worden toegevoegd omdat ze "
 "geen geldige bestanden lijken te zijn."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Het bestand '%s' lijkt geen geldige afbeelding te zijn."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Kan emblemen niet toevoegen"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Geen van de bestanden kunnen als emblemen worden toegevoegd omdat ze geen "
 "geldige afbeeldingen lijken te zijn."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "De gesleepte tekst was geen geldige bestandslocatie."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Kan embleem niet toevoegen"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Het bestand '%s' lijkt geen geldige afbeelding te zijn."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Het gesleepte bestand lijkt geen geldige afbeelding te zijn."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Verwijderen"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabriek voor het hardware-venster"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Hardware-weergave"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardware-weergave"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Hardware-weergave"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardware-weergave"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "naam van het pictogram om hardware te tonen"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "samenvatting van de hardware info"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cachegrootte"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-# &l
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "De computer staat al %d dagen, %d uren en %d minuten aan"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hardwareoverzicht"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Dit is een plaatshouder voor de CPU-pagina."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Dit is een plaatshouder voor de RAM-pagina."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Dit is een plaatshouder voor de IDE-pagina."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Geschiedenis"
@@ -277,51 +213,48 @@ msgid "Nautilus Image Properties view"
 msgstr "Nautilus afbeeldingseigenschappenvenster"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Camera"
+msgstr "Merk camera"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Camera"
+msgstr "Model camera"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Datum genomen"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Belichtingstijd"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "programma"
+msgstr "Belichtingsprogramma"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Diafragma-waarde"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Meetmodus"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Geflitst"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Brandpuntsafstand"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Sluitersnelheid"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO-waarde"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -343,7 +276,7 @@ msgstr "Afbeeldingsinformatie laden mislukt"
 
 #: components/image_properties/nautilus-image-properties-view.c:423
 msgid "loading..."
-msgstr "Bezig met laden..."
+msgstr "laden..."
 
 #: components/image_properties/nautilus-image-properties-view.c:439
 msgid "URI currently displayed"
@@ -405,7 +338,7 @@ msgstr "Gebruik Google om het web te doorzoeken naar de geselecteerde tekst"
 
 #: components/text/services/webster.xml.h:1
 msgid "Look Up Selected Text in Dictionary"
-msgstr "Zoek Geselecteerd Tekst in Woordenboek"
+msgstr "Geselecteerde tekst opzoeken in woordenboek"
 
 #: components/text/services/webster.xml.h:2
 msgid "Look up the selected text in the Merriam-Webster dictionary"
@@ -917,6 +850,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internationaal"
@@ -1117,9 +1054,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Nieuw venster openen voor elk geopend bestand"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "Persoonlijke map-pictogram zichtbaar op werkblad"
+msgstr "Computer-pictogram zichtbaar op werkblad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1208,31 +1144,19 @@ msgid "Desktop trash icon name"
 msgstr "Naam van prullenbak-pictogram op werkblad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Mappen groter dan dit, worden afgekapt rond deze grootte. De bedoeling "
-"hiervan is om het onbedoeld opblazen van de heap te voorkomen en daarmee het "
-"doodslaan van Nautilus bij enorme mappen. Een negatieve waarde geeft aan dat "
-"er geen begrenzing is. De waarde is een benadering ten gevolge van het "
-"\"chunksgewijze\" inlezen van mappen."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "'speciale' vlaggen inschakelen in bestandsvoorkeuren-dialoogvenster"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Bestandsnaam voor de standaard mapachtergrond. Alleen gebruikt als "
 "background_set waar is."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1240,6 +1164,20 @@ msgstr ""
 "Bestandsnaam voor standaard zijpaneel-achtergrond. Alleen gebruikt als "
 "side_pane_background_set waar is."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Mappen groter dan dit, worden afgekapt rond deze grootte. De bedoeling "
+"hiervan is om het onbedoeld opblazen van de heap te voorkomen en daarmee het "
+"doodslaan van Nautilus bij enorme mappen. Een negatieve waarde geeft aan dat "
+"er geen begrenzing is. De waarde is een benadering ten gevolge van het "
+"\"chunksgewijze\" inlezen van mappen."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Standaard bladwijzers in het bladwijzermenu verbergen"
@@ -1249,9 +1187,10 @@ msgid "Home icon visible on desktop"
 msgstr "Persoonlijke map-pictogram zichtbaar op werkblad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Als ingesteld op waar, dan toont Nautilus alleen mappen in de boom-zijbalk. "
 "Anders toont het zowel mappen als bestanden."
@@ -1290,9 +1229,10 @@ msgstr ""
 "opties van een bestand instellen in het bestandsvoorkeuren-venster."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Als ingesteld op waar, dan toont Nautilus mappen vóór bestanden in de "
 "pictogram- en lijstweergaven."
@@ -1337,8 +1277,9 @@ msgstr ""
 "in het Bladwijzers-menu tonen."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Als ingesteld op waar, dan gebruikt Nautilus de persoonlijke map van de "
@@ -1356,9 +1297,10 @@ msgstr ""
 "tilde (~) beschouwd als reservekopiebestanden."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Indien ingesteld op waar, dan worden verborgen bestanden getoond in het "
 "bestandsbeheer. Verborgen bestanden zijn ofwel bestanden die beginnen met "
@@ -1375,17 +1317,17 @@ msgstr ""
 "keer dat u zich aanmeldt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
 "Indien ingesteld op waar, dan wordt een pictogram dat verwijst naar de "
-"prullenbak op het werkblad gezet."
+"computer-locatie op het werkblad gezet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Indien ingesteld op waar, dan wordt een pictogram dat verwijst naar de "
@@ -1424,10 +1366,10 @@ msgstr ""
 "maar aflopend gesorteerd."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
-"Indien ingesteld op waar, dan worden pictogrammen standaard dichter op "
-"elkaar gezet in nieuwe vensters."
+"Indien waar, dan worden pictogrammen standaard dichter op elkaar gezet in "
+"nieuwe vensters."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1439,8 +1381,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If true, new windows will use manual layout by default."
 msgstr ""
-"Indien ingesteld op waar dan maken nieuwe vensters standaard van handmatige "
-"lay-out gebruik."
+"Indien waar, dan maken nieuwe vensters standaard van handmatige lay-out "
+"gebruik."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
@@ -1457,7 +1399,8 @@ msgid "List of possible captions on icons"
 msgstr "Lijst van mogelijke bijschriften bij pictogrammen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maximum aantal afhandelbare bestanden in een map"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1477,11 +1420,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus neemt het tekenen van het werkblad voor zijn rekening"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus gebruikt de persoonlijke map van de gebruiker als werkblad"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Mappen slechts in de boom-zijbalk tonen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1501,7 +1446,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Sorteervolgorde omdraaien in nieuwe vensters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Mappen eerst tonen in vensters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1540,10 +1486,11 @@ msgstr ""
 "voorproefje van geluid gegeven."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1555,12 +1502,13 @@ msgstr ""
 "\" dan worden er nooit voorbeeldgegevens gelezen."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Snelheidsafweging voor wanneer bestanden als miniaturen te tonen. Indien "
 "ingesteld op \"always\" dan wordt er altijd een miniatuur gemaakt, zelfs als "
@@ -1570,10 +1518,11 @@ msgstr ""
 "een afbeelding gemaakt, maar slechts een algemeen pictogram gebruikt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Snelheidsafweging voor wanneer het aantal items in een map te tonen. Indien "
@@ -1586,19 +1535,19 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Standaard sorteervolgorde voor items in de pictogramweergave. Mogelijke "
-"waarden zijn: \"name\", \"size\", \"type\", \"modification_date\", \"emblems"
-"\"."
+"waarden zijn: \"name\", \"size\", \"type\", \"modification_date\", en "
+"\"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"Standaard sorteervolgorde voor het item in de lijstweergave. Mogelijke "
-"waarden zijn: name, size, type, en modification_date."
+"Standaard sorteervolgorde voor de items in lijstweergave. Mogelijke waarden "
+"zijn: \"name\", \"size\", \"type\", en \"modification_date.\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
@@ -1638,11 +1587,11 @@ msgstr "Soort klik om bestanden te starten/openen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
 msgid "Use manual layout in new windows"
-msgstr "Handmatige lay-out gebruiken in nieuwe vensters"
+msgstr "Handmatige lay-out in nieuwe vensters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr "Strakkere lay-out gebruiken in nieuwe vensters"
+msgid "Use tighter layout in new windows"
+msgstr "Strakkere lay-out in nieuwe vensters"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1671,7 +1620,8 @@ msgstr ""
 "waarden zijn \"list_view\" en \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Wanneer het aantal items in een map te tonen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1683,7 +1633,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Wanneer miniaturen van afbeeldingsbestanden te tonen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Of een aangepaste standaard-mapachtergrond is ingesteld."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1720,15 +1671,15 @@ msgstr "Breedte van het zijpaneel"
 
 #: libnautilus-private/filesystem-attributes.xml.h:1
 msgid "AFFS Volume"
-msgstr "AFFS Volume"
+msgstr "AFFS Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:2
 msgid "AFS Network Volume"
-msgstr "AFS Netwerk Volume"
+msgstr "AFS Netwerk Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:3
 msgid "Auto-detected Volume"
-msgstr "Automatisch gedetecteerd Volume"
+msgstr "Automatisch gedetecteerd Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:4
 msgid "CD Digital Audio"
@@ -1736,103 +1687,103 @@ msgstr "CD Digitale Audio"
 
 #: libnautilus-private/filesystem-attributes.xml.h:5
 msgid "CD-ROM Drive"
-msgstr "CD-Rom"
+msgstr "CD-ROM-speler"
 
 #: libnautilus-private/filesystem-attributes.xml.h:6
 msgid "CDROM Volume"
-msgstr "CDROM Volume"
+msgstr "CDROM-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:7
 msgid "DVD Volume"
-msgstr "DVD Volume"
+msgstr "DVD-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:8
 msgid "Enhanced DOS Volume"
-msgstr "Geavanceerd DOS Volume"
+msgstr "Geavanceerd DOS volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:9
 msgid "Ext2 Linux Volume"
-msgstr "Ext2 Linux Volume"
+msgstr "Ext2 Linux volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:10
 msgid "Ext3 Linux Volume"
-msgstr "Ext3 Linux Volume"
+msgstr "Ext3 Linux volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:11
 msgid "Hardware Device Volume"
-msgstr "Hardware-apparaat Volume"
+msgstr "Hardware-apparaat volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:12
 msgid "Hsfs CDROM Volume"
-msgstr "Hsfs CDROM-volume"
+msgstr "Hsfs CDROM-Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:13
 msgid "JFS Volume"
-msgstr "JFS Volume"
+msgstr "JFS Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:14
 msgid "MSDOS Volume"
-msgstr "MSDOS-Volume"
+msgstr "MSDOS-Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:15
 msgid "MacOS Volume"
-msgstr "MacOS-Volume"
+msgstr "MacOS-Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:16
 msgid "Minix Volume"
-msgstr "Minix Volume"
+msgstr "Minix Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:17
 msgid "NFS Network Volume"
-msgstr "NFS Netwerk Volume"
+msgstr "NFS Netwerk Volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:18
 msgid "Pcfs Solaris Volume"
-msgstr "Pcfs Solaris-volume"
+msgstr "Pcfs Solaris-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:19
 msgid "ReiserFS Linux Volume"
-msgstr "ReiserFS Linux Volume"
+msgstr "ReiserFS Linux volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:20
 msgid "Solaris/BSD Volume"
-msgstr "Solaris/BSD Volume"
+msgstr "Solaris/BSD volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:21
 msgid "SuperMount Volume"
-msgstr "Supermount-volume"
+msgstr "Supermount-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:22
 msgid "System Volume"
-msgstr "Systeem-volume"
+msgstr "Systeem-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:23
 msgid "Udfs Solaris Volume"
-msgstr "Udfs Solaris-volume"
+msgstr "Udfs Solaris-volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:24
 msgid "Windows NT Volume"
-msgstr "Windows NT Volume"
+msgstr "Windows NT volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:25
 msgid "Windows Shared Volume"
-msgstr "Windows gedeeld volume"
+msgstr "Windows gedeeld volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:26
 msgid "Windows VFAT Volume"
-msgstr "Windows VFAT Volume"
+msgstr "Windows VFAT volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:27
 msgid "XFS Linux Volume"
-msgstr "XFS Linux Volume"
+msgstr "XFS Linux volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:28
 msgid "XIAFS Volume"
-msgstr "XIAFS Volume"
+msgstr "XIAFS volumen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:29
 msgid "Xenix Volume"
-msgstr "Xenix Volume"
+msgstr "Xenix volumen"
 
 #: libnautilus-private/nautilus-customization-data.c:406
 msgid "reset"
@@ -1844,68 +1795,82 @@ msgstr "herinitialiseren"
 msgid "on the desktop"
 msgstr "op het werkblad"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Kan volumen niet verwijderen"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"U kunt een volume-pictogram niet verwijderen. Indien u het medium wilt "
-"uitwerpen, gebruikt u dan Uitwerpen in het rechtsklik-menu van het volume."
+"U kunt een volumen-pictogram niet verwijderen. Indien u het medium wilt "
+"uitwerpen, gebruikt u dan Uitwerpen in het rechtsklik-menu van het volumen."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
-msgstr "Kan volume niet verwijderen"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
+msgstr "Kan volumen niet verwijderen"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Hierheen _verplaatsen"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "Hierheen _kopiëren"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Hierheen ver_wijzen"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Als _achtergrond instellen"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Als achtergrond instellen voor _alle mappen"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Als achtergrond ins_tellen voor deze map"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Sorry, maar u moet een niet-leeg trefwoord voor het nieuwe embleem opgeven."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Kan het embleem niet installeren"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1916,20 +1881,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Sorry, maar er is reeds een embleem met de naam \"%s\". Gelieve een andere "
 "naam ervoor te kiezen."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Kan het embleem niet installeren"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Sorry, niet in staat aangepast embleem op te slaan."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Sorry, niet in staat aangepaste embleemnaam op te slaan."
 
@@ -1948,23 +1919,29 @@ msgstr "Van:"
 msgid "To:"
 msgstr "Aan:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Fout tijdens het verplaatsen."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Fout bij verplaatsen.\n"
 "\n"
 "\"%s\" kan niet verplaatst worden, want het item bevindt zich op een alleen-"
 "lezen schijf."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Fout tijdens het verwijderen."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1973,23 +1950,18 @@ msgstr ""
 "\"%s\" kan niet verwijderd worden, want u heeft geen rechten om de "
 "bovenliggende map te wijzigen."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Fout bij verwijderen.\n"
 "\n"
 "\"%s\" kan niet verwijderd worden, want het bevindt zich op een alleen-lezen "
 "schijf."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1998,12 +1970,15 @@ msgstr ""
 "\"%s\" kan niet verplaatst worden, want u heeft geen rechten om dit item of "
 "de bovenliggende map te wijzigen."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Fout tijdens het verplaatsen."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Fout bij verplaatsen.\n"
@@ -2011,12 +1986,10 @@ msgstr ""
 "\"%s\" kan niet verplaatst worden, omdat dit item of zijn bovenliggende map "
 "zich bevindt in de bestemmingslocatie."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Fout bij verplaatsen.\n"
@@ -2024,238 +1997,178 @@ msgstr ""
 "\"%s\" kan niet naar de Prullenbak verplaatst worden, want u heeft geen "
 "rechten om dit item of de bovenliggende map te wijzigen."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Fout tijdens het kopiëren."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Fout bij kopiëren\n"
 "\n"
 "\"%s\" kan niet worden gekopiëerd omdat u er geen leesrechten voor heeft"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fout bij het kopiëren naar \"%s\".\n"
-"\n"
-"Er is onvoldoende ruimte op de bestemmingslocatie."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Fout tijdens het kopiëren."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Fout bij het verplaatsen naar \"%s\".\n"
 "\n"
 "Er is onvoldoende ruimte op de bestemmingslocatie."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fout bij het aanmaken van verwijzing in \"%s\".\n"
-"\n"
-"Er is onvoldoende ruimte op de bestemmingslocatie."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Fout tijdens het verplaatsen."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Fout tijdens het aanmaken van verwijzingen."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Fout bij het kopiëren naar \"%s\".\n"
 "\n"
 "U heeft geen schrijfrechten voor deze map."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Fout bij het kopiëren naar \"%s\".\n"
 "\n"
 "De bestemmingslocatie is alleen-lezen."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fout bij het verplaatsen naar \"%s\".\n"
-"\n"
-"U heeft geen schrijfrechten op de doelmap."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fout bij het verplaatsen naar \"%s\".\n"
-"\n"
-"De doelschijf ondersteunt alleen lezen."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fout bij het aanmaken van verwijzingen in \"%s\".\n"
-"\n"
-"U heeft geen schrijfrechten voor deze map."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Fout tijdens het verplaatsen."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fout bij het aanmaken van verwijzingen in \"%s\".\n"
-"\n"
-"De bestemmingsschijf is alleen-lezen."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het kopiëren van \"%s\".\n"
-"\n"
-"Wilt u doorgaan?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Fout tijdens het aanmaken van verwijzingen."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Fout tijdens het kopiëren."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Fout \"%s\"  bij het verplaatsen van \"%s\".\n"
+"Fout \"%s\" bij het verplaatsen.\n"
 "\n"
 "Wilt u doorgaan?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het aanmaken van een verwijzing naar \"%s\".\n"
-"\n"
-"Wilt u doorgaan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Fout tijdens het verplaatsen."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Fout \"%s\" bij het verwijderen van \"%s\".\n"
+"Fout \"%s\" bij het aanmaken van een verwijzing naar \"%s\".\n"
 "\n"
 "Wilt u doorgaan?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het kopiëren.\n"
-"\n"
-"Wilt u doorgaan?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Fout tijdens het verwijderen."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het verplaatsen.\n"
-"\n"
-"Wilt u doorgaan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Fout tijdens het kopiëren."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het aanmaken van verwijzingen.\n"
-"\n"
-"Wilt u doorgaan?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Fout tijdens het verplaatsen."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fout \"%s\" bij het verwijderen.\n"
-"\n"
-"Wilt u doorgaan?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Fout tijdens het aanmaken van verwijzingen."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Fout tijdens het verwijderen."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Fout tijdens het kopiëren."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Fout tijdens het verplaatsen."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Fout tijdens het aanmaken van verwijzingen."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Fout tijdens het verwijderen."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Overslaan"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Opnieuw"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kan aangegeven actie niet voltooien."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kan niet verplaatst worden naar de nieuwe lokatie, want de naam wordt "
 "reeds gebruikt voor een speciaal item dat niet verplaatst of vervangen kan "
@@ -2263,13 +2176,16 @@ msgstr ""
 "\n"
 "Indien u \"%s\" toch wilt verplaatsen, dan moet het eerst hernoemen."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kan aangegeven actie niet voltooien."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kan niet gekopiëerd worden naar de nieuwe lokatie, want de naam wordt "
 "reeds gebruikt voor een speciaal item dat niet verplaatst of vervangen kan "
@@ -2278,44 +2194,50 @@ msgstr ""
 "Als u \"%s\" toch wilt kopiëren, dient u het te hernoemen en opnieuw te "
 "proberen."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Vervangen van bestand mislukt."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Bestand \"%s\" bestaat reeds.\n"
 "\n"
 "Wilt u het vervangen?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflict tijdens het kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Vervangen"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Alles vervangen"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "verwijzing naar %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "nog een verwijzing naar %s"
@@ -2324,25 +2246,25 @@ msgstr "nog een verwijzing naar %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%de verwijzing naar %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%de verwijzing naar %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%de verwijzing naar %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%de verwijzing naar %s"
@@ -2352,562 +2274,599 @@ msgstr "%de verwijzing naar %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (nog een kopie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "e kopie"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "e kopie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "e kopie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "e kopie"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (nog een kopie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dte kopie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%de kopie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Onbekende GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Bestanden naar de Prullenbak aan het verplaatsen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Eruit gegooid: "
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Bezig met voorbereiden van verplaatsen naar de Prullenbak..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Bestanden aan het verplaatsen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Verplaatste bestanden:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Verplaatsing aan het voorbereiden..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Verplaatsing aan het voltooien..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Bezig met aanmaken van verwijzingen naar bestanden"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Bestandsverwijzingen:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Verwijzingen aan het maken"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Bezig met voorbereiden van aanmaken van verwijzingen..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Bezig met afronden van aanmaken van verwijzingen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Bezig met kopiëren"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Gekopieerde bestanden:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Bezig met kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Bezig met voorbereiden van kopiëren..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "U kunt geen items naar de Prullenbak kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Kan niet kopiëren naar Prullenbak"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "U kunt geen map verplaatsen naar zichzelf."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "U kunt deze Prullenbak-map niet kopiëren."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "U kunt de locatie van de prullenbak niet veranderen"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "U kunt de prullenbak niet kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "U kunt geen map verplaatsen naar zichzelf."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "U kunt geen map naar zichzelf kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Nieuwe lege map aanmaken in deze map"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Verplaatsen naar zichzelf niet mogelijk"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kan niet kopiëren naar zichzelf "
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "U kunt geen map over zichzelf heen kopiëren"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kan niet kopiëren over zichzelf heen"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Fout bij aanmaken van nieuwe map.\n"
 "\n"
 "U heeft geen schrijfrechten voor de bestemmingslocatie."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Fout bij aanmaken van nieuwe map.\n"
 "\n"
 "Er is geen ruimte op de bestemmingslocatie."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fout \"%s\" bij het aanmaken van nieuwe map."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Fout bij het aanmaken van nieuwe map"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Fout bij het aanmaken van nieuwe map"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "naamloze map"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Fout \"%s\" bij het aanmaken van nieuwe map."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Fout bij het aanmaken van nieuwe map"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Fout bij het aanmaken van nieuwe map"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 bestand"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Bezig met wissen bestanden"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Gewiste bestanden:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Bezig met wissen"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Bezig met voorbereiden van verwijderen van bestanden..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Prullenbak aan het legen"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Bezig met voorbereiden van Prullenbak legen..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr ""
-"Weet u zeker dat u alle objecten in de prullenbak permanent wilt verwijderen?"
+msgstr "Weet u zeker dat u alle objecten in de prullenbak wilt weggooien?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Als u de prullenbak leegt, zal de inhoud voorgoed verloren gaan."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Legen"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopie).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (nog een kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (nog een kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (nog een kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (nog kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (112e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123e kopie).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124e kopie)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124e kopie).txt"
 
@@ -2926,64 +2885,64 @@ msgstr "foo (124e kopie).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "vandaag om 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "vandaag om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "vandaag om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "vandaag om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "vandaag, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "vandaag om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "vandaag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "gisteren om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "gisteren om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "gisteren om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "gisteren om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "gisteren, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "gisteren om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "Westers"
 
@@ -2992,133 +2951,133 @@ msgstr "Westers"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Woensdag 00 September 00 0000 om 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y om %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Maa 00 Oct 0000 om 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y om %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Maa 00 Oct 0000 om 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y at %-I:%M %"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Oct 0000 om 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y om %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Oct 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 items"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mappen"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 bestanden"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 map"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 bestand"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u items"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mappen"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u bestanden"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? items"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "onbekend type"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "onbekend MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "onbekend"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programma"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3128,7 +3087,7 @@ msgstr ""
 "waarschijnlijk dat uw gnome-vfs.keys bestand op de verkeerde plaats staat, "
 "of niet gevonden kon worden vanwege een andere reden."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3137,11 +3096,11 @@ msgstr ""
 "Geen beschrijving gevonden voor MIME-type \"%s\" (bestand is \"%s\"), "
 "gelieve dit door te geven aan de gnome-vfs mailing lijst."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "verwijzing"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "verwijzing (gebroken)"
 
@@ -3262,11 +3221,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Bestanden zoeken op bestandsnaam en eigenschappen"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Pictogrammenweergave"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Lijstweergave"
@@ -3410,148 +3371,152 @@ msgstr "%s's persoonlijke map"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Countertop"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "bestandspictogram"
+msgstr "Computer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "bewerkbare tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "het bewerkbare bijschrift"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "aanvullende tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "wat meer tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "gemarkeerd voor selectie"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "of we gemarkeerd voor selectie zijn"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "gemarkeerd als toetsenbordfocus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "of we gemarkeerd zijn om de toetsenbordfocus terug te geven"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "gemarkeerd voor loslaten"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "of we gemarkeerd zijn voor sleepactie loslaten"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "De selectierechthoek"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Tekst omkaderen"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Kader om ongeselecteerde tekst tekenen"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Kleur selectieveld"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Naar van het selectieveld"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha-waarde selectieveld"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Doorschijnendheid van het selectieveld"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alpha-waarde markering"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Doorschijnendheid van de markering voor geselecteerde pictogrammen"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Lichte informatiekleur"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Kleur voor informatietekst tegen een donkere achtergrond"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Donkere informatiekleur"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Kleur voor informatietekst tegen een lichte achtergrond"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Deze map maakt gebruik van een automatische plaatsing. Wilt u dit wijzigen "
 "in handmatige plaatsing en dit item laten staan waar u het neergezet hebt? "
 "Dit kan de opgeslagen handmatige plaatsing rommelig maken."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Deze map maakt gebruik van automatische plaatsing. Wilt u dit wijzigen in "
 "handmatige plaatsing  en deze items laten staan waar u ze neergezet hebt? "
 "Dit kan de opgeslagen handmatige plaatsing rommelig maken."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Deze map maakt gebruik van een automatische plaatsing. Wilt u dit wijzigen "
 "in handmatige opmaak en dit item laten staan waar u het neergezet hebt?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Deze map maakt gebruik van een automatische plaatsing. Wilt u dit wijzigen "
 "in handmatige plaatsing en deze items laten staan waar u ze neergezet hebt?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Omschakelen naar handmatige plaatsing?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Omschakelen"
 
@@ -3660,72 +3625,72 @@ msgstr "Is standaard voor \"%s\"-items."
 msgid "Is the default for all \"%s\" items."
 msgstr "Is de standaard voor alle \"%s\"-items."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Verander \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Zet in het menu voor \"%s\"-items"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Gebruik als standaard voor \"%s\"-items"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Zet in het menu alleen voor \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Gebruik als standaard alleen voor \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Zet niet in het menu voor \"%s\"-items"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Naam"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Kie_zen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Voltooid"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Veranderen..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Bestandstypen en Programma's"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ga daarheen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3733,48 +3698,48 @@ msgstr ""
 "U kunt instellen welke programma's worden aangeboden voor welke "
 "bestandstypen in het Bestandstypen en programma's-dialoogvenster."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Met andere toepassing openen"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Kies het programma om \"%s\" mee te openen:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Openen met andere weergave"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Kies een weergave voor \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Geen weergave beschikbaar voor \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Geen weergave beschikbaar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Er is geen programma geassocieerd met \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Geen programma's geassocieerd"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Er is geen actie geassocieerd met \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Geen actie geassocieerd"
 
@@ -3782,11 +3747,9 @@ msgstr "Geen actie geassocieerd"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3795,42 +3758,41 @@ msgstr ""
 "U kunt GNOME configureren om toepassingen met bestandstypen te associëren. "
 "Wilt u nu een toepassing met dit bestandstype associëren?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Toepassing associëren"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "De weergave geassocieerd met \"%s\" is ongeldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Ongeldige weergave geassocieerd"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "De toepassing geassocieerd met \"%s\" is ongeldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Ongeldige toepassing geassocieerd"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "De actie geassocieerd met \"%s\" is ongeldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Ongeldige actie geassociëerd"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3841,95 +3803,136 @@ msgstr ""
 "bestandstype te associëren. Wilt u nu een toepassing of weergave met dit "
 "bestandstype associëren?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Actie associëren"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" kan \"%s\" niet openen, want \"%s\" kan bestanden op \"%s\" niet "
+"benaderen.  Wilt u een ander programma kiezen?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" kan \"%s\" niet openen, want \"%s\" kan bestanden op \"%s\" niet "
 "benaderen.  Wilt u een ander programma kiezen?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "De standaardactie kan \"%s\" niet openen, omdat het bestanden op \"%s\" niet "
 "kan benaderen.  Wenst u een andere actie te kiezen?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Kan locatie niet openen"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" kan \"%s\" niet openen, want \"%s\" kan bestanden op \"%s\" niet "
+"benaderen.  Wilt u een ander programma kiezen?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" kan \"%s\" niet openen, want \"%s\" kan bestanden op \"%s\" niet "
 "benaderen.  Geen andere programma's zijn beschikbaar om dit bestand te "
 "openen. Wellicht kunt u het bestand wel openen als u het naar uw computer "
 "kopiëert."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "De standaardactie kan \"%s\" niet openen, omdat het bestanden op \"%s\" niet "
-"kan benaderen. Geen andere acties zijn beschikbaar om dit bestand te "
-"bekijken. Wellicht kunt u het bestand wel openen als u het naar uw computer "
+"kan benaderen.  Wenst u een andere actie te kiezen?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" kan \"%s\" niet openen, want \"%s\" kan bestanden op \"%s\" niet "
+"benaderen.  Geen andere programma's zijn beschikbaar om dit bestand te "
+"openen. Wellicht kunt u het bestand wel openen als u het naar uw computer "
 "kopiëert."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Sorry, om veiligheidsredenen kunt u geen opdrachten vanaf een locatie op "
 "afstand uitvoeren."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Kan verwijzingen op afstand niet uitvoeren"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Er is een fout opgetreden bij het starten van de toepassing.\n"
 "\n"
 "Details:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Er is een fout opgetreden bij het starten van de toepassing"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Sleepdoel accepteert alleen lokale bestanden"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Dit sleepdoel accepteert alleen lokale bestanden.\n"
@@ -3937,15 +3940,15 @@ msgstr ""
 "Om niet-lokale bestanden te openen, moet u ze naar een lokale map kopiëren "
 "en ze opnieuw slepen."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Sleepdoel accepteert alleen lokale bestanden"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4198,14 +4201,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Items die \"medusa\" in de naam hebben en mappen zijn."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Bezig met doorzoeken van schijven"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus doorzoekt uw schijven op Prullenbakken"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Bewerken"
@@ -4274,7 +4269,7 @@ msgstr "Tekst _plakken"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Uw computer-opslag weergeven"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4289,13 +4284,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Uw persoonlijke map weergeven met Nautilus bestandsbeheer"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Bestandssysteem"
+msgstr "Bestandssysteem doorbladeren"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Bestandssysteem doorbladeren met het bestandsbeheer"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4406,97 +4400,105 @@ msgstr "Achtergrond"
 msgid "Empty Trash"
 msgstr "Prullenbak legen"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Dit zal %d nieuwe vensters openen. Weet u zeker dat u dat wilt?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d vensters openen?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Weet u zeker dat u \"%s\" blijvend wilt verwijderen?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Dit zal %d nieuwe vensters openen. Weet u zeker dat u dat wilt?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Weet u zeker dat u \"%s\" blijvend wilt verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Weet u zeker dat u de %d geselecteerde items permanent wilt verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Als u de prullenbak leegt, zal de inhoud voorgoed verloren gaan."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Selecteer een categorie:"
+msgstr "Selecteer een patroon"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Patronen"
+msgstr "_Patroon:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" geselecteerd"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 map geselecteerd"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappen geselecteerd"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (bevat 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (bevat 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (bevat %d items)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (bevat in totaal 0 items)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (bevat in totaal 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (bevat in totaal %d items)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d items geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ander item geselecteerd (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andere items geselecteerd (%s)"
@@ -4508,7 +4510,7 @@ msgstr "%d andere items geselecteerd (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4517,107 +4519,128 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "De map \"%s\" bevat meer bestanden dan Nautilus aankan. Niet alle bestanden "
 "worden getoond."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Te veel bestanden"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" kan niet naar de Prullenbak verplaatst worden. Wilt u het "
 "rechtstreeks verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"De %d geselecteerde items kunnen niet naar de Prullenbak verplaatst worden. "
-"Wilt u ze rechtstreeks verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" kan niet naar de Prullenbak verplaatst worden. Wilt u het "
+"rechtstreeks verwijderen?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d van de geselecteerd items kunnen niet naar de prullenbak verplaatst "
-"worden. Wilt u ze deze %d items rechtstreeks verwijderen?"
+"\"%s\" kan niet naar de Prullenbak verplaatst worden. Wilt u het "
+"rechtstreeks verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Direct verwijderen?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Weet u zeker dat u \"%s\" blijvend wilt verwijderen uit de Prullenbak?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Weet u zeker dat u de %d items blijvend wilt verwijderen uit de Prullenbak?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+#, fuzzy
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Als u de prullenbak leegt, zal de inhoud voorgoed verloren gaan."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Verwijderen uit de Prullenbak?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Gebruik \"%s\" om het geselecteerde item te openen"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Andere _toepassing..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Een _toepassing..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Andere _weergave..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Een _weergave..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Kan aangegeven actie niet voltooien: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Kan aangegeven actie niet voltooien."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Voer \"%s\" uit op ieder geselecteerde item"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Alle uitvoerbare bestanden in deze map zullen getoond worden in het Scripts-"
+"menu. Door een script te kiezen uit het menu wordt het script uitgevoerd met "
+"de geselecteerde items als invoer."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4625,11 +4648,11 @@ msgstr ""
 "menu. Door een script te kiezen uit het menu wordt het script uitgevoerd met "
 "de geselecteerde items als invoer."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Scripts info"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4672,17 +4695,17 @@ msgstr ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: positie en afmetingen van het huidige "
 "venster"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" wordt verplaatst als u de opdracht 'Plak Bestanden' geeft"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" wordt gekopieerd als u de opdracht 'Plak Bestanden' geeft"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4690,7 +4713,7 @@ msgstr ""
 "De %d geselecteerde items worden verplaatst als u de opdracht 'Plak "
 "Bestanden' geeft"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4698,161 +4721,164 @@ msgstr ""
 "De %d geselecteerde items worden gekopieeerd als u de opdracht 'Plak "
 "Bestanden' geeft"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Er staat niets op het klembord om te plakken."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Aankoppelingsfout"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Afkoppelingsfout"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Aankoppelingsfout"
+msgstr "Uitwerpfout"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Uit_werpen"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
-msgstr "Volume _ontkoppelen"
+msgstr "Volumen _ontkoppelen"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "_Openen in nieuw venster"
+msgstr "Openen in nieuw venster"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Openen in %d _Nieuwe Vensters"
+msgstr "Openen in %d nieuwe vensters"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Persoonlijke map"
+msgstr "Map doorbladeren"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Persoonlijke map"
+msgstr "Mappen doorbladeren"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Verwijderen uit de _Prullenbak"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Verwijder alle geselecteerde items blijvend"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Verplaatsen naar Prullenbak"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Verplaats alle geselecteerde items naar de Prullenbak"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Verwijzingen ma_ken"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Verwijzing ma_ken"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Prullenbak _legen"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Bestand _knippen"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Bestanden k_nippen"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Bestand _kopiëren"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Bestanden _kopiëren"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Deze verwijzing kan niet gebruikt worden, omdat het doel ontbreekt. Wilt u "
 "de verwijzing in de Prullenbak gooien?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Deze verwijzing kan niet gebruikt worden, omdat het doel ontbreekt. Wilt u "
+"de verwijzing in de Prullenbak gooien?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Deze verwijzing kan niet gebruikt worden, omdat haar doel \"%s\"ontbreekt. "
 "Wilt u de verwijzing in de Prullenbak gooien?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Loze verwijzing"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\"is een uitvoerbaar tekstbestand. Wilt u het uitvoeren, of de inhoud "
 "bekijken?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Uitvoeren of weergeven?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Weergeven"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Uitvoeren in _Terminalvenster"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Weergeven"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Uitvoeren"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Bezig met openenen: \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Openen afbreken?"
 
@@ -4873,10 +4899,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Sorry, het weergeven van de inhoud van \"%s\"is mislukt."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Fout bij het weergeven van een map"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4884,7 +4915,7 @@ msgstr ""
 "De naam \"%s\" is al in gebruik in deze map. Gelieve een andere naam te "
 "kiezen."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4892,12 +4923,12 @@ msgstr ""
 "Er is geen \"%s\" in deze map. Misschien is het kort geleden verplaatst of "
 "verwijderd?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "U hebt niet de benodigde rechten om \"%s\" te hernoemen."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4906,84 +4937,104 @@ msgstr ""
 "De naam \"%s\" is ongeldig, omdat hij de tekens \"/\" gebruikt. Gelieve een "
 "andere naam te kiezen."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "De naam \"%s\" is ongeldig. Gelieve een andere naam te kiezen."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Kan de naam van \"%s\" niet wijzigen, want het is een alleen-lezen schijf"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Sorry, kan \"%s\" niet hernoemen naar \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Hernoemfout"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "U hebt de benodigde rechten niet om de groep van \"%s\" te veranderen."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Kan de groep van \"%s\" niet wijzigen, want het is een alleen-lezen schijf"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Sorry, kan de groep van \"%s\" niet veranderen."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Er is een fout opgetreden tijdens het instellen de groep"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Kan de eigenaar van \"%s\" niet wijzigen, want het is een alleen-lezen schijf"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Sorry, kan de eigenaar van \"%s\" niet wijzigen."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Er is een fout opgetreden bij het instellen van de eigenaar"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Kan de rechten van \"%s\" niet wijzigen, want het is een alleen-lezen schijf"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Sorry, kan de rechten van \"%s\" niet veranderen."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Fout tijdens instellen rechten"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Hernoemen van \"%s\" naar \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Hernoemen afbreken?"
 
@@ -5041,129 +5092,152 @@ msgstr "_Oorspronkelijke pictogramafmetingen herstellen"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Oorspronkelijke pictogramafmetingen herstellen"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "wijst naar \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Slepen en neerzetten wordt alleen ondersteund op lokale bestandssystemen."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Slepen en neerzetten wordt alleen ondersteund op lokale bestandssystemen."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Fout bij slepen en neerzetten"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Een ongeldig sleeptype werd gebruikt."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Grootte"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Wijzigingsdatum"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"U kunt niet meer dan één eigen pictogram per keer toekennen! Sleep één "
+"afbeelding om een aangepast pictogram in te stellen."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "U kunt niet meer dan één eigen pictogram per keer toekennen! Sleep één "
 "afbeelding om een aangepast pictogram in te stellen."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Meer dan één afbeelding"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Het bestand dat u versleepte is niet lokaal. U kunt alleen lokale "
+"afbeeldingen als aangepaste pictogrammen gebruiken."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Het bestand dat u versleepte is niet lokaal. U kunt alleen lokale "
 "afbeeldingen als aangepaste pictogrammen gebruiken."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Alleen lokale afbeeldingen"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Het bestand dat u versleepte is geen afbeelding. U kunt alleen lokale "
-"afbeeldingen als aangepast pictogrammen gebruiken."
+"Het bestand dat u versleepte is niet lokaal. U kunt alleen lokale "
+"afbeeldingen als aangepaste pictogrammen gebruiken."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Alleen afbeeldingen"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Eigenschappen"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Verandering van groep annuleren?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Bezig met veranderen groep"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Verandering van eigenaar annuleren?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "bezig met veranderen eigenaar"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "niets"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "onleesbaar"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, met grootte %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d items, totaal %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(sommige inhoud niet leesbaar)"
 
@@ -5173,193 +5247,191 @@ msgstr "(sommige inhoud niet leesbaar)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Inhoud:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Eenvoudig"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Namen:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Grootte:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lokatie:"
 
-# Nog eens een betere vertaling vinden voor 'Volume'?!
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
-msgstr "Volume:"
+msgstr "Volumen:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Vrije ruimte:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Verwijzingsdoel:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Gewijzigd:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Gebruikt:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Aangepast pictogram selecteren..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Aangepast pictogram _verwijderen"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lezen"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Schrijven"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Uitvoeren"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Gebruikers-ID instellen"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Speciale vlaggen:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Groeps-ID instellen"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Vast"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Rechten"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "U bent niet de eigenaar en kunt dus geen eigenschappen wijzigen."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Bestands_eigenaar:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Bestandseigenaar:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Bestandsgroep:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Bestandsgroep:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Groep:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Anderen:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstweergave:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Numerieke weergave:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Laatst gewijzigd:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "De eigenschappen van \"%s\" kunnen niet worden bepaald."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 "De eigenschappen van het geselecteerde bestand kunnen niet worden bepaald."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Er is een fout opgetreden bij het weergeven van de hulptekst:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Er is een fout opgetreden bij de hulpweergave: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Kan hulptekst niet tonen"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Eigenschappenvenster annuleren?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Bezig met aanmaken eigenschappenvenster"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Kies een pictogram"
 
@@ -5377,71 +5449,112 @@ msgid "Search Results"
 msgstr "Zoekresultaten"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Sorry, maar de Medusa Zoekdienst is beschikbaar omdat ze niet geïnstalleerd "
-"is."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Sorry, de Medusa-zoekdienst is niet beschikbaar."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Zoekdienst niet beschikbaar"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "De zoekopdracht die u heeft gekozen is nieuwer dan de index van uw systeem. "
 "De zoekopdracht levert momenteel geen resultaten op. U kan een nieuwe index "
 "maken door als root \"medusa-indexd\" uit te voeren in een terminal."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Het zoekprogramma kan uw indexlijst niet openen. Uw index kan ontbreken of "
+"foutief zijn. U kan een maken door als root \"medusa-indexd\" uit te voeren "
+"in een terminal."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Zoek naar items die te nieuw zijn"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Elk geïndexeerd bestand op uw computer komt overeen met de door u gekozen "
+"criteria. Wellicht kunt u de spelling van uw selectie controleren of meer "
+"criteria toevoegen om het aantal resultaten terug te brengen."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Elk geïndexeerd bestand op uw computer komt overeen met de door u gekozen "
 "criteria. Wellicht kunt u de spelling van uw selectie controleren of meer "
 "criteria toevoegen om het aantal resultaten terug te brengen."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Fout tijdens veranderen eigenaar"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Het zoekprogramma kan uw indexlijst niet openen. Uw index kan ontbreken of "
 "foutief zijn. U kan een maken door als root \"medusa-indexd\" uit te voeren "
 "in een terminal."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Fout bij het lezen van de bestandsindex"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Een fout is opgetreden tijdens het laden van deze zoekinhouden: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Om een snelle zoekopdracht uit te voeren heeft het zoekprograma een lijst "
+"nodig van de bestanden op uw systeem. Het zoekprogramma kan momenteel niet "
+"over deze lijst beschikken."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Om een snelle zoekopdracht uit te voeren heeft het zoekprograma een lijst "
+"nodig van de bestanden op uw systeem. Het zoekprogramma kan momenteel niet "
+"over deze lijst beschikken."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5449,26 +5562,23 @@ msgstr ""
 "op uw systeel. Het zoekprogramma kan momenteel niet over uw lijst beschikken "
 "dus zal een trager zoekprogramma gebruikt worden dat geen lijst nodig heeft."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Om een snelle zoekopdracht uit te voeren heeft het zoekprograma een lijst "
-"nodig van de bestanden op uw systeem. Het zoekprogramma kan momenteel niet "
-"over deze lijst beschikken."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Snelzoeken is niet beschikbaar"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Inhoudszoeken is niet beschikbaar"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5482,37 +5592,66 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Om te kunnen snelzoeken heeft de Zoekdienst een index nodig van de bestanden "
 "op uw systeem. Uw computer is op dit moment bezig die index te maken. Omdat "
 "er nog geen index is, kan het zoeken meerdere minuten kosten."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Om te kunnen zoeken op inhoud, heeft de Zoekdienst een index nodig van de "
 "inhoud van uw systeem. Uw computer is op dit moment bezig die index te "
 "maken. Zoeken op inhoud is mogelijk zodra de index voltooid is."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Zoeken via een index is niet mogelijk"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Om een snelle zoekopdracht uit te voeren heeft het zoekprograma een lijst "
+"nodig van de bestanden op uw systeem. Het zoekprogramma kan momenteel niet "
+"over deze lijst beschikken."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Om een snelle zoekopdracht uit te voeren heeft het zoekprograma een lijst "
+"nodig van de bestanden op uw systeem. Het zoekprogramma kan momenteel niet "
+"over deze lijst beschikken."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Om te kunnen snelzoeken heeft de Zoekfunctie een index nodig van de "
 "bestanden op uw systeem. Op dit moment is er geen index beschikbaar. U kunt "
@@ -5520,12 +5659,12 @@ msgstr ""
 "opdrachtaanwijzing.Totdat een volledige index beschikbaar is, zal een "
 "zoekactie meerdere minuten in beslag nemen."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Om te kunnen zoeken op inhoud, is er een index nodig van de inhoud van de "
 "bestanden op uw systeem. Uw computer heeft op dit moment geen index. Wilt u "
@@ -5533,7 +5672,12 @@ msgstr ""
 "opdrachtaanwijzing. Totdat een volledige index beschikbaar is, kunnen geen "
 "inhoudszoekacties uitgevoerd worden."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Snelzoeken is niet beschikbaar op uw computer"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5543,11 +5687,12 @@ msgstr ""
 "bestanden op uw systeem. Uw systeembeheerder heeft het snelzoeken op uw "
 "systeem echter uitgeschakeld, en er is geen index beschikbaar."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Snelzoeken is niet beschikbaar op uw computer"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Snelzoeken is niet beschikbaar"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Waar"
 
@@ -5556,7 +5701,7 @@ msgstr "Waar"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "In nieuw venste_r onthullen"
@@ -5567,7 +5712,7 @@ msgstr "In nieuw venste_r onthullen"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "In %d _nieuwe vensters onthullen"
@@ -5576,15 +5721,21 @@ msgstr "In %d _nieuwe vensters onthullen"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus heeft meer zoekresultaten gevonden dan het kan weergeven. Sommige "
 "resultaten worden niet weergegeven. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus heeft meer zoekresultaten gevonden dan het kan weergeven. Sommige "
+"resultaten worden niet weergegeven. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Teveel overeenkomsten"
 
@@ -5598,12 +5749,12 @@ msgid "Create L_auncher"
 msgstr "Nieuwe st_arter aanmaken"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Nieuwe starter aanmaken"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Alle items uit de Prullenbak wissen"
 
@@ -5625,7 +5776,7 @@ msgstr ""
 #  add the reset background item, possibly disabled
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "_Standaard achtergrond terugzetten"
@@ -5647,58 +5798,67 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Andere weergave kiezen om het item mee te bekijken"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Ma_p aanmaken"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Ma_p aanmaken"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Nieuwe lege map aanmaken in deze map"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Nieuwe lege map aanmaken in deze map"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Symbolische verwijzing maken voor elk geselecteerd item"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Klonen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Alle geselecteerde items wissen, zonder ze in de Prullenbak te gooien."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Elk geselecteerd item klonen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Starter bewerken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Starter-informatie bewerken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
-msgstr "Het geselecteerde volume formatteren"
+msgstr "Het geselecteerde volumen formatteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medi_a-eigenschappen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Het geselecteerde volume ontkoppelen."
+msgstr "Het geselecteerde volumen aankoppelen."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
-"Bestanden verplaatsen of kopiëren die eerder door een 'Bestanden knippen' of "
+"Bestanden verplaatsen of kopiëren die eerder bij een 'Bestanden knippen' of "
 "'Bestanden kopiëren'-opdracht waren geselecteerd"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5706,134 +5866,138 @@ msgstr ""
 "Bestanden die eerder door een 'Bestanden knippen' of 'Bestanden kopiëren'-"
 "opdracht waren geselecteerd, verplaatsen of kopiëren naar de huidige map"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Openen _met"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Elk geselecteerd item in een nieuw venster openen"
+msgstr "Elk geselecteerd item in een navigatievenster openen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "_Openen in nieuw venster"
+msgstr "Openen in navigatievenster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Geselecteerd item in dit venster openen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Geselecteerde bestanden klaarmaken om gekopieerd te worden met de 'Bestanden "
 "plakken'-opdracht"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Geselecteerde bestanden klaarmaken om verplaatst te worden met de 'Bestanden "
 "plakken'-opdracht"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "B_eschermen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
-msgstr "Het geselecteerde volume beschermen"
+msgstr "Het geselecteerde volumen beschermen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Geselecteerde item hernoemen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Weergave terugzetten naar _standaard"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Sorteervolgorde en zoomfactor terugzetten overeenkomend met voorkeuren voor "
 "deze weergave"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Scripts in ~/Nautilus/scripts draaien of beheren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Alle bestanden selecteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "_Patronen"
+msgstr "_Patroon selecteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Alle items in dit venster selecteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Alle items in dit venster selecteren"
+msgstr "Items selecteren in dit venster overeenkomend met een bepaald patroon"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
-msgstr "De media-eigenschappen van het geselecteerde volume tonen"
+msgstr "De media-eigenschappen van het geselecteerde volumen tonen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "De map met scripts die in dit menu staan tonen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
-msgstr "Het geselecteerde volume ontkoppelen."
+msgstr "Het geselecteerde volumen ontkoppelen."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "De standaardachtergrond voor deze lokatie gebruiken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "De eigenschappen per geselecteerd item bekijken of wijzigen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Bestand _kopiëren"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "Volume _ontkoppelen"
+msgstr "Volumen _koppelen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Openen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Scriptsmap openen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Bestanden _plakken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Bestanden in map _plakken"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Eigenschappen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Hernoemen..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5921,7 +6085,12 @@ msgstr "_Handmatig"
 msgid "Indexing is %d%% complete."
 msgstr "Indexeren voor %d%% voltooid."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Uw bestanden zijn voor het laatst geïndexeerd op %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5929,25 +6098,29 @@ msgstr ""
 "Eenmaal daags worden uw bestanden en tekstinhoud geïndexeerd zodat uw "
 "zoekopdrachten snel verlopen."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexeringsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Uw bestanden zijn voor het laatst geïndexeerd op %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Eenmaal daags worden u bestanden en tekstinhoud geïndexeerd zodat uw "
-"zoekopdrachten snel verlopen. Uw bestanden worden op dit moment geïndexeerd."
+"Eenmaal daags worden uw bestanden en tekstinhoud geïndexeerd zodat uw "
+"zoekopdrachten snel verlopen."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Er is momenteel geen lijst van uw bestanden."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5957,15 +6130,19 @@ msgstr ""
 "bestande op uw systeem om het zoeken te versnellen. Snelzoeken staat niet "
 "aan op uw computer, u hebt momenteel dus geen bestandenlijst."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Er is momenteel geen lijst van uw bestanden."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Sorry, de Medusa-zoekdienst is niet beschikbaar."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I.%M %p, %x"
 
@@ -5989,32 +6166,37 @@ msgstr "_Indexeringsstatus tonen"
 msgid "Show status of indexing used when searching"
 msgstr "Indexeringsstatus tonen die gebruikt wordt bij het zoeken"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Kan vereiste map niet aanmaken"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Kan vereiste mappen niet aanmaken"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus kan de vereiste map \"%s\" niet aanmaken. Gelieve deze map aan te "
 "maken alvorens Nautilus te starten, of de rechten zodanig in te stellen "
 "zodat Nautilus hem kan aanmaken."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Kan vereiste mappen niet aanmaken"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6025,15 +6207,19 @@ msgstr ""
 "Gelieve deze mappen aan te maken alvorens Nautilus te starten, of de rechten "
 "zodanig in te stellen dat Nautilus ze kan aanmaken."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Verwijzing naar oud werkblad"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "De locatie van de werkbladmap is veranderd in GNOME 2.4. Een verwijzing met "
 "de naam \"Verwijzing naar oud werkblad\" is aangemaakt op het werkblad. U "
@@ -6041,8 +6227,9 @@ msgstr ""
 "vervolgens verwijderen."
 
 # Gemigreerd oud werkblad?
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Oude werkblad gemigreerd"
 
 #. Can't register myself due to trouble locating the
@@ -6055,7 +6242,7 @@ msgstr "Oude werkblad gemigreerd"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6067,7 +6254,7 @@ msgstr ""
 "installeren."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6113,12 +6300,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus kan nu niet gebruikt worden vanwege een onbekende fout."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6126,7 +6313,7 @@ msgstr ""
 "Nautilus kan nu niet gebruikt worden vanwege een onverwachte fout van Bonobo "
 "bij het registreren van de weergavedienst van de bestandsbeheerder."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6136,7 +6323,7 @@ msgstr ""
 "Bonobo bij het zoeken van de Fabriek. Het stoppen van bonobo-activation-"
 "server en het herstarten van Nautilus lost het probleem wellicht op. "
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6146,6 +6333,17 @@ msgstr ""
 "het zoeken naar het shell object. Het stoppen van bonobo-activation-server "
 "en het herstarten van Nautilus lost wellicht het probleem op."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Er is een fout opgetreden bij het weergeven van de hulptekst:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Geen bladwijzers gedefinieerd"
@@ -6179,39 +6377,46 @@ msgstr "Minder opties"
 msgid "Find Them!"
 msgstr "Zoeken!"
 
+#: src/nautilus-connect-server-dialog.c:86
+#, fuzzy
+msgid "You must enter a name for the server."
+msgstr "U dient een naam in te vullen voor de server"
+
 #: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
-msgstr "Verplaatsen naar zichzelf niet mogelijk"
+msgid "Can't Connect to Server"
+msgstr "Kan geen verbinding maken met server"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" is geen geldige lokatie. Controleer de spelling en probeer dan "
-"opnieuw."
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Sorry, maar \"%s\" is geen geldige bestandsnaam."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Kan \"%s\" niet vinden. Controleer de spelling en probeer dan opnieuw."
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Netwerkservers"
+msgstr "Verbinden met server"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Naam:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Lokatie:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "_Verbinden"
+msgstr "Verbinden"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6412,6 +6617,20 @@ msgstr ""
 "U kunt dit bestand eventueel handmatig wissen om de druïde nogmaals te laten "
 "verschijnen.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"U kunt niet meer dan één eigen pictogram per keer toekennen! Sleep één "
+"afbeelding om een aangepast pictogram in te stellen."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Het bestand dat u versleepte is niet lokaal. U kunt alleen lokale "
+"afbeeldingen als aangepaste pictogrammen gebruiken."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6422,26 +6641,25 @@ msgstr "Openen met %s"
 msgid "Open with..."
 msgstr "Openen met..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Kan de CD-brandertoepassing niet starten:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Kan CD-brander niet starten"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Prullenbak legen"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "In_houd naar CD schrijven"
 
@@ -6449,119 +6667,132 @@ msgstr "In_houd naar CD schrijven"
 msgid "Go To:"
 msgstr "Ga naar:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Wilt u deze %d lokaties in aparte vensters weergeven?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "In meerdere vensters weergeven?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Kan locatie niet openen"
+msgstr "Locatie openen"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Enkele snelle zelf-tests uitvoeren."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Initieel venster met de gegeven afmetingen creëren."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Vensters slechts creëren voor expliciet gegeven URI's."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Het werkblad niet beheren (de voorkeuren in het voorkeurenvenster negeren)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "bladervenster openen"
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Nautilus afsluiten"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus herstarten"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Bestandsbeheer"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan niet gebruikt worden met URI's.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan niet gebruik worden met andere opties.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan niet gebruikt worden met URI's.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan niet gebruik worden met URI's.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan niet worden gebruik met meer dan één 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Weet u zeker dat u \"%s\" blijvend wilt verwijderen?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Weet u zeker dat u de geschiedenis wilt vergeten? Als u dat doet bent u "
 "gedoemd deze te herhalen."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Weet u zeker dat u de lijst van lokaties die u bezocht hebt wilt wissen?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+#, fuzzy
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Als u de prullenbak leegt, zal de inhoud voorgoed verloren gaan."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Geschiedenis wissen"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Lokatie \"%s\" bestaat niet. Wilt deze lokatie verwijderen uit uw "
 "bladwijzers en van uw lokatielijst?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "De Lokatie \"%s\" bestaat niet langer."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bladwijzer voor niet-bestaande lokatie"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -6595,15 +6826,13 @@ msgid "Close _All Windows"
 msgstr "_Alle vensters sluiten"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Alle Nautilus-vensters sluiten"
+msgstr "Alle navigatievensters sluiten"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Verbinden met _Server..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6618,107 +6847,117 @@ msgid "Forward"
 msgstr "Volgende"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Naar de Prullenbak-map gaan"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Naar de volgende bezochte lokatie gaan"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Naar de vorige bezochte lokatie gaan"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Naar de Prullenbak-map gaan"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Persoonlijk"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Lokatie_balk"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Verversen"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Op deze computer zoeken naar bestanden"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Statusbalk"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Naar CD schrijven"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Bladwijzer toevoegen"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Terug"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "Bl_adwijzers"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Geschiedenis _opschonen"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Countertop"
+msgstr "_Computer"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Bladwijzers bewerken"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Vooruit"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ga naar"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "Persoonlijke _map"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lokatie..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Zijpaneel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Prullenbak"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Omhoog"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "Beel_d"
 
@@ -6732,38 +6971,42 @@ msgid "View as..."
 msgstr "Weergeven als..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Bestandseigenaar:"
+msgstr "Bestandenbladerprogramma: %s"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "In één van de zijpanelen is een fout opgetreden en deze kan niet doorgaan. "
-"Het is helaas niet mogelijk te bepalen welke."
+"Het is helaas niet mogelijk te zeggen welke."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
-"In zijpaneel %s is een fout opgetreden, en het het kan niet doorgaan. Als "
-"dit vaker gebeurt, kunt het paneel wellicht beter uitschakelen."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1109
+#, fuzzy, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Er trad een fout op bij het starten van de %s-weergave."
+
+#: src/nautilus-navigation-window.c:1110
 #, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr ""
+"In zijpaneel %s is een fout opgetreden, en deze kan niet doorgaan. Als dit "
+"vaker gebeurt, kunt dat paneel wellicht beter uitschakelen."
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Laden van zijpaneel mislukt"
+msgstr "Zijpaneel heeft gefaald"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Zijpaneel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Bevat een zijpaneel-beeld"
 
@@ -6797,147 +7040,180 @@ msgstr "_Nieuwe toevoegen..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Patroon %s kan helaas niet worden verwijderd."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Kan patroon niet verwijderen."
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Embleem %s kan helaas niet worden verwijderd."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Kan het embleem niet verwijderen"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Nieuw embleem creëren:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Trefwoord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Afbeelding:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Selecteer een afbeelding voor het nieuwe embleem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Nieuwe kleur creëren:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Kleur_naam:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Kleur_waarde:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Sorry, maar \"%s\" is geen geldige bestandsnaam."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Sorry, maar u hebt geen geldige bestandsnaam opgegeven."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Kan patroon niet installeren!"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sorry, maar uw kunt de terugzet-afbeelding niet vervangen."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Geen afbeelding"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Sorry, maar het patroon %s kan niet worden geïnstalleerd"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Selecteert u een afbeeldingsbestand om als patroon toe te voegen"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sorry, maar u moet een niet-lege naam voor de nieuwe kleur opgeven."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Kan de kleur niet installeren"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Selecteer een kleur om toe te voegen"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Sorry, maar '%s' is geen bruikbaar afbeeldingsbestand!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Het bestand '%s' lijkt geen geldige afbeelding te zijn."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Selecteer een categorie:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Verwijderen _annuleren"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Nieuw patroon _toevoegen..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Nieuwe kleur _toevoegen..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Nieuw embleem _toevoegen..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klik op een patroon om het te verwijderen."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klik op een kleur om hem te verwijderen."
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klik op een embleem om het te verwijderen."
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patronen:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Kleuren:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemen:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Een patroon _verwijderen..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Een kleur verwijderen..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Een embleem verwijderen..."
 
@@ -7322,43 +7598,40 @@ msgid "Show %s"
 msgstr "%s tonen"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "_CD-maker"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "_Alle vensters sluiten"
+msgid "Close P_arent Folders"
+msgstr "Oudermappen sluiten"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Ouders van deze map sluiten"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Naar lege CD-map gaan"
+msgstr "Naar Computer gaan"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "Naar de Prullenbak-map gaan"
+msgstr "Naar de CD-maker gaan"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "_Lokatie..."
+msgstr "_Lokatie openen..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "O_uder openen"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Items die] mappen zijn"
+msgstr "Oudermap openen"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Patronen"
+msgstr "_Plekken"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7378,17 +7651,20 @@ msgstr "de huidige selectie"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "het type venster waarin de weergave is ingebed"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
-msgstr "Tonen is mislukt"
+msgstr "Weergave is mislukt"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Er trad een fout op bij het starten van de %s-weergave."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "In de %s-weergave is een fout opgetreden en deze kan niet doorgaan. U kunt "
 "eventueel een andere weergave kiezen of naar een andere lokatie gaan."
@@ -7398,92 +7674,125 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Er trad een fout op bij het starten van de %s-weergave."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "De NautilusToepassing geassocieerd met dit venster"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Inhoudsweergave"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Huidig bestand of map weergeven"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Kan \"%s\" niet vinden. Controleer de spelling en probeer dan opnieuw."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Kan emblemen niet toevoegen"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus kan \"%s\" niet tonen."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Kan \"%s\" niet tonen, omdat Nautilus het bestandstype niet kan vaststellen."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus heeft geen component die \"%s\" kan weergeven."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Weergave van \"%s\" is mislukt, omdat Nautilus kan omgaan met %s: lokaties."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Kan \"%s\" weergeven, omdat de aanmeldpoging mislukte."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Kan \"%s\" niet weergeven, omdat de toegang werd geweigerd."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Weergave van \"%s\" is mislukt, om dat computer \"%s\" niet gevonden is. "
 "Controleer de spelling en uw proxy-instellingen."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "Weergeven van \"%s\" is mislukt. Controleer uw proxy-instellingen."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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 "Kan \"%s\" niet tonen, omdat Nautilus de SMB master browser"
+"browser."
+msgstr ""
+"Weergave van \"%s\" is mislukt, omdat Nautilus kan omgaan met %s: lokaties."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Zoeken is niet beschikbaar op dit moment, omdat u geen index hebt of omdat "
+"de zoekdienst niet draait. Controleer dat u de Medusa-zoekdienst heeft "
+"gestart en als u geen index hebt, dat de Medusa-indexeerder draait."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Zoeken is niet beschikbaar op dit moment, omdat u geen index hebt of omdat "
 "de zoekdienst niet draait. Controleer dat u de Medusa-zoekdienst heeft "
 "gestart en als u geen index hebt, dat de Medusa-indexeerder draait."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Zoeken niet beschikbaar"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan \"%s\" niet tonen."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Kan lokatie niet weergeven"
 
@@ -7495,7 +7804,7 @@ msgstr "Ga naar de lokatie waarnaar deze bladwijzer verwijst"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7503,14 +7812,14 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Dennis Smit, Dirk-Jan C. Binnema, Mendel Mobach, Almer S. Tigelaar, "
 "Ludootje, Vincent van Adrighem, Ronald Hummelink, Jordi Bosveld, Reinout van "
 "Schouwen"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7526,39 +7835,40 @@ msgstr "Ga een paar pagina's terug"
 msgid "Go forward a number of pages"
 msgstr "Ga een paar pagina's vooruit"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Toon deze lokatie met \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Netwerk"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Stippen"
+msgstr "Lettertypen"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "_CD-maker"
+msgstr "CD-maker"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Toepassings-ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Het toepassings-ID van het venster"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Toepassing"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "De NautilusToepassing geassocieerd met dit venster"
 
@@ -7594,6 +7904,246 @@ msgstr "Netwerkservers"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Uw netwerkservers weergeven met Nautilus bestandsbeheer"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabriek voor het hardware-venster"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Hardware-weergave"
+
+#~ msgid "Hardware view"
+#~ msgstr "Hardware-weergave"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Hardware-weergave"
+
+#~ msgid "hardware view"
+#~ msgstr "hardware-weergave"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "naam van het pictogram om hardware te tonen"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "samenvatting van de hardware info"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cachegrootte"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB RAM"
+
+# &l
+#~ 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 "De computer staat al %d dagen, %d uren en %d minuten aan"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Hardwareoverzicht"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Dit is een plaatshouder voor de CPU-pagina."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Dit is een plaatshouder voor de RAM-pagina."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Dit is een plaatshouder voor de IDE-pagina."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fout bij het kopiëren naar \"%s\".\n"
+#~ "\n"
+#~ "Er is onvoldoende ruimte op de bestemmingslocatie."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fout bij het aanmaken van verwijzing in \"%s\".\n"
+#~ "\n"
+#~ "Er is onvoldoende ruimte op de bestemmingslocatie."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fout bij het verplaatsen naar \"%s\".\n"
+#~ "\n"
+#~ "U heeft geen schrijfrechten op de doelmap."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fout bij het verplaatsen naar \"%s\".\n"
+#~ "\n"
+#~ "De doelschijf ondersteunt alleen lezen."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fout bij het aanmaken van verwijzingen in \"%s\".\n"
+#~ "\n"
+#~ "U heeft geen schrijfrechten voor deze map."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fout bij het aanmaken van verwijzingen in \"%s\".\n"
+#~ "\n"
+#~ "De bestemmingsschijf is alleen-lezen."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\" bij het kopiëren van \"%s\".\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\"  bij het verplaatsen van \"%s\".\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\" bij het verwijderen van \"%s\".\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\" bij het kopiëren.\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\" bij het aanmaken van verwijzingen.\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fout \"%s\" bij het verwijderen.\n"
+#~ "\n"
+#~ "Wilt u doorgaan?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Kan niet kopiëren naar Prullenbak"
+
+#~ 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 ""
+#~ "De standaardactie kan \"%s\" niet openen, omdat het bestanden op \"%s\" "
+#~ "niet kan benaderen. Geen andere acties zijn beschikbaar om dit bestand te "
+#~ "bekijken. Wellicht kunt u het bestand wel openen als u het naar uw "
+#~ "computer kopiëert."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Bezig met doorzoeken van schijven"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus doorzoekt uw schijven op Prullenbakken"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "De %d geselecteerde items kunnen niet naar de Prullenbak verplaatst "
+#~ "worden. Wilt u ze rechtstreeks verwijderen?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d van de geselecteerd items kunnen niet naar de prullenbak verplaatst "
+#~ "worden. Wilt u ze deze %d items rechtstreeks verwijderen?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Het bestand dat u versleepte is geen afbeelding. U kunt alleen lokale "
+#~ "afbeeldingen als aangepast pictogrammen gebruiken."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Sorry, maar de Medusa Zoekdienst is beschikbaar omdat ze niet "
+#~ "geïnstalleerd is."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Eenmaal daags worden u bestanden en tekstinhoud geïndexeerd zodat uw "
+#~ "zoekopdrachten snel verlopen. Uw bestanden worden op dit moment "
+#~ "geïndexeerd."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" is geen geldige lokatie. Controleer de spelling en probeer dan "
+#~ "opnieuw."
+
+#~ 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 "Kan \"%s\" niet tonen, omdat Nautilus de SMB master browser"
+
+#~ msgid "file icon"
+#~ msgstr "bestandspictogram"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Naam:"
+
 #~ msgid "Unknown"
 #~ msgstr "Onbekend"
 
@@ -7688,9 +8238,6 @@ msgstr "Uw netwerkservers weergeven met Nautilus bestandsbeheer"
 #~ msgid "_Toolbar"
 #~ msgstr "_Werkbalk"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "De Lokatie \"%s\" bestaat niet langer."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Ga naar niet-bestaande lokatie"
 
diff --git a/po/nn.po b/po/nn.po
index 164726f7e..b42e52a7d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,314 +1,245 @@
-# Norwegian translation of Nautilus (Nynorsk dialect).
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# translation of nn.po to Norwegian Nynorsk
+# Norwegian nynorsk translation of Nautilus
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+#
+# TODO: Katalog -> mappe
+# TODO: Element, oppføring -> fil ???
+# TODO: Plassering (fil på disk, URL) -> stad (eller noko slikt).
+#             Unngå forvirring med ikonplassering i vindauge
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002.
+# Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Nautilus 1.0.6\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2001-12-14 13:29+0100\n"
-"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
-"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"Project-Id-Version: nn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-28 17:41+0100\n"
+"PO-Revision-Date: 2003-12-31 14:11+0100\n"
+"Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
-msgstr ""
+msgstr "Fabrikk for Nautilus komponentadapter-fabrikkar"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:2
 msgid "Factory for Nautilus component adapter factories "
-msgstr ""
+msgstr "Fabrikk for Nautilus komponentadapter-fabrikkar "
 
+# TRN: «embeddables»?
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:3
+#, fuzzy
 msgid ""
 "Factory for objects that wrap ordinary Bonobo Controls or Embeddables to "
 "look like Nautilus Views"
 msgstr ""
+"Fabrikk for objekt som pakkar inn vanlege Bonobo-kontrollar eller "
+"«embeddables» slik at dei ser ut som Nautilus-visingar"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:4
-#, fuzzy
 msgid "Nautilus component adapter factory"
-msgstr "Tekstkomponent fabrikk"
+msgstr "Nautilus komponentadapterfabrikk"
 
 #: components/adapter/main.c:101
 msgid "bonobo_ui_init() failed."
-msgstr ""
+msgstr "bonobo_ui_init() feila."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
-msgstr "Emblem"
+msgstr "Merke"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:2
-#, fuzzy
 msgid "Nautilus Emblem side pane"
-msgstr "Nautilus-tema"
+msgstr "Nautilus sidepanel for merke"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:3
-#, fuzzy
 msgid "Nautilus Emblem view"
-msgstr "Nautilus lenke"
+msgstr "Nautilus merkevising"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
-msgstr ""
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Klarte ikkje å fjerna merket «%s»."
 
 #: components/emblem/nautilus-emblem-view.c:204
-#, fuzzy
-msgid "Couldn't remove emblem"
-msgstr "Kunne ikkje fjerne merke!"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr "Det er truleg eit permanent merke, og ikkje eit du har lagt på sjølv."
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
+msgstr "Klarte ikkje å fjerna merke"
+
+# panel/extern.c:780
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kunne ikkje endra namn på merket «%s»."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
-msgstr ""
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
+msgstr "Det er truleg eit permanent merke, og ikkje eit du har lagt på sjølv."
 
 # panel/extern.c:780
-#: components/emblem/nautilus-emblem-view.c:239
-#, fuzzy
-msgid "Couldn't rename emblem"
-msgstr "Kan ikkje leggja til applet"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
+msgstr "Klarte ikkje å endra namn på merket"
 
 # panel/menu.c:5020
-#: components/emblem/nautilus-emblem-view.c:258
-#, fuzzy
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
-msgstr "Fjern dette panelet ..."
+msgstr "Gje nytt namn til merke"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
-msgstr ""
+msgstr "Nytt namn på merket:"
 
 # gtk/gtkfilesel.c:1074
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Gje nytt namn"
 
-#: components/emblem/nautilus-emblem-view.c:503
-#, fuzzy
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
-msgstr "Legg til ny MIME-type ..."
+msgstr "Legg til merker ..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
+"Skriv eit skildrande namn på kvart merke. Dette namnet vil brukast andre "
+"stader for å identifisera merka."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
+"Skriv eit skildrande namn på merket. Dette namnet vil brukast andre stader "
+"for å identifisera merket."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Nokon av filene kunne ikkje leggjast til som merke."
 
-# panel/extern.c:780
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-#, fuzzy
-msgid "Couldn't add emblems"
-msgstr "Kan ikkje leggja til applet"
-
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Merkene ser ikkje ut til å vera gyldige bilete."
 
-#: components/emblem/nautilus-emblem-view.c:762
+# panel/extern.c:780
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr "Kunne ikkje leggja til merke"
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Ingen av filene kunne leggjast til som merke."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Merket kan ikkje leggjast til."
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
-msgstr ""
+msgstr "Den dregne teksten er ikkje ei gyldig filadresse."
 
 # panel/extern.c:780
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-#, fuzzy
-msgid "Couldn't add emblem"
-msgstr "Kan ikkje leggja til applet"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
+msgstr "Kunne ikkje leggja til merke"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
-msgstr ""
+msgstr "Fila «%s» ser ikkje ut til å vera eit gydlig bilete."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
-msgstr ""
+msgstr "Fila som vart dregen ser ikkje ut til å vera eit gyldig bilete."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Slett"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Maskinvare"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-#, fuzzy
-msgid "Hardware Viewer"
-msgstr "Biletevisar"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vis som maskinvare"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-#, fuzzy
-msgid "hardware view"
-msgstr "teikneining"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB minne"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB minne"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
-msgstr "Historikk"
+msgstr "Logg"
 
 #: components/history/Nautilus_View_history.server.in.in.h:2
-#, fuzzy
 msgid "History side pane"
-msgstr "Historikkstorleik"
+msgstr "Loggpanel"
 
 #: components/history/Nautilus_View_history.server.in.in.h:3
-#, fuzzy
 msgid "History side pane for Nautilus"
-msgstr "Historikkstorleik"
+msgstr "Nautilus-sidepanel som viser loggen"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:1
 msgid "Image"
 msgstr "Bilete"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:2
-#, fuzzy
 msgid "Image Properties content view component"
-msgstr "Fjernar teksta i komponenten"
+msgstr "Innhaldsvisarkomponent for bileteeigenskapar"
 
 #: components/image_properties/Nautilus_View_image_properties.server.in.in.h:3
-#, fuzzy
 msgid "Nautilus Image Properties view"
-msgstr "Nautilus-tema"
+msgstr "Nautilus-visar for bileteeigenskapar"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Kabaret"
+msgstr "Kameramerke"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Kabaret"
+msgstr "Kameramodell"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Teken dato"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Lukkartid"
 
 # gtk/gtkfontsel.c:664
 # gsm/gsm-client-list.c:122
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "Program"
+msgstr "Eksponeringsprogram"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Blendarverdi"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "MÃ¥lingsmodus"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Blitz brukt"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Brennvidde"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
@@ -316,7 +247,7 @@ msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO-verdi"
 
 # panel/foobar-widget.c:226
 #: components/image_properties/nautilus-image-properties-view.c:203
@@ -330,19 +261,20 @@ msgid ""
 "<b>Image Type:</b> %s (%s)\n"
 "<b>Resolution:</b> %dx%d pixels\n"
 msgstr ""
+"<b>Biletetype:</b> %s (%s)\n"
+"<b>Oppløysing:</b> %d x %d pikslar\n"
 
 #: components/image_properties/nautilus-image-properties-view.c:235
 msgid "Failed to load image information"
-msgstr ""
+msgstr "Klarte ikkje å lasta informasjon om biletet"
 
 #: components/image_properties/nautilus-image-properties-view.c:423
-#, fuzzy
 msgid "loading..."
-msgstr "Plassering"
+msgstr "Lastar ..."
 
 #: components/image_properties/nautilus-image-properties-view.c:439
 msgid "URI currently displayed"
-msgstr ""
+msgstr "URI som vert vist no"
 
 #: components/notes/Nautilus_View_notes.server.in.in.h:1
 msgid "Notes"
@@ -350,38 +282,32 @@ msgstr "Notat"
 
 # panel/basep-widget.c:885
 #: components/notes/Nautilus_View_notes.server.in.in.h:2
-#, fuzzy
 msgid "Notes side pane"
-msgstr "Gøym dette panelet"
+msgstr "Sidepanel for notatar"
 
 #: components/notes/Nautilus_View_notes.server.in.in.h:3
-#, fuzzy
 msgid "Notes side pane for Nautilus"
-msgstr "Historikkstorleik"
+msgstr "Nautilus-sidepanel for notatar"
 
 #: components/text/Nautilus_View_text.server.in.in.h:1
-#, fuzzy
 msgid "Factory for text view"
-msgstr "Fabrikk for EBrowser-kontroll"
+msgstr "Fabrikk for tekstframsyning"
 
 #: components/text/Nautilus_View_text.server.in.in.h:2
 msgid "Text"
 msgstr "Tekst"
 
 #: components/text/Nautilus_View_text.server.in.in.h:3
-#, fuzzy
 msgid "Text Viewer"
-msgstr "Bruk framsynar"
+msgstr "Tekstvisar"
 
 #: components/text/Nautilus_View_text.server.in.in.h:4
-#, fuzzy
 msgid "Text view"
-msgstr "Visningstype:"
+msgstr "Tekstframsyning"
 
 #: components/text/Nautilus_View_text.server.in.in.h:5
-#, fuzzy
 msgid "Text view factory"
-msgstr "Tekstkomponent fabrikk"
+msgstr "Fabrikk for tekstframsyning"
 
 #: components/text/Nautilus_View_text.server.in.in.h:6
 msgid "View as Text"
@@ -389,9 +315,8 @@ msgstr "Vis som tekst"
 
 #: components/text/nautilus-text-view-ui.xml.h:1
 #: libnautilus/nautilus-clipboard-ui.xml.h:2
-#, fuzzy
 msgid "Copy the selected text to the clipboard"
-msgstr "Kopierer utvalet til utklippstavla"
+msgstr "Kopierer merka tekst til utklippstavla"
 
 #: components/text/nautilus-text-view-ui.xml.h:2
 #: libnautilus/nautilus-clipboard-ui.xml.h:10 src/nautilus-shell-ui.xml.h:36
@@ -399,56 +324,51 @@ msgid "_Copy Text"
 msgstr "_Kopier tekst"
 
 #: components/text/services/google.xml.h:1
-#, fuzzy
 msgid "Search Google for Selected Text"
-msgstr "Søk etter tekst"
+msgstr "Søk på Google etter den merka teksten"
 
 #: components/text/services/google.xml.h:2
 msgid "Use Google to search the web for the selected text"
-msgstr ""
+msgstr "Bruk Google til å søka på verdsveven etter den merka teksten"
 
 #: components/text/services/webster.xml.h:1
-#, fuzzy
 msgid "Look Up Selected Text in Dictionary"
-msgstr "Slå opp ord i ordliste"
+msgstr "Slå opp merka tekst i ordliste"
 
 #: components/text/services/webster.xml.h:2
 msgid "Look up the selected text in the Merriam-Webster dictionary"
-msgstr ""
+msgstr "Slå opp den merka teksten i Merriam-Webster-ordboka."
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
-msgstr ""
+msgstr "animasjon som viser at noko skjer"
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:2
 #: components/throbber/nautilus-throbber.c:587
-#, fuzzy
 msgid "throbber"
-msgstr "Oktober"
+msgstr "pulsikon"
 
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:3
-#, fuzzy
 msgid "throbber factory"
-msgstr "EBrowser fabrikk"
+msgstr "pulsikon-fabrikk"
 
+# TRN: Factory object eller Object factory?
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:4
 #, fuzzy
 msgid "throbber object factory"
-msgstr "bonobo GnoMines objekt fabrikk"
+msgstr "pulsikonobjekt-fabrikk"
 
 #: components/throbber/nautilus-throbber.c:588
 msgid "provides visual status"
-msgstr ""
+msgstr "viser status"
 
 #: components/tree/Nautilus_View_tree.server.in.in.h:1
-#, fuzzy
 msgid "Nautilus Tree side pane"
-msgstr "Nautilus-tema"
+msgstr "Nautilus sidepanel for treframsyning"
 
 #: components/tree/Nautilus_View_tree.server.in.in.h:2
-#, fuzzy
 msgid "Nautilus Tree view"
-msgstr "Nautilus-tema"
+msgstr "Nautilus treframsyning"
 
 # gsm/splash.c:65
 #: components/tree/Nautilus_View_tree.server.in.in.h:3
@@ -456,52 +376,46 @@ msgid "Tree"
 msgstr "Tre"
 
 #: components/tree/nautilus-tree-model.c:1136
-#, fuzzy
 msgid "(Empty)"
-msgstr "Tom"
+msgstr "(Tom)"
 
 #: components/tree/nautilus-tree-model.c:1136
-#, fuzzy
 msgid "Loading..."
-msgstr "Plassering"
+msgstr "Lastar ..."
 
 # gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
 #: components/tree/nautilus-tree-view.c:529 nautilus-home.desktop.in.h:1
-#, fuzzy
 msgid "Home Folder"
-msgstr "Ny mappe"
+msgstr "Heimemappe"
 
 #: components/tree/nautilus-tree-view.c:531
 msgid "Filesystem"
-msgstr ""
+msgstr "Filsystem"
 
 #: components/tree/nautilus-tree-view.c:533
 msgid "Network Neighbourhood"
-msgstr ""
+msgstr "Nettverksnabolaget"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
 msgstr "Program"
 
 #: data/applications.desktop.in.h:2
-#, fuzzy
 msgid "Browse available software"
-msgstr "Bla gjennom tilgjengelege X11-fargar."
+msgstr "Bla gjennom tilgjengeleg programvare"
 
 # panel/launcher.c:499 panel/launcher.c:693 panel/menu.c:1715
 #: data/browser.xml.h:1
-#, fuzzy
 msgid "Apparition"
-msgstr "Applikasjon"
+msgstr "Hildring"
 
 #: data/browser.xml.h:2
-#, fuzzy
 msgid "Art"
-msgstr "Artist"
+msgstr "Kunst"
 
 #: data/browser.xml.h:3
 msgid "Azul"
-msgstr ""
+msgstr "Azul"
 
 # help-browser/window.c:237
 #: data/browser.xml.h:4
@@ -509,45 +423,38 @@ msgid "Black"
 msgstr "Svart"
 
 #: data/browser.xml.h:5
-#, fuzzy
 msgid "Blue Ridge"
-msgstr "Blå:"
+msgstr "Blå kant"
 
 #: data/browser.xml.h:6
-#, fuzzy
 msgid "Blue Rough"
-msgstr "Blå:"
+msgstr "Røff blå"
 
 # panel/foobar-widget.c:323
 #: data/browser.xml.h:7
-#, fuzzy
 msgid "Blue Type"
-msgstr "Etter type"
+msgstr "Blå type"
 
 #: data/browser.xml.h:8
-#, fuzzy
 msgid "Brushed Metal"
-msgstr "Thrash Metal"
+msgstr "Børsta metall"
 
 #: data/browser.xml.h:9
-#, fuzzy
 msgid "Bubble Gum"
-msgstr "Boble3D"
+msgstr "Tyggegummi"
 
 #: data/browser.xml.h:10
 msgid "Burlap"
-msgstr ""
+msgstr "Vadmål"
 
 # gnome-terminal/gnome-terminal.glade.h:52
 #: data/browser.xml.h:11
-#, fuzzy
 msgid "C_olors"
-msgstr "Fargar"
+msgstr "F_argar"
 
 #: data/browser.xml.h:12
-#, fuzzy
 msgid "Camera"
-msgstr "Kabaret"
+msgstr "Kamera"
 
 #: data/browser.xml.h:13
 msgid "Camouflage"
@@ -578,18 +485,16 @@ msgid "Cork"
 msgstr "Kork"
 
 #: data/browser.xml.h:20
-#, fuzzy
 msgid "Countertop"
-msgstr "Innhald"
+msgstr "Benkplate"
 
 #: data/browser.xml.h:21
 msgid "Danger"
-msgstr "Farleg"
+msgstr "Fare"
 
 #: data/browser.xml.h:22
-#, fuzzy
 msgid "Danube"
-msgstr "Dance"
+msgstr "Donau"
 
 #: data/browser.xml.h:23
 msgid "Dark Cork"
@@ -602,24 +507,20 @@ msgstr "Mørk GNOME"
 
 # panel/logout.c:192
 #: data/browser.xml.h:25
-#, fuzzy
 msgid "Deep Teal"
-msgstr "Deltabell"
+msgstr "Djup blågrøn"
 
 #: data/browser.xml.h:26
-#, fuzzy
 msgid "Distinguished"
-msgstr "ferdig"
+msgstr "Utmerka"
 
 #: data/browser.xml.h:27
-#, fuzzy
 msgid "Documents"
-msgstr "Dokumentasjon:"
+msgstr "Dokument"
 
 #: data/browser.xml.h:28
-#, fuzzy
 msgid "Dots"
-msgstr "notat"
+msgstr "Prikkar"
 
 #: data/browser.xml.h:29
 msgid "Draft"
@@ -627,20 +528,19 @@ msgstr "Kladd"
 
 #: data/browser.xml.h:30
 msgid "Drag a color to an object to change it to that color"
-msgstr ""
+msgstr "Dra ein farge til eit objekt for å endra fargen på det"
 
 #: data/browser.xml.h:31
 msgid "Drag a pattern tile to an object to change it"
-msgstr ""
+msgstr "Dra ei mønsterflis til eit objekt for å endra det"
 
 #: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
-msgstr ""
+msgstr "Dra eit merke til eit objekt for å merka det"
 
 #: data/browser.xml.h:33
-#, fuzzy
 msgid "Eclipse"
-msgstr "Ellipse"
+msgstr "Formørking"
 
 #: data/browser.xml.h:34
 msgid "Envy"
@@ -657,24 +557,20 @@ msgid "Fibers"
 msgstr "Fiber"
 
 #: data/browser.xml.h:38
-#, fuzzy
 msgid "Fire Engine"
-msgstr "Første linje"
+msgstr "Brannbil"
 
 #: data/browser.xml.h:39
-#, fuzzy
 msgid "Fleur De Lis"
-msgstr "Fila eksisterar"
+msgstr "Franske liljer"
 
 #: data/browser.xml.h:40
-#, fuzzy
 msgid "Floral"
-msgstr "Flyttal"
+msgstr "Blomar"
 
 #: data/browser.xml.h:41
-#, fuzzy
 msgid "Fossil"
-msgstr "Umogleg"
+msgstr "Fossilt"
 
 # gsm/splash.c:450
 #: data/browser.xml.h:42 icons/gnome/gnome.xml.h:2
@@ -690,9 +586,8 @@ msgid "Grapefruit"
 msgstr "Grapefrukt"
 
 #: data/browser.xml.h:45
-#, fuzzy
 msgid "Green Weave"
-msgstr "Skjermsparar"
+msgstr "Grønn vev"
 
 # gnome-terminal/gnome-terminal.glade.h:28 panel/panel_config.c:1619
 #: data/browser.xml.h:46
@@ -717,9 +612,8 @@ msgid "Lemon"
 msgstr "Sitron"
 
 #: data/browser.xml.h:51
-#, fuzzy
 msgid "Mail"
-msgstr "Metal"
+msgstr "Post"
 
 #: data/browser.xml.h:52
 msgid "Mango"
@@ -727,14 +621,12 @@ msgstr "Mango"
 
 # help-browser/toc.c:136
 #: data/browser.xml.h:53
-#, fuzzy
 msgid "Manila Paper"
-msgstr "Manualsider"
+msgstr "Manilapapir"
 
 #: data/browser.xml.h:54
-#, fuzzy
 msgid "Moss Ridge"
-msgstr "Preg bilete"
+msgstr "Mosekant"
 
 #: data/browser.xml.h:55
 msgid "Mud"
@@ -742,7 +634,7 @@ msgstr "Gjørme"
 
 #: data/browser.xml.h:56
 msgid "Multimedia"
-msgstr ""
+msgstr "Multimedia"
 
 #: data/browser.xml.h:57
 msgid "New"
@@ -757,33 +649,29 @@ msgid "OK"
 msgstr "OK"
 
 #: data/browser.xml.h:60
-#, fuzzy
 msgid "Ocean Strips"
-msgstr "Ved oppstart"
+msgstr "Havstriper"
 
 #: data/browser.xml.h:61
 msgid "Oh No"
 msgstr "Ã… nei"
 
 #: data/browser.xml.h:62
-#, fuzzy
 msgid "Onyx"
-msgstr "PÃ¥"
+msgstr "Onyx"
 
 #: data/browser.xml.h:63
 msgid "Orange"
 msgstr "Oransje"
 
 #: data/browser.xml.h:64
-#, fuzzy
 msgid "Package"
-msgstr "Rackspace"
+msgstr "Pakke"
 
 # help-browser/bookmarks.c:221
 #: data/browser.xml.h:65
-#, fuzzy
 msgid "Pale Blue"
-msgstr "Sidetittel"
+msgstr "Lys blå"
 
 #: data/browser.xml.h:66
 msgid "Personal"
@@ -791,18 +679,16 @@ msgstr "Personleg"
 
 #: data/browser.xml.h:67
 msgid "Pictures"
-msgstr ""
+msgstr "Bilete"
 
 #: data/browser.xml.h:68
-#, fuzzy
 msgid "Purple Marble"
-msgstr "lillaaktig blå"
+msgstr "Rosa marmor"
 
 # panel/session.c:290
 #: data/browser.xml.h:69
-#, fuzzy
 msgid "Ridged Paper"
-msgstr "Red Carpet"
+msgstr "Kraftpapir"
 
 #: data/browser.xml.h:70
 msgid "Rough Paper"
@@ -817,9 +703,8 @@ msgid "Sea Foam"
 msgstr "Sjøsprøyt"
 
 #: data/browser.xml.h:73
-#, fuzzy
 msgid "Shale"
-msgstr "Skalert"
+msgstr "Skifer"
 
 #: data/browser.xml.h:74
 msgid "Silver"
@@ -831,17 +716,15 @@ msgstr "Himmel"
 
 #: data/browser.xml.h:76
 msgid "Sky Ridge"
-msgstr ""
+msgstr "Himmelkant"
 
 #: data/browser.xml.h:77
-#, fuzzy
 msgid "Snow Ridge"
-msgstr "Vis tid"
+msgstr "Snøkant"
 
 #: data/browser.xml.h:78
-#, fuzzy
 msgid "Sound"
-msgstr "Soul"
+msgstr "Lyd"
 
 # panel/gnome-panel-properties.c:585
 #: data/browser.xml.h:79
@@ -849,19 +732,16 @@ msgid "Special"
 msgstr "Spesiell"
 
 #: data/browser.xml.h:80
-#, fuzzy
 msgid "Stucco"
-msgstr "Vellukka"
+msgstr "Gipskalk"
 
 #: data/browser.xml.h:81
-#, fuzzy
 msgid "Tangerine"
-msgstr "Understreking"
+msgstr "Mandarin"
 
 #: data/browser.xml.h:82
-#, fuzzy
 msgid "Terracotta"
-msgstr "Terror"
+msgstr "Terrakotta"
 
 #: data/browser.xml.h:83
 msgid "Urgent"
@@ -873,11 +753,11 @@ msgstr "Fiolett"
 
 #: data/browser.xml.h:85
 msgid "Wavy White"
-msgstr ""
+msgstr "Bølgjande kvit"
 
 #: data/browser.xml.h:86
 msgid "Web"
-msgstr ""
+msgstr "Vev"
 
 #: data/browser.xml.h:87
 msgid "White"
@@ -888,19 +768,16 @@ msgid "White Ribs"
 msgstr ""
 
 #: data/browser.xml.h:89
-#, fuzzy
 msgid "_Emblems"
-msgstr "Emblem"
+msgstr "M_erker"
 
 #: data/browser.xml.h:90
-#, fuzzy
 msgid "_Patterns"
-msgstr "Mønster"
+msgstr "_Mønster"
 
 #: data/favorites.desktop.in.h:1
-#, fuzzy
 msgid "Favorite applications"
-msgstr "_Anna program"
+msgstr "Yndlingsprogram"
 
 # panel/foobar-widget.c:1067 panel/menu.c:3846 panel/menu.c:5475
 # panel/menu.c:5529 panel/menu.c:5537
@@ -910,26 +787,23 @@ msgstr "Favorittar"
 
 #: data/preferences.desktop.in.h:1
 msgid "Adjust your user environment"
-msgstr ""
+msgstr "Tilpass brukarmiljøet ditt"
 
 #: data/preferences.desktop.in.h:2
-#, fuzzy
 msgid "Desktop Preferences"
-msgstr "Vis brukarval"
+msgstr "Brukarval for skrivebordet"
 
 #: data/serverconfig.desktop.in.h:1
 msgid "Configure network services (web server, DNS server, etc.)"
-msgstr ""
+msgstr "Set opp nettverkstenester (vevtenar, DNS-tenar, etc.)"
 
 #: data/serverconfig.desktop.in.h:2 data/serverconfig.directory.in.h:2
-#, fuzzy
 msgid "Server Settings"
-msgstr "Systeminnstillingar"
+msgstr "Tenarinnstillingar"
 
 #: data/serverconfig.directory.in.h:1
-#, fuzzy
 msgid "Configure network services"
-msgstr "Lagre konfigura_sjonsfil"
+msgstr "Set opp nettverkstenester"
 
 #: data/starthere-link.desktop.in.h:1 data/starthere.desktop.in.h:1
 #: data/starthere.directory.in.h:1
@@ -994,8 +868,11 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Maskinvare"
+
 #: data/static_bookmarks.xml.h:16
-#, fuzzy
 msgid "International"
 msgstr "Internasjonalt"
 
@@ -1100,9 +977,8 @@ msgid "Sun Wah Linux"
 msgstr "Sun Wah Linux"
 
 #: data/static_bookmarks.xml.h:41
-#, fuzzy
 msgid "Web Services"
-msgstr "Teneste"
+msgstr "Vev-tenester"
 
 # help-browser/toc-man.c:29 help-browser/toc2-man.c:31
 #: data/static_bookmarks.xml.h:42
@@ -1123,7 +999,7 @@ msgstr "Zero-Knowledge"
 
 #: data/sysconfig.desktop.in.h:1 data/sysconfig.directory.in.h:1
 msgid "Change systemwide settings (affects all users)"
-msgstr ""
+msgstr "Endra innstillingane for heile systemet (påverkar alle brukarane)"
 
 #: data/sysconfig.desktop.in.h:2 data/sysconfig.directory.in.h:2
 msgid "System Settings"
@@ -1131,49 +1007,44 @@ msgstr "Systeminnstillingar"
 
 #: icons/crux_eggplant/crux_eggplant.xml.h:1
 msgid "An Eggplant variation of the Crux theme."
-msgstr ""
+msgstr "Ein aubergine-variant av drakta Crux."
 
 #: icons/crux_eggplant/crux_eggplant.xml.h:2
 msgid "Crux-Eggplant"
-msgstr ""
+msgstr "Crux-aubergine"
 
 #: icons/crux_teal/crux_teal.xml.h:1
-#, fuzzy
 msgid "A Teal variation of the Crux theme."
-msgstr "Ei kort skildring av malen"
+msgstr "Ein blågrøn variant av Crux-drakta"
 
 #: icons/crux_teal/crux_teal.xml.h:2
-#, fuzzy
 msgid "Crux-Teal"
-msgstr "Crux tema"
+msgstr "Blågrøn Crux"
 
 #: icons/default/default.xml.h:1
-#, fuzzy
 msgid "Eazel"
-msgstr "Slett"
+msgstr "Eazel"
 
 #: icons/default/default.xml.h:2
 msgid "This is the default theme for Nautilus."
-msgstr ""
+msgstr "Dette er standarddrakta til Nautilus."
 
 #: icons/gnome/gnome.xml.h:1
 msgid "A theme designed to fit well with the classic GNOME environment."
-msgstr ""
+msgstr "Ei drakt som er utforma til å passa godt inn i det klassiske GNOME-miljøet."
 
 #: icons/sierra/sierra.xml.h:1
-#, fuzzy
 msgid "Sierra"
-msgstr "Tenar"
+msgstr ""
 
 #: icons/sierra/sierra.xml.h:2
 msgid "Uses manila folders and gray-green backgrounds."
-msgstr ""
+msgstr "Bruker mapper i manila og grågrøne bakgrunnar"
 
 # gsm/gsm-client-row.c:56
 #: icons/tahoe/tahoe.xml.h:1
-#, fuzzy
 msgid "Tahoe"
-msgstr "Papirkorg"
+msgstr ""
 
 #: icons/tahoe/tahoe.xml.h:2
 msgid "This theme uses photo-realistic folders."
@@ -1181,13 +1052,13 @@ msgstr ""
 
 #: libbackground/preview-file-selection.c:207
 msgid "Can't find an hbox, using a normal file selection"
-msgstr ""
+msgstr "Kan ikkje finna ein hbox. Brukar vanleg filveljar."
 
+# TRN: Dette er objektet ei førehandsvising, ikkje verbet. Trur eg.
 #: libbackground/preview-file-selection.c:212
 #: src/nautilus-file-management-properties.glade.h:55
-#, fuzzy
 msgid "Preview"
-msgstr "Forrige"
+msgstr "Førehandsvising"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:1
 msgid ""
@@ -1197,22 +1068,27 @@ msgid ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 msgstr ""
+"Ei liste over ikontekstar under eit ikon i ikonvisinga og skrivebordet. Det "
+"faktiske talet på ikontekstar som vert viste kjem an på forstørringa. "
+"Moglege verdiar er: «size», «type», «date_modified», «date_changed», "
+"«date_accessed», «owner», «group», «permissions», «octal_permissions» og "
+"«mime_type»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:2
 msgid "Add Nautilus to session"
-msgstr ""
+msgstr "Legg til Nautilus i økta"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Bring up a new window for every opened file"
-msgstr ""
+msgstr "Opna filer i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "Computer icon visible on desktop"
-msgstr ""
+msgstr "Datamaskinikon synleg på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
-msgstr ""
+msgstr "Vilkår for søking med søkelinja"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
 msgid ""
@@ -1221,171 +1097,178 @@ msgid ""
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 msgstr ""
+"Vilkår for å finna filer ved hjelp av søkelinja. Dersom verdien er "
+"«search_by_text», vil Nautilus søka etter filnamn. Dersom verdien er "
+"«search_by_text_and_properties» vil Nautilus søka etter filnamn og "
+"fileigenskapar."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 msgid "Current Nautilus theme (deprecated)"
-msgstr ""
+msgstr "Noverande Nautilus-drakt (utgått)"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
-#, fuzzy
 msgid "Custom Background Set"
-msgstr "Nullstill bakgrunn"
+msgstr "Brukarvald bakgrunn satt"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
-#, fuzzy
 msgid "Custom Side Pane Background Set"
-msgstr "Nullstill bakgrunn"
+msgstr "Brukarvald bakgrunn satt i sidestolpen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
-#, fuzzy
 msgid "Default Background Color"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Standard bakgrunnsfarge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
-#, fuzzy
 msgid "Default Background Filename"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Standard bakgrunnsfilnamn"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
-#, fuzzy
 msgid "Default Side Pane Background Color"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Standard bakgrunnsfarge på sidestolpe"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Default Side Pane Background Filename"
-msgstr ""
+msgstr "Filnamn for standardbakgrunn i sidestolpen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
-#, fuzzy
 msgid "Default folder viewer"
-msgstr "Forvald storleik"
+msgstr "Standar mappeframsyning"
 
 # gnome-terminal/gnome-terminal.c:2692
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
-#, fuzzy
 msgid "Default icon zoom level"
-msgstr "Sett forstørringsnivå:"
+msgstr "Standard forstørringsnivå"
 
 # gnome-terminal/gnome-terminal.c:2692
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
-#, fuzzy
 msgid "Default list zoom level"
-msgstr "Sett forstørringsnivå:"
+msgstr "Standard forstørringsnivå for listeframsyning"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
-#, fuzzy
 msgid "Default sort order"
-msgstr "_Standard skrifttype"
+msgstr "Sandrd sortering"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Default zoom level used by the icon view."
-msgstr ""
+msgstr "Standard forstørring brukt i ikonframsyninga."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default zoom level used by the list view."
-msgstr ""
+msgstr "Standard forstørring brukt i listeframsyninga."
 
 # gsm/splash.c:68 panel/menu.c:5224 panel/menu.c:5229 panel/menu.c:5599
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
-#, fuzzy
 msgid "Desktop font"
-msgstr "Skrivebord"
+msgstr "Skrifttype på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
-#, fuzzy
 msgid "Desktop home icon name"
-msgstr "Start spelet om att"
+msgstr "Namn på heime-ikonet på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
-#, fuzzy
 msgid "Desktop trash icon name"
-msgstr "Start spelet om att"
+msgstr "Namn på papirkorg-ikonet på skrivebordet"
 
+# gsm/session-properties.c:217
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
+msgid "Enable 'special' flags in file preferences dialog"
+msgstr "Bruk «spesielle» flagg i brukarvala for filer"
 
-# gsm/session-properties.c:217
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-#, fuzzy
-msgid "Enable 'special' flags in file preferences dialog"
-msgstr "Eigenskapar for økt"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
+msgstr ""
+"Filnamn for standard mappebakgrunn. Berre brukt viss «background_set» er "
+"sann."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
+"Filnamn for standard bakgrunn i sidestolpen. Berre brukt dersom "
+"«side_pane_background_set» er sann."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
+"Mappergar større enn dette vil verta avkorta. Dette er for å unngå å bruka "
+"for mykje minne og dermed krasja Nautilus ved å opna enorme mapper. Ein "
+"negativ verdi tyder inga grense. Grensa er ikkje eksakt, sidan mapper vert "
+"lesne i blokker."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
-msgstr ""
+msgstr "Gøym innebygde bokmerke i bokmerkemenyen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Home icon visible on desktop"
-msgstr ""
+msgstr "Heime-ikonet synleg på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
+"Dersom sann, vil Nautilus berre visa mapper i treframsyninga i sidestolpen. "
+"Elles vil framsyninga visa både filer og mapper."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
-msgid ""
-"If set to true, newly opened windows will have the location bar visible."
-msgstr ""
+msgid "If set to true, newly opened windows will have the location bar visible."
+msgstr "Dersom sann, vil nyopna vindauge ha adresselinja synleg."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "If set to true, newly opened windows will have the side pane visible."
-msgstr ""
+msgstr "Dersom sann, vil nyopna vindauge ha sidestolpen synleg."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr ""
+msgstr "Dersom sann, vil nyopna vindauge ha statuslinja synleg."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr ""
+msgstr "Dersom denne er satt til sann, vil nyopna vindauge ha synlege verktøylinjer."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 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 ""
+"Dersom sann, let Nautilus deg redigera dei meir avanserte og innfløkte "
+"eigenskapane til filene i fileigenskap-dialogan."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
+"Dersom sann, vil Nautilus visa mapper før filer i liste- og "
+"ikonframsyningane."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "put files in the trash."
 msgstr ""
+"Dersom sann, vil Nautilus be om stadfesting før filer vert flytta til "
+"papirkorga."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid ""
 "If set to true, then Nautilus will bring up a new Nautilus window by default "
 "whenever an item is opened."
 msgstr ""
+"Dersom sann, vil Nautilus opna eit nytt vindauge kvar gong eit objekt vert "
+"opna."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
-#, fuzzy
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Dersom sann, vil Nautilus teikna ikon på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid ""
@@ -1393,18 +1276,24 @@ msgid ""
 "file immediately and in-place, instead of moving it to the trash. This "
 "feature can be dangerous, so use caution."
 msgstr ""
+"Dersom sann, vil Nautilus la deg sletta filer med ein gong, utan å flytta "
+"dei til papirkorga. Denne eigenskapen kan vera farleg, så ver varsam."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid ""
 "If set to true, then Nautilus will just show the user's bookmarks in the "
 "bookmark menu."
 msgstr ""
+"Dersom sann, vil Nautilus berre visa brukaren sine eigne bokmerke i "
+"bokmerkemenyen,"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+"Dersom sann, vil Nautilus bruka heimemappa til brukaren som skrivebord. "
+"Elles vert ~/Desktop brukt som skrivebord."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1412,36 +1301,43 @@ msgid ""
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
 "files."
 msgstr ""
+"Dersom sann, vis tryggleikskopiar slik som dei Emacs lagar. Førebels vert "
+"berre filnamn som sluttar med tilde (~) rekna som tryggleikskopiar."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
+"Dersom sann, vert skjulte filer vist i filhandsamaren. Skjulte filer har "
+"anten filnamn som startar med punktum eller som er lista opp i fila «."
+"hidden» i mappa."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 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 ""
+"Dersom sann, vil Nautilus leggja seg sjølv til økta når han startar. Dermed "
+"vil han og starta automatisk neste gong du loggar inn."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
-msgstr ""
+msgstr "Dersom denne er sann, vert eit ikon til «Min datamaskin» lagt på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
-msgstr ""
+msgstr "Dersom sann, vil eit ikon med lenkje til heimemappa setjast på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
-msgstr ""
+msgstr "Dersom sann, vil eit ikon med lenkje til papirkorga setjast på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
@@ -1449,6 +1345,9 @@ msgid ""
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
 "sorted from \"z\" to \"a\"."
 msgstr ""
+"Dersom sann, vil filene i nye vindauge sorterast baklengs. Det vil seia at "
+"dersom dei vert sorterte på namn, vert dei sorterte frå «å» til «a» i staden "
+"for frå «a» til «å»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
@@ -1457,19 +1356,22 @@ msgid ""
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 msgstr ""
+"Dersom sann, vil filene i nye vindauge sorterast baklengs. Det vil seia at "
+"dersom dei vert sorterte på namn, vert dei sorterte frå «å» til «a» i staden "
+"for frå «a» til «å». Dersom filene vert sorterte på storleik, vert dei "
+"sorterte i minkande rekkefølgje i staden for i aukande."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
-msgstr ""
+msgid "If true, icons will be laid out tighter by default in new windows."
+msgstr "Dersom sann, vert ikon plassert tettare i nye vindauge."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
-msgid ""
-"If true, labels will be placed beside icons rather than underneath them."
-msgstr ""
+msgid "If true, labels will be placed beside icons rather than underneath them."
+msgstr "Dersom sann, vert merkelappar plassert attmed ikona i staden for under."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If true, new windows will use manual layout by default."
-msgstr ""
+msgstr "Dersom sann, vil nye vindauge bruka manuell ikonplassering."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid ""
@@ -1477,81 +1379,81 @@ msgid ""
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
 msgstr ""
+"Bilete over denne storleiken (i byte) vil ikkje få miniatyrar. Føremålet med "
+"denne innstillinga er å unngå å laga miniatyrar av store bilete som kan ta "
+"lang tid å lasta eller som brukar mykje minne."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid "List of possible captions on icons"
-msgstr ""
+msgstr "Liste over moglege ikontekstar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
-msgstr ""
+msgid "Maximum handled files in a folder"
+msgstr "Største tal på filer å handsama i ei mappe"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Maximum image size for thumbnailing"
-msgstr ""
+msgstr "Største biletestorleik for miniatyrar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
+"Namn på Nautilus-drakta som skal brukast. Dette har vore utgått sidan "
+"Nautilus 2.2. Bruk ikondrakta i staden."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "Nautilus handles drawing the desktop"
-msgstr ""
+msgstr "Nautilus tek seg av å teikna skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Nautilus bruker heimemappa til brukaren som skrivebord"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr ""
+msgid "Only show folders in the tree sidebar"
+msgstr "Vis berre mapper i treet i sidestolpen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
 msgstr ""
+"Moglege verdiar er «single», for å opna filer med eitt klikk, eller "
+"«double», for å opna filer med dobbeltklikk."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 msgid "Put labels beside icons"
-msgstr ""
+msgstr "Plasser etikettar attmed ikon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
-#, fuzzy
 msgid "Reverse sort order in new windows"
-msgstr "Opne heile mappa i _vindauge"
+msgstr "Sorter i omvendt rekkefølgje i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-#, fuzzy
-msgid "Show directories first in windows"
-msgstr "Vis kun eitt vindauge"
+msgid "Show folders first in windows"
+msgstr "Vis mappene fyrst i vindauga"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
-#, fuzzy
 msgid "Show location bar in new windows"
-msgstr "Vis kun eitt vindauge"
+msgstr "Vis adresselinja i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
-#, fuzzy
 msgid "Show side pane in new windows"
-msgstr "Vis kun eitt vindauge"
+msgstr "Vis sidestolpen i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-#, fuzzy
 msgid "Show status bar in new windows"
-msgstr "Vis kun eitt vindauge"
+msgstr "Vis statuslinja i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
-#, fuzzy
 msgid "Show toolbar in new windows"
-msgstr "Vis kun eitt vindauge"
+msgstr "Vis verktøylinja i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:69
-#, fuzzy
 msgid "Side pane view"
-msgstr "Vis _sidepanel"
+msgstr "Sidepanelframsyning"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:70
 msgid ""
@@ -1560,95 +1462,111 @@ msgid ""
 "on a remote server. If set to \"local_only\" then only plays previews on "
 "local filesystems. If set to \"never\" then it never previews sound."
 msgstr ""
+"Justering av når lydfiler skal spelast av når muspeikaren går over dei. "
+"Dersom verdien er «always», vert lyden alltid spelt, sjølv om fila er på ein "
+"ekstern tenar. Dersom verdien er «local_only», vert berre filer som ligg "
+"lokalt på maskina spelte. Dersom verdien er «never», vert lydfiler aldri "
+"spelte av."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
+"Justering av når tekstfiler skal førehandsvisast i ikonet. Dersom verdien er "
+"«always», vert fila alltid førehandsvist, sjølv om fila er på ein ekstern "
+"tenar. Dersom verdien er «local_only», vert berre filer som ligg lokalt på "
+"maskina førehandsviste. Dersom verdien er «never», vert filene aldri "
+"førehandsviste."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
+"Justering av når biletefiler skal førehandsvisast i ikonet. Dersom verdien "
+"er «always», vert fila alltid førehandsvist, sjølv om fila er på ein ekstern "
+"tenar. Dersom verdien er «local_only», vert berre filer som ligg lokalt på "
+"maskina førehandsviste. Dersom verdien er «never», vert filene aldri "
+"førehandsviste. Eit standardikon vert brukt i staden."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
+"Justering av når elementa i ei mappe skal teljast opp.Dersom verdien er "
+"«always», vert elementa alltid telte opp, sjølv om mappa er på ein ekstern "
+"tenar. Dersom verdien er «local_only», vert berre mapper som ligg lokalt på "
+"maskina telte opp. Dersom verdien er «never», vert mappene aldri telte opp."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
+"Standard sorteringsrekkefølgje for element i ikonvisingar. Moglege verdiar "
+"er «name», «size», «modification_date» og «emblems»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
+"Standard sorteringsrekkefølgje for element i listevisingar. Moglege verdiar "
+"er «name», «size» og modification_date»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
-#, fuzzy
 msgid "The default width of the side pane in new windows."
-msgstr "Vis kun eitt vindauge"
+msgstr "Breidda på sidestolpen i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:77
-#, fuzzy
 msgid "The font description used for the icons on the desktop."
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Skildring av skrifttypen som vert brukt til ikona på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:78
 msgid "The side pane view to show in newly opened windows."
-msgstr ""
+msgstr "Sidestolpevisinga som skal brukast i nye vindauge."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:79
-#, fuzzy
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Sjølvvald namn på heime-ikonet på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
-#, fuzzy
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Sjølvvald namn på papirkorg-ikonet på skrivebordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid "Trash icon visible on desktop"
-msgstr ""
+msgstr "Papirkorg-ikon på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:82
 msgid "Type of click used to launch/open files"
-msgstr ""
+msgstr "Type klikk som opnar/køyrer filer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
-#, fuzzy
 msgid "Use manual layout in new windows"
-msgstr "Bruk interpolasjon"
+msgstr "Bruk manuell plassering i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-#, fuzzy
-msgid "Use tighter Layout in new windows"
-msgstr "Opne i eige vindauge"
+msgid "Use tighter layout in new windows"
+msgstr "Bruk tettare plassering i nye vindauge"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
-#, fuzzy
 msgid "What to do with executable text files when activated"
-msgstr "Køyr ved klikk"
+msgstr "Kva som skal gjerast med køyrbare tekstfiler som vert aktiverte"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:86
 msgid ""
@@ -1657,6 +1575,10 @@ msgid ""
 "\"ask\" to ask what to do via a dialog, and \"display\" to display them as "
 "text files."
 msgstr ""
+"Kva som skal gjerast med køyrbare tekstfiler når dei vert aktiverte (enkelt- "
+"eller dobbeltklikka). Moglege verdiar er «launch» for å køyra dei som "
+"program, «ask» for å spørja i ein dialog, og «display» for å visa dei som "
+"tekstfiler."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:87
 msgid ""
@@ -1664,197 +1586,174 @@ msgid ""
 "another view for that particular folder. Possible values are \"list_view\" "
 "and \"icon_view\"."
 msgstr ""
+"NÃ¥r ei mappe vert vitja, vert denne framvisaren brukt dersom du ikkje har "
+"valt ein annan framvisar for nett den mappa. Moglege verdiar er «list_view» "
+"og «icon_view»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-#, fuzzy
-msgid "When to show number of items in a directory"
-msgstr "_Vis felta ordna:"
+msgid "When to show number of items in a folder"
+msgstr "Om talet på element i ei mappe skal visast"
 
 # applets/tasklist/tasklist_properties.c:334
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
-#, fuzzy
 msgid "When to show preview text in icons"
-msgstr "Syn små ikon"
+msgstr "Om tekstfiler skal førehandsvisast som ikon"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:90
 msgid "When to show thumbnails of image files"
-msgstr ""
+msgstr "Om biletefiler skal førehandsvisast som miniatyrar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-#, fuzzy
-msgid "Whether a custom default directory background has been set."
-msgstr "Set som skrivebordsbakgrunn"
+msgid "Whether a custom default folder background has been set."
+msgstr "Om det er sjølvvald bakgrunn i mappevisinga."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
-msgstr ""
+msgstr "Om det er sjølvvald bakgrunn i sidestolpen."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Whether to ask for confirmation when moving files to trash"
-msgstr ""
+msgstr "Om det skal spørjast etter stadfesting når filer vert flytta til papirkorga."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:94
 msgid "Whether to enable immediate deletion"
-msgstr ""
+msgstr "Om filer skal slettast med ein gong, utan å spørja."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:95
 msgid "Whether to preview sounds when mousing over an icon"
-msgstr ""
+msgstr "Om lydfiler skal førehandsvisast når muspeikaren går over ikonet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:96
 msgid "Whether to show backup files"
-msgstr ""
+msgstr "Om tryggleikskopiar skal visast"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:97
 msgid "Whether to show hidden files"
-msgstr ""
+msgstr "Om skjulte filer skal visast"
 
 # gnome-terminal/gnome-terminal.c:1525
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
-#, fuzzy
 msgid "Width of the side pane"
-msgstr "_Skjul menylinja"
+msgstr "Breidde på sidestolpen"
 
 #: libnautilus-private/filesystem-attributes.xml.h:1
-#, fuzzy
 msgid "AFFS Volume"
-msgstr "Som Verdi"
+msgstr "AFFS-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:2
-#, fuzzy
 msgid "AFS Network Volume"
-msgstr "Nettverksmeny"
+msgstr "AFS nettverksvolum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:3
-#, fuzzy
 msgid "Auto-detected Volume"
-msgstr "Auto_oppdag"
+msgstr "Automatisk attkjent volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:4
-#, fuzzy
 msgid "CD Digital Audio"
-msgstr "Dolby Digital lyd"
+msgstr "Digital CD-lyd"
 
 #: libnautilus-private/filesystem-attributes.xml.h:5
 msgid "CD-ROM Drive"
 msgstr "CDROM-spelar"
 
 #: libnautilus-private/filesystem-attributes.xml.h:6
-#, fuzzy
 msgid "CDROM Volume"
-msgstr "CDROM-spelar"
+msgstr "CDROM-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:7
-#, fuzzy
 msgid "DVD Volume"
-msgstr "Auk lydstyrke"
+msgstr "DVD-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:8
 msgid "Enhanced DOS Volume"
-msgstr ""
+msgstr "Utvida DOS-volum"
 
 # gnome-terminal/gnome-terminal.c:978
 #: libnautilus-private/filesystem-attributes.xml.h:9
-#, fuzzy
 msgid "Ext2 Linux Volume"
-msgstr "Linux-konsoll"
+msgstr "Ext2 Linux-volum"
 
 # gnome-terminal/gnome-terminal.c:978
 #: libnautilus-private/filesystem-attributes.xml.h:10
-#, fuzzy
 msgid "Ext3 Linux Volume"
-msgstr "Linux-konsoll"
+msgstr "Ext3 Linux-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:11
 msgid "Hardware Device Volume"
-msgstr ""
+msgstr "Maskinvareeiningsvolum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:12
-#, fuzzy
 msgid "Hsfs CDROM Volume"
-msgstr "CDROM-spelar"
+msgstr "Hsfs CDROM-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:13
-#, fuzzy
 msgid "JFS Volume"
-msgstr "Auk lydstyrke"
+msgstr "JFS-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:14
-#, fuzzy
 msgid "MSDOS Volume"
-msgstr "ESD lydmålar"
+msgstr "MSDOS-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:15
-#, fuzzy
 msgid "MacOS Volume"
-msgstr "ESD lydmålar"
+msgstr "MacOS-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:16
-#, fuzzy
 msgid "Minix Volume"
-msgstr "Endeleg verdi"
+msgstr "Minix-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:17
-#, fuzzy
 msgid "NFS Network Volume"
-msgstr "Nettverksmeny"
+msgstr "NFS nettverksvolum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:18
-#, fuzzy
 msgid "Pcfs Solaris Volume"
-msgstr "/WindowShade-modus"
+msgstr "Pcfs Solaris-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:19
 msgid "ReiserFS Linux Volume"
-msgstr ""
+msgstr "ReiserFS Linux-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:20
 msgid "Solaris/BSD Volume"
-msgstr ""
+msgstr "Solaris/BSD-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:21
-#, fuzzy
 msgid "SuperMount Volume"
-msgstr "Auk lydstyrke"
+msgstr "SuperMount-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:22
-#, fuzzy
 msgid "System Volume"
-msgstr "System meny"
+msgstr "Systemvolum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:23
-#, fuzzy
 msgid "Udfs Solaris Volume"
-msgstr "/WindowShade-modus"
+msgstr "Udfs Solaris-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:24
-#, fuzzy
 msgid "Windows NT Volume"
-msgstr "Windows ikonfil"
+msgstr "Windows NT-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:25
-#, fuzzy
 msgid "Windows Shared Volume"
-msgstr "/WindowShade-modus"
+msgstr "Delt Windows-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:26
 msgid "Windows VFAT Volume"
-msgstr ""
+msgstr "Windows VFAT-volum"
 
 # gnome-terminal/gnome-terminal.c:978
 #: libnautilus-private/filesystem-attributes.xml.h:27
-#, fuzzy
 msgid "XFS Linux Volume"
-msgstr "Linux-konsoll"
+msgstr "XFS Linux-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:28
-#, fuzzy
 msgid "XIAFS Volume"
-msgstr "Som Verdi"
+msgstr "XIAFS-volum"
 
 #: libnautilus-private/filesystem-attributes.xml.h:29
 msgid "Xenix Volume"
-msgstr ""
+msgstr "Xenix-volum"
 
 #: libnautilus-private/nautilus-customization-data.c:406
 msgid "reset"
@@ -1864,103 +1763,110 @@ msgstr "nullstill"
 #: libnautilus-private/nautilus-desktop-directory-file.c:442
 #: libnautilus-private/nautilus-desktop-icon-file.c:163
 #: libnautilus-private/nautilus-trash-file.c:690
-#, fuzzy
 msgid "on the desktop"
-msgstr "Til skrivebordet"
+msgstr "på skrivebordet"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Kan ikkje sletta eit volumikon."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
-msgstr ""
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
+msgstr "Bruk menyvalet «Løys ut» for å løysa ut volumet."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-#, fuzzy
-msgid "Can't delete volume"
-msgstr "Klarte ikkje å generere datoen i dag!"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Kan ikkje sletta volumet"
 
 # gsm/gsm-client-row.c:56
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papirkorg"
 
 # gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-#: libnautilus-private/nautilus-dnd.c:617
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
-msgstr "ingen plass"
+msgstr "_Flytt hit"
 
 # gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-#: libnautilus-private/nautilus-dnd.c:622
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
-msgstr "ingen plass"
+msgstr "_Kopier hit"
 
-#: libnautilus-private/nautilus-dnd.c:627
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
-msgstr "MÃ¥l"
+msgstr "_Lag lenkje hit"
 
-#: libnautilus-private/nautilus-dnd.c:632
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
-msgstr "Nullstill bakgrunn"
+msgstr "Bruk til _bakgrunn"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: libnautilus-private/nautilus-dnd.c:682
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
-msgstr "Nullstill bakgrunn"
+msgstr "Bruk til bakgrunn i _alle mapper"
 
-#: libnautilus-private/nautilus-dnd.c:687
-#, fuzzy
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
-msgstr "Nullstill bakgrunn"
+msgstr "Bruk til bakgrunn i _denne mappa"
 
 #: 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 "Merket kan ikkje leggjast inn."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
-msgstr ""
+msgstr "Du må gje det nye merket eit nøkkelord."
 
 # panel/extern.c:780
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-#, fuzzy
-msgid "Couldn't install emblem"
-msgstr "Kan ikkje leggja til applet"
+#: 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 "Klarte ikkje leggja inn merket"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
-msgid ""
-"Sorry, but emblem keywords can only contain letters, spaces and numbers."
-msgstr ""
+#: libnautilus-private/nautilus-emblem-utils.c:203
+msgid "Sorry, but emblem keywords can only contain letters, spaces and numbers."
+msgstr "Nøkkelord for merke kan berre innehalda bokstavar, tal og mellomrom."
 
 #. this really should never happen, as a user has no idea
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Det finst allereie eit merke som heiter «%s»."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Bruk eit anna namn på merket."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+# panel/extern.c:780
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Klarte ikkje leggja inn merke"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
-msgstr ""
+msgstr "Klarte ikkje lagra eigendefinert merke"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
-msgstr ""
+msgstr "Klarte ikkje å lagra eigendefinert merkenamn"
 
 #: libnautilus-private/nautilus-file-operations-progress.c:456
 #, c-format
@@ -1977,290 +1883,267 @@ msgstr "Frå:"
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Feil under flytting"
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "«%s» kan ikkje flyttast, fordi ho er på ein skrivebeskytta disk."
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Feil under sletting."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
+"«%s» kan ikkje slettast avdi du ikkje har dei løyva som trengst for å endra "
+"foreldermappa."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "«%s» kan ikkje slettast, fordi ho ligg på ein skrivebeskytta disk."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
+"«%s» kan ikkje flyttast, fordi du ikkje har dei løyva som trengst for å "
+"endra henne eller foreldermappa."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Feil under flytting."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
-msgstr ""
+msgstr "Kan ikkje flytta. «%s» si foreldermappe er i målet."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
+"Kan ikkje flytta til papirkorga. Du har ikkje løyve til å endra «%s» eller "
+"foreldermappa."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Feil under kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
+msgstr "«%s» kan ikkje kopierast. Du har ikkje løyve til å lesa henne."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
+msgid "Error while copying to \"%s\"."
+msgstr "Feil under kopiering til «%s»."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Det er ikkje nok plass på målet."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
+msgid "Error while moving to \"%s\"."
+msgstr "Feil under flytting til «%s»."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+msgid "Error while creating link in \"%s\"."
+msgstr "Feil under oppretting av lenkje i «%s»."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, fuzzy, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr "Feil ved opning av fil \"%s\" for lesing."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "Du har ikkje skriveløyve til denne mappa."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "MÃ¥ldisken er skrivebeskytta."
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
+msgid "Error while moving items to \"%s\"."
+msgstr "Feil under flytting til «%s»."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error while creating links in \"%s\"."
+msgstr "Feil under oppretting av lenkjer i «%s»."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Feil «%s» under kopiering av «%s»."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Vil du halda fram?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Feil «%s» under flytting av «%s»."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Feil «%s» under lenkjing til «%s»."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Feil «%s» under sletting av «%s»."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while copying."
+msgstr "Feil «%s» under kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while moving."
+msgstr "Feil «%s» under flytting."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
+msgid "Error \"%s\" while linking."
+msgstr "Feil «%s» under lenkjing."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-#, fuzzy
-msgid "Error while copying."
-msgstr "Feil ved lagring av fil."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Feil «%s» under sletting."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-#, fuzzy
-msgid "Error while moving."
-msgstr "Feil ved lagring av fil."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
+msgstr "Feil under kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-#, fuzzy
-msgid "Error while linking."
-msgstr "Feil ved lasting av tilleggsmodul."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
+msgstr "Feil under flytting"
 
 #: libnautilus-private/nautilus-file-operations.c:906
-#, fuzzy
-msgid "Error while deleting."
-msgstr "Feil ved lesing av fil."
+msgid "Error While Linking"
+msgstr "Feil under lenkjing"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Hopp over"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
+msgstr "Feil under sletting"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Prøv på nytt"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Hopp over"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Prøv på nytt"
+
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kan ikkje flytta «%s» til den nye adressa."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
+"Namnet er allereie brukt til eit særskilt element som ikkje kan fjernast "
+"eller erstatta. Dersom du framleis vil flytta elementet, må du gje det nytt "
+"namn og prøva igjen."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kan ikkje kopiera «%s» til den nye adressa."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
+"Namnet er allereie brukt på eit spesielt element som ikkje kan flyttast "
+"eller overskrivast. Dersom du framleis vil kopiera, må du gje målet eit nytt "
+"namn og prøva igjen."
 
 # gmenu/order.c:81
-#: libnautilus-private/nautilus-file-operations.c:1031
-#, fuzzy
-msgid "Unable to replace file."
-msgstr "Kunne ikkje opprette fil: %s\n"
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "Kan ikkje erstatta fila"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, fuzzy, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"Fila %s finst alt.\n"
-"vil du skriva over den?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Fila %s finst frå før. Vil du skriva over henne?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
+"Dersom du prøver å byta ut ei eksisterande fil, vert innhaldet i denne "
+"overskrive."
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
+msgstr "Konflikt under kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Byt ut"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Bytt ut"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Erstatt alle"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Bytt ut _alle"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "lenkje til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "ei annan lenkje til %s"
@@ -2269,28 +2152,28 @@ msgstr "ei annan lenkje til %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:1166
+#, c-format
 msgid "%dst link to %s"
-msgstr "Limer inn i %s"
+msgstr "%dst lenkje til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:1170
+#, c-format
 msgid "%dnd link to %s"
-msgstr "%d linjer å importera"
+msgstr "%dnd lenkje til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:1174
+#, c-format
 msgid "%drd link to %s"
-msgstr "%d linjer å importera"
+msgstr "%drd lenkje til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:1178
+#, c-format
 msgid "%dth link to %s"
-msgstr "%d linjer å importera"
+msgstr "%dth lenkje til %s"
 
 # panel/menu.c:3208 panel/menu.c:3210
 #. Localizers:
@@ -2298,600 +2181,601 @@ msgstr "%d linjer å importera"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
-msgstr " (ein til kopi)"
+msgstr " (ein kopi til)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
-msgstr ""
+msgstr ". kopi)"
 
+# TRN: File bug. Engelsk konstruksjon.
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
-msgstr " kopi)"
+msgstr ". kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
-msgstr ""
+msgstr ". kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
-msgstr " kopi)"
+msgstr ". kopi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
-msgstr "%s (ein til kopi)%s"
+msgstr "%s (ein kopi til)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
-msgstr ""
+msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
-msgstr ""
+msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
-msgstr ""
+msgstr "%s (%d. kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
-msgstr ""
+msgstr "%s (%d. kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
+#, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
-msgstr "Ukjend GnomeVFSSeekPosition %d"
+msgstr "Ukjend GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
-msgstr "Lagrar fil til straum."
+msgstr "Flytter filer til papirkorga."
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
-msgstr "Gruppa til fileigar"
+msgstr "Filer kasta ut:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Flyttar"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:1859
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur flytting til papirkorga ..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Flyttar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Filer flytta:"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:1870
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur flytting ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
-msgstr ""
+msgstr "Fullfører flytting ..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
-msgstr "Byt ut streng i po-fil"
+msgstr "Lagar lenkjer til filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
-msgstr "Første linje"
+msgstr "Filer lenkja:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
-msgstr "Bindande"
+msgstr "Lenkjer"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:1884
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur å laga lenkjer ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
-msgstr ""
+msgstr "Fullfører å laga lenkjer ..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
-msgstr "Kopierer"
+msgstr "Kopierer filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
-msgstr "Filtype:"
+msgstr "Filer kopierte:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopierer"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:1896
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur kopiering ..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr ""
+# panel/menu.c:3920
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Du kan ikkje kopiera element til papirkorga."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Filer og mapper kan berre flyttast til papirkorga."
 
 # panel/menu.c:3920
-#: libnautilus-private/nautilus-file-operations.c:1935
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
-msgstr "Du kan ikkje fjerne det siste panelet:"
+msgstr "Du kan ikkje flytta denne papirkorg-mappa."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
+msgstr "Du kan ikkje kopiera denne papirkorg-mappa."
+
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
 msgstr ""
+"Ein papirkorg-mappe vert brukt til å lagra element som vert flytta til "
+"papirkorga."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
-msgstr ""
+msgstr "Kan ikkje endra adressa til papirkorga"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
-msgstr "Kan ikkje opne"
+msgstr "Kan ikkje kopiera papirkorga"
 
 # panel/menu.c:3920
-#: libnautilus-private/nautilus-file-operations.c:1962
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
-msgstr "Du kan ikkje fjerne det siste panelet:"
+msgstr "Du kan ikkje flytta ei mappe inn i seg sjølv."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
-msgstr ""
-"Kan ikkje fjerna post frå\n"
-"postboksen '%1':\n"
-"%2"
+msgstr "Du kan ikkje kopiera ei mappe inn i seg sjølv."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "MÃ¥lmappa er inni kjeldemappa."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
-msgstr "Kan ikkje opne"
+msgstr "Kan ikkje flytta inn i seg sjølv"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
-msgstr "Kan ikkje opne"
+msgstr "Kan ikkje kopiera inn i seg sjølv"
 
 # panel/menu.c:3920
-#: libnautilus-private/nautilus-file-operations.c:1978
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
-msgstr "Du kan ikkje fjerne det siste panelet:"
+msgstr "Kan ikkje kopiera ei fil over seg sjølv."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "MÃ¥let og kjelda er same fil."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
-msgstr "Kan ikkje opne"
+msgstr "Kan ikkje kopiera over seg sjølv"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "Du har ikkje løyve til å skriva til målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "Ikkje plass på målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-file-operations.c:2057
+#, c-format
 msgid "Error \"%s\" creating new folder."
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+msgstr "Feil «%s» under oppretting av ny mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-#, fuzzy
-msgid "Error creating new folder"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Feil under oppretting av ny mappe."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
+msgstr "Feil under oppretting av ny mappe."
 
 # gmenu/treenew.c:137 gmenu/treenew.c:144 panel/menu.c:797
 # gmenu/treenew.c:118 gmenu/treenew.c:127
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
-msgstr "utan_namn.desktop"
+msgstr "mappe utan namn"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Feil «%s» under oppretting av nytt dokument."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Feil under oppretting av nytt dokument."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Feil under oppretting av nytt dokument"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "ny fil"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Slettar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
-msgstr "XMMS: Filer sletta"
+msgstr "Filer sletta:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Slettar"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:2196
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur sletting av filer ..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
-msgstr ""
+msgstr "Tømmer papirkorga"
 
 # help-browser/window.c:244 panel/extern.c:471 panel/swallow.c:92
-#: libnautilus-private/nautilus-file-operations.c:2231
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
-msgstr "Førebur lagring ..."
+msgstr "Førebur tømming av papirkorga ..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
+msgstr "Er du sikker på at du vil fjerna alle elementa i papirkorga?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Dersom du tømer papirkorga, vert elementa sletta for godt."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
-msgstr "Tom"
+msgstr "_Tøm"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
-msgstr ""
+msgstr "foo (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
-msgstr ""
+msgstr ".foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
-msgstr ""
+msgstr "foo foo (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
-msgstr ""
+msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
-msgstr ""
+msgstr "foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
-msgstr ""
+msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
-msgstr ""
+msgstr "foo foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
-msgstr ""
+msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
-msgstr ""
+msgstr "foo foo (kopi).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
-msgstr ""
+msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
-msgstr ""
+msgstr "foo.. (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo ..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
-msgstr ""
+msgstr "foo... (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
-msgstr ""
+msgstr "foo. (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
-msgstr ""
+msgstr "foo. (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
-msgstr ""
+msgstr "foo (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
-msgstr ""
+msgstr "foo (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
-msgstr ""
+msgstr "foo (3. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
-msgstr ""
+msgstr "foo (3. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
-msgstr ""
+msgstr "foo foo (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
-msgstr ""
+msgstr "foo foo (3. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
-msgstr ""
+msgstr "foo (13. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
-msgstr ""
+msgstr "foo (14. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
-msgstr ""
+msgstr "foo (13. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
-msgstr ""
+msgstr "foo (14. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
-msgstr ""
+msgstr "foo (21. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
-msgstr ""
+msgstr "foo (22. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
-msgstr ""
+msgstr "foo (21. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
-msgstr ""
+msgstr "foo (22. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
-msgstr ""
+msgstr "foo (23. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
-msgstr ""
+msgstr "foo (23. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
-msgstr ""
+msgstr "foo (24. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
-msgstr ""
+msgstr "foo (24. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
-msgstr ""
+msgstr "foo (25. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
-msgstr ""
+msgstr "foo (25. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
-msgstr ""
+msgstr "foo foo (24. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
-msgstr ""
+msgstr "foo foo (25. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
-msgstr ""
+msgstr "foo foo (24. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
-msgstr ""
+msgstr "foo foo (25. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
-msgstr ""
+msgstr "foo foo (100000000000000. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
-msgstr ""
+msgstr "foo (10. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
-msgstr ""
+msgstr "foo (11. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
-msgstr ""
+msgstr "foo (10. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
-msgstr ""
+msgstr "foo (12. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
-msgstr ""
+msgstr "foo (12. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
-msgstr ""
+msgstr "foo (12. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
-msgstr ""
+msgstr "foo (110. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
-msgstr ""
+msgstr "foo (111. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
-msgstr ""
+msgstr "foo (110. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
-msgstr ""
+msgstr "foo (112. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
-msgstr ""
+msgstr "foo (122. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
-msgstr ""
+msgstr "foo (123. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
-msgstr ""
+msgstr "foo (122. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
-msgstr ""
+msgstr "foo (123. kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
-msgstr ""
+msgstr "foo (124. kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
-msgstr ""
+msgstr "foo (124. kopi).txt"
 
 #. Today, use special word.
 #. * strftime patterns preceeded with the widest
@@ -2908,71 +2792,67 @@ msgstr ""
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
-msgstr ""
+msgstr "i dag kl. 00.00.00"
 
 # panel/menu.c:3522 panel/session.c:1541
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
-msgstr "i dag klokka %-I:%M:%S %p"
+msgstr "i dag kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
-msgstr ""
+msgstr "i dag kl. 00.00"
 
 # panel/foobar-widget.c:556
-#: libnautilus-private/nautilus-file.c:2764
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
-msgstr "I dag, %l:%M %p"
+msgstr "i dag kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
-msgstr "i dag, 00:00 PM"
+msgstr "i dag, 00.00"
 
 # panel/foobar-widget.c:556
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
-msgstr "i dag, %-I:%M %p"
+msgstr "i dag, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "i dag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
-msgstr ""
+msgstr "i går kl. 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2780
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
-msgstr "Seint i går %l:%M %p"
+msgstr "i går kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
-msgstr ""
+msgstr "i går kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2783
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
-msgstr "Seint i går %l:%M %p"
+msgstr "i går kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
-msgstr "i går, 00:00 PM"
+msgstr "i går kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2786
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
-msgstr "Seint i går %l:%M %p"
+msgstr "i går, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "i går"
 
@@ -2981,222 +2861,217 @@ msgstr "i går"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
-msgstr ""
+msgstr "Onsdag 0. september 0000 kl. 00.00.00"
 
 # applets/gen_util/clock.c:450
-#: libnautilus-private/nautilus-file.c:2801
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
-msgstr "%a, %d  %b  %Y %H:%M:%S %z"
+msgstr "%A, %-d. %B %Y, %-H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
-msgstr ""
+msgstr "MÃ¥n 0. Okt 0000 kl. 00.00.00"
 
 # applets/gen_util/clock.c:450
-#: libnautilus-private/nautilus-file.c:2804
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
-msgstr "%a, %d  %b  %Y %H:%M:%S %z"
+msgstr "%a, %-d. %b %Y, %-H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
-msgstr ""
+msgstr "MÃ¥n 00. okt 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2807
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
-msgstr "%a %b %d, %I:%M %p"
+msgstr "%a, %-d. %b %Y kl. %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
-msgstr ""
+msgstr "00. okt 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2810
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%-d. %b %Y, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
-msgstr ""
+msgstr "00. okt 0000, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
-msgstr ""
+msgstr "00.00.00, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2816
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
-msgstr "%a %b %d, %I:%M %p"
+msgstr "%-d.%m.%y kl. %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
-msgstr ""
+msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 element"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
-msgstr "0 mappe"
+msgstr "0 mapper"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u element"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mapper"
 
 # panel/gnome-panel-properties.c:346 panel/gnome-panel-properties.c:364
 # panel/menu.c:4722
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? element"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ukjend type"
 
-#: libnautilus-private/nautilus-file.c:4460
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
-msgstr "ukjend type"
+msgstr "ukjend MIME-type"
 
 # gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ukjend"
 
 # gtk/gtkfontsel.c:664
 # gsm/gsm-client-list.c:122
-#: libnautilus-private/nautilus-file.c:4498
-#, fuzzy
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
-msgstr "Program"
+msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
+"Kan ikkje finna skildring sjølv for «x-directory/normal». Det tyder truleg "
+"at «gnome-vfs.keys»-fila di er på feil stad eller ikkje vert funnen av ein "
+"annan grunn."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
+"Fann inga skildring for MIME-typen «%s» (fila «%s»). Sei ifrå til gnome-vfs-"
+"lista."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "lenkje"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
-msgstr ""
+msgstr "lenkje (broten)"
 
 #: libnautilus-private/nautilus-global-preferences.c:102
-#, fuzzy
 msgid "_Always"
-msgstr "Alltid"
+msgstr "_Alltid"
 
 #: libnautilus-private/nautilus-global-preferences.c:103
-#, fuzzy
 msgid "_Local File Only"
-msgstr "Lokale filer"
+msgstr "Berre _lokale filer"
 
 #: libnautilus-private/nautilus-global-preferences.c:104
-#, fuzzy
 msgid "_Never"
-msgstr "Aldri"
+msgstr "_Aldri"
 
 #: libnautilus-private/nautilus-global-preferences.c:110
 #: src/nautilus-file-management-properties.glade.h:14
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "25%"
 msgstr "25%"
 
 #: libnautilus-private/nautilus-global-preferences.c:112
 #: src/nautilus-file-management-properties.glade.h:20
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "50%"
 msgstr "50%"
 
 #: libnautilus-private/nautilus-global-preferences.c:114
 #: src/nautilus-file-management-properties.glade.h:23
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "75%"
 msgstr "75%"
 
 #: libnautilus-private/nautilus-global-preferences.c:116
 #: src/nautilus-file-management-properties.glade.h:8
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "100%"
 msgstr "100%"
 
 #: libnautilus-private/nautilus-global-preferences.c:118
 #: src/nautilus-file-management-properties.glade.h:10
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "150%"
 msgstr "150%"
 
 #: libnautilus-private/nautilus-global-preferences.c:120
 #: src/nautilus-file-management-properties.glade.h:12
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "200%"
 msgstr "200%"
 
 #: libnautilus-private/nautilus-global-preferences.c:122
 #: src/nautilus-file-management-properties.glade.h:17
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "400%"
 msgstr "400%"
 
@@ -3235,50 +3110,46 @@ msgstr "100 MB"
 
 #: libnautilus-private/nautilus-global-preferences.c:139
 msgid "Activate items with a _single click"
-msgstr ""
+msgstr "Aktiver element med _enkeltklikk"
 
 #: libnautilus-private/nautilus-global-preferences.c:143
 msgid "Activate items with a _double click"
-msgstr ""
+msgstr "Aktiver element med _dobbeltklikk"
 
 #: libnautilus-private/nautilus-global-preferences.c:151
-#, fuzzy
 msgid "E_xecute files when they are clicked"
-msgstr "Køyr ved klikk"
+msgstr "K_øyr filer når dei vert klikka"
 
 #: libnautilus-private/nautilus-global-preferences.c:155
-#, fuzzy
 msgid "Display _files when they are clicked"
-msgstr "Viser det første biletet i biletelista"
+msgstr "Vis _filer når dei vert klikka"
 
 #: libnautilus-private/nautilus-global-preferences.c:159
 #: src/nautilus-file-management-properties.glade.h:65
-#, fuzzy
 msgid "_Ask each time"
-msgstr "Spørj kvar gong"
+msgstr "_Spør kvar gong"
 
 #: libnautilus-private/nautilus-global-preferences.c:167
-#, fuzzy
 msgid "Search for files by file name only"
-msgstr "Søk kun i spesifisert område"
+msgstr "Søk etter filer berre på namn"
 
 #: libnautilus-private/nautilus-global-preferences.c:171
 msgid "Search for files by file name and file properties"
-msgstr ""
+msgstr "Søk etter filer på namn og fileigenskapar"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
-#, fuzzy
 msgid "Icon View"
-msgstr "MÃ¥nadsvising"
+msgstr "Ikonvising"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
-msgstr "Vis liste"
+msgstr "Listevising"
 
 #: libnautilus-private/nautilus-global-preferences.c:184
-#, fuzzy
 msgid "Manually"
 msgstr "Manuell"
 
@@ -3287,7 +3158,7 @@ msgstr "Manuell"
 #: libnautilus-private/nautilus-global-preferences.c:195
 #: src/nautilus-file-management-properties.glade.h:41
 msgid "By Name"
-msgstr "PÃ¥ namn"
+msgstr "Etter namn"
 
 # panel/foobar-widget.c:324
 #: libnautilus-private/nautilus-global-preferences.c:187
@@ -3306,15 +3177,14 @@ msgstr "Etter type"
 #: libnautilus-private/nautilus-global-preferences.c:189
 #: libnautilus-private/nautilus-global-preferences.c:198
 #: src/nautilus-file-management-properties.glade.h:40
-#, fuzzy
 msgid "By Modification Date"
-msgstr "Siste endringstid"
+msgstr "Etter endringstid"
 
 #: libnautilus-private/nautilus-global-preferences.c:190
 #: libnautilus-private/nautilus-global-preferences.c:199
 #: src/nautilus-file-management-properties.glade.h:39
 msgid "By Emblems"
-msgstr ""
+msgstr "Etter merke"
 
 #: libnautilus-private/nautilus-global-preferences.c:204
 msgid "8"
@@ -3388,21 +3258,18 @@ msgstr "gruppe"
 
 #: libnautilus-private/nautilus-global-preferences.c:224
 #: src/nautilus-file-management-properties.glade.h:80
-#, fuzzy
 msgid "permissions"
-msgstr "Løyve: "
+msgstr "løyve"
 
 #: libnautilus-private/nautilus-global-preferences.c:225
 #: src/nautilus-file-management-properties.glade.h:78
-#, fuzzy
 msgid "octal permissions"
-msgstr "Løyve: "
+msgstr "oktale løyve"
 
 #: libnautilus-private/nautilus-global-preferences.c:226
 #: src/nautilus-file-management-properties.glade.h:53
-#, fuzzy
 msgid "MIME type"
-msgstr "_MIME-type"
+msgstr "MIME-type"
 
 # gtk/gtkinputdialog.c:544
 #: libnautilus-private/nautilus-global-preferences.c:227
@@ -3425,149 +3292,148 @@ msgstr "%s sin heim"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr ""
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
-#, fuzzy
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
-msgstr "Meditative"
+msgstr "redigerbar tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
-msgstr ""
+msgstr "den redigerbare merkelappen"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
-msgstr ""
+msgstr "tilleggstekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
-msgstr ""
+msgstr "litt meir tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
-#, fuzzy
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
-msgstr "Venstre seksjon:"
+msgstr "merka for utval"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
-msgstr ""
+msgstr "om me er meirka for eit utval"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
-msgstr ""
+msgstr "merka som tataturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
-msgstr ""
+msgstr "merka for slepp"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
-msgstr ""
+msgstr "om me er merka for eit dra-og-slepp-slepp"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
-msgstr "Gøym valde kolonner"
+msgstr "Utvalsrektangelet"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
-msgstr "Lim inn tekst"
+msgstr "Teikn ramme rundt tekst"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
-msgstr ""
+msgstr "Teikn ei ramme rundt tekst som ikkje er vald"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
-msgstr "Vel ikon for montert"
+msgstr "Farge på utvalsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
-msgstr "GÃ¥ til heimeplassering"
+msgstr "Farge på utvalsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
-msgstr "Vel alle"
+msgstr "Alfa i utvalsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
-msgstr ""
+msgstr "Kor ugjennomsiktig utvalsboksen er"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
-msgstr ""
+msgstr "Lys opp alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
-msgstr "Venstre seksjon:"
+msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
-msgstr ""
+msgstr "Lys informasjonsfarge"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
-msgstr ""
+msgstr "Farge brukt på informasjonstekst mot ein mørk bakgrunn"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
-#, fuzzy
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
-msgstr "Mørk kork"
+msgstr "Mørk informasjonsfarge"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
-msgstr ""
+msgstr "Farge brukt på informasjonstekst mot ein lys bakgrunn"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
+"Vil du byta til manuell plassering og la dette elementet liggja der du slapp "
+"det? Dette vil rota til den lagra manuelle plasseringa."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Denne mappa brukar automatisk plassering."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
+"Vil du byta til manuell plassering og la desse elementa liggja der du slapp "
+"dei? Dette vil rota til den lagra manuelle plasseringa."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
+"Vil du byta til manuell plassering og la dette elementet liggja der du slapp "
+"det?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
+"Vil du byta til manuell plassering og la desse elementa liggja der du slapp "
+"dei?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
-msgstr ""
+msgstr "Byta til manuell plassering?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
-#, fuzzy
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
-msgstr "med"
+msgstr "Byt"
 
 #: libnautilus-private/nautilus-medusa-support.c:123
 #, c-format
@@ -3583,6 +3449,16 @@ msgid ""
 "Fast searches will not be available until an initial index of your files has "
 "been created.  This may take a long time."
 msgstr ""
+"For å slå på raskt søk, må du redigera fila «%s» som root. Du slår på medusa-"
+"tenesta ved å setja flagget «enabled» til «yes».\n"
+"For å starta indekseringa og søketenenesta med ein gong, må du også køyra "
+"følgjande kommandoar som root:\n"
+"\n"
+"medusa-indexd\n"
+"medusa-searchd\n"
+"\n"
+"Raske søk vil ikkje vera tilgjengelege før filene dine er indekserte. Det "
+"kan ta lang tid."
 
 #: libnautilus-private/nautilus-medusa-support.c:138
 msgid ""
@@ -3593,357 +3469,385 @@ msgid ""
 "If you are using a packaged version of Nautilus, fast searching is not "
 "available.\n"
 msgstr ""
+"Klarte ikkje å finna medusa, programmet som utfører søk, på systemet ditt. "
+"Dersom du har kompilert Nautilus sjølv, må du installera medusa og kompilera "
+"Nautilus på nytt. (Du kan finna medusa på ftp://ftp.gnome.org/)\n"
+"Dersom du bruker ein pakkeversjon av Nautilus vil ikkje raske søk vera "
+"tilgjengelege.\n"
 
 #: libnautilus-private/nautilus-program-chooser.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "There was an error displaying help: %s"
-msgstr "Det oppstod feil under køyring av gdb."
+msgstr "Ein feil oppstod under framsyning av hjelp: %s"
 
 # panel/menu-properties.c:416
 #: libnautilus-private/nautilus-program-chooser.c:333
-#, fuzzy
 msgid "not in menu"
-msgstr "PÃ¥ hovudmenyen"
+msgstr "ikkje i menyen"
 
 #: libnautilus-private/nautilus-program-chooser.c:336
-#, fuzzy
 msgid "in menu for this file"
-msgstr "Ingen informasjon for dette filsystemet."
+msgstr "i menyen for denne fila"
 
 #: libnautilus-private/nautilus-program-chooser.c:339
 #: libnautilus-private/nautilus-program-chooser.c:342
-#, fuzzy, c-format
+#, c-format
 msgid "in menu for \"%s\""
-msgstr "Visning for \"%s\""
+msgstr "i menyen for «%s»"
 
 # applets/tasklist/tasklist_properties.c:196
 #: libnautilus-private/nautilus-program-chooser.c:345
-#, fuzzy
 msgid "default for this file"
-msgstr "Standard oppgåvestorleik:"
+msgstr "standard for denne fila"
 
 #: libnautilus-private/nautilus-program-chooser.c:348
 #: libnautilus-private/nautilus-program-chooser.c:351
-#, fuzzy, c-format
+#, c-format
 msgid "default for \"%s\""
-msgstr "Standardval - %s"
+msgstr "standard for «%s»"
 
 #: libnautilus-private/nautilus-program-chooser.c:396
 #, c-format
 msgid "Is not in the menu for \"%s\" items."
-msgstr ""
+msgstr "Er ikkje i menyen for «%s»-element."
 
 # panel/gnome-panel-properties.c:830
 #: libnautilus-private/nautilus-program-chooser.c:399
-#, fuzzy, c-format
+#, c-format
 msgid "Is in the menu for \"%s\"."
-msgstr "I menyen"
+msgstr "Er i menyen for «%s»."
 
 #: libnautilus-private/nautilus-program-chooser.c:402
 #, c-format
 msgid "Is in the menu for \"%s\" items."
-msgstr ""
+msgstr "Er i menyen for «%s»-element."
 
 #: libnautilus-private/nautilus-program-chooser.c:405
 #, c-format
 msgid "Is in the menu for all \"%s\" items."
-msgstr ""
+msgstr "Er i menyen for alle element av typen «%s»."
 
 #: libnautilus-private/nautilus-program-chooser.c:408
-#, fuzzy, c-format
+#, c-format
 msgid "Is the default for \"%s\"."
-msgstr ""
-"\n"
-"eller standardfila av type: "
+msgstr "Er standard for «%s»."
 
 #: libnautilus-private/nautilus-program-chooser.c:411
-#, fuzzy, c-format
+#, c-format
 msgid "Is the default for \"%s\" items."
-msgstr ""
-"\n"
-"eller standardfila av type: "
+msgstr "Er standard for «%s»-element."
 
 #: libnautilus-private/nautilus-program-chooser.c:414
 #, c-format
 msgid "Is the default for all \"%s\" items."
-msgstr ""
+msgstr "Er standard for alle «%s»-element."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1030
+#, c-format
 msgid "Modify \"%s\""
-msgstr "Flyttar %s"
+msgstr "Endra «%s»"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
-msgstr ""
+msgstr "Ta med i menyen for «%s»-element"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1063
+#, c-format
 msgid "Use as default for \"%s\" items"
-msgstr "Bruk som _standardmappe"
+msgstr "Bruk som standard for «%s»-element"
 
 # panel/gnome-panel-properties.c:830
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1070
+#, c-format
 msgid "Include in the menu for \"%s\" only"
-msgstr "I menyen"
+msgstr "Ta med i menyen berre for «%s»"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1076
+#, c-format
 msgid "Use as default for \"%s\" only"
-msgstr "Bruk som _standardmappe"
+msgstr "Standard berre for «%s»"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
-msgstr ""
+msgstr "Ikkje ta med i menyen for «%s»-element"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Namn"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
-msgstr "Velj"
+msgstr "_Vel"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Ferdig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
-msgstr "Endra ..."
+msgstr "_Endra ..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Filtyper og program"
 
 # gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-#: libnautilus-private/nautilus-program-chooser.c:1451
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
-msgstr "ingen plass"
+msgstr "_GÃ¥ dit"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
+"Du kan setja opp kva for program som vert foreslått for kva slags filtypar i "
+"dialogen Filtypar og program."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
-msgstr "_Anna program"
+msgstr "Opna med eit anna program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
-msgstr ""
+msgstr "Vel eit program å opna «%s» med:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
-msgstr "Køy_r med hjelpar"
+msgstr "Opna med annan framvisar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1488
+#, c-format
 msgid "Choose a view for \"%s\":"
-msgstr "Visning for \"%s\""
+msgstr "Vel ei framsyning for «%s»"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1591
+#, c-format
 msgid "No viewers are available for \"%s\"."
-msgstr "Bla gjennom tilgjengelege X11-fargar."
+msgstr "Ingen framvisarar tilgjengelege for «%s»"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Ingen framvisarar tilgjengelege"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
-msgstr ""
+msgstr "Det er ikkje knytta noko program til «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Ingen tilknytta program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
-msgstr ""
+msgstr "Det er ikkje knytt noko handling til «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Inga handling tilknytta"
 
 #. Note: This might be misleading in the components case, since the
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
+"Du kan setja opp GNOME til å knytta program til filtypar. Vil du knytta eit "
+"program til denne filtypen no?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-#, fuzzy
-msgid "Associate Application"
-msgstr "_Anna program"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Tilknytt program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
-msgstr ""
+msgstr "Framsynaren knytta til «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
-msgstr ""
+msgstr "Ugyldig framvisar tilknytta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
-msgstr ""
+msgstr "Programmet knytta til «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Ugyldig program tilknytta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
-msgstr ""
+msgstr "Handlinga tilknytta «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
-msgstr "Inga skildring tilgjengeleg"
+msgstr "Ugyldig handling tiljnytta"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
+"Du kan setja opp GNOME til å knytta eit anna program eller ein annan "
+"framvisar til dette programmet. Vil du tilknytta eit program eller ein "
+"framvisar no?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-#, fuzzy
-msgid "Associate Action"
-msgstr "_Anna program"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "T_ilknytt handling"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Klarte ikkje å opna. Vil du velja eit anna program?"
+
+# TRN: Denne treng alvorleg å skrivast om, men fyrst må
+# TRN: eg finna ut nett kva det er meint. URL-ar? ssh://?, ftp:;//?
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
+"«%s» kan ikkje opna «%s», fordi «%s» ikkje kan opna filer på stader av typen "
+"«%s»."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Klarte ikkje å opna. Vil du velja ei anna handling?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+# TRN: Treng også litt omskriving.
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
+"Standardhandlinga kan ikkje opna «%s», fordi ho ikkje kan opna filer med "
+"adresser av typen «%s»."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
-#, fuzzy
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
-msgstr "Kopier lenkjeadresse"
+msgstr "Kan ikkje opna adressa"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+# TRN: Punktumfeil?
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"«%s» kan ikkje opna «%s», fordi «%s» ikkje kan opna filer på stader av typen "
+"«%s»."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
+"Det er ingen andre program som kan opna denne fila. Dersom du kopierer henne "
+"til datamaskinen din, kan det tenkjast at du kan opna henne."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+# TRN: Punktumfeil?
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Standardhandlinga kan ikkje opna «%s», fordi ho ikkje kan opna filer på "
+"adresser av typen «%s»."
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
+"Det er ingen andre handlingar som kan brukast til å visa denne fila. Dersom "
+"du kopierer henne til datamaskinen din, kan det tenkjast at du kan opna "
+"henne."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
+#, c-format
 msgid "Opening %s"
 msgstr "Opnar «%s»"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Du kan ikkje køyra kommandoar frå ein ekstern tenar."
+
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Dette er kopla ut av omsyn til tryggleiken."
 
 # applets/gen_util/printer.c:120
-#: libnautilus-private/nautilus-program-choosing.c:1163
-#, fuzzy
-msgid "Can't execute remote links"
-msgstr "Kan ikkje køyre utskriftskommando"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "Kan ikkje køyra eksterne lenkjer"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-#, fuzzy
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr "Det oppstod feil under køyring av gdb."
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detaljar:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-#, fuzzy
-msgid "Error launching application"
-msgstr "_Anna program"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Ein feil oppstod under oppstart av programmet."
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
-msgid ""
-"This drop target only supports local files.\n"
-"\n"
-"To open non-local files copy them to a local folder and then drop them again."
-msgstr ""
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
+msgstr "Feil under oppstarten av programmet"
+
+# applets/tasklist/tasklist_properties.c:334
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Dette målet for slepping støttar berre lokale filer."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1213
+msgid "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
+"For å opna ikkje-lokale filer på du fyrst kopiera dei til ei lokal mappe og "
+"så sleppa dei på nytt."
+
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "Sleppemål støttar berre lokale filer"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
+"For å opna ikkje-lokale filer på du fyrst kopiera dei til ei lokal mappe og "
+"så sleppa dei på nytt. Dei lokale filene du slepte har allereie vorte opna."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -3957,200 +3861,195 @@ msgstr ""
 #: libnautilus-private/nautilus-search-uri.c:211
 #, c-format
 msgid "[Items ]containing \"%s\" in their names"
-msgstr ""
+msgstr "[Element ]som har «%s» i namnet"
 
 #. "%s" here is a pattern the file name started with, such as
 #. "nautilus"
 #: libnautilus-private/nautilus-search-uri.c:216
 #, c-format
 msgid "[Items ]starting with \"%s\""
-msgstr ""
+msgstr "[Element ]som startar med «%s»"
 
 #. "%s" here is a pattern the file name ended with, such as
 #. "mime"
 #: libnautilus-private/nautilus-search-uri.c:221
 #, c-format
 msgid "[Items ]ending with %s"
-msgstr ""
+msgstr "[Element ]som sluttar med «%s»"
 
 #. "%s" here is a pattern the file name did not match, such
 #. as "nautilus"
 #: libnautilus-private/nautilus-search-uri.c:226
 #, c-format
 msgid "[Items ]not containing \"%s\" in their names"
-msgstr ""
+msgstr "[Element ]som ikkje har «%s» i namnet"
 
 #. "%s" is a regular expression string, for example "[abc]"
 #: libnautilus-private/nautilus-search-uri.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "[Items ]matching the regular expression \"%s\""
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
+msgstr "[Element ]som stemmer med det regulære uttrykket «%s»"
 
 #. "%s" is a file glob, for example "*.txt"
 #: libnautilus-private/nautilus-search-uri.c:234
 #, c-format
 msgid "[Items ]matching the file pattern \"%s\""
-msgstr ""
+msgstr "[Element ]som stemmer med filmønsteret «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:247
-#, fuzzy
 msgid "[Items that are ]regular files"
-msgstr "%s er ikkje ei vanleg fil."
+msgstr "[Element som er ]vanlege filer"
 
 #: libnautilus-private/nautilus-search-uri.c:250
-#, fuzzy
 msgid "[Items that are ]text files"
-msgstr "Inkluder tekstfil"
+msgstr "[Element som er ]tekstfiler"
 
 #: libnautilus-private/nautilus-search-uri.c:253
-#, fuzzy
 msgid "[Items that are ]applications"
-msgstr "_Anna program"
+msgstr "[Element som er ]program"
 
 #: libnautilus-private/nautilus-search-uri.c:256
 msgid "[Items that are ]folders"
-msgstr ""
+msgstr "[Element som er ]mapper"
 
 #: libnautilus-private/nautilus-search-uri.c:259
 msgid "[Items that are ]music"
-msgstr ""
+msgstr "[Element som er ]musikk"
 
 #. "%s" here is a word describing a file type, for example
 #. "folder"
 #: libnautilus-private/nautilus-search-uri.c:267
 #, c-format
 msgid "[Items ]that are not %s"
-msgstr ""
+msgstr "[Element ]som ikkje er %s"
 
 #. "%s" here is a word describing a file type, for example
 #. "folder"
 #: libnautilus-private/nautilus-search-uri.c:272
 #, c-format
 msgid "[Items ]that are %s"
-msgstr ""
+msgstr "[Element ]som ikkje er %s"
 
 #. "%s" here is the name of user on a Linux machine, such as
 #. "root"
 #: libnautilus-private/nautilus-search-uri.c:286
 #, c-format
 msgid "[Items ]not owned by \"%s\""
-msgstr ""
+msgstr "[Element ]som ikkje er eigde av «%s»"
 
 #. "%s" here is the name of user on a Linux machine, such as
 #. "root"
 #: libnautilus-private/nautilus-search-uri.c:291
 #, c-format
 msgid "[Items ]owned by \"%s\""
-msgstr ""
+msgstr "[Element ]som er eigde av «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:294
 #, c-format
 msgid "[Items ]with owner UID \"%s\""
-msgstr ""
+msgstr "[Element ]med eigar-UID «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:297
 #, c-format
 msgid "[Items ]with owner UID other than \"%s\""
-msgstr ""
+msgstr "[Element ]med eigar-UID ulik «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:308
 #, c-format
 msgid "[Items ]larger than %s bytes"
-msgstr ""
+msgstr "[Element ]større enn %s byte"
 
 #: libnautilus-private/nautilus-search-uri.c:311
 #, c-format
 msgid "[Items ]smaller than %s bytes"
-msgstr ""
+msgstr "[Element ]mindre enn %s byte"
 
 #: libnautilus-private/nautilus-search-uri.c:314
 #, c-format
 msgid "[Items ]of %s bytes"
-msgstr ""
+msgstr "[Element ]på %s byte"
 
 #: libnautilus-private/nautilus-search-uri.c:325
 msgid "[Items ]modified today"
-msgstr ""
+msgstr "[Element ]endra i dag"
 
 #: libnautilus-private/nautilus-search-uri.c:328
 msgid "[Items ]modified yesterday"
-msgstr ""
+msgstr "[Element ]endra i går"
 
 #: libnautilus-private/nautilus-search-uri.c:331
 #, c-format
 msgid "[Items ]modified on %s"
-msgstr ""
+msgstr "[Element ]endra %s"
 
 #: libnautilus-private/nautilus-search-uri.c:333
 #, c-format
 msgid "[Items ]not modified on %s"
-msgstr ""
+msgstr "[Element ]ikkje endra %s"
 
 #: libnautilus-private/nautilus-search-uri.c:336
 #, c-format
 msgid "[Items ]modified before %s"
-msgstr ""
+msgstr "[Element ]endra før %s"
 
 #: libnautilus-private/nautilus-search-uri.c:339
 #, c-format
 msgid "[Items ]modified after %s"
-msgstr ""
+msgstr "[Element ]endra etter %s"
 
 #: libnautilus-private/nautilus-search-uri.c:342
 #, c-format
 msgid "[Items ]modified within a week of %s"
-msgstr ""
+msgstr "[Element ]endra innan ei veke frå %s"
 
 #: libnautilus-private/nautilus-search-uri.c:345
 #, c-format
 msgid "[Items ]modified within a month of %s"
-msgstr ""
+msgstr "[Element ]endra innan ein månad frå %s"
 
 #. "%s" here is the name of an Emblem
 #: libnautilus-private/nautilus-search-uri.c:358
 #, c-format
 msgid "[Items ]marked with \"%s\""
-msgstr ""
+msgstr "[Element ]merka med «%s»"
 
 #. "%s" here is the name of an Emblem
 #: libnautilus-private/nautilus-search-uri.c:362
 #, c-format
 msgid "[Items ]not marked with \"%s\""
-msgstr ""
+msgstr "[Element ]ikkje merka med «%s»"
 
 #. "%s" here is a word or words present in the file, for
 #. example "nautilus" or "apple orange"
 #: libnautilus-private/nautilus-search-uri.c:378
 #, c-format
 msgid "[Items ]with all the words \"%s\""
-msgstr ""
+msgstr "[Element ]som inneheld alle orda «%s»"
 
 #. "%s" here is a word or words present in the file, for
 #. example "nautilus" or "apple orange"
 #: libnautilus-private/nautilus-search-uri.c:383
 #, c-format
 msgid "[Items ]containing one of the words \"%s\""
-msgstr ""
+msgstr "[Element ]som inneheld eit av orda «%s»"
 
 #. "%s" here is a word or words present in the file, for
 #. example "nautilus" or "apple orange"
 #: libnautilus-private/nautilus-search-uri.c:388
 #, c-format
 msgid "[Items ]without all the words \"%s\""
-msgstr ""
+msgstr "[Element ]som ikkje inneheld alle orda «%s»"
 
 #. "%s" here is a word or words present in the file, for
 #. example "nautilus" or "apple orange"
 #: libnautilus-private/nautilus-search-uri.c:393
 #, c-format
 msgid "[Items ]without any of the words \"%s\""
-msgstr ""
+msgstr "[Element ]som ikkje inneheld nokon av orda «%s»"
 
 #: libnautilus-private/nautilus-search-uri.c:555
 msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
-msgstr ""
+msgstr "[Element større enn 400KiB] og [utan alle orda «eple appelsin»]"
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4159,72 +4058,58 @@ msgstr ""
 msgid ""
 "[Items larger than 400K], [owned by root and without all the words \"apple "
 "orange\"]"
-msgstr ""
+msgstr "[Element større enn 400KiB], [eig av root og utan alle orda «eple appelsin»]"
 
 #. The beginning of the description of a search that has just been
 #. performed.  The "%s" here is a description of a single criterion,
 #. which in english might be "that contain the word 'foo'"
 #: libnautilus-private/nautilus-search-uri.c:590
-#, fuzzy, c-format
+#, c-format
 msgid "Items %s"
-msgstr "Element 1"
+msgstr "Element %s"
 
 #: libnautilus-private/nautilus-search-uri.c:700
 msgid "Items containing \"stuff\" in their names"
-msgstr ""
+msgstr "Element som har «ting» i namnet"
 
 #: libnautilus-private/nautilus-search-uri.c:702
-#, fuzzy
 msgid "Items that are regular files"
-msgstr "%s er ikkje ei vanleg fil."
+msgstr "Element som er vanlege filer"
 
 #: libnautilus-private/nautilus-search-uri.c:705
 msgid "Items containing \"stuff\" in their names and that are regular files"
-msgstr ""
+msgstr "Element som har «ting» i namnet og er vanlege filer"
 
 #: libnautilus-private/nautilus-search-uri.c:709
 msgid ""
 "Items containing \"stuff\" in their names, that are regular files and "
 "smaller than 2000 bytes"
-msgstr ""
+msgstr "Element som har «ting» i namnet, er vanlege filer og mindre enn 2000 byte"
 
 #: libnautilus-private/nautilus-search-uri.c:713
 msgid "Items containing \"medusa\" in their names and that are folders"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:69
-#, fuzzy
-msgid "Searching Disks"
-msgstr "Søkjer ..."
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
+msgstr "Element som har «medusa» i namnet og er mapper"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Rediger"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:175
-#, fuzzy
 msgid "Undo Edit"
-msgstr "Eining"
+msgstr "Angra redigering"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:176
-#, fuzzy
 msgid "Undo the edit"
-msgstr "Angre på operasjonen"
+msgstr "Angra redigeringa"
 
 # gnome-about/contributors.h:76
 #: libnautilus-private/nautilus-undo-signal-handlers.c:177
-#, fuzzy
 msgid "Redo Edit"
-msgstr "Gergo Érdi"
+msgstr "Gjenopprett redigering"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:178
-#, fuzzy
 msgid "Redo the edit"
-msgstr "Gjer om operasjonen"
+msgstr "Gjenopprett angra redigering"
 
 #: libnautilus-private/nautilus-view-identifier.c:62
 #, c-format
@@ -4232,48 +4117,41 @@ msgid "View as %s"
 msgstr "Vis som %s"
 
 #: libnautilus-private/nautilus-view-identifier.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "%s Viewer"
-msgstr "Bruk framsynar"
+msgstr "%s-framvisar"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:1 src/nautilus-shell-ui.xml.h:1
-#, fuzzy
 msgid "C_lear Text"
-msgstr "_Blank ut Tekst"
+msgstr "F_jern tekst"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:3
-#, fuzzy
 msgid "Cut Text"
 msgstr "Klipp ut tekst"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:4 src/nautilus-shell-ui.xml.h:4
-#, fuzzy
 msgid "Cut _Text"
-msgstr "_Tekst"
+msgstr "Klipp ut _tekst"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:5
-#, fuzzy
 msgid "Cut the selected text to the clipboard"
-msgstr "Kopierer utvalet til utklippstavla"
+msgstr "Klipp ut merka tekst og legg på utklippstavla"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:6
-#, fuzzy
 msgid "Paste the text stored on the clipboard"
-msgstr "Lim inn innhald frå utklippstavla"
+msgstr "Lim inn tekst lagra på utklippstavla"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:7
-#, fuzzy
 msgid "Remove the selected text without putting it on the clipboard"
-msgstr "Kopierer utvalet til utklippstavla"
+msgstr "Fjern den merka teksten utan å leggja han på oppslagstavla"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:19
 msgid "Select _All"
 msgstr "Vel _alt"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:9
-#, fuzzy
 msgid "Select all the text in a text field"
-msgstr "Vel eit tema som skal innstallerast"
+msgstr "Merk all teksten i eit tekstfelt"
 
 #: libnautilus/nautilus-clipboard-ui.xml.h:11 src/nautilus-shell-ui.xml.h:40
 msgid "_Paste Text"
@@ -4285,30 +4163,27 @@ msgstr ""
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
-msgstr ""
+msgstr "Endra korleis filer vert handsama"
 
 #: nautilus-file-management-properties.desktop.in.h:2
-#, fuzzy
 msgid "File Management"
-msgstr "Fileigar:"
+msgstr "Filhandsaming"
 
 #: nautilus-home.desktop.in.h:2
 msgid "View your home folder in the Nautilus file manager"
-msgstr ""
+msgstr "Vis heimemappa i Nautilus-filhandsamaren"
 
-# gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Ny mappe"
+msgstr "Bla gjennom filsystem"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Bla gjennom filsystemet med filhandsamaren"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
-msgstr ""
+msgstr "Fabrikk for Nautilus-skalet og filhandsamaren"
 
 # panel/drawer.c:142 panel/menu-properties.c:617 panel/menu-properties.c:653
 #: src/Nautilus_shell.server.in.h:2
@@ -4316,101 +4191,94 @@ msgid "Icons"
 msgstr "Ikon"
 
 #: src/Nautilus_shell.server.in.h:3
-#, fuzzy
 msgid "Icons Viewer"
-msgstr "Bruk framsynar"
+msgstr "Ikonframvisar"
 
 #: src/Nautilus_shell.server.in.h:4
 msgid "List"
 msgstr "Liste"
 
 #: src/Nautilus_shell.server.in.h:5
-#, fuzzy
 msgid "List Viewer"
-msgstr "Vis liste"
+msgstr "Listeframvisar"
 
 #: src/Nautilus_shell.server.in.h:6
-#, fuzzy
 msgid "Nautilus factory"
-msgstr "Nautilus-tema"
+msgstr "Nautilus-fabrikk"
 
 #: src/Nautilus_shell.server.in.h:7
 msgid "Nautilus file manager component that shows a scrollable list"
-msgstr ""
+msgstr "Filhandsamarkomponent som viser ei rullande liste"
 
 #: src/Nautilus_shell.server.in.h:8
 msgid ""
 "Nautilus file manager component that shows a scrollable list for search "
 "results"
-msgstr ""
+msgstr "Filhansamarkomponent som viser ei rullande liste over søkeresultat"
 
 #: src/Nautilus_shell.server.in.h:9
 msgid "Nautilus file manager component that shows a two-dimensional icon space"
-msgstr ""
+msgstr "Filhandsamarkomponent som viser eit todimensjonalt ikonområde"
 
 #: src/Nautilus_shell.server.in.h:10
 msgid "Nautilus file manager component that shows icons on the desktop"
-msgstr ""
+msgstr "Filhandsamarkomponent som viser ikon på skrivebordet"
 
 #: src/Nautilus_shell.server.in.h:11
 msgid "Nautilus file manager desktop icon view"
-msgstr ""
+msgstr "Skrivebordsikonframsyning i filhandsamaren"
 
 #: src/Nautilus_shell.server.in.h:12
 msgid "Nautilus file manager icon view"
-msgstr ""
+msgstr "Ikonframvising i filhandsamaraen"
 
 #: src/Nautilus_shell.server.in.h:13
 msgid "Nautilus file manager list view"
-msgstr ""
+msgstr "Listeframvising i filhandsamaren"
 
 #: src/Nautilus_shell.server.in.h:14
 msgid "Nautilus file manager search results list view"
-msgstr ""
+msgstr "Listeframvising av søkreresultat i filhandsamaren"
 
 #: src/Nautilus_shell.server.in.h:15
 msgid "Nautilus metafile factory"
-msgstr ""
+msgstr "Metafil-fabrikk for Nautilus"
 
 #: src/Nautilus_shell.server.in.h:16
-#, fuzzy
 msgid "Nautilus shell"
-msgstr "Nautilus-tema"
+msgstr "Nautilus-skal"
 
 #: src/Nautilus_shell.server.in.h:17
 msgid ""
 "Nautilus shell operations that can be done from subsequent command-line "
 "invocations"
 msgstr ""
+"Nautilus skaloperasjonar som kan gjerast av etterfølgjande kommandoar på "
+"kommandolinja"
 
 #: src/Nautilus_shell.server.in.h:18
 msgid "Produces metafile objects for accessing Nautilus metadata"
-msgstr ""
+msgstr "Lagar metafil-objekt til å aksessera Nautilus-metadata"
 
 #: src/Nautilus_shell.server.in.h:19
-#, fuzzy
 msgid "Search List"
-msgstr "Stjerner"
+msgstr "Søkeliste"
 
 #: src/Nautilus_shell.server.in.h:20
-#, fuzzy
 msgid "View as Icons"
 msgstr "Vis som ikon"
 
 #: src/Nautilus_shell.server.in.h:21
-#, fuzzy
 msgid "View as List"
 msgstr "Vis som liste"
 
 #: src/Nautilus_shell.server.in.h:22
-#, fuzzy
 msgid "View as _Icons"
-msgstr "Vis som ikon"
+msgstr "Vis som _ikon"
 
 #: src/Nautilus_shell.server.in.h:23
-#, fuzzy
 msgid "View as _List"
-msgstr "Vis som liste"
+msgstr "Vis som _liste"
 
 #: src/file-manager/fm-desktop-icon-view.c:582
 msgid "Background"
@@ -4421,104 +4289,108 @@ msgstr "Bakgrunn"
 msgid "Empty Trash"
 msgstr "Tøm papirkorga"
 
-#: src/file-manager/fm-directory-view.c:497
-#, fuzzy, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Dette vil slette alle oppføringane lagra i historikken din.\n"
-"Er du sikker på at du vil gjere dette?"
-
-#: src/file-manager/fm-directory-view.c:499
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:541
+#, c-format
 msgid "Open %d Windows?"
-msgstr "Opne nytt vindauge"
+msgstr "Opna %d vindauge?"
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Er du sikker på at du vil opna alle filene?"
 
-#: src/file-manager/fm-directory-view.c:823
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Dette vil opna %d nye vindauge."
+
+#: src/file-manager/fm-directory-view.c:898
+#, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "Er du sikker på at du vil fjerna malen '%s'?"
+msgstr "Er du sikker på at du vil fjerna «%s» for godt?"
 
-#: src/file-manager/fm-directory-view.c:827
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:902
+#, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
+msgstr "Er du sikker på at du vil fjerna dei %d sletta elementa for godt?"
+
+# gmenu/main.c:106
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Dersom du slettar eit element, går det tapt for alltid."
 
 # gtk/gtkfilesel.c:959
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Slett?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Vel teikn"
+msgstr "Vel mønster"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "Mønster"
+msgstr "_Mønster:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
-msgstr "«%s»  vald"
+msgstr "«%s» vald"
 
-#: src/file-manager/fm-directory-view.c:1587
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
-msgstr "ikkje noke prosjekt valt"
+msgstr "1 mappe vald"
 
-#: src/file-manager/fm-directory-view.c:1590
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1751
+#, c-format
 msgid "%d folders selected"
-msgstr "%s sesjon valt"
+msgstr "%d mapper vald"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
-msgstr "(inneheld 0 element)"
+msgstr " (inneheld 0 element)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (inneheld 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1601
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1762
+#, c-format
 msgid " (containing %d items)"
-msgstr "%s (%d element)"
+msgstr "(inneheld %d element)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
-msgstr ""
+msgstr " (inneheld til saman 0 element)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
-msgstr ""
+msgstr " (inneheld til saman 1 element)"
 
 # gtk/gtkfontsel.c:771
-#: src/file-manager/fm-directory-view.c:1612
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1773
+#, c-format
 msgid " (containing a total of %d items)"
-msgstr "%i skrifttypar tilgjengeleg med totalt %i stilar."
+msgstr " (inneheld til saman %d element)"
 
-#: src/file-manager/fm-directory-view.c:1625
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1786
+#, c-format
 msgid "\"%s\" selected (%s)"
-msgstr "Legg til valde filer"
+msgstr "«%s» vald (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1790
+#, c-format
 msgid "%d items selected (%s)"
-msgstr "Gøym valde rader"
+msgstr "%d element valde (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1797
+#, c-format
 msgid "1 other item selected (%s)"
-msgstr "Sorter valde celler"
+msgstr "1 anna element vald (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:1800
+#, c-format
 msgid "%d other items selected (%s)"
-msgstr "Gøym valde rader"
+msgstr "%d andre element valde (%s)"
 
 #. This is marked for translation in case a localizer
 #. * needs to change ", " to something else. The comma
@@ -4527,126 +4399,133 @@ msgstr "Gøym valde rader"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
-msgstr ""
+msgstr "%s%s, %s"
 
 #. Note that the number of items actually displayed varies somewhat due
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
-msgstr ""
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
+msgstr "Mappa «%s» inneheld fleire filer enn Nautilus kan handsama."
 
-#: src/file-manager/fm-directory-view.c:1800
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Somme filer vil ikkje verta viste."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
-msgstr "For mange opne filer"
+msgstr "For mange filer"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr ""
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "Kan ikkje flytta fila til papirkorga. Vil du sletta fila for godt?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr ""
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Fila «%s» kan ikkje flyttast til papirkorga."
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
-msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Kan ikkje flytta elementa til papirkorga. Vil du sletta dei for godt?"
+
+#: src/file-manager/fm-directory-view.c:3220
+msgid "Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Kan ikkje flytta somme element til papirkorga. Vil du sletta dei for godt?"
 
 # gmenu/treedel.c:130 gmenu/treedel.c:153
-#: src/file-manager/fm-directory-view.c:3049
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
-msgstr "Slett denne menyoppføringa?"
+msgstr "Slett no?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, fuzzy, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "Er du sikker på at du vil sletta denne overføringa?"
+#: src/file-manager/fm-directory-view.c:3259
+#, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Er du sikker på at du vil fjerna «%s» frå papirkorga for godt?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
+"trash?"
+msgstr ""
+"Er du sikker på at du vil fjerna dei %d merka elementa frå papirkorga for "
+"godt?"
 
-#: src/file-manager/fm-directory-view.c:3091
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Dersom du slettar eit element, går det tapt for alltid."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
-msgstr "S_lett format"
+msgstr "Slett frå papirkorga?"
 
 # gmenu/main.c:106
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
+#, c-format
 msgid "Use \"%s\" to open the selected item"
-msgstr "Slett vald menyoppføring"
+msgstr "Bruk «%s» til å opna det valde elementet"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
-msgstr "_Anna program"
+msgstr "_Anna program ..."
 
-#: src/file-manager/fm-directory-view.c:3491
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
-msgstr "Legg til program ..."
+msgstr "Eit _program ..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
-msgstr "Andre ..."
+msgstr "Annan fram_visar ..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
-msgstr "Vis ..."
+msgstr "Ein fram_visar ..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
-msgstr ""
+msgstr "Klarte ikkje å fullføra den valde handlinga: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
-msgstr ""
+msgstr "Klarte ikkje å fullfåra den valde handlinga."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
-msgstr ""
+msgstr "Køyr «%s» på alle valde element."
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Lag dokument frå malen «%s»"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr "Alle køyrbare filer i denne mappa vert viste i Skript-menyen."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
+"Eit skript som vert vald frå menyen vert køyrt med alle merka filer som "
+"inndata."
 
-#: src/file-manager/fm-directory-view.c:4359
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
-msgstr "Om Dia"
+msgstr "Om skript"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4667,358 +4546,354 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
+"Alle køyrbare filer i denne mappa vil verta synlege i Skript-menyen. Å velja "
+"eit skript frå menyen vil køyra det skriptet.\n"
+"\n"
+"Når skriptet vert køyrt frå ei lokal mappe, vil skriptet få namna på dei "
+"merka filene som argument. Når skriptet vert køyrt frå ei ekstern mappe (t."
+"d. ei vev- eller ftp-framsyning) får skriptet ingen argument.\n"
+"\n"
+"I alle tilfelle vert desse miljøvariablane satt av Nautilus:\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: stiar til valde filer, skilde med "
+"linjeskift (berre når lokalt)\n"
+"\n"
+"NAUTILUS_SCRIPT_SELECTED_URIS: URI-ar til valde filer, skilde med "
+"linjeskift\n"
+"\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI til den aktive adressa\n"
+"\n"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: plassering av og storleik på det aktive "
+"vindauget"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
-msgstr ""
+msgstr "«%s» vert flytta dersom du vel «Lim inn filer»"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
-msgstr ""
+msgstr "«%s» vert kopiert dersom du vel «Lim inn filer»"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
-msgid ""
-"The %d selected items will be moved if you select the Paste Files command"
-msgstr ""
+msgid "The %d selected items will be moved if you select the Paste Files command"
+msgstr "Dei %d valde elementa vert flytta dersom du vel «Lim inn filer»"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
-msgid ""
-"The %d selected items will be copied if you select the Paste Files command"
-msgstr ""
+msgid "The %d selected items will be copied if you select the Paste Files command"
+msgstr "Dei %d valde elementa vert kopierte dersom du vel «Lim inn filer»"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
-msgstr ""
+msgstr "Det er ingenting å lima inn på utklippstavla."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
-msgstr "Ukjend feil"
+msgstr "Monteringsfeil"
 
-#: src/file-manager/fm-directory-view.c:4737
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
-msgstr "Ukjend feil"
+msgstr "Avmonteringsfeil"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Ukjend feil"
+msgstr "Utløysingsfeil"
 
 # applets/gen_util/mailcheck.c:1130
-#: src/file-manager/fm-directory-view.c:4961
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
-msgstr "Utfør"
+msgstr "Løys _ut"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
-msgstr "Auk lydstyrke"
+msgstr "_Avmonter volum"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "Opne i eige vindauge"
+msgstr "Opna i nytt vindauge"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Opne i eige vindauge"
+msgstr "Opna i %d nye vindauge"
 
 # gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Ny mappe"
+msgstr "Vis mappe"
 
 # gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Ny mappe"
+msgstr "Vis mapper"
 
-#: src/file-manager/fm-directory-view.c:5073
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
-msgstr "S_lett format"
+msgstr "Sle_tt frå papirkorga"
 
 # gmenu/main.c:106
-#: src/file-manager/fm-directory-view.c:5075
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
-msgstr "Slett vald menyoppføring"
+msgstr "Slett alle dei valde elementa for godt"
 
 # gmenu/main.c:113 gmenu/main.c:143
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
-msgstr "Flytt til papirkorga"
+msgstr "Fly_tt til papirkorga"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
-msgstr ""
+msgstr "Flytt kvart vald element til papirkorga."
 
 # gtk/gtkfilesel.c:959
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
-msgstr "Slett"
+msgstr "Sle_tt"
 
-#: src/file-manager/fm-directory-view.c:5124
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
-msgstr "Lim inn lenke"
+msgstr "Lag len_kjer"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
-msgstr "Lim inn lenke"
+msgstr "Lag len_kje"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
-msgstr ""
+msgstr "_Tøm papirkorga"
 
-#: src/file-manager/fm-directory-view.c:5154
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
-msgstr "O_vervak fil"
+msgstr "Klipp u_t fil"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
-msgstr "O_vervak fil"
+msgstr "Klipp u_t filer"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopier fil"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopier filer"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
+"Denne lenkja peikar på eit mål som ikkje finst. Vil du flytta henne til "
+"papirkorga?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Denne lenkja kan ikkje brukast. Ho har ikkje noko mål."
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Lenkja kan ikkje brukast. Målet «%s» finst ikkje."
 
-#: src/file-manager/fm-directory-view.c:5366
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
-msgstr "Broten"
+msgstr "Broten lenkje"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Vil du køyra «%s» eller visa innhaldet?"
 
-#: src/file-manager/fm-directory-view.c:5429
-msgid "Run or Display?"
-msgstr ""
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "«%s» er ei køyrbar tekstfil."
 
-#: src/file-manager/fm-directory-view.c:5430
-#, fuzzy
-msgid "_Display"
-msgstr "Dagleg"
+#: src/file-manager/fm-directory-view.c:5923
+msgid "Run or Display?"
+msgstr "Køyr eller vis?"
 
 # gnome-terminal/gnome-terminal.c:1523 gnome-terminal/gnome-terminal.c:1540
-#: src/file-manager/fm-directory-view.c:5431
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
-msgstr "Ny terminal"
+msgstr "Køyr i _Terminal"
+
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Vis"
 
 # panel/gnome-run.c:1156
-#: src/file-manager/fm-directory-view.c:5434
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
-msgstr "Køyr"
+msgstr "_Køyr"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
+msgid "Opening \"%s\"."
 msgstr "Opnar «%s»"
 
-#: src/file-manager/fm-directory-view.c:5692
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
-msgstr "Avbroten"
+msgstr "Avbryt opning?"
 
 #: src/file-manager/fm-error-reporting.c:57
-#, fuzzy, c-format
-msgid ""
-"You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr ""
-"Du har ikkje skriveløyve til fila:\n"
-"%s"
+#, c-format
+msgid "You do not have the permissions necessary to view the contents of \"%s\"."
+msgstr "Du har ikkje løyve til å lesa fila «%s»."
 
 #: src/file-manager/fm-error-reporting.c:61
 #, c-format
 msgid "\"%s\" couldn't be found. Perhaps it has recently been deleted."
-msgstr ""
+msgstr "Klarte ikkje å finna «%s». Kanskje ho har vorte sletta nyleg."
 
 #: src/file-manager/fm-error-reporting.c:68
 #, c-format
 msgid "Sorry, couldn't display all the contents of \"%s\"."
-msgstr ""
+msgstr "Klarte ikkje å visa alt innhaldet i «%s»."
 
 #: src/file-manager/fm-error-reporting.c:71
-#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Innhaldet i mappa kunne ikkje visast."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
-msgstr "Feil ved lesing av linje"
+msgstr "Feil under framvising av mappe"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
+msgid "The name \"%s\" is already used in this folder. Please use a different name."
+msgstr "Namnet «%s» er allereie i bruk i denne mappa. Vel eit anna namn."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
-msgid ""
-"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+msgid "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
+"Det er ikkje nokon «%s» i denne mappa. Kanskje elementet nett vart flytta "
+"eller sletta?"
 
-#: src/file-manager/fm-error-reporting.c:112
-#, fuzzy, c-format
+#: src/file-manager/fm-error-reporting.c:113
+#, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
-msgstr ""
-"Du har ikkje skriveløyve til fila:\n"
-"%s"
+msgstr "Du har ikkje løyve til å endra namn på «%s»."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
-msgstr ""
+msgstr "Namnet «%s» er ikkje gyldig. Det inneheld teiknet «/». Bruk eit anna namn."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
-msgstr ""
+msgstr "Namnet «%s» er ikkje gyldig. Bruk eit anna namn."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
+msgstr "Klarte ikkje å gje «%s» nytt namn. Disken er skrivebeskytta."
 
-#: src/file-manager/fm-error-reporting.c:136
-#, fuzzy, c-format
+#: src/file-manager/fm-error-reporting.c:137
+#, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
-msgstr ""
-"Kunne ikkje laga mellombels fil\n"
-"%1:\n"
-"%2"
+msgstr "Klarte ikkje å endra namnet på «%s» til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:143
-#, fuzzy
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Elementet kunne ikkje få nytt namn."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
-msgstr "Gjenverande feilmeldingar:"
+msgstr "Feil under namnebyte"
 
-#: src/file-manager/fm-error-reporting.c:163
-#, fuzzy, c-format
-msgid ""
-"You do not have the permissions necessary to change the group of \"%s\"."
-msgstr ""
-"Du har ikkje skriveløyve til fila:\n"
-"%s"
+#: 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 ikkje løyve til å endra gruppa til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
+msgstr "Klarte ikkje å endra gruppa til «%s». Disken er skrivebeskytta"
 
-#: src/file-manager/fm-error-reporting.c:175
-#, fuzzy, c-format
+#: src/file-manager/fm-error-reporting.c:177
+#, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
-msgstr ""
-"Kunne ikkje opna\n"
-"\"%1\""
+msgstr "Klarte ikkje å endra gruppa til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:179
-#, fuzzy
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Klarte ikkje å endra gruppa."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
-msgstr "Feil ved køyring av groff."
+msgstr "Feil under endring av gruppe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
+msgstr "Klarte ikkje å endra eigaren til «%s». Disken er skrivebeskytta"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
-msgstr ""
+msgstr "Klarte ikkje å endra eigaren til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:211
-#, fuzzy
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Klarte ikkje å endra eigar."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
+msgstr "Feil under endring av eigar"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
+msgid "Couldn't change the permissions of \"%s\" because it is on a read-only disk"
+msgstr "Klarte ikkje å endra løyva til «%s». Disken er skrivebeskytta"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
-msgstr ""
+msgstr "Klarte ikkje å endra løyva til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:243
-#, fuzzy
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Løyva kunne ikkje endrast."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
-msgstr ""
-"Feil ved skriving av fil:\n"
-"%s"
+msgstr "Feil under setjing av løyve"
 
-#: src/file-manager/fm-error-reporting.c:309
-#, fuzzy, c-format
+#: src/file-manager/fm-error-reporting.c:312
+#, c-format
 msgid "Renaming \"%s\" to \"%s\"."
-msgstr "Tømer %s i %s"
+msgstr "Byter namn på «%s» til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:314
-#, fuzzy
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
-msgstr "_Endre namn"
+msgstr "Avbryt namnebyte?"
 
 # panel/foobar-widget.c:322
 #: src/file-manager/fm-icon-view.c:161
-#, fuzzy
 msgid "by _Name"
-msgstr "PÃ¥ namn"
+msgstr "etter _namn"
 
 #: src/file-manager/fm-icon-view.c:162
 #: src/file-manager/nautilus-icon-view-ui.xml.h:13
 msgid "Keep icons sorted by name in rows"
-msgstr ""
+msgstr "Sorter ikona i rader etter namn"
 
 # panel/foobar-widget.c:324
 #: src/file-manager/fm-icon-view.c:168
@@ -5028,181 +4903,175 @@ msgstr "etter _storleik"
 #: src/file-manager/fm-icon-view.c:169
 #: src/file-manager/nautilus-icon-view-ui.xml.h:14
 msgid "Keep icons sorted by size in rows"
-msgstr ""
+msgstr "Sorter ikona i rader etter storleik"
 
 # panel/foobar-widget.c:323
 #: src/file-manager/fm-icon-view.c:175
-#, fuzzy
 msgid "by _Type"
-msgstr "Etter type"
+msgstr "etter _type"
 
 #: src/file-manager/fm-icon-view.c:176
 #: src/file-manager/nautilus-icon-view-ui.xml.h:15
 msgid "Keep icons sorted by type in rows"
-msgstr ""
+msgstr "Sorter ikona i rader etter type"
 
 #: src/file-manager/fm-icon-view.c:182
-#, fuzzy
 msgid "by Modification _Date"
-msgstr "Siste endringstid"
+msgstr "etter _siste endringstid"
 
 #: src/file-manager/fm-icon-view.c:183
 #: src/file-manager/nautilus-icon-view-ui.xml.h:12
 msgid "Keep icons sorted by modification date in rows"
-msgstr ""
+msgstr "Sorter ikona i rader etter siste endringstid"
 
 #: src/file-manager/fm-icon-view.c:189
 msgid "by _Emblems"
-msgstr ""
+msgstr "etter m_erke"
 
 #: src/file-manager/fm-icon-view.c:190
 #: src/file-manager/nautilus-icon-view-ui.xml.h:11
 msgid "Keep icons sorted by emblems in rows"
-msgstr ""
+msgstr "Sorter ikona i rader etter merke"
 
 #: src/file-manager/fm-icon-view.c:1605
 #: src/file-manager/nautilus-icon-view-ui.xml.h:20
 msgid "Restore Icons' Original Si_zes"
-msgstr ""
+msgstr "G_jenopprett opprinneleg storleik på ikona"
 
 #: src/file-manager/fm-icon-view.c:1606
 msgid "Restore Icon's Original Si_ze"
-msgstr ""
+msgstr "G_jenopprett opprinneleg storleik på ikonet"
 
-#: src/file-manager/fm-icon-view.c:1961
-#, fuzzy, c-format
+#: src/file-manager/fm-icon-view.c:1962
+#, c-format
 msgid "pointing at \"%s\""
-msgstr "Tastar inn \"%s%s\""
+msgstr "peikar på «%s»"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr ""
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Dra-og-slepp er ikkje støtta."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-#, fuzzy
-msgid "Drag and Drop error"
-msgstr "Drag og slepp handtak"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Dra-og-slepp er berre støtta på lokale filsystem."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr "Dra-og-slepp-feil"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
-msgstr ""
+msgstr "Ein ugyldig dratype vart brukt."
 
-#: src/file-manager/fm-list-view.c:762
-#, fuzzy
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
-msgstr "Fileigar:"
+msgstr "Filnamn"
 
 # applets/tasklist/tasklist_properties.c:276 panel/menu.c:4780
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Storleik"
 
 # panel/menu.c:4771
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
-#, fuzzy
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
-msgstr "Endra:"
+msgstr "Dato endra"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "Du kan ikkje ha meir enn eitt sjølvvald ikon om gongen."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Dra berre eitt bilete for å setja sjølvvald ikon."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
-#, fuzzy
 msgid "More Than One Image"
-msgstr "GÃ¥ tilbake ei melding"
+msgstr "Meir enn eitt bilete"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
+msgid "The file that you dropped is not local."
+msgstr "Fila du sleppte er ikkje lokal."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Du kan berre bruka lokale bilete som sjølvvalde ikon."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
-#, fuzzy
 msgid "Local Images Only"
-msgstr "Last alle bilete"
+msgstr "Berre lokale bilete"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
+msgid "The file that you dropped is not an image."
+msgstr "Fila du sleppte er ikkje eit bilete."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
-msgstr "Kun bileter"
+msgstr "Berre bilete"
 
 # panel/menu.c:5102
-#: src/file-manager/fm-properties-window.c:916
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
-msgstr "Eigenskapar for %s"
+msgstr "Eigenskapar"
 
 # panel/menu.c:5102
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Eigenskapar for %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
-msgstr ""
+msgstr "Avbryt gruppeendring?"
 
-#: src/file-manager/fm-properties-window.c:1381
-#, fuzzy
-msgid "Changing group"
-msgstr "Endrar formatet på %s"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Endrar gruppe."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
-msgstr ""
+msgstr "Avbryt eigarendring?"
 
-#: src/file-manager/fm-properties-window.c:1543
-#, fuzzy
-msgid "Changing owner"
-msgstr "Ved å endra celle:"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Endrar eigar."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ingenting"
 
-#: src/file-manager/fm-properties-window.c:1750
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
-msgstr "Diskant"
+msgstr "uleseleg"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
-msgstr ""
+msgstr "1 element, med storleik %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
-msgstr ""
+msgstr "%d element, totalt %s"
 
-#: src/file-manager/fm-properties-window.c:1772
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
-msgstr ""
-"\n"
-"finst ikkje eller kan ikkje lesast.\n"
+msgstr "(noko uleseleg innhald)"
 
 #. Also set the title field here, with a trailing carriage return &
 #. * space if the value field has two lines. This is a hack to get the
@@ -5210,230 +5079,196 @@ 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:1789
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
-msgstr "Innhald"
+msgstr "Innhald:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Enkel"
 
-#: src/file-manager/fm-properties-window.c:2208
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
-msgstr "Namn"
+msgstr "_Namn:"
 
-#: src/file-manager/fm-properties-window.c:2210
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
-msgstr "Namn"
+msgstr "_Namn:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
-msgstr ""
+msgstr "--"
 
 # applets/tasklist/tasklist_properties.c:276 panel/menu.c:4780
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Storleik:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Stad:"
 
-#: src/file-manager/fm-properties-window.c:2282
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
-msgstr "Auk lydstyrke"
+msgstr "Lydstyrke:"
 
-#: src/file-manager/fm-properties-window.c:2286
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
-msgstr "Freestyle"
+msgstr "Ledig plass:"
 
-#: src/file-manager/fm-properties-window.c:2294
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
-msgstr "MÃ¥l"
+msgstr "Lenkjemål:"
 
-#: src/file-manager/fm-properties-window.c:2300
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
-msgstr "_MIME-type"
+msgstr "MIME-type:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Endra:"
 
-#: src/file-manager/fm-properties-window.c:2315
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
-msgstr "Nekta tilgang"
+msgstr "Aksessert:"
 
-#: src/file-manager/fm-properties-window.c:2331
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
-msgstr "Vel ikon"
+msgstr "_Vel sjølvvald ikon ..."
 
-#: src/file-manager/fm-properties-window.c:2337
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
-msgstr "Fjern merka kolonne"
+msgstr "_Fjern sjølvvald ikon"
 
-#: src/file-manager/fm-properties-window.c:2678
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
-msgstr "Les"
+msgstr "_Lesa"
 
-#: src/file-manager/fm-properties-window.c:2680
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
-msgstr "Skrive"
+msgstr "_Skriva"
 
 # applets/gen_util/mailcheck.c:1130
-#: src/file-manager/fm-properties-window.c:2682
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
-msgstr "Utfør"
+msgstr "_Køyra"
 
-#: src/file-manager/fm-properties-window.c:2759
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
-msgstr "Brukar-ID"
+msgstr "Sett br_ukar-ID"
 
 # help-browser/toc-man.c:22 help-browser/toc2-man.c:24
-#: src/file-manager/fm-properties-window.c:2764
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
-msgstr "Spesialfiler"
+msgstr "Spesielle flagg:"
 
-#: src/file-manager/fm-properties-window.c:2767
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
-msgstr "Prosessgruppe-ID"
+msgstr "Settt gr_uppe-ID"
 
-#: src/file-manager/fm-properties-window.c:2769
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
-msgstr "Festa"
+msgstr "Kli_strande"
 
-#: src/file-manager/fm-properties-window.c:2853
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
-msgstr "Løyve: "
+msgstr "Løyve"
 
 # gmenu/treenew.c:35 gmenu/treenew.c:110
-#: src/file-manager/fm-properties-window.c:2863
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
-msgstr ""
-"Du kan ikkje legge til noko i denne undermenyen.\n"
-"Du har ikkje rette tilgongsrettar."
+msgstr "Du er ikkje eigaren, så du kan ikkje endra desse løyva."
 
-#: src/file-manager/fm-properties-window.c:2876
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Fil_eigar:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Fileigar:"
 
-#: src/file-manager/fm-properties-window.c:2893
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
-msgstr "Filgruppe:"
+msgstr "_Filgruppe:"
 
-#: src/file-manager/fm-properties-window.c:2902
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Filgruppe:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Eigar:"
 
-#: src/file-manager/fm-properties-window.c:2915
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
-msgstr "Gruppe"
+msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/file-manager/fm-properties-window.c:2989
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
-msgstr "Visningstype:"
+msgstr "Tekstframvising:"
 
-#: src/file-manager/fm-properties-window.c:2993
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
-msgstr "Taloppføring"
+msgstr "Talframvising:"
 
 # panel/foobar-widget.c:327
-#: src/file-manager/fm-properties-window.c:2997
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
-msgstr "Etter tid for siste endring"
+msgstr "Sist endra:"
 
-#: src/file-manager/fm-properties-window.c:3003
-#, fuzzy, c-format
+#: src/file-manager/fm-properties-window.c:3030
+#, c-format
 msgid "The permissions of \"%s\" could not be determined."
-msgstr "Fann ikkje klassen '%1'."
+msgstr "Klarte ikkje å fastslå løyva til «%s»"
 
-#: src/file-manager/fm-properties-window.c:3006
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
-msgstr "Fann ikkje klassen '%1'."
+msgstr "Klarte ikkje å fastslå løyva til den valde fila."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, fuzzy, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr "Det oppstod feil under køyring av gdb."
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Ein feil oppstod under vising av hjelp."
 
 # panel/extern.c:780
-#: src/file-manager/fm-properties-window.c:3324
-#, fuzzy
-msgid "Couldn't show help"
-msgstr "Kan ikkje leggja til applet"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "Klarte ikkje å visa hjelp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
-msgstr ""
+msgstr "Avbryt framvising av eigenskapar-vindauget?"
 
 # gsm/session-properties.c:217
-#: src/file-manager/fm-properties-window.c:3662
-#, fuzzy
-msgid "Creating Properties window"
-msgstr "Eigenskapar for økt"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Lagar eigenskapar-vindauget."
 
-#: src/file-manager/fm-properties-window.c:3788
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
-msgstr "Vel ikon"
+msgstr "Vel eit ikon"
 
 #: src/file-manager/fm-search-list-view.c:124
 #, c-format
@@ -5441,97 +5276,111 @@ msgid ""
 "Search results may not include items modified after %s, when your drive was "
 "last indexed."
 msgstr ""
+"Søkeresultatet vil kanskje ikkje inkludera element som er endra etter %s, "
+"som er den datoen indeksen vart oppdatert sist."
 
 #: src/file-manager/fm-search-list-view.c:144
 msgid "Search Results"
 msgstr "Søkeresultat"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Søketenesta Medusa er ikkje tilgjengeleg."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
-#, fuzzy
+msgid "Medusa is not installed."
+msgstr "Medusa er ikkje installert."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
-msgstr "Tenesta er ikkje tilgjengeleg"
+msgstr "Søketenesta er ikkje tilgjengeleg."
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
+"Søket du har valt er nyare enn indeksen på systemet ditt. Søkeresultatet vil "
+"ikkje gje nokon resultat no."
 
-#: src/file-manager/fm-search-list-view.c:196
-#, fuzzy
-msgid "Search for items that are too new"
-msgstr "Søk etter tekst"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Du kan laga ein ny indeks ved å køyra «medusa-indexd» på kommandolinja som "
+"root."
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr "Søk etter element som er for nye"
+
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr "Alle dei indekserte filene på systemet ditt passar med søkekriteria dine."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
+"Du kan kontrollera stavinga på vala dine eller leggja til nye kriterier for "
+"å avgrensa søket."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-#, fuzzy
-msgid "Error during search"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
+msgstr "Feil under søk"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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 ""
+"corrupt."
+msgstr "Kan ikkje opna systemindeksen din. Indeksen kan mangla eller vera øydelagt."
 
-#: src/file-manager/fm-search-list-view.c:214
-#, fuzzy
-msgid "Error reading file index"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Feil under lesing av filindeks"
+
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Ein feil oppstod medan innhaldet i dette søket vart lasta."
 
-#: src/file-manager/fm-search-list-view.c:220
-#, fuzzy, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Ein feil oppstod ved lesing av kategorilista"
+#: src/file-manager/fm-search-list-view.c:240
+msgid "To do a fast search, Find requires an index of the files on your system."
+msgstr "Filene på systemet ditt må vera indekserte for at raske søk skal vera mogleg."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:242
+msgid "To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Filene på systemet ditt må vera indekserte for at innhaldssøk skal vera "
+"mogleg."
+
+#: src/file-manager/fm-search-list-view.c:245
 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 ""
+msgstr "Kan ikkje aksessera indeks. Bruker eit seinare søk i staden."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
-msgstr ""
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Kan ikkje aksessera indeks."
 
-#: src/file-manager/fm-search-list-view.c:253
-#, fuzzy
-msgid "Fast searches are not available"
-msgstr "Tenesta er ikkje tilgjengeleg"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Raske søk er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-#, fuzzy
-msgid "Content searches are not available"
-msgstr "Tenesta er ikkje tilgjengeleg"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Innhaldssøk er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5539,59 +5388,97 @@ msgid ""
 "\n"
 "medusa-searchd"
 msgstr ""
+"Indeksfilene er tilgjengelege, men Medusa-søkenissen, som tek seg av indeks-"
+"førespurnader, køyrer ikkje. For å starta desse programmet, må du logga inn "
+"som root og køyra dette programmet på kommandolinja:\n"
+"\n"
+"medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
+"Ein indeks over filene på systemet ditt trengst for å gjera raske søk. Lagar "
+"indeksen no."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
+"Ein indeks over filene på systemet ditt trengst for å gjera innhaldssøk. "
+"Lagar indeksen no."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-#, fuzzy
-msgid "Indexed searches are not available"
-msgstr "Tenesta er ikkje tilgjengeleg"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr "Kan ikkje bruka indeks. Dette kan ta fleire minutt."
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Innhaldssøk vil verta tilgjengelege når indeksen er ferdig."
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Indeksert søk er ikkje tilgjengeleg"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
+"Ein indeks over filene på systemet ditt trengst for å gjera raske søk. Det "
+"er ingen tilgjengelege indeksar no."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
+"Ein indeks over filene på systemet ditt trengst for å gjera innhaldssøk. Det "
+"er ingen tilgjengelege indeksar no."
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Du kan laga ein indeks ved å køyra «medusa-indexd» på kommandolinja som "
+"root. Søk vil ta lang tid før indeksen er ferdig."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Du kan laga ein indeks ved å køyra «medusa-indexd» på kommandolinja som "
+"root. Innhaldssøk vil ikkje vera mogleg før indeksen er ferdig."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Raske søk er ikkje slått på på maskina di."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:330
 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 ""
+"Ein indeks over filene på systemet ditt trengst for å gjera innhaldssøk. "
+"Systemadministrator har slått av raske søk, så det er ingen tilgjengelege "
+"indeksar."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr ""
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Raske søk er ikkje slått på"
 
 # gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-#: src/file-manager/fm-search-list-view.c:506
-#, fuzzy
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
-msgstr "ingen plass"
+msgstr "Kor"
 
 # help-browser/window.c:151
 #. "Reveal in New Window" means open the parent folder for the
@@ -5599,11 +5486,10 @@ msgstr "ingen plass"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
-#, fuzzy
 msgid "_Reveal in New Window"
-msgstr "_Nytt vindauge"
+msgstr "_Vis i nytt vindauge"
 
 #. "Reveal in n New Windows" means open the parent folder for each
 #. * selected item in a separate new window, select each selected
@@ -5611,390 +5497,365 @@ msgstr "_Nytt vindauge"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
-#, fuzzy, c-format
+#: src/file-manager/fm-search-list-view.c:575
+#, c-format
 msgid "Reveal in %d _New Windows"
-msgstr "Opne i eige vindauge"
+msgstr "Vis i %d _nye vindauge"
 
 #. Note that the number of items actually displayed varies somewhat due
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus fann for mange søketreff til å visa alle."
 
-#: src/file-manager/fm-search-list-view.c:686
-#, fuzzy
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Somme treff vil ikkje verta viste."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
-msgstr "For mange lenkjer"
+msgstr "For mange treff"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:1
-#, fuzzy
 msgid "Change Desktop _Background"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Endra skrivebords_bakgrunn"
 
 # gsm/splash.c:65
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-#, fuzzy
 msgid "Create L_auncher"
-msgstr "Panelet"
+msgstr "Lag oppst_artar"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
-msgstr "Lag ein ny hallo"
+msgstr "Lag ny oppstartar"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
-msgstr "Velg alle celler i reknearket"
+msgstr "Slett alle elementa i papirkorga"
 
 # gnome-terminal/gnome-terminal.c:1523 gnome-terminal/gnome-terminal.c:1540
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
-#, fuzzy
 msgid "Open T_erminal"
-msgstr "Ny terminal"
+msgstr "Opna t_erminal"
 
 # gnome-terminal/gnome-terminal.c:1523 gnome-terminal/gnome-terminal.c:1540
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
-#, fuzzy
 msgid "Open a new GNOME terminal window"
-msgstr "Opprettar eit nytt terminalvindauge"
+msgstr "Opnar eit nytt GNOME-terminalvindauge"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:8
-msgid ""
-"Show a window that lets you set your desktop background's pattern or color"
-msgstr ""
+msgid "Show a window that lets you set your desktop background's pattern or color"
+msgstr "Vis eit vindauge som let deg endra fargen eller mønsteret på skrivebordet."
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
-#, fuzzy
 msgid "Use _Default Background"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Bruk _standardbakgrunn"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:10
-#, fuzzy
 msgid "Use the default desktop background"
-msgstr "Set som skrivebordsbakgrunn"
+msgstr "Bruk standardbakgrunnen på skrivebordet"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:1
 msgid "Choose a program with which to open the selected item"
-msgstr ""
+msgstr "Vel eit program til å opna det valde elementet med"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:2
 msgid "Choose another application with which to open the selected item"
-msgstr ""
+msgstr "Vel eit anna program til å opna det valde elementet med"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:3
 msgid "Choose another viewer with which to view the selected item"
-msgstr ""
+msgstr "Vel ein annan framvisar å visa det valde elementet med"
 
 # panel/menu.c:291 panel/menu.c:1034 panel/menu.c:1051 panel/menu.c:2272
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-#, fuzzy
-msgid "Create _Folder"
-msgstr "Kan ikkje lasta oppføringa"
+msgid "Create _Document"
+msgstr "Lag _dokument"
 
+# panel/menu.c:291 panel/menu.c:1034 panel/menu.c:1051 panel/menu.c:2272
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
-msgstr ""
+msgid "Create _Folder"
+msgstr "Lag _mappe"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Lag ei ny tom fil i denne mappa"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Lag ei ny tom mappe inni denne mappa"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
-msgstr ""
+msgstr "Lag ei symbolsk lenkje til alle dei valde elementa"
 
 # panel/gnome-panel-properties.c:359
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Lag kopi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
-msgstr ""
+msgstr "Slett alle dei valde elementa, utan å flytta til papirkorga."
 
 # gmenu/main.c:106
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
-msgstr "Slett vald menyoppføring"
+msgstr "Lag kopiar av alle dei valde elementa"
 
 # gsm/splash.c:65
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
-msgstr "Panelet"
+msgstr "Rediger oppstartar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
-msgstr ""
+msgstr "Rediger informasjonen om oppstartaren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
-msgstr "Gøym valde kolonner"
+msgstr "Formatter det valde volumet"
 
 # panel/menu.c:5102
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
-msgstr "Eigenskapar for %s"
+msgstr "Eigensk_apar for mediet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Gøym valde kolonner"
+msgstr "Monter det valde volumet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
-msgid ""
-"Move or copy files previously selected by a Cut Files or Copy Files command"
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+msgid "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
+"Flytt eller kopier filer som tidlegare har vorte flytta med ein klipp ut "
+"filer- eller ein kopier filer-kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
+"Flytt eller kopier filer som tidlegare har vorte flytta med ein klipp ut "
+"filer- eller ein kopier filer-kommando til den valde mappa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Ingen malar installerte"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
-msgstr "Opne skuff"
+msgstr "Opna _med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Opne i eige vindauge"
+msgstr "Opna kvart vald element i eit navigasjonsvindauge"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "Opne i eige vindauge"
+msgstr "Opna i navigasjonsvindauge"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
-msgstr "Opne heile mappa i _vindauge"
+msgstr "Opna dei valde elementa i dette vindauget"
 
 # applets/gen_util/printer.c:358
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
-msgstr ""
-"Skrivarapplet let deg nytta dreg-og-slipp for å skriva ut filene via "
-"utskriftskommandoen"
+msgstr "Gjer del valde filene klare til å kopierast med ein «Lim inn filer»-kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
-msgstr ""
+msgstr "Gjer dei valde filene klare til å flyttast med ein «Lim inn filer»-kommando"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
-msgstr ""
+msgstr "V_ern"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
-msgstr "Sorter valde celler"
+msgstr "Vern det valde volumet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
-msgstr "Fjern merka kolonne"
+msgstr "Gje vald element nytt namn"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
-msgstr "Vis liste"
+msgstr "_Still framsyninga tilbake til standardinnstillingane"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
+"Still sorteringsrekkefølgje og forstørring til dei ålmenne innstillingane "
+"til denne framvisinga"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
-msgstr ""
+msgstr "Køyr eller handsam skript frå ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
-msgstr "Vel _alt"
+msgstr "Vel _alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "Mønster"
+msgstr "Vel _mønster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
-msgstr "Vel siste oppføringa i lista"
+msgstr "Vel alle elementa i dette vindauget"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Vel siste oppføringa i lista"
+msgstr "Vel dei elementa som stemmer med eit mønster i dette vindauget"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
-msgstr "Modifiser formateringa itl valde celler"
+msgstr "Vis mediaeigenskapane til det valde volumet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
-msgstr ""
+msgstr "Vis mappa som inneheld skripta som vert viste i denne menyen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
-msgstr ""
+msgstr "Avmonter det valde volumet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
-msgstr ""
+msgstr "Bruk standardbakgrunnen for denne adressa"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
-msgstr "Modifiser formateringa itl valde celler"
+msgstr "Vis eller endra eigenskapane til kvart vald element"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "_Tom fil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
-msgstr "Vermelding"
+msgstr "_Formater"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "Auk lydstyrke"
+msgstr "_Monter volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Opne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
-msgstr "Opne JavaScript-konsollet"
+msgstr "_Opna skriptmappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
-msgstr "O_vervak fil"
+msgstr "_Lim inn filer"
 
 # gmenu/treenew.c:137 gmenu/treenew.c:144 panel/menu.c:797
 # gmenu/treenew.c:118 gmenu/treenew.c:127
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
-msgstr "utan_namn.desktop"
+msgstr "_Lim filer inn i mappe"
 
 # panel/menu.c:5102
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
-msgstr "Eigenskapar for %s"
+msgstr "_Eigenskapar"
 
 # gtk/gtkfilesel.c:1074
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
-msgstr "_Gje nytt namn"
+msgstr "_Gje nytt namn ..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
-msgstr "Senka"
+msgstr "_Skript"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:1
 msgid "Arran_ge Items"
-msgstr ""
+msgstr "_Plasser element"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:2
-#, fuzzy
 msgid "By Modification _Date"
-msgstr "Siste endringstid"
+msgstr "Etter siste _endringstid"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:3
 msgid "By _Emblems"
-msgstr ""
+msgstr "Etter _merke"
 
 # panel/foobar-widget.c:322
 #: src/file-manager/nautilus-icon-view-ui.xml.h:4
-#, fuzzy
 msgid "By _Name"
-msgstr "PÃ¥ namn"
+msgstr "Etter _namn"
 
 # panel/foobar-widget.c:324
 #: src/file-manager/nautilus-icon-view-ui.xml.h:5
-#, fuzzy
 msgid "By _Size"
-msgstr "Etter storleik"
+msgstr "Etter _storleik"
 
 # panel/foobar-widget.c:323
 #: src/file-manager/nautilus-icon-view-ui.xml.h:6
-#, fuzzy
 msgid "By _Type"
-msgstr "Etter type"
+msgstr "Etter _type"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:7
 msgid "Clean _Up by Name"
-msgstr ""
+msgstr "Rydd _opp etter namn"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:8
-#, fuzzy
 msgid "Compact _Layout"
-msgstr "Dialogutsjånad"
+msgstr "Tett p_lassering"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:9
 msgid "Display icons in the opposite order"
-msgstr ""
+msgstr "Vis ikon i omvendt rekkefølge"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:10
 msgid "Keep icons lined up on a grid"
-msgstr ""
+msgstr "Hald ikona justerte i eit rutenett"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Leave icons wherever they are dropped"
-msgstr ""
+msgstr "Lat ikona liggja der dei vert sleppte"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:17
-#, fuzzy
 msgid "Make the selected icon stretchable"
-msgstr "Gøym valde kolonner"
+msgstr "Gjer det valde ikonet strekkbart"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:18
-#, fuzzy
 msgid "Re_versed Order"
-msgstr "Omvendt"
+msgstr "Om_vendt rekkefølgje"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:19
 msgid "Reposition icons to better fit in the window and avoid overlapping"
-msgstr ""
+msgstr "Flytt ikona slik at dei passar betre i vindauget og ikkje overlappar"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:21
 msgid "Restore each selected icon to its original size"
-msgstr ""
+msgstr "Gjenopprett den opprinnelege storleiken til alle ikona"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:22
-#, fuzzy
 msgid "Str_etch Icon"
-msgstr "Vel ikon"
+msgstr "Str_ekk ikon"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:23
 msgid "Toggle using a tighter layout scheme"
-msgstr ""
+msgstr "Slå av/på bruk av tett plassering"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "_Keep Aligned"
-msgstr ""
+msgstr "_Hald justert"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "_Manually"
@@ -6003,126 +5864,145 @@ msgstr "_Manuell"
 #: src/file-manager/nautilus-indexing-info.c:89
 #, c-format
 msgid "Indexing is %d%% complete."
-msgstr ""
+msgstr "Indeksering er %d %% ferdig."
+
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Filene dine vart sist indeksert %s."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
+"Filene dine og tekstinnhaldet vert indeksert ein gong om dagen slik at søka "
+"dine vert raske."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
-#, fuzzy
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
-msgstr "IDE Status"
+msgstr "Indekseringsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr ""
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Filene dine vert indekserte."
 
-#: src/file-manager/nautilus-indexing-info.c:202
-msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+# TRN: duplisert streng (linje 170 vs. 198: Mellomrom i den eine.)
+#: src/file-manager/nautilus-indexing-info.c:198
+msgid "Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
+"Filene dine og tekstinnhaldet vert indeksert ein gong om dagen slik at søka "
+"dine vert raske."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Det finst ingen indeks over filene dine no."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
+"Når raske søk er slått på, vert ein indeks laga over filene dine slik at søk "
+"går raskare. Raske søk er ikkje slått på på datamaskina di, så du har ikkje "
+"nokon indeks no."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr ""
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Finst ingen indeks"
 
-#: src/file-manager/nautilus-indexing-info.c:302
-#, fuzzy
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
-msgstr "Standard fillagrar er ikkje tilgjengeleg."
+msgstr "Medusa-søketenesta er ikkje tilgjengeleg."
+
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Kontroller at Medusa er satt opp ordentleg."
 
 # applets/gen_util/clock.c:191 applets/gen_util/clock.c:395
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
-msgstr "%I:%M %p, %x"
+msgstr "%H.%M, %x"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:1
 msgid "Reveal each selected item in its original folder"
-msgstr ""
+msgstr "Vis kvart valde element i si opprinnelege mappe"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:2
-#, fuzzy
 msgid "Reveal in New Window"
-msgstr "Lag nytt _vindauge"
+msgstr "Vis i nytt vindauge"
 
 # panel/gnome-panel-properties.c:899
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:3
-#, fuzzy
 msgid "Show Indexing Status"
-msgstr "Vis modemstatus"
+msgstr "Vis indekseringsstatus"
 
 # panel/gnome-panel-properties.c:899
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:4
-#, fuzzy
 msgid "Show _Indexing Status"
-msgstr "Vis modemstatus"
+msgstr "Vis _indekseringsstatus"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:5
 msgid "Show status of indexing used when searching"
-msgstr ""
+msgstr "Vis status for indekseringa som vert brukt til søk"
 
-#: src/nautilus-application.c:255
-#, fuzzy
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
+msgstr "Klarte ikkje å laga påkravd mappe"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus klarte ikkje å laga den påkravde mappa «%s»."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
+"Lag denne mappa, eller set opp løyva slik at Nautilus kan laga henne, før du "
+"køyrer Nautilus."
 
-#: src/nautilus-application.c:261
-#, fuzzy
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
+msgstr "Klarte ikkje å laga påkravde mapper"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus klarte ikkje å laga desse mappene: %s"
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
+"Lag desse mappene før du køyrer Nautilus, eller sett løyva slik at Nautilus "
+"kan laga dei."
 
 # applets/desk-guide/deskguide_applet.c:122
-#: src/nautilus-application.c:334
-#, fuzzy
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
-msgstr "Rekkje med skrivebord"
+msgstr "Lenkje til gamalt skrivebord"
+
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr "Ei lenkje som heiter «Lenkje til gamalt skrivebord» er laga på skrivebordet."
 
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
+"Plasseringa av skrivebordsmappa vart endra i GNOME 2.4. Du kan opna lenkja "
+"og flytta over filene du vil ha, og så sletta lenkja."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+# applets/desk-guide/deskguide_applet.c:122
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "Flytta over gamalt skrivebord"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6134,15 +6014,19 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
 "installing Nautilus again."
 msgstr ""
+"Nautilus kan ikkje brukast no. Det kan hjelpa å køyra kommandoen «bonobo-"
+"slay» på kommandolinja. Dersom det ikkje hjelper, kan du prøva å starta "
+"maskina på nytt eller installera Nautilus på nytt."
 
+# TRN: Rapporter feil: «Nautilus_Shell.server» eller «Nautilus_shell.server»?
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6162,6 +6046,23 @@ msgid ""
 "We have also seen this error when a faulty version of bonobo-activation was "
 "installed."
 msgstr ""
+"Nautilus kan ikkje brukast no. Det kan hjelpa å køyra kommandoen «bonobo-"
+"slay» på kommandolinja. Dersom det ikkje hjelper, kan du prøva å starta "
+"maskina på nytt eller installera Nautilus på nytt.\n"
+"\n"
+"Bonobo klarte ikkje å finna fila «Nautilus_shell.server». Ein mogleg årsak "
+"til dette er at LD_LIBRARY_PATH er satt, men mappa som inneheld biblioteket "
+"«bonobo-activation» ikkje er med. Ein annan mogleg grunn er at "
+"installasjonen var mislukka og at fila «Nautilus_shell.server» ikkje vart "
+"lagt inn.\n"
+"Å køyra «bonobo-slay» vil drepa alle Bonobo Activation- og GConf-prosessar, "
+"også dei som vert brukt av andre program.\n"
+"\n"
+"Stundom hjelper det å drepa bonobo-activation-server og gconfd, men me veit "
+"ikkje kvifor.\n"
+"\n"
+"Me har også sett denne feilen når ein defekt versjon av bonobo-activation er "
+"installert."
 
 #. Some misc. error (can never happen with current
 #. * version of bonobo-activation). Show dialog and terminate the
@@ -6171,104 +6072,122 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
-msgstr ""
+msgstr "Nautilus kan ikkje brukast no, pga. ein uventa feil."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
+"Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under "
+"freistnad på å registrera framvisingstenaren i filhandsamaren."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
+"Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under "
+"freistnad på å finna fabrikken. Det kan kanskje hjelpa å drepa bonobo-"
+"activation-server og starta Nautilus på nytt."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
+"Nautilus kan ikkje brukast no pga. ein uventa feil frå Bonobo under "
+"freistnad på å finna skal-objektet. Det kan kanskje hjelpa å drepa bonobo-"
+"activation-server og starta Nautilus på nytt."
+
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Det oppstod feil under vising av hjelp:\n"
+"%s"
 
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
-msgstr ""
+msgstr "Ingen bokmerke definerte"
 
 # help-browser/window.c:213
 #: src/nautilus-bookmarks-window.glade.h:1
-#, fuzzy
 msgid "<b>_Bookmarks</b>"
-msgstr "_Bokmerke"
+msgstr "<b>_Bokmerke</b>"
 
+# TRN: -> Stad, adresse?
 #: src/nautilus-bookmarks-window.glade.h:2
-#, fuzzy
 msgid "<b>_Location</b>"
-msgstr "Plassering"
+msgstr "<b>_Adresse</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
-msgstr ""
+msgstr "<b>_Namn</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:4
-#, fuzzy
 msgid "Edit Bookmarks"
-msgstr "R_ediger bokmerke ..."
+msgstr "Rediger bokmerke"
 
 #: src/nautilus-complex-search-bar.c:200
 msgid "More Options"
 msgstr "Meir val"
 
 #: src/nautilus-complex-search-bar.c:209
-#, fuzzy
 msgid "Fewer Options"
-msgstr "Generelle val"
+msgstr "Færre val"
 
 #. Create button first so we can use it for auto_click
 #: src/nautilus-complex-search-bar.c:227 src/nautilus-simple-search-bar.c:125
-#, fuzzy
 msgid "Find Them!"
-msgstr "Ferdig!"
+msgstr "Finn!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Du må skriva inn eit namn på tenaren."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Kan ikkje opne"
+msgid "Please enter a name and try again."
+msgstr "Skriv inn eit namn og prøv igjen."
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Kan ikkje kopla til tenaren"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "«%s» er ikkje ei gyldig adresse."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, fuzzy, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"Feil i fil \"%s\"\n"
-"på linje %d.\n"
-"Sjekk fila og prøv igjen."
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Kontroller stavinga og prøv igjen."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Netraverse"
+msgstr "Kopla til tenar"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "Namn"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Adresse:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "Conectiva"
+msgstr "Copla til"
 
 # gsm/splash.c:68 panel/menu.c:5224 panel/menu.c:5229 panel/menu.c:5599
 #: src/nautilus-desktop-window.c:356
@@ -6277,82 +6196,77 @@ msgstr "Skrivebord"
 
 #: src/nautilus-file-management-properties.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: src/nautilus-file-management-properties.glade.h:2
-#, fuzzy
 msgid "1 GB"
-msgstr "1 MB"
+msgstr "1 GiB"
 
 #: src/nautilus-file-management-properties.glade.h:5
-#, fuzzy
 msgid "100 KB"
-msgstr "100 K"
+msgstr "100 KiB"
 
 #: src/nautilus-file-management-properties.glade.h:21
-#, fuzzy
 msgid "500 KB"
-msgstr "500 K"
+msgstr "500 KiB"
 
 #: src/nautilus-file-management-properties.glade.h:24
 msgid "<span weight=\"bold\">Behaviour</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Ã…tferd</span>"
 
 #: src/nautilus-file-management-properties.glade.h:25
 msgid "<span weight=\"bold\">Default View</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Standardframsyning</span>"
 
 #: src/nautilus-file-management-properties.glade.h:26
 msgid "<span weight=\"bold\">Executable Text Files</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Køyrbare tekstfiler</span>"
 
 #: src/nautilus-file-management-properties.glade.h:27
 msgid "<span weight=\"bold\">Folders</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Mapper</span>"
 
 #: src/nautilus-file-management-properties.glade.h:28
 msgid "<span weight=\"bold\">Icon Captions</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Ikontekstar</span>"
 
 #: src/nautilus-file-management-properties.glade.h:29
 msgid "<span weight=\"bold\">Icon View Defaults</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Standard for ikonframvising</span>"
 
 #: src/nautilus-file-management-properties.glade.h:30
 msgid "<span weight=\"bold\">List View Defaults</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Standard for listeframvising</span>"
 
 #: src/nautilus-file-management-properties.glade.h:31
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Andre filer som kan førehandsvisast</span>"
 
 #: src/nautilus-file-management-properties.glade.h:32
 msgid "<span weight=\"bold\">Sound Files</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Lydfiler</span>"
 
 #: src/nautilus-file-management-properties.glade.h:33
 msgid "<span weight=\"bold\">Text Files</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Tekstfiler</span>"
 
 #: src/nautilus-file-management-properties.glade.h:34
 msgid "<span weight=\"bold\">Trash</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Papirkorg</span>"
 
 #: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Standard for treframvising</span>"
 
 #: src/nautilus-file-management-properties.glade.h:36
-#, fuzzy
 msgid "Always"
 msgstr "Alltid"
 
 #: src/nautilus-file-management-properties.glade.h:37
 msgid "Ask before _emptying the Trash or deleting files"
-msgstr ""
+msgstr "Spør før _papirkorga vert tømt eller filer vert sletta"
 
 #: src/nautilus-file-management-properties.glade.h:38
-#, fuzzy
 msgid "Behavior"
 msgstr "Ã…tferd"
 
@@ -6361,124 +6275,109 @@ msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
 msgstr ""
+"Vel rekkefølgja informasjonen skal stå i under ikonnamna. Meir informasjon "
+"vil verta synleg etterkvart som du forstørrar."
 
 #: src/nautilus-file-management-properties.glade.h:45
-#, fuzzy
 msgid "Count _number of items:"
-msgstr "_Vis felta ordna:"
+msgstr "Tel kor ma_nge element:"
 
 # gnome-terminal/gnome-terminal.c:2692
 #: src/nautilus-file-management-properties.glade.h:46
-#, fuzzy
 msgid "Default _zoom level:"
-msgstr "Sett forstørringsnivå:"
+msgstr "Standard _forstørringsnivå:"
 
 #: src/nautilus-file-management-properties.glade.h:47
-#, fuzzy
 msgid "File Management Preferences"
-msgstr "Vis brukarval"
+msgstr "Brukarval for filhandsaming"
 
 #: src/nautilus-file-management-properties.glade.h:48
 msgid "I_nclude a Delete command that bypasses Trash"
-msgstr ""
+msgstr "Ta med ei_n slettekommando som ikkje går gjennom papirkorga"
 
 #: src/nautilus-file-management-properties.glade.h:49
-#, fuzzy
 msgid "Icon Captions"
-msgstr "Tittel"
+msgstr "Ikontekstar"
 
 #: src/nautilus-file-management-properties.glade.h:52
-#, fuzzy
 msgid "Local Files Only"
-msgstr "Lokale filer"
+msgstr "Berre lokale filer"
 
 #: src/nautilus-file-management-properties.glade.h:54
-#, fuzzy
 msgid "Never"
 msgstr "Aldri"
 
 #: src/nautilus-file-management-properties.glade.h:56
-#, fuzzy
 msgid "Preview _sound files:"
-msgstr "Lagre lydfil"
+msgstr "Førehandsvis _lydfiler:"
 
 #: src/nautilus-file-management-properties.glade.h:57
-#, fuzzy
 msgid "Show _only folders"
-msgstr "Endre celler som inneheld"
+msgstr "Vis _berre mapper"
 
 #: src/nautilus-file-management-properties.glade.h:58
-#, fuzzy
 msgid "Show _thumbnails:"
-msgstr "Showtunes"
+msgstr "Vis minia_tyrar:"
 
 #: src/nautilus-file-management-properties.glade.h:59
 msgid "Show hidden and _backup files"
-msgstr ""
+msgstr "Vis skjulte _filer og tryggleikskopiar"
 
 # applets/tasklist/tasklist_properties.c:334
 #: src/nautilus-file-management-properties.glade.h:60
-#, fuzzy
 msgid "Show te_xt in icons:"
-msgstr "Syn små ikon"
+msgstr "Vis te_kst i ikon:"
 
 #: src/nautilus-file-management-properties.glade.h:61
-#, fuzzy
 msgid "Sort _folders before files"
-msgstr "Søk katalogar rekursivt for font filer."
+msgstr "Vis mapper _før filer"
 
 #: src/nautilus-file-management-properties.glade.h:62
 msgid "View _new folders using:"
-msgstr ""
+msgstr "Vis _nye mapper med:"
 
 # help-browser/window.c:228
 #: src/nautilus-file-management-properties.glade.h:63
-#, fuzzy
 msgid "Views"
-msgstr "_Vis"
+msgstr "Framvisingar"
 
 #: src/nautilus-file-management-properties.glade.h:64
 msgid "_Arrange items:"
-msgstr ""
+msgstr "Pl_asser element:"
 
 # gnome-terminal/gnome-terminal.c:2692
 #: src/nautilus-file-management-properties.glade.h:66
-#, fuzzy
 msgid "_Default zoom level:"
-msgstr "Sett forstørringsnivå:"
+msgstr "_Standard forstørringsnivå:"
 
 #: src/nautilus-file-management-properties.glade.h:67
 msgid "_Double click to activate items"
-msgstr ""
+msgstr "_Dobbeltklikk for å aktivera element"
 
 #: src/nautilus-file-management-properties.glade.h:68
 msgid "_Only for files smaller than:"
-msgstr ""
+msgstr "_Berre for filer mindre enn:"
 
 #: src/nautilus-file-management-properties.glade.h:69
-#, fuzzy
 msgid "_Run executable text files when they are clicked"
-msgstr "Køyr ved klikk"
+msgstr "_Køyr køyrbare tekstfiler når dei vert klikka"
 
 #: src/nautilus-file-management-properties.glade.h:70
 msgid "_Single click to activate items"
-msgstr ""
+msgstr "_Enkeltklikk for å aktivera element"
 
 # applets/tasklist/tasklist_properties.c:334
 #: src/nautilus-file-management-properties.glade.h:71
-#, fuzzy
 msgid "_Text beside icons"
-msgstr "Syn små ikon"
+msgstr "_Tekst attmed ikon"
 
 #: src/nautilus-file-management-properties.glade.h:72
-#, fuzzy
 msgid "_Use compact layout"
-msgstr "Bruk interpolasjon"
+msgstr "_Bruk tett plassering"
 
 #: src/nautilus-file-management-properties.glade.h:73
-#, fuzzy
 msgid "_View executable text files when they are clicked"
-msgstr "Køyr ved klikk"
+msgstr "_Vis køyrbare tekstfiler når dei vert klikka"
 
 #: src/nautilus-first-time-druid.c:40
 msgid ""
@@ -6487,167 +6386,184 @@ msgid ""
 "\n"
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
+"At denne fila finst, tyder på at oppsettsvegvisaren til Nautilus har\n"
+"vorte køyrt.\n"
+"\n"
+"Du kan få fram vegvisaren igjen ved å sletta denne fila.\n"
+
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "Du kan ikkje tileigna meir enn eitt sjølvvald ikon om gongen."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Du kan berre bruka bilete som sjølvvalde ikon."
 
 # gtk/gtkcolorsel.c:227
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
-msgstr "Opne med %s"
+msgstr "Opna med %s"
 
 #. Catch-all button after all the others.
 #: src/nautilus-information-panel.c:911
 msgid "Open with..."
-msgstr "Opne med ..."
+msgstr "Opna med ..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Klarte ikkje å starta CD-brennar-programmet."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+# gsm/splash.c:65
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
+msgstr "Klarte ikkje å starta CD-brennar"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
-#, fuzzy
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
-msgstr "Tøm papirkorga"
+msgstr "_Tøm papirkorga"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
-msgstr ""
+msgstr "_Skriv innhaldet på ein CD"
 
 #: src/nautilus-location-bar.c:62
 msgid "Go To:"
 msgstr "GÃ¥ til:"
 
-#: src/nautilus-location-bar.c:154
-#, fuzzy, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Vil du nullstilla lista over ignorerte ord i alle dokument?"
+#: src/nautilus-location-bar.c:155
+#, c-format
+msgid "Do you want to view %d locations?"
+msgstr "Vil du visa %d adresser?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
-msgstr ""
+msgstr "Visa i fleire vindauge?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Kopier lenkjeadresse"
+msgstr "Opna adresse"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
-msgstr ""
+msgstr "Gjennomfør eit sett med raske sjølvtestar."
 
-#: src/nautilus-main.c:190
-#, fuzzy
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
-msgstr ""
-"Opprett det første vindauget med gitt geometi.\n"
-"Sjå X(1) for GEOMETRY-formatet"
+msgstr "Lag det fyrste vindauget med den oppgjevne geometrien."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
-msgstr ""
+msgstr "Berre lag vindauge for eksplisitt oppgjevne URI-ar."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
+"Ikkje teikn opp skrivebordet (oversjå kva som er stilt inn i "
+"brukarvaldialogen)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "opna eit nettlesarvindauge."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
-msgstr "Avslutt Nautilus"
+msgstr "Avslutt Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
-msgstr "Start om att Nautilus"
+msgstr "Start Nautilus om att."
 
-#: src/nautilus-main.c:233
-#, fuzzy
+#: src/nautilus-main.c:234
 msgid "File Manager"
-msgstr "Fileigar:"
+msgstr "Filhandsamar"
 
 # gsm/splash.c:69
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
-msgstr ""
+msgstr "nautilus: --check kan ikkje brukast med URI-ar.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
-msgstr ""
+msgstr "nautilus: --check kan ikkje brukast med andre flagg.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
-msgstr ""
+msgstr "nautilus: --quit kan ikkje brukast med URI-ar.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
-msgstr ""
+msgstr "nautilus: --restart kan ikkje brukast med URI-ar.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
-msgstr ""
+msgstr "nautilus: --geometry kan ikkje brukast med meir enn ein URI.\n"
 
+# TRN: Feilmeld: Søt vits, men kan ikkje omsetjast.
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Er du sikker på at du vil fjerna loggen?"
+
+# TRN: Feilmeld: Søt vits, men kan ikkje omsetjast.
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
-#, fuzzy
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "Er du sikker på at du vil fjerne ALLE oversetjingar frå po-fila?"
+msgstr "Er du sikker på at du vil tømma lista over adresser du har vitja?"
+
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Dersom du tømmer adresselista, forsvinn adressane for godt."
 
 # help-browser/window.c:240
-#: src/nautilus-navigation-window-menus.c:194
-#, fuzzy
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
-msgstr "Framover i historikken"
+msgstr "Tøm loggen"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
+"Vil du fjerna alle bokmerkene til den ikkje-eksisterande adressa frå lista "
+"di?"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Adressa «%s» finst ikkje."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
-msgstr ""
+msgstr "Bokmerke til adresse som ikkje finst"
 
 # help-browser/bookmarks.c:242
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Fjern"
 
 #: src/nautilus-navigation-window-ui.xml.h:1
-#, fuzzy
 msgid "Add a bookmark for the current location to this menu"
-msgstr "Legg til eit bokmerke for den gjeldande sida til standardmappa"
+msgstr "Legg til eit bokmerke for den gjeldande adressa i denne menyen"
 
 #: src/nautilus-navigation-window-ui.xml.h:2
 msgid "Back"
@@ -6655,179 +6571,171 @@ msgstr "Tilbake"
 
 #: src/nautilus-navigation-window-ui.xml.h:3
 msgid "Change the visibility of this window's location bar"
-msgstr ""
+msgstr "Endra om adresselinja vert vist i dette vindauget"
 
 #: src/nautilus-navigation-window-ui.xml.h:4
 msgid "Change the visibility of this window's sidebar"
-msgstr ""
+msgstr "Endra om sidestolpen vert vist i dette vindauget"
 
 #: src/nautilus-navigation-window-ui.xml.h:5
 msgid "Change the visibility of this window's statusbar"
-msgstr ""
+msgstr "Endra om statuslinja vert vist i dette vindauget"
 
 #: src/nautilus-navigation-window-ui.xml.h:6
 msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr ""
+msgstr "Tøm innhaldet i Gå-menyen og fram/tilbake-listene"
 
 # applets/tasklist/tasklist_menu.c:316
 #: src/nautilus-navigation-window-ui.xml.h:7
-#, fuzzy
 msgid "Close _All Windows"
-msgstr "Lukk vindauge"
+msgstr "Lukk _alle vindauga"
 
 # applets/tasklist/tasklist_menu.c:316
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Lukk alle Galeon vindauge"
+msgstr "Lukk alle navigeringsvindauga"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Kopla til _tenar ...."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr ""
+msgstr "Vis eit vindauge som let deg redigera bokmerkene i denne menyen"
 
 #: src/nautilus-navigation-window-ui.xml.h:12 src/nautilus-shell-ui.xml.h:10
 msgid "Find"
-msgstr "Søk etter"
+msgstr "Finn"
 
 #: src/nautilus-navigation-window-ui.xml.h:13
 msgid "Forward"
 msgstr "Fram"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-#, fuzzy
-msgid "Go to the next visited location"
-msgstr "GÃ¥ til spesifisert addresse"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "GÃ¥ til malmappa"
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-#, fuzzy
-msgid "Go to the previous visited location"
-msgstr "GÃ¥ til spesifisert addresse"
+msgid "Go to the next visited location"
+msgstr "GÃ¥ til neste vitja adresse"
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-#, fuzzy
-msgid "Go to the trash folder"
-msgstr "GÃ¥ til siste melding"
+msgid "Go to the previous visited location"
+msgstr "Gå til førre vitja adresse"
 
 #: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
+msgstr "GÃ¥ til papirkorga"
+
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Heim"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
-msgstr "Opna"
+msgstr "A_dresselinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
-msgstr "Les"
+msgstr "Les på nytt"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
-msgstr "Søk katalogar rekursivt for font filer."
+msgstr "Leit etter filer på denne datamaskina"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
-msgstr "&Statuslinje"
+msgstr "St_atuslinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Opp"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
-msgstr ""
+msgstr "Skriv til CD"
 
 # help-browser/window.c:158
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Legg til bokmerke"
 
 # help-browser/window.c:173
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Til_bake"
 
 # help-browser/window.c:213
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bokmerke"
 
 # help-browser/window.c:208
-#: src/nautilus-navigation-window-ui.xml.h:28
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
-msgstr "_Historikk"
+msgstr "_Tøm logg"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Datamaskin"
+msgstr "_Datamaskin"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
-msgstr "R_ediger bokmerke ..."
+msgstr "R_ediger bokmerke"
 
 # help-browser/window.c:176
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Framover"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_GÃ¥"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Heim"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
-msgstr "Plassering"
+msgstr "_Adresse ..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
-msgstr "Vis _sidepanel"
+msgstr "_Sidepanel"
+
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Malar"
 
 # gsm/gsm-client-row.c:56
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
-msgstr "Papirkorg"
+msgstr "_Papirkorg"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
-msgstr "Opp"
+msgstr "_Opp"
 
 # help-browser/window.c:228
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
 #: src/nautilus-navigation-window.c:338
-#, fuzzy
 msgid "Information"
-msgstr "Internasjonalt"
+msgstr "Informasjon"
 
 #. Add "View as..." extra bonus choice.
 #: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
@@ -6835,250 +6743,255 @@ msgid "View as..."
 msgstr "Vis som ..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Fileigar:"
+msgstr "Filframvisar: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
+# gnome-terminal/gnome-terminal.c:2060
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Eitt av sidepanela støtte på ein feil og kan ikkje halda fram."
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Kan diverre ikkje seia kva for eit."
 
-#: src/nautilus-navigation-window.c:1103
+# gnome-terminal/gnome-terminal.c:2060
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Sidepanelet %s støtte på ein feil og kan ikkje halda fram."
 
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Dersom dette skjer fleire gongar vil du kanskje slå av dette panelet."
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Vis _sidepanel"
+msgstr "Sidepanelet feila"
 
-#: src/nautilus-navigation-window.c:1239
-#, fuzzy
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
-msgstr "Vis _sidepanel"
+msgstr "Sidepanel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
-msgstr ""
+msgstr "Inneheld ei sidepanelframvising"
 
 #: src/nautilus-profiler.c:209
-#, fuzzy
 msgid "Print"
-msgstr "Port:"
+msgstr "Skriv ut"
 
 #: src/nautilus-profiler.c:210
-#, fuzzy
 msgid "Save"
-msgstr "Rave"
+msgstr "Lagra"
 
+# TRN: Finn ut kva dette er, og finn eit betre ord enn «dump».
 #: src/nautilus-profiler.c:246
 #, fuzzy
 msgid "Profile Dump"
-msgstr "_Skrivar"
+msgstr "Profildump"
 
 #. set the title and standard close accelerator
 #: src/nautilus-property-browser.c:270
-#, fuzzy
 msgid "Backgrounds and Emblems"
-msgstr "Bakgrunnsbilete"
+msgstr "Bakgrunnar og merke"
 
 # help-browser/bookmarks.c:242
 #: src/nautilus-property-browser.c:386
-#, fuzzy
 msgid "_Remove..."
-msgstr "Fjern ..."
+msgstr "Fje_rn..."
 
 # gsm/session-properties-capplet.c:247 gsm/session-properties-capplet.c:301
 #: src/nautilus-property-browser.c:407
-#, fuzzy
 msgid "_Add new..."
-msgstr "Legg til ny ..."
+msgstr "_Legg til ny ..."
 
 #: src/nautilus-property-browser.c:913
 #, c-format
 msgid "Sorry, but pattern %s couldn't be deleted."
-msgstr ""
+msgstr "Klarte ikkje å sletta mønsteret «%s»."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-#, fuzzy
-msgid "Couldn't delete pattern"
-msgstr "Kunne ikkje fjerna malen"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Kontroller at du har dei løyva som trengst for å sletta mønsteret."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
+msgstr "Klarte ikkje å sletta mønster"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
-msgstr ""
+msgstr "Klarte ikkje å sletta merket «%s»."
 
-#: src/nautilus-property-browser.c:981
-#, fuzzy
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Kontroller at du har dei løyva som trengst for å sletta merket."
+
+# panel/extern.c:780
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Klarte ikkje å sletta merket"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
-msgstr "Lag nytt sample"
+msgstr "Lag nytt merke:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
-#, fuzzy
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
-msgstr "Nøkkelord:"
+msgstr "Nø_kkelord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
-#, fuzzy
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
-msgstr "Bilete:"
+msgstr "B_ilete:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
-msgstr ""
+msgstr "Vel ei biletefil for det nye merket:"
 
-#: src/nautilus-property-browser.c:1040
-#, fuzzy
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
-msgstr "Lag ein ny hallo"
+msgstr "Lag ein ny farge:"
 
 # panel/menu.c:4752 panel/panel_config.c:1570 panel/panel_config.c:1585
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
-#, fuzzy
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
-msgstr "Farge:"
+msgstr "Farge_namn:"
 
 # gnome-terminal/gnome-terminal.glade.h:49
-#: src/nautilus-property-browser.c:1070
-#, fuzzy
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
-msgstr "Fargepalett:"
+msgstr "Farge_verdi:"
 
-#: src/nautilus-property-browser.c:1101
-#, fuzzy, c-format
+#: src/nautilus-property-browser.c:1104
+#, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
-msgstr ""
-"Dette er inga gyldig PO-fil:\n"
-"%1"
+msgstr "«%s» er ikkje eit gyldig filnamn."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
-msgstr ""
+msgstr "Du oppgav ikkje eit gyldig filnamn."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-#, fuzzy
-msgid "Couldn't install pattern"
-msgstr "Klatre oppdatere merke!"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Prøv igjen."
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr "Klarte ikkje å installera mønster"
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
-msgstr ""
+msgstr "Du kan ikkje erstatta nullstill-biletet."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Nullstill er eit spesielt bilete som ikkje kan erstattast."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ikkje eit bilete"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
-msgstr ""
+msgstr "Klarte ikkje å installera mønsteret «%s»."
 
-#: src/nautilus-property-browser.c:1167
-#, fuzzy
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
-msgstr "Vel fil som skal opnast:"
+msgstr "Vel ei biletefil å leggja til som eit mønster"
+
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Klarte ikkje å installera fargen"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
-msgstr ""
+msgstr "Du må oppgje eit ikkje-tomt namn på den nye fargen"
 
-#: src/nautilus-property-browser.c:1229
-#, fuzzy
-msgid "Couldn't install color"
-msgstr ""
-"Kunne ikkje lesa fil:\n"
-"%s"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "Klarte ikkje å installera farge"
 
-#: src/nautilus-property-browser.c:1281
-#, fuzzy
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
-msgstr "Vel katalog som skal leggast til:"
+msgstr "Vel farge å leggja til"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr ""
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "«%s» er ikkje ei brukande biletefil."
 
-#: src/nautilus-property-browser.c:2041
-#, fuzzy
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Fila er ikkje eit bilete."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
-msgstr "Vel teikn"
+msgstr "Vel kategori:"
 
 # gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868
 # gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514
 # gtk/gtkgamma.c:424
 # gsm/session-properties.c:332
-#: src/nautilus-property-browser.c:2050
-#, fuzzy
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
-msgstr "Avbryt innlogging"
+msgstr "_Avbryt fjern"
 
-#: src/nautilus-property-browser.c:2056
-#, fuzzy
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
-msgstr "Legg til ny MIME-type ..."
+msgstr "_Legg til nytt mønster ..."
 
-#: src/nautilus-property-browser.c:2059
-#, fuzzy
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
-msgstr "Legg til kolonne ..."
+msgstr "_Legg til ny farge ..."
 
-#: src/nautilus-property-browser.c:2062
-#, fuzzy
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
-msgstr "Legg til ny MIME-type ..."
+msgstr "_Legg til nytt merke ..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
-msgstr ""
+msgstr "Klikk på eit mønster for å fjerna det."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
-msgstr ""
+msgstr "Klikk på ein farge for å fjerna han."
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
-msgstr ""
+msgstr "Klikk på eit merke for å fjerna det."
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mønster:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Fargar:"
 
-#: src/nautilus-property-browser.c:2106
-#, fuzzy
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
-msgstr "Døme:"
+msgstr "Merke:"
 
 # panel/menu.c:5020
-#: src/nautilus-property-browser.c:2126
-#, fuzzy
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
-msgstr "Fjern dette panelet ..."
+msgstr "Fje_rn eit mønster ..."
 
-#: src/nautilus-property-browser.c:2129
-#, fuzzy
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
-msgstr "Farge på side ..."
+msgstr "Fje_rn ein farge ..."
 
 # panel/menu.c:5020
-#: src/nautilus-property-browser.c:2132
-#, fuzzy
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
-msgstr "Fjern dette panelet ..."
+msgstr "Fje_rn eit merke ..."
 
 #. Menu item in the search bar.
 #. Bracketed items are context, and are message
@@ -7089,170 +7002,160 @@ msgstr "Fjern dette panelet ..."
 #. will not be used.
 #: src/nautilus-search-bar-criterion.c:73
 msgid "[Search for] Name [contains \"fish\"]"
-msgstr ""
+msgstr "[Søk etter] Namn [Inneheld «fisk»]"
 
 #: src/nautilus-search-bar-criterion.c:74
 msgid "[Search for] Content [includes all of \"fish tree\"]"
-msgstr ""
+msgstr "[Søk etter] Innhald [Inkluderer alle av «fisk tre»]"
 
 #: src/nautilus-search-bar-criterion.c:75
 msgid "[Search for] Type [is regular file]"
-msgstr ""
+msgstr "[Søk etter] Type [er vanleg fil]"
 
 #: src/nautilus-search-bar-criterion.c:76
 msgid "[Search for] Size [larger than 400K]"
-msgstr ""
+msgstr "[Søk etter] Storleik [større enn 400 KiB]"
 
 #: src/nautilus-search-bar-criterion.c:77
 msgid "[Search for] With Emblem [includes \"Important\"]"
-msgstr ""
+msgstr "[Søk etter] Med merke [har «Viktig»]"
 
 #: src/nautilus-search-bar-criterion.c:78
 msgid "[Search for] Last Modified [before yesterday]"
-msgstr ""
+msgstr "[Søk etter] Sist endra [før i går]"
 
 #: src/nautilus-search-bar-criterion.c:79
 msgid "[Search for] Owner [is not root]"
-msgstr ""
+msgstr "[Søk etter] Eigar [er ikkje root]"
 
 #: src/nautilus-search-bar-criterion.c:85
-#, fuzzy
 msgid "[File name] contains [help]"
-msgstr ""
-"Kan ikkje laga heimekatalog\n"
-"Feil: %1"
+msgstr "[Filnamn] inneheld [hjelp]"
 
 #: src/nautilus-search-bar-criterion.c:86
 msgid "[File name] starts with [nautilus]"
-msgstr ""
+msgstr "[Filnamn] startar med [nautilus]"
 
 #: src/nautilus-search-bar-criterion.c:87
 msgid "[File name] ends with [.c]"
-msgstr ""
+msgstr "[Filnamn] sluttar med [.c]"
 
 #: src/nautilus-search-bar-criterion.c:88
 msgid "[File name] matches glob [*.c]"
-msgstr ""
+msgstr "[Filnamn] passar til jokerstreng [*.c]"
 
 #: src/nautilus-search-bar-criterion.c:89
 msgid "[File name] matches regexp [\"e??l.$\"]"
-msgstr ""
+msgstr "[Filnamn] passar til regulært uttrykk [«e??l.$»]"
 
 #: src/nautilus-search-bar-criterion.c:94
 msgid "[File content] includes all of [apple orange]"
-msgstr ""
+msgstr "[Filinnhald] inneheld alle av [eple appelsin]"
 
 #: src/nautilus-search-bar-criterion.c:95
 msgid "[File content] includes any of [apply orange]"
-msgstr ""
+msgstr "[Filinnhald] inneheld minst ein av [eple appelsin]"
 
 #: src/nautilus-search-bar-criterion.c:96
 msgid "[File content] does not include all of [apple orange]"
-msgstr ""
+msgstr "[Filinnhald] inneheld ikkje alle av [eple appelsin]"
 
 #: src/nautilus-search-bar-criterion.c:97
 msgid "[File content] includes none of [apple orange]"
-msgstr ""
+msgstr "[Filinnhald] inneheld ingen av [eple appelsin]"
 
 #: src/nautilus-search-bar-criterion.c:103
 msgid "[File type] is [folder]"
-msgstr ""
+msgstr "[Filtype] er [mappe]"
 
 #: src/nautilus-search-bar-criterion.c:104
-#, fuzzy
 msgid "[File type] is not [folder]"
-msgstr "Finn ikkje fila %s"
+msgstr "[Filtype] er ikkje [mappe]"
 
 #: src/nautilus-search-bar-criterion.c:109
-#, fuzzy
 msgid "[File type is] regular file"
-msgstr "%s er ikkje ei vanleg fil."
+msgstr "[Filtype er] regulært uttrykk"
 
 #: src/nautilus-search-bar-criterion.c:110
-#, fuzzy
 msgid "[File type is] text file"
-msgstr "Katalog for førehandsval fil:"
+msgstr "[Filtype er] tekstfil"
 
 #: src/nautilus-search-bar-criterion.c:111
-#, fuzzy
 msgid "[File type is] application"
-msgstr "Fjern program"
+msgstr "[Filtype er] program"
 
 #: src/nautilus-search-bar-criterion.c:112
 msgid "[File type is] folder"
-msgstr ""
+msgstr "[Filtype er] mappe"
 
 #: src/nautilus-search-bar-criterion.c:113
-#, fuzzy
 msgid "[File type is] music"
-msgstr "Filtype:"
+msgstr "[Filtype er] musikk"
 
 #: src/nautilus-search-bar-criterion.c:118
 msgid "[File size is] larger than [400K]"
-msgstr ""
+msgstr "[Filstorleik er] større enn [400 KiB]"
 
 #: src/nautilus-search-bar-criterion.c:119
 msgid "[File size is] smaller than [300K]"
-msgstr ""
+msgstr "[Filstorleik er] mindre enn [300 KiB]"
 
 #: src/nautilus-search-bar-criterion.c:124
 msgid "[With emblem] marked with [Important]"
-msgstr ""
+msgstr "[Med merke] merka [Viktig]"
 
 #: src/nautilus-search-bar-criterion.c:125
 msgid "[With emblem] not marked with [Important]"
-msgstr ""
+msgstr "[Med merke] ikkje merka [Viktig]"
 
 #: src/nautilus-search-bar-criterion.c:130
-#, fuzzy
 msgid "[Last modified date] is [1/24/00]"
-msgstr "Sist endra dato:"
+msgstr "[Sist endra dato] er [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:131
 msgid "[Last modified date] is not [1/24/00]"
-msgstr ""
+msgstr "[Sist endra dato] er ikkje [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:132
 msgid "[Last modified date] is after [1/24/00]"
-msgstr ""
+msgstr "[Sist endra dato] er etter [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:133
 msgid "[Last modified date] is before [1/24/00]"
-msgstr ""
+msgstr "[Sist endra dato] er før [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:135
-#, fuzzy
 msgid "[Last modified date] is today"
-msgstr "Sist endra dato:"
+msgstr "[Sist endra dato] er i dag"
 
 #: src/nautilus-search-bar-criterion.c:136
-#, fuzzy
 msgid "[Last modified date] is yesterday"
-msgstr "Siste endringstid"
+msgstr "[Sist endra dato] er i går"
 
 #: src/nautilus-search-bar-criterion.c:138
 msgid "[Last modified date] is within a week of [1/24/00]"
-msgstr ""
+msgstr "[Sist endra dato] er innan ei veke rundt [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:139
 msgid "[Last modified date] is within a month of [1/24/00]"
-msgstr ""
+msgstr "[Sist endra dato] er innan ein månad rundt [24/1/2000]"
 
 #: src/nautilus-search-bar-criterion.c:158
-#, fuzzy
 msgid "[File owner] is [root]"
-msgstr "Gruppa til fileigar"
+msgstr "[Fileigar] er [root]"
 
 #: src/nautilus-search-bar-criterion.c:159
-#, fuzzy
 msgid "[File owner] is not [root]"
-msgstr "Filopnar har ikkje nokon id"
+msgstr "[Fileigar] er ikkje [root]"
 
 #: src/nautilus-server-connect.c:132
 msgid ""
 "Couldn't execute nautilus\n"
 "Make sure nautilus is in your path and correctly installed"
 msgstr ""
+"Klarte ikkje å køyra Nautilus\n"
+"Kontroller at du har Nautilus i søkestien og at Nautilus er ordentleg "
+"installert"
 
 #: src/nautilus-server-connect.c:395
 #, c-format
@@ -7261,137 +7164,126 @@ msgid ""
 "Please make sure that the address is correct and alternatively, type in this "
 "address in the file manager directly"
 msgstr ""
+"Klarte ikkje å kopla til URI %s\n"
+"Kontroller at adressa er rett. Du kan også prøva å skriva denne adressa "
+"direkte i filhandsamaren"
 
 #: src/nautilus-server-connect.c:460
 msgid ""
 "Glade file for the connect to server program is missing.\n"
 "Please check your installation of nautilus"
 msgstr ""
+"Glade-fila til programmet som skal kopla til tenaren manglar.\n"
+"Kontroller Nautilus-installasjonen din"
 
 #: src/nautilus-server-connect.desktop.in.h:1
 msgid "Add a new server to your Network Servers and connect to it"
-msgstr ""
+msgstr "Legg til ein ny tenar under «nettverkstenarar» og kopla til han."
 
 #: src/nautilus-server-connect.desktop.in.h:2
 #: src/nautilus-server-connect.glade.h:2
-#, fuzzy
 msgid "New Server"
-msgstr "New Wave"
+msgstr "Ny tenar"
 
 #: src/nautilus-server-connect.glade.h:1
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: src/nautilus-server-connect.glade.h:3
-#, fuzzy
 msgid "_Connect"
-msgstr "Conectiva"
+msgstr "_Kopla til"
 
 #: src/nautilus-shell-ui.xml.h:2
 msgid "Choose a view for the current location, or modify the set of views"
-msgstr ""
+msgstr "Vel ei framsyning av den noverande adressa, eller endra framvisingssettet"
 
 #: src/nautilus-shell-ui.xml.h:3
 msgid "Close this window"
-msgstr "Lukk vindauge"
+msgstr "Lukk dette vindauget"
 
 #: src/nautilus-shell-ui.xml.h:5
-#, fuzzy
 msgid "Display Nautilus help"
-msgstr "Nautilus-tema"
+msgstr "Vis Nautilus-hjelp"
 
 #: src/nautilus-shell-ui.xml.h:6
 msgid "Display credits for the creators of Nautilus"
-msgstr ""
+msgstr "Vis kven som laga Nautilus"
 
 #: src/nautilus-shell-ui.xml.h:7
 msgid ""
 "Display patterns, colors, and emblems that can be used to customize "
 "appearance"
-msgstr ""
+msgstr "Vis fargar, mønster og merke som kan brukast til å endra utsjånaden"
 
 #: src/nautilus-shell-ui.xml.h:8
-#, fuzzy
 msgid "Display the latest contents of the current location"
-msgstr "Vis det nyaste innhaldet i aktiv side"
+msgstr "Vis det nyaste innhaldet i den noverande sida"
 
 #: src/nautilus-shell-ui.xml.h:9
-#, fuzzy
 msgid "Edit Nautilus preferences"
-msgstr "Migrer bokmerke og innstillingar"
+msgstr "Endra Nautilus-brukarval"
 
 #: src/nautilus-shell-ui.xml.h:11
-#, fuzzy
 msgid "Go to Empty CD folder"
-msgstr "GÃ¥ til siste melding"
+msgstr "GÃ¥ til tom CD-mappe"
 
 #: src/nautilus-shell-ui.xml.h:12
 msgid "Go to the home location"
-msgstr "GÃ¥ til heimeplassering"
+msgstr "GÃ¥ til heimeadressa"
 
 #: src/nautilus-shell-ui.xml.h:13
 msgid "Go up one level"
-msgstr ""
+msgstr "Gå opp eit nivå"
 
 # panel/gnome-panel-properties.c:528
 #: src/nautilus-shell-ui.xml.h:14
-#, fuzzy
 msgid "Normal Si_ze"
-msgstr "Normal flis"
+msgstr "Normal _storleik"
 
 #: src/nautilus-shell-ui.xml.h:15
-#, fuzzy
 msgid "Prefere_nces"
-msgstr "Brukarval"
+msgstr "_Brukarval"
 
 #: src/nautilus-shell-ui.xml.h:16
 msgid "Report Profiling"
-msgstr ""
+msgstr "Rapporter profilering"
 
 # gnome-terminal/gnome-terminal.c:1548 gnome-terminal/gnome-terminal.c:1577
 #: src/nautilus-shell-ui.xml.h:17
-#, fuzzy
 msgid "Reset Profiling"
-msgstr "_Nullstill terminal"
+msgstr "Nullstill profilering"
 
 #: src/nautilus-shell-ui.xml.h:20
-#, fuzzy
 msgid "Show the contents at the normal size"
-msgstr "Sett biletestorleiken tilbake til den vanlege storleiken"
+msgstr "Vis innhaldet i normal storleik"
 
 #: src/nautilus-shell-ui.xml.h:21 src/nautilus-zoom-control.c:96
-#, fuzzy
 msgid "Show the contents in less detail"
-msgstr "Send gjeldande fil i e-post"
+msgstr "Vis innhaldet mindre detaljert"
 
 #: src/nautilus-shell-ui.xml.h:22 src/nautilus-zoom-control.c:95
-#, fuzzy
 msgid "Show the contents in more detail"
-msgstr "_Vis felta ordna:"
+msgstr "Vis innhaldet meir detaljert"
 
 #: src/nautilus-shell-ui.xml.h:23
-#, fuzzy
 msgid "Start Profiling"
-msgstr "Start opptak"
+msgstr "Start profilering"
 
 #: src/nautilus-shell-ui.xml.h:24
-#, fuzzy
 msgid "Stop Profiling"
-msgstr "Stopp spelinga"
+msgstr "Stopp profilering"
 
 #: src/nautilus-shell-ui.xml.h:25
-#, fuzzy
 msgid "Stop loading this location"
-msgstr "Kopier lenkjeadresse"
+msgstr "Stopp lasting av denne adressa."
 
 #: src/nautilus-shell-ui.xml.h:26
-#, fuzzy
 msgid "Undo the last text change"
-msgstr "Gjer om siste handling"
+msgstr "Gjer om siste tekstendring"
 
 #: src/nautilus-shell-ui.xml.h:28
 msgid "Write contents to a CD"
-msgstr ""
+msgstr "Skriv innhaldet til ein CD"
 
 #: src/nautilus-shell-ui.xml.h:29
 msgid "Zoom _In"
@@ -7403,16 +7295,16 @@ msgstr "For_minsk"
 
 #: src/nautilus-shell-ui.xml.h:31
 msgid "_About"
-msgstr ""
+msgstr "_Om"
 
 #: src/nautilus-shell-ui.xml.h:32
-#, fuzzy
 msgid "_Backgrounds and Emblems"
-msgstr "Bakgrunnsbilete"
+msgstr "_Bakgrunnar og merke"
 
+# TRN: Feilmeld: Duplisert streng: «CD _Creator» ein annan stad
 #: src/nautilus-shell-ui.xml.h:33
 msgid "_CD Creator"
-msgstr ""
+msgstr "_CD-brennar"
 
 # applets/tasklist/tasklist_menu.c:316
 #: src/nautilus-shell-ui.xml.h:34
@@ -7424,7 +7316,6 @@ msgid "_Contents"
 msgstr "_Innhald"
 
 #: src/nautilus-shell-ui.xml.h:37
-#, fuzzy
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -7438,246 +7329,252 @@ msgid "_Help"
 msgstr "_Hjelp"
 
 #: src/nautilus-shell-ui.xml.h:41
-#, fuzzy
 msgid "_Profiler"
-msgstr "_Skrivar"
+msgstr "_Profilering"
 
 #: src/nautilus-shell-ui.xml.h:42
-#, fuzzy
 msgid "_Reload"
-msgstr "Les"
+msgstr "_Les på ny"
 
 #: src/nautilus-shell-ui.xml.h:43
-#, fuzzy
 msgid "_Report Profiling"
-msgstr "Arbeid _fråkopla"
+msgstr "_Rapporter profilering"
 
 # gnome-terminal/gnome-terminal.c:1548 gnome-terminal/gnome-terminal.c:1577
 #: src/nautilus-shell-ui.xml.h:44
-#, fuzzy
 msgid "_Reset Profiling"
-msgstr "_Nullstill terminal"
+msgstr "_Nullstill profilering"
 
 #: src/nautilus-shell-ui.xml.h:45
-#, fuzzy
 msgid "_Start Profiling"
-msgstr "Start opptak"
+msgstr "_Start profilering"
 
 #: src/nautilus-shell-ui.xml.h:46
-#, fuzzy
 msgid "_Stop"
-msgstr "Stopp"
+msgstr "_Stopp"
 
 #: src/nautilus-shell-ui.xml.h:47
-#, fuzzy
 msgid "_Stop Profiling"
-msgstr "Stopp spelinga"
+msgstr "_Stopp profilering"
 
 #: src/nautilus-shell-ui.xml.h:48
 msgid "_Undo"
-msgstr "_Angre"
+msgstr "_Angra"
 
 #: src/nautilus-shell-ui.xml.h:50
 msgid "_View as..."
 msgstr "_Vis som ..."
 
 #: src/nautilus-shell-ui.xml.h:51
-#, fuzzy
 msgid "_Write to CD"
-msgstr "Skrive"
+msgstr "_Skriv til CD"
 
 # panel/basep-widget.c:885
 #: src/nautilus-side-pane.c:395
-#, fuzzy
 msgid "Close the side pane"
-msgstr "Gøym dette panelet"
+msgstr "Lukk sidepanelet"
 
 #: src/nautilus-side-pane.c:566
-#, fuzzy, c-format
+#, c-format
 msgid "Show %s"
-msgstr "Regnbyer"
+msgstr "Vis %s"
 
+# TRN: Feilmeld: Duplisert streng: «_CD Creator» ein annan stad
 #: src/nautilus-spatial-window-ui.xml.h:1
 msgid "CD _Creator"
-msgstr ""
+msgstr "_CD-brennar"
 
-# applets/tasklist/tasklist_menu.c:316
+# panel/menu.c:291 panel/menu.c:1034 panel/menu.c:1051 panel/menu.c:2272
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "Lukk vindauge"
+msgid "Close P_arent Folders"
+msgstr "Lukk forelderm_appene"
+
+# panel/basep-widget.c:885
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Lukk foreldra til denne mappa"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Datamaskin"
+msgstr "GÃ¥ til datamaskin"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "GÃ¥ til siste melding"
+msgstr "GÃ¥ til CD-brennar"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "Plassering"
+msgstr "Opna _adresse ..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+# TRN: Feilmeld: To snøggtastar
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "Opna _forelder"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "Opne JavaScript-konsollet"
+msgstr "Opna foreldermappe"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "Mønster"
+msgstr "_Stader"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
 msgstr "Finn:"
 
 #: src/nautilus-view-frame.c:595
-#, fuzzy
 msgid "a title"
-msgstr "Tittel"
+msgstr "ein tittel"
 
 #: src/nautilus-view-frame.c:604
 msgid "the browse history"
-msgstr ""
+msgstr "nettlesarloggen"
 
 #: src/nautilus-view-frame.c:613
-#, fuzzy
 msgid "the current selection"
-msgstr "Venstre seksjon:"
+msgstr "noverande merking"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "typen vindauge framvisinga er bakt inn i"
 
 #: src/nautilus-window-manage-views.c:817
-#, fuzzy
 msgid "View Failed"
-msgstr "Syn kalender"
+msgstr "Framvising feila"
 
+# gnome-terminal/gnome-terminal.c:2060
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
+msgid "The %s view encountered an error and can't continue."
+msgstr "Framvisinga %s støtte på ein feil og kan ikkje halda fram."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Du kan v velja ein anna framvisar eller gå til ei annadresse.a adress"
 
 # gnome-terminal/gnome-terminal.c:2060
 #: src/nautilus-window-manage-views.c:839
-#, fuzzy, c-format
+#, c-format
 msgid "The %s view encountered an error while starting up."
-msgstr ""
-"Det har skjedd ein feil under forsøk på å logge inn.\n"
-"\n"
-"%s"
+msgstr "Framsyninga %s støtte på ein feil under oppstart."
 
-#: src/nautilus-window-manage-views.c:986
-#, fuzzy
-msgid "Content View"
-msgstr "Bruk framsynar"
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Adressa kan ikkje visast med denne framvisaren."
 
 #: src/nautilus-window-manage-views.c:987
-#, fuzzy
-msgid "View of the current file or folder"
-msgstr "GÃ¥ til siste melding"
+msgid "Content View"
+msgstr "Innhaldsframvisar"
 
-#: src/nautilus-window-manage-views.c:1239
-#, fuzzy, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Feil i fil \"%s\"\n"
-"på linje %d.\n"
-"Sjekk fila og prøv igjen."
+#: src/nautilus-window-manage-views.c:988
+msgid "View of the current file or folder"
+msgstr "Framvising av noverande fil eller mappe"
 
-#: src/nautilus-window-manage-views.c:1259
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
+msgid "Couldn't find \"%s\"."
+msgstr "Klarte ikkje å finna «%s»."
 
-#: src/nautilus-window-manage-views.c:1267
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr ""
+msgid "Couldn't display \"%s\"."
+msgstr "Klarte ikkje å visa «%s»."
+
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus kan ikkje fastslå filtypen."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr ""
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "Nautilus har ikkje installert nokon framvisarar som kan visa denne filtypen."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr ""
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus kan ikkje handsama «%s»-adresser."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr ""
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Klarte ikkje å logga inn."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Tilgang vart nekta."
 
-#: src/nautilus-window-manage-views.c:1309
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Kan ikkje visa «%s». Klarte ikkje finna verten «%s»."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1319
+msgid "Check that the spelling is correct and that your proxy settings are correct."
+msgstr "Kontroller stavinga og mellomtenarinnstillingane."
+
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Kontroller mellomtenarinnstillingane."
+
+# TRN: «Master browser»?
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Kontroller at ein SMB-tenar køyrer på det lokale nettverket."
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
+"Søking er ikkje tilgjengeleg no. Anten har du ikkje nokon indeks, eller så "
+"køyrer ikkje søketenesta."
 
-#: src/nautilus-window-manage-views.c:1332
-#, fuzzy
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Kontroller at du har starta Medusa-søketenesta. Dersom du ikkje har nokon "
+"indeks må du også kontrollera at Medusa-indekseraren køyrer."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
-msgstr "Tenesta er ikkje tilgjengeleg"
+msgstr "Søk er ikkje tilgjengeleg"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
-msgstr ""
+msgstr "Nautilus kan ikkje visa «%s»."
 
-#: src/nautilus-window-manage-views.c:1342
-#, fuzzy
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Vel ein annan framvisar og prøv igjen."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
-msgstr "/Spel av adresse"
+msgstr "Kan ikkje visa adresse"
 
 #: src/nautilus-window-menus.c:214
-#, fuzzy
 msgid "Go to the location specified by this bookmark"
-msgstr "GÃ¥ til neste stad i historikklista"
+msgstr "GÃ¥ til adressa i dette bokmerket"
 
 #. Localize to deal with issues in the copyright
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Opphavsrett © 1999-2001 Eazel, Inc."
 
@@ -7685,63 +7582,65 @@ msgstr "Opphavsrett © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
-#, fuzzy
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
-msgstr "Omsetjarar"
+msgstr ""
+"Omsett til norsk (nynorsk) av\n"
+"Roy-Magne Mo <rmo@sunnmore.net>\n"
+"Åsmund Skjæveland <aasmunds@fys.uio.no>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
+"Nautilus er eit grafisk skal for GNOME. Nautilus gjer det enkelt å handsama "
+"filene dine og styra resten av systemet."
 
 #: src/nautilus-window-toolbars.c:361
 msgid "Go back a few pages"
-msgstr ""
+msgstr "GÃ¥ tilbake nokre sider"
 
 #: src/nautilus-window-toolbars.c:364
 msgid "Go forward a number of pages"
-msgstr ""
+msgstr "GÃ¥ framover nokre sider"
 
-#: src/nautilus-window.c:902
-#, fuzzy, c-format
+#: src/nautilus-window.c:907
+#, c-format
 msgid "Display this location with \"%s\""
-msgstr "Vis denne teksta og avslutt."
+msgstr "Vis denne adressa med «%s»"
 
-# panel/distribution.c:31
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Nettverk"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Skrifttyper"
+msgstr "Skrifttypar"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Drakter"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "GÃ¥ til siste melding"
+msgstr "CD-brennar"
 
-#: src/nautilus-window.c:1610
-#, fuzzy
+#: src/nautilus-window.c:1624
 msgid "Application ID"
-msgstr "Program"
+msgstr "Program-ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
-msgstr ""
+msgstr "Program-ID til vindauget."
 
-#: src/nautilus-window.c:1617
-#, fuzzy
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Program"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
-msgstr ""
+msgstr "NautilusApplication kopla til dette vindauget."
 
 #: src/nautilus-zoom-control.c:83
 msgid "Zoom In"
@@ -7752,32 +7651,98 @@ msgid "Zoom Out"
 msgstr "Forminsk"
 
 #: src/nautilus-zoom-control.c:85
-#, fuzzy
 msgid "Zoom to Fit"
-msgstr "Forminsk"
+msgstr "Tilpass til vindauget"
 
+# TRN: Skaler kva? Eit bilete?
 #: src/nautilus-zoom-control.c:97
-#, fuzzy
 msgid "Try to fit in window"
-msgstr "Vis kun eitt vindauge"
+msgstr "Prøv å skalera slik at det passar i vindauget."
 
 #: src/nautilus-zoom-control.c:796
-#, fuzzy
 msgid "Zoom"
-msgstr "Forstørr"
+msgstr "Vis større/mindre"
 
 #: src/nautilus-zoom-control.c:802
 msgid "Set the zoom level of the current view"
-msgstr ""
+msgstr "Sett forstørring/forminsking av den noverande framvisinga"
 
 #: src/network-scheme.desktop.in.h:1
-#, fuzzy
 msgid "Network Servers"
-msgstr "Netraverse"
+msgstr "Nettverkstenarar"
 
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
-msgstr ""
+msgstr "Vis nettverkstenarane dine i Nautilus"
+
+#, fuzzy
+#~ msgid "Searching Disks"
+#~ msgstr "Søkjer ..."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory for maskinvarevising"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Maskinvarevisar"
+
+#~ msgid "Hardware view"
+#~ msgstr "Maskinvarevising"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Vis som maskinvare"
+
+#~ msgid "hardware view"
+#~ msgstr "maskinvarevising"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "namn på ikonet til maskinvarevising"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "oppsummering av informasjon om maskinvarevising"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K storleik på mellomlageret"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB minne"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB minne"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Oppetida er %d dagar, %d timar og %d minutt"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Oversyn over maskinvare"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Dette er ein plasshaldar for CPU-sida"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Dette er ein plasshaldar for RAM-sida."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Dette er ein plasshaldar for IDE-sida."
+
+#, fuzzy
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "Feil i fil \"%s\"\n"
+#~ "på linje %d.\n"
+#~ "Sjekk fila og prøv igjen."
 
 #~ msgid "Unknown"
 #~ msgstr "Ukjend"
@@ -7803,6 +7768,10 @@ msgstr ""
 #~ msgid "ISO 9660 Volume"
 #~ msgstr "ISO 9660 volum"
 
+#, fuzzy
+#~ msgid "Open _in This Window"
+#~ msgstr "Opne i eige vindauge"
+
 # applets/desk-guide/deskguide_applet.c:101
 #, fuzzy
 #~ msgid "Dis_ks"
@@ -7813,26 +7782,6 @@ msgstr ""
 #~ msgstr "Monter/avmonter drev"
 
 #, fuzzy
-#~ msgid "Open _in This Window"
-#~ msgstr "Opne i eige vindauge"
-
-#, fuzzy
-#~ msgid "Open _in New Window"
-#~ msgstr "Opne i eige vindauge"
-
-# gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
-#~ msgid "_New Folder"
-#~ msgstr "_Ny mappe"
-
-#, fuzzy
-#~ msgid "Sort in _reverse"
-#~ msgstr "Vis med denne sortering"
-
-#, fuzzy
-#~ msgid "Use _manual layout"
-#~ msgstr "Bruk interpolasjon"
-
-#, fuzzy
 #~ msgid "_Open activated item in a new window"
 #~ msgstr "Opne i eige vindauge"
 
@@ -7840,9 +7789,9 @@ msgstr ""
 #~ msgid "Go to the Start Here folder"
 #~ msgstr "GÃ¥ til siste melding"
 
-# help-browser/window.c:151
-#~ msgid "New _Window"
-#~ msgstr "_Nytt vindauge"
+#, fuzzy
+#~ msgid "Open New _Window"
+#~ msgstr "Opne i eige vindauge"
 
 #~ msgid "_Find"
 #~ msgstr "_Finn"
@@ -7859,18 +7808,25 @@ msgstr ""
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "GÃ¥ til spesifisert addresse"
 
+# gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+#~ msgid "_New Folder"
+#~ msgstr "_Ny mappe"
+
 #, fuzzy
-#~ msgid "Authentication Required"
-#~ msgstr "Slett valet"
+#~ msgid "Sort in _reverse"
+#~ msgstr "Vis med denne sortering"
 
 #, fuzzy
-#~ msgid "_Location:"
-#~ msgstr "Stad:"
+#~ msgid "Use _manual layout"
+#~ msgstr "Bruk interpolasjon"
+
+# help-browser/window.c:151
+#~ msgid "New _Window"
+#~ msgstr "_Nytt vindauge"
 
-# panel/menu.c:3920
 #, fuzzy
-#~ msgid "You cannot copy the Trash."
-#~ msgstr "Du kan ikkje fjerne det siste panelet:"
+#~ msgid "Authentication Required"
+#~ msgstr "Slett valet"
 
 #, fuzzy
 #~ msgid "F_onts"
@@ -7925,9 +7881,6 @@ msgstr ""
 #~ msgid "Copy Text"
 #~ msgstr "Kopier tekst"
 
-#~ msgid "Paste Text"
-#~ msgstr "Lim inn tekst"
-
 #~ msgid "Select All"
 #~ msgstr "Vel alle"
 
@@ -8016,10 +7969,6 @@ msgstr ""
 #~ msgid "(none)"
 #~ msgstr "(ingen)"
 
-#, fuzzy
-#~ msgid "Themes"
-#~ msgstr "_Times"
-
 # help-browser/window.c:151
 #, fuzzy
 #~ msgid "New Window Behavior"
@@ -8092,11 +8041,6 @@ msgstr ""
 #~ msgid "Always show text in icons"
 #~ msgstr "Syn små ikon"
 
-# applets/tasklist/tasklist_properties.c:334
-#, fuzzy
-#~ msgid "Show text in icons for local files"
-#~ msgstr "Syn små ikon"
-
 #, fuzzy
 #~ msgid "Always show the number of items in folders"
 #~ msgstr "_Vis felta ordna:"
@@ -8701,10 +8645,6 @@ msgstr ""
 #~ msgstr "Vel ei bilete"
 
 #, fuzzy
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "%s er ikkje ei vanleg fil."
-
-#, fuzzy
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Vel fila som skal lagrast"
 
@@ -8727,10 +8667,6 @@ msgstr ""
 #~ msgid "cover image"
 #~ msgstr "Vel ei bilete"
 
-#, fuzzy
-#~ msgid "Sorry, but there was an error reading %s."
-#~ msgstr "Det oppstod feil under køyring av gdb."
-
 # gtk/gtkfilesel.c:959
 #~ msgid "Delete"
 #~ msgstr "Slett"
@@ -8763,10 +8699,6 @@ msgstr ""
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#, fuzzy
-#~ msgid "Couldn't load %s"
-#~ msgstr "Kunne ikkje laste modul"
-
 # gnome-hint/gnome-hint.c:39
 #~ msgid "Loading %s"
 #~ msgstr "Lastar %s"
@@ -9314,18 +9246,12 @@ msgstr ""
 #~ msgid "(see: "
 #~ msgstr "(sjå: "
 
-#~ msgid "(see also: "
-#~ msgstr "(sjå også: "
-
 #~ msgid "_Index:"
 #~ msgstr "_Indeks:"
 
 #~ msgid "Select Al_l"
 #~ msgstr "Vel a_lle"
 
-#~ msgid "Select _None"
-#~ msgstr "Vel i_ngen"
-
 #, fuzzy
 #~ msgid "Show indexes for:"
 #~ msgstr "Vis med denne sortering"
@@ -9765,3 +9691,4 @@ msgstr ""
 
 #~ msgid "Close"
 #~ msgstr "Lukk"
+
diff --git a/po/no.po b/po/no.po
index 80323b01a..d4d47c2f3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,17 +1,21 @@
+# translation of no.po to Norwegian Nynorsk
 # Norwegian translation of Nautilus (Bokmål dialect).
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@online.no>, 2000.
+# Copyright (C) 2000-2003 Free Software Foundation, Inc.
+# Kjartan Maraas <kmaraas@gnome.org>, 2000-2003.
+# Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Nautilus 0.2\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-09-06 09:52+0200\n"
-"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
-"Language-Team: Norwegian <no@li.org>\n"
+"Project-Id-Version: no\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-14 19:11+0100\n"
+"Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in.h:1
 msgid "Factory for Nautilus component adapter factories"
@@ -38,8 +42,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() feilet."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemer"
 
@@ -53,47 +57,55 @@ msgstr "Nautilus emblemvisning"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Kunne ikke fjerne emblem med navn «%s»."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Kunne ikke fjerne emblem med navn «%s». Dette skjer sannsynligvis fordi "
-"emblemet er permanent, og ikke et du har lagt til selv."
+"Dette skjer sannsynligvis fordi emblemet er permanent, og ikke et du har "
+"lagt til selv."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "Kunne ikke fjerne emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kunne ikke endre navn på emblem med navn «%s»."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Kunne ikke endre navn på emblem med navn «%s». Dette skjer sannsynligvis "
-"fordi emblemet er permanent og ikke et du har lagt til selv."
+"Dette skjer sannsynligvis fordi emblemet er permanent, og ikke et du har "
+"lagt til selv."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr "Kunne ikke endre navn på emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Endre navn på emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Oppgi et nytt navn for vist emblem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Legg til emblemer..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -101,7 +113,7 @@ msgstr ""
 "Oppgi et beskrivende navn for hvert emblem. Dette navnet vil brukes andre "
 "steder for å identifisere emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -109,139 +121,55 @@ msgstr ""
 "Oppgi et beskrivende navn ved siden av emblemet. Dette navnet vil bli brukt "
 "andre steder for å identifisere emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Noen av filene kunne ikke legges til som emblemer fordi de ikke ser ut til å "
-"være gyldige bilder."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Noen av filene kunne ikke legges til som emblemer."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Emblemene ser ikke ut til å være gyldige bilder."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "Kunne ikke legge til emblemer"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Ingen av bildene kunne legges til som emblemer fordi de ikke ser ut til å "
-"være gyldige bilder."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Ingen av bildene kunne legges til som emblemer."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Emblemet kan ikke legges til."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Teksten som ble dratt var ikke en gyldig filplassering."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Kunne ikke legge til emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Filen «%s» ser ikke ut til å være et gyldig bilde."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Filen som ble dratt ser ikke ut til å være et gyldig bilde."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Slett"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory for maskinvarevisning"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Maskinvare"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Maskinvarevisning"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Maskinvarevisning"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vis som maskinvare"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "maskinvarevisning"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "navn på ikon for maskinvarevisning"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "sammendrag for maskinvarevisning"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache størrelse"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Oppetiden er %d dager, %d timer, %d minutter"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Oversikt over maskinvare"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Dette er en plassholder for CPU-siden."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Dette er en plassholder for RAM-siden."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Dette er en plassholder for IDE-siden."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historikk"
@@ -267,51 +195,48 @@ msgid "Nautilus Image Properties view"
 msgstr "Nautilus-visning for bildeegenskaper"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Kamera"
+msgstr "Merke for kamera"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Kamera"
+msgstr "Kameramodell"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Dato tatt"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Lukkertid"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "program"
+msgstr "Lukkerprogram"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Blenderverdi"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "MÃ¥lingsmodus"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Blitz brukt"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Brennvidde"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Lukkerhastighet"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ISO hastighet"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -668,7 +593,7 @@ msgstr "Mango"
 
 #: data/browser.xml.h:53
 msgid "Manila Paper"
-msgstr "Manilla papir"
+msgstr "Manillapapir"
 
 #: data/browser.xml.h:54
 msgid "Moss Ridge"
@@ -907,6 +832,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Maskinvare"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internasjonal"
@@ -1107,9 +1036,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Ta opp et nytt vindu for hver åpnet fil"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "Vis Hjem-ikonet på skrivebordet"
+msgstr "Datamaskinikon vises på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1192,30 +1120,19 @@ msgid "Desktop trash icon name"
 msgstr "Ikonnavn for Papirkurv på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Kataloger over denne størrelsen vil bli avkortet. Formålet med dette er å "
-"unngå å bruke for mye minne og dermed terminere Nautilus ved åpning av "
-"enorme kataloger. En negativ verdi betyr ingen grense. Grensen er tilnærmet "
-"da kataloger leses i biter av en viss størrelse."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Aktiver «spesielle» flagg i dialogen brukervalg"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Filnavn for forvalgt bakgrunn for en mappe. Brukes kun hvis background_set "
 "er satt til «true»."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1223,6 +1140,19 @@ msgstr ""
 "Filnavn for forvalgt bakgrunn for sidepanelet. Brukes kun hvis "
 "side_pane_background er satt til «true»."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Kataloger over denne størrelsen vil bli avkortet. Formålet med dette er å "
+"unngå å bruke for mye minne og dermed terminere Nautilus ved åpning av "
+"enorme kataloger. En negativ verdi betyr ingen grense. Grensen er tilnærmet "
+"da kataloger leses i biter av en viss størrelse."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Skjul innebygde bokmerker i bokmerkemenyen"
@@ -1232,9 +1162,10 @@ msgid "Home icon visible on desktop"
 msgstr "Vis Hjem-ikonet på skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Nautilus viser kun kataloger i trevisningen i sidepanelet hvis satt til "
 "«true». Ellers vises både kataloger og filer."
@@ -1265,9 +1196,10 @@ msgstr ""
 "ved en fil i brukervalg-dialogen hvis satt til «true»"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Nautilus viser kataloger foran filer i ikon- og listevisning hvis satt til "
 "«true»."
@@ -1309,8 +1241,9 @@ msgstr ""
 "Nautilus viser kun brukers bokmerker i bokmerkemenyen hvis satt til «true»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Nautilus bruker brukerens hjemmekatalog som skrivebord hvis satt til «true». "
@@ -1327,9 +1260,10 @@ msgstr ""
 "sikkerhetskopier."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Skjulte filer vises i filhåndtereren hvis satt til «true». Skjulte filer er "
 "enten filer som starter med punktum eller filer som listes i filen .hidden i "
@@ -1353,8 +1287,9 @@ msgstr ""
 "settes til «true»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Et ikon med en lenke til hjemmekatalogen vil plasseres på skrivebordet hvis "
@@ -1391,7 +1326,8 @@ msgstr ""
 "synkende heller enn stigende rekkefølge."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Hvis sann vil ikoner ha tettere plassering som forvalg i nye vinduer."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1419,7 +1355,8 @@ msgid "List of possible captions on icons"
 msgstr "Liste med mulig bildetekst for ikoner"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maksimalt antall filer som håndteres i en katalog"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1439,11 +1376,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus tar seg av tegning av skrivebordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus bruker brukerens hjemmekatalog som skrivebord"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Vis kun kataloger i treet i sidelinjen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1463,7 +1402,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Omvendt sorteringsrekkefølge i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Vis kataloger først i vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1500,10 +1440,11 @@ msgstr ""
 "forhåndsvises."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1513,12 +1454,13 @@ msgstr ""
 "lokale filsystemer. Sett til «never» for å slå av forhåndsvisninger."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Optimisering ved visning av bilder som miniatyrer. Hvis satt til «always» "
 "vil miniatyrer alltid vises, selv om katalogen er på en ekstern tjener. Hvis "
@@ -1526,10 +1468,11 @@ msgstr ""
 "satt til «never» vil miniatyrer aldri vises, kun et vanlig ikon."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Optimisering ved visning av antall oppføringer i en katalog. Hvis satt til "
@@ -1538,17 +1481,19 @@ msgstr ""
 "filsystemer. Hvis satt til «never» vil antall aldri beregnes."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Forvalgt sorteringsrekkefølge for oppføringer i ikonvisning. Mulige verdier "
 "er «name», «size», «type», «modification_date» og «emblems»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Forvalgt sorteringsrekkefølge for oppføringer i listevisning. Mulige verdier "
 "er «name», «size», «type» og «modification_date»"
@@ -1590,7 +1535,7 @@ msgid "Use manual layout in new windows"
 msgstr "Bruk manuell plassering i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Bruk tettere plassering i nye vinduer"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1619,7 +1564,8 @@ msgstr ""
 "og «icon_view»."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Når antall oppføringer i en katalog skal vises"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1631,7 +1577,8 @@ msgid "When to show thumbnails of image files"
 msgstr "NÃ¥r skal miniatyrer vises for bildefiler"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Om en tilpasset forvalgt skrivebordsbakgrunn er satt."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1789,67 +1736,75 @@ msgstr "nullstill"
 msgid "on the desktop"
 msgstr "på skrivebordet"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Kan ikke slette et volumikon."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
-msgstr ""
-"Du kan ikke slette et volum-ikon. Vennligst bruk menyvalget «Løs ut» hvis du "
-"ønsker å løse ut volumet"
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
+msgstr "Vennligst bruk menyvalget «Løs ut» hvis du ønsker å løse ut volumet"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr "Kan ikke slette volum"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
-msgstr "Søppelkurv"
+msgstr "Papirkurv"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Flytt hit"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopier hit"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Lag lenke hit"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Sett som bakgrunn for _alle mapper"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Sett som bakgrunn for _denne mappen"
 
 #: 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 ikke installeres."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Beklager, men du må spesifisere et navn for det nye emblemet."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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 "Kunne ikke installere emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1859,20 +1814,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Beklager, men et emblem med navn «%s» eksisterer allerede. Vennligst velg et "
-"annet navn for det."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Beklager, men et emblem med navn «%s» eksisterer allerede."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Vennligst velg et annet navn på emblemet."
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Kunne ikke installere emblem"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Beklager. Kan ikke lagre egendefinert emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Beklager. Kan ikke lagre egendefinert emblemnavn."
 
@@ -1891,22 +1850,28 @@ msgstr "Fra:"
 msgid "To:"
 msgstr "Til:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Feil under flytting."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Feil under flytting.\n"
 "\n"
 "«%s» kan ikke flyttes fordi disken er skrivebeskyttet."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Feil under sletting."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1915,22 +1880,17 @@ msgstr ""
 "«%s» kan ikke slettes fordi du ikke har rettigheter til å endre "
 "opphavsmappen."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Feil under sletting.\n"
 "\n"
 "«%s» kan ikke slettes fordi opphavsmappen er skrivebeskyttet."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1939,24 +1899,25 @@ msgstr ""
 "«%s» kan ikke flyttes fordi du ikke har rettigheter til å endre den "
 "opphavsmappen."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Feil under flytting."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Feil under flytting.\n"
 "\n"
 "«%s» kan ikke flyttes fordi den, eller en mappe i stien, er i målmappens sti."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Feil under flytting.\n"
@@ -1964,295 +1925,242 @@ msgstr ""
 "«%s» kan ikke flyttes til søppelkurven fordi du ikke har rettigheter til å "
 "endre den eller opphavsmappen."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Feil under kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Feil under kopiering.\n"
 "\n"
 "«%s» kan ikke kopieres fordi du ikke har leserettigheter."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Feil under kopiering til «%s».\n"
-"\n"
-"Ikke nok plass på målet."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Feil under kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Feil under flytting til «%s».\n"
 "\n"
 "Ikke nok plass på målet."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Feil under oppretting av lenke i «%s».\n"
-"\n"
-"Ikke nok plass på målet."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Feil under flytting."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Feil under oppretting av lenke."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Feil under kopiering til «%s».\n"
 "\n"
 "Du har ikke skriverettigheter til denne mappen."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Feil under kopiering til «%s».\n"
 "\n"
 "MÃ¥ldisken er skrivebeskyttet."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Feil under flytting av oppføringer til «%s».\n"
-"\n"
-"Du har ikke skriverettigheter til denne mappen."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Feil under flytting av oppføringer til «%s».\n"
-"\n"
-"MÃ¥ldisken er skrivebeskyttet."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Feil under oppretting av lenker i «%s».\n"
-"\n"
-"Du har ikke skriverettigheter i denne mappen."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Feil under flytting."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Feil under oppretting av lenker i «%s».\n"
-"\n"
-"MÃ¥ldisken er skrivebeskyttet."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under kopiering av «%s».\n"
-"\n"
-"Vil du fortsette?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Feil under oppretting av lenke."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Feil under kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Feil «%s» under flytting av «%s».\n"
+"Feil «%s» under flytting.\n"
 "\n"
 "Vil du fortsette?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under oppretting av lenke til «%s».\n"
-"\n"
-"Vil du fortsette?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Feil under flytting."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Feil «%s» under sletting av «%s».\n"
+"Feil «%s» under oppretting av lenke til «%s».\n"
 "\n"
 "Vil du fortsette?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under kopiering.\n"
-"\n"
-"Vil du fortsette?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Feil under sletting."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under flytting.\n"
-"\n"
-"Vil du fortsette?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Feil under kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under oppretting av lenke.\n"
-"\n"
-"Vil du fortsette?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Feil under flytting."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Feil «%s» under sletting.\n"
-"\n"
-"Vil du fortsette?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Feil under oppretting av lenke."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Feil under sletting."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Feil under kopiering."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Feil under flytting."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Feil under oppretting av lenke."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Feil under sletting."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Hopp over"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Prøv igjen"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kunne ikke fullføre spesifisert handling."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "«%s» kunne ikke flyttes til den nye plasseringen fordi navnet allerede er i "
 "bruk for en spesiell oppføring som ikke kan fjernes eller flyttes.\n"
 "\n"
 "Hvis du fremdeles vil flytte «%s», endre navn og prøv igjen."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kunne ikke fullføre spesifisert handling."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "«%s» kunne ikke kopieres til ny plassering fordi navnet allerede er i bruk "
 "for en spesiell oppføring som ikke kan fjernes eller flyttes.\n"
 "\n"
 "Hvis du fremdeles vil kopiere «%s», endre navn og prøv igjen."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Kan ikke erstatte fil."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Filen «%s» eksisterer allerede.\n"
 "\n"
 "Vil du erstatte den?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+"Hvis du erstatter en eksisterende fil vil innholdet i denne overskrives."
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "Konflikt under kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Erstatt"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "E_rstatt"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Erstatt alle"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Erstatt _alle"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "lenke til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "en annen lenke til %s"
@@ -2261,25 +2169,25 @@ msgstr "en annen lenke til %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dste lenke til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dre lenke til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%ddje lenke til %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dde lenke til %s"
@@ -2289,562 +2197,599 @@ msgstr "%dde lenke til %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopi)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (ny kopi)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "de (kopi)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ste (kopi)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "dre (kopi)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "dje (kopi)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopi)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ny kopi)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dte kopi)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dste kopi)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dndre kopi)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%ddje kopi)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Ukjent GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Flytter filer til søppelkurv"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Filer kastet ut:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Flytter"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Forbereder flytting til søppel..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Flytter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Filer flyttet:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Forbereder flytting..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Fullfører flytting..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Oppretter lenker til filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Filer lenket:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Lenker"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Forbereder oppretting av lenker..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Fullfører oppretting av lenker..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopierer filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Filer kopiert:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopierer"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Forbereder kopiering..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Du kan ikke kopiere oppføringer til søppelkurven."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Du kan ikke kopiere oppføringer til papirkurven."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Kan ikke kopiere til søppelkurv"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Filer og mapper kan kun flyttes til papirkurven."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Du kan ikke flytte denne søppelmappen."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Du kan ikke kopiere søppelkurven."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"En papirkurv brukes for å lagre oppføringer som er flyttet til papirkurven."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Kan ikke endre plassering av Søppelkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Kan ikke kopiere søppelkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Du kan ikke flytte en mappe til seg selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Du kan ikke kopiere en mappe over seg selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Lag en ny tom mappe i denne mappen"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Kan ikke flytte til seg selv"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kan ikke kopiere til seg selv"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Du kan ikke kopiere en fil over seg selv."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "MÃ¥l og kilde er samme fil."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kan ikke kopiere over seg selv"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Feil under oppretting av ny mappe.\n"
 "\n"
 "Du har ikke skriverettigheter til målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Feil under oppretting av ny mappe.\n"
 "\n"
 "Ingen plass på målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Feil \"%s\" under oppretting av ny mappe."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Feil under oppretting av ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Feil under oppretting av ny mappe"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "mappe uten navn"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Feil \"%s\" under oppretting av ny mappe."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Feil under oppretting av ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Feil under oppretting av ny mappe"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fil"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Sletter filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Filer slettet:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Sletter"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Forbereder sletting av filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tømmer søppelkurven"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Forbereder tømming av søppelkurven..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
-msgstr ""
-"Er du sikker på at du vil slette alle oppføringer i søppelkurven permanent?"
+msgstr "Er du sikker på at du vil tømme alle oppføringer i søppelkurven?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Hvis du tømmer papirkurven vil oppføringene bli slettet permanent."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Tøm"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopi).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (ny kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3dje kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3dje kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ny kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3dje kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ste kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ndre kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ste kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ndre kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23dje kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23dje kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25te kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25te kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11te kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (12te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12te kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111te kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110de kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (112te kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122ndre kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123dje kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122dre kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123dje kopi).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124de kopi)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124de kopi).txt"
 
@@ -2863,64 +2808,64 @@ msgstr "foo (124de kopi).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "i dag kl. 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "i dag kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "i dag kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "i dag kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "i dag, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "i dag, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "i dag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "i går kl. 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "i går kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "i går kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "i går kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "i går kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "i går, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "i går"
 
@@ -2929,133 +2874,133 @@ msgstr "i går"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Onsdag, 0. september 0000 kl. 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y, %-H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Man, 0. Okt 0000 kl. 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y, %-H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Man, okt 00 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y kl. %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Okt 00 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Okt 00 0000, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y kl. %-H.%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 oppføringer"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mapper"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 oppføring"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u oppføringer"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mapper"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? oppføringer"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ukjent type"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "ukjent MIME-type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ukjent"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3065,7 +3010,7 @@ msgstr ""
 "sannsynligvis at din gnome-vfs.keys fil er på feilt sted eller ikke kan "
 "finnes av en eller annen grunn."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3074,11 +3019,11 @@ msgstr ""
 "Ingen beskrivelse funnet for MIME-type «%s» (fil «%s»), si i fra til gnome-"
 "vfs e-post listen."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "lenke"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "lenke (ødelagt)"
 
@@ -3199,11 +3144,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Søk etter filer på tekstinnhold og egenskaper"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonvisning"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listevisning"
@@ -3347,148 +3294,152 @@ msgstr "Hjem til %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Benketopp"
+msgstr "Datamaskin"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikon for fil"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "redigerbar tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "den redigerbare etiketten"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "tilleggstekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "litt mer tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "merket for utvalg"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "om vi er merket for et utvalg"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "merket som tastaturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "om vi er merket for å rendre tastaturfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "merket for slipp"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "om vi er merket for slipp"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Utvalgsrektangelet"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Sett tekst i ramme"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Tegn en ramme rundt tekst som ikke er valgt"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Farge for utvalgsboks"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Farge på utvalgsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha for utvalgsboks"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Ugjennomsiktighet for utvalgsboksen"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Lys opp alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Ugjennomsiktighet i merking for valgte ikoner"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Lys informasjonsfarge"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Farge som brukes for informativ tekst på en mørk bakgrunn"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Mørk informasjonsfarge"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Farge som brukes for informativ tekst på en lys bakgrunn"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la oppføringen bli hvor du slapp den? Dette vil ødelegge den "
 "lagrede manuelle plasseringen."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Denne mappen bruker automatisk plassering."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la disse oppføringene bli hvor du slapp dem? Dette vil "
 "ødelegge den lagrede manuelle plasseringen."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la denne oppføringen bli hvor du slapp den?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Denne katalogen bruker automatisk plassering. Ønsker du å bytte til manuell "
 "plassering og la disse oppføringene bli hvor du slapp dem?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Bytt til manuell plassering?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Bytt"
 
@@ -3596,72 +3547,72 @@ msgstr "Er forvalgt for «%s»-oppføringer."
 msgid "Is the default for all \"%s\" items."
 msgstr "Er forvalgt for alle «%s»-oppføringer."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Endre «%s»"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Ta med i menyen for «%s»-oppføringer."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Bruk som standard for «%s»-oppføringer"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Ta kun med i menyen for «%s»"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Bruk som forvalg kun for «%s»"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ikke ta med i menyen for «%s»-oppføringer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Navn"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Velg"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Ferdig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Endre..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Filtyper og programmer"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_GÃ¥ dit"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3669,48 +3620,48 @@ msgstr ""
 "Du kan konfigurere hvilke programmer som foreslås for hvilke filtyper i "
 "dialogen Filtyper og programmer."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Ã…pne med en annen applikasjon"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Velg en applikasjon du vil åpne «%s» med:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Ã…pne med annet visningsprogram"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Velg en visning for «%s»:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Ingen visninger tilgjengelig for «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Ingen visninger tilgjengelig"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Det finnes ingen applikasjoner som er assosiert med «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Ingen applikasjon assosiert"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Ingen handling er assosiert med «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Ingen handling assosiert"
 
@@ -3718,11 +3669,9 @@ msgstr "Ingen handling assosiert"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3731,42 +3680,41 @@ msgstr ""
 "Du kan konfigurere GNOME til å koble applikasjoner til filtyper. Vil du "
 "assosiere en applikasjon med denne filtypen nå?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Koble til applikasjon"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Visning som er assosiert med «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Ugyldig visningskomponent assosiert"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Applikasjonen som er assosiert med «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Ugyldig applikasjon assosiert"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Handlingen som er assosiert med «%s» er ugyldig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Ugyldig handling assosiert"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3777,111 +3725,138 @@ msgstr ""
 "til filtyper. Vil du assosiere en applikasjon eller visningskomponent med "
 "denne filtypen nå?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Tilegn handling"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"«%s» kan ikke åpne «%s» fordi «%s» ikke kan aksessere filer i «%s»-"
+"plasseringer. Vil du velge en annen applikasjon?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "«%s» kan ikke åpne «%s» fordi «%s» ikke kan aksessere filer i «%s»-"
 "plasseringer. Vil du velge en annen applikasjon?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Forvalgt handling kan ikke åpne «%s» fordi den ikke kan aksessere filer i "
 "lokasjoner som «%s». Vil du velge en annen handling?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Kan ikke åpne lokasjon"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"«%s» kan ikke åpne «%s» fordi «%s» ikke kan aksessere filer i «%s»-"
+"plasseringer. Vil du velge en annen applikasjon?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "«%s» kan ikke åpne «%s» fordi «%s» ikke kan aksessere filer i «%s»-"
 "lokasjoner. Ingen andre applikasjoner er tilgjengelige for å vise denne "
 "filen. Hvis du kopierer denne filen til din datamaskin, vil du kanskje kunne "
 "Ã¥pne den."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Forvalgt handling kan ikke åpne «%s» fordi den ikke kan aksessere filer i "
-"lokasjoner som «%s». Ingen andre handlinger er tilgjengelige for å vise "
-"denne filen. Hvis du kopierer denne filen til din datamaskin, vil du kanskje "
-"kunne åpne den."
+"lokasjoner som «%s». Vil du velge en annen handling?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"«%s» kan ikke åpne «%s» fordi «%s» ikke kan aksessere filer i «%s»-"
+"lokasjoner. Ingen andre applikasjoner er tilgjengelige for å vise denne "
+"filen. Hvis du kopierer denne filen til din datamaskin, vil du kanskje kunne "
+"Ã¥pne den."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Ã…pner %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Beklager, men du kan ikke kjøre kommandoer fra en ekstern tjener av "
-"sikkerhetshensyn."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Beklager, du kan ikke kjøre kommandoer fra en ekstern tjener."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "Kunne ikke kjøre eksterne lenker"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Dette er deaktivert av sikkerhetshensyn."
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"En feil oppsto under oppstart av applikasjon\n"
-"\n"
-"Detaljer: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "Kan ikke kjøre eksterne lenker"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detaljer: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "En feil oppsto under oppstart av applikasjonen."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Feil under oppstart av applikasjon"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Mål for slipp støtter kun lokale filer."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Målet for slipp støtter kun lokale filer.\n"
-"\n"
 "For å åpne eksterne filer må du kopiere dem til en lokal mappe og slippe dem "
 "igjen."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr "Mål for slipp støtter kun lokale filer"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4135,14 +4110,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Oppføringer som har «medusa» i navnet og er mapper"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Søker på diskene"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus søker etter søppelmapper på dine disker."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Rediger"
@@ -4211,7 +4178,7 @@ msgstr "_Lim inn tekst"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Vis datamaskinens filer"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4226,13 +4193,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Vis din hjemmekatalog i Nautilus filhåndtereren"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Filsystem"
+msgstr "Bla gjennom filsystem"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Bla gjennom filsystemet med filhåndtereren"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4344,96 +4310,104 @@ msgstr "Bakgrunn"
 msgid "Empty Trash"
 msgstr "Tøm søppelkurv"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Dette vil åpne %d separate vinduer. Er du sikker på at du vil dette?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Ã…pne %d nye vinduer?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Er du sikker på at du vil slette «%s» permanent?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Dette vil åpne %d separate vinduer. Er du sikker på at du vil dette?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Er du sikker på at du vil slette «%s» permanent?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Er du sikker på at du vil slette %d valgte oppføringer permanent?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Hvis du tømmer papirkurven vil oppføringene bli slettet permanent."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Slett?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Velg en kategori:"
+msgstr "Velg mønster"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Mønstre"
+msgstr "_Mønster:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "«%s» valgt"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mappe valgt"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mapper valgt"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (inneholdende 0 oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (inneholdende 1 oppføring)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (inneholdende %d oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (inneholdende totalt 0 oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (inneholdende totalt 1 oppføring)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (inneholdende totalt %d oppføringer)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "«%s» valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d oppføringer valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 annen oppføring valgt (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andre oppføringer valgt (%s)"
@@ -4445,7 +4419,7 @@ msgstr "%d andre oppføringer valgt (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4454,107 +4428,126 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mappen «%s» inneholder flere filer enn Nautilus kan håndtere. Noen filer vil "
 "ikke vises."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Noen filer vil ikke vises."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "For mange filer"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "«%s» kan ikke flyttes til søppelkurven. Ønsker du å slette den med én gang?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Fil «%s» kan ikke flyttes til papirkurven."
+
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
-"De %d valgte oppføringene kan ikke flyttes til søppelkurven. Vil du slette "
-"dem med én gang?"
+"«%s» kan ikke flyttes til søppelkurven. Ønsker du å slette den med én gang?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d av de valgte oppføringene kan ikke flyttes til søppelkurven. Vil du "
-"slette disse %d oppføringene med én gang?"
+"«%s» kan ikke flyttes til søppelkurven. Ønsker du å slette den med én gang?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Slett med én gang?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Er du sikker på at du vil slette «%s» fra søppelkurven permanent?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Er du sikker på at du vil slette %d valgte oppføringer i søppelkurven "
 "permanent?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+#, fuzzy
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Hvis du tømmer papirkurven vil oppføringene bli slettet permanent."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Slett fra søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Bruk «%s» til å åpne valgt oppføring"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Andre _applikasjoner..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "En _applikasjon..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Annet _visningsprogram..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Et _visningsprogram..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Kunne ikke fullføre spesifisert handling: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Kunne ikke fullføre spesifisert handling."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Kjør «%s» på valgte oppføringer"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Opprett dokument fra mal «%s»"
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Alle kjørbare filer i denne mappen vil vises i Skript-menyen. Ved å velge et "
+"skript fra denne menyen vil du kjøre dette skriptet med eventuelle markerte "
+"oppføringer som inndata."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4562,11 +4555,11 @@ msgstr ""
 "skript fra denne menyen vil du kjøre dette skriptet med eventuelle markerte "
 "oppføringer som inndata."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Om skript"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4607,17 +4600,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posisjon og størrelse for aktivt vindu"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "«%s» vil bli flyttet hvis du velger kommandoen Lim inn filer"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "«%s» vil bli kopiert hvis du velger kommandoen Lim inn filer"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4625,7 +4618,7 @@ msgstr ""
 "De %d valgte oppføringene vil bli flyttet hvis du velger kommandoen Lim inn "
 "filer"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4633,159 +4626,162 @@ msgstr ""
 "De %d valgte oppføringene vil bli flyttet hvis du velger kommandoen Lim inn "
 "filer"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Ingenting å lime inn fra utklippstavlen."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Monteringsfeil"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Feil under avmontering"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Monteringsfeil"
+msgstr "Feil under utløsing"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Løs _ut"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Avmonter volum"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "Ã…pne _i et nytt vindu"
+msgstr "Ã…pne i nytt vindu"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Ã…pne _i %d nye vinduer"
+msgstr "Ã…pne i %d nye vinduer"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Hjemmekatalog"
+msgstr "Vis mappe"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Hjemmekatalog"
+msgstr "Vis mapper"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Sle_tt fra søppelkurven"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Slett alle valgte oppføringer permanent"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Fl_ytt til søppelkurv"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Flytt hver valgt oppføring til søppelkurven"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Sle_tt"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Opprett _lenker"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Opprett _lenke"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Tøm søppelkurv"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Klipp u_t fil"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Klipp u_t filer"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopier fil"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopier filer"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Denne lenken kan ikke brukes fordi den ikke har noe mål. Vil du flytte denne "
 "lenken til søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Denne lenken kan ikke brukes fordi den ikke har noe mål. Vil du flytte denne "
+"lenken til søppelkurven?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Denne lenken kan ikke brukes fordi målet, «%s», ikke eksisterer. Vil du "
 "flytte denne lenken til søppelkurven?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Ødelagt lenke"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "\"%s\" er en kjørbar tekstfil. Vil du kjøre den eller vise innholdet?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "«%s» er en kjørbar tekstfil."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Kjør eller vis?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Vis"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Kjør i _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Vis"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Kjø_r"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Åpner «%s»"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Avbryt åpning?"
 
@@ -4806,29 +4802,34 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Beklager, kunne ikke vise alt innholdet for «%s»."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Rettighetene for «%s» kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Feil under visning av mappe"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Navnet «%s» er allerede i bruk i denne mappen. Vennligst bruk et annet navn."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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» finnes ikke i denne mappen. Kanskje den er flyttet eller slettet nylig?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Du har ikke nødvendige rettigheter til å endre navn på «%s»."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4837,82 +4838,102 @@ msgstr ""
 "Navnet «%s» er ikke gyldig fordi det inneholder tegnet «/». Vennligst bruk "
 "et annet navn."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Navnet «%s» er ikke gyldig. Vennligst bruk et annet navn."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Kunne ikke endre navn på «%s» fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Beklager, kunne ikke endre navn for «%s» til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Rettighetene for «%s» kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Feil under endring av navn"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ikke nødvendige rettigheter til å endre gruppen for «%s»."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Kunne ikke endre gruppe for «%s» fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Beklager, kunne ikke endre gruppe for «%s»."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Rettighetene for «%s» kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Feil under setting av gruppe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Kunne ikke endre eier for «%s» fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Beklager, kunne ikke endre eier for «%s»."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Rettighetene for «%s» kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Feil under endring av eier"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Kunne ikke endre rettigheter for «%s» fordi den er på en skrivebeskyttet disk"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Beklager, kunne ikke endre rettigheter for «%s»."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Rettighetene for «%s» kunne ikke bestemmes."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Feil under setting av rettigheter"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Endrer navn fra «%s» til «%s»."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Avbryt endring av navn?"
 
@@ -4970,128 +4991,150 @@ msgstr "G_jenopprett ikonenes opprinnelige størrelser"
 msgid "Restore Icon's Original Si_ze"
 msgstr "G_jenopprett ikonets opprinnelige størrelse"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "peker til «%s»"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Dra-og-slipp er kun støttet for lokale filsystemer."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Dra-og-slipp er kun støttet for lokale filsystemer."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Feil ved dra-og-slipp"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "En ugyldig type ble brukt for draoperasjon."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Type"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Dato endret"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Du kan ikke tilegne mer enn ett egendefinert ikon om gangen! Vennligst dra "
 "kun ett bilde for å bestemme egendefinert ikon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Du kan ikke tilegne mer enn ett egendefinert ikon om gangen! Vennligst dra "
+"kun ett bilde for å bestemme egendefinert ikon."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mer enn ett bilde"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Filen du slapp er ikke lokal. Du kan kun bruke lokale bilder som "
 "egendefinerte ikoner."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Filen du slapp er ikke lokal. Du kan kun bruke lokale bilder som "
+"egendefinerte ikoner."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Kun lokale bilder"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Filen du slapp er ikke et bilde. Du kan kun bruke lokale bilder som "
+"Filen du slapp er ikke lokal. Du kan kun bruke lokale bilder som "
 "egendefinerte ikoner."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Kun bilder"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper for %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Avbryt endring av gruppe?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Endrer gruppe"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Avbryt endring av eier?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Endrer eier"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ingenting"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ulesbar"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 oppføring, med størrelse %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d oppføringer, totalt %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(noe innhold ikke lesbart)"
 
@@ -5101,191 +5144,190 @@ msgstr "(noe innhold ikke lesbart)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Innhold:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Navn:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Type:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Adresse:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volum:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Ledig plass:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Lenkemål:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Endret:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Aksessert:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Velg egendefinert ikon..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Fjern egendefinert ikon"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lese"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Skrive"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Kjøre"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Sett br_uker-ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Spesielle flagg:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Sett gr_uppe-ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "K_lebrig"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Du er ikke eieren, du kan derfor ikke endre disse rettighetene."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "Fil_eier:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Fileier:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Filgruppe:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Filgruppe:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Eier:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstvisning:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Tallvisning:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Sist endret:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Rettighetene for «%s» kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Rettigheter for «%s» kunne ikke bestemmes."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"En feil oppsto under vising av hjelp: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Det oppsto en feil under vising av hjelp: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Kunne ikke vise hjelp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Avbryt visning av egenskaper-vinduet?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Oppretter egenskaper-vindu"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Velg et ikon"
 
@@ -5303,71 +5345,110 @@ msgid "Search Results"
 msgstr "Søkeresultat"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Beklager, men Medusa-søketjenesten ikke tilgjengelig fordi den ikke er "
-"installert."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Beklager, men Medusa-søketjenesten ikke tilgjengelig."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Medusa er ikke installert."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Søketjenesten ikke tilgjengelig"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Søket du har valgt er nyere enn indeksen på ditt system. Søket vil ikke "
 "returnere noe resultat nå. Du kan opprette en ny indeks ved å kjøre \"medusa-"
 "indexd\" som root fra kommandolinjen."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"\"Find\" kan ikke åpne din filsystemindeks. Indeksen mangler eller er "
+"korrupt. Du kan opprette en ny indeks ved å kjøre «medusa-indexd» som root "
+"på kommandolinjen."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Søk etter oppføringer som er for nye"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Alle indekserte filer på din datamaskin er lik kriteriet du valgte. Du kan "
+"sjekke stavemåten for utvalgene eller legge til flere kriterier for å gjøre "
+"søket smalere."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Alle indekserte filer på din datamaskin er lik kriteriet du valgte. Du kan "
 "sjekke stavemåten for utvalgene eller legge til flere kriterier for å gjøre "
 "søket smalere."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Feil under søk"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "\"Find\" kan ikke åpne din filsystemindeks. Indeksen mangler eller er "
 "korrupt. Du kan opprette en ny indeks ved å kjøre «medusa-indexd» som root "
 "på kommandolinjen."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Feil under lesing av filindeks"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "En feil oppstod under lasting av dette søkets innhold: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"For å utføre et innholdssøk krever «Finn» en indeks over filene på ditt "
+"system. «Finn» kan ikke aksessere din indeks akkurat nå."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"For å utføre et innholdssøk krever «Finn» en indeks over filene på ditt "
+"system. «Finn» kan ikke aksessere din indeks akkurat nå."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5375,25 +5456,23 @@ msgstr ""
 "«Finn» kan ikke aksessere din indeks akkurat nå så et tregere søk vil "
 "utføres som ikke bruker indeksen."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"For å utføre et innholdssøk krever «Finn» en indeks over filene på ditt "
-"system. «Finn» kan ikke aksessere din indeks akkurat nå."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Raskt søk er ikke tilgjengelig"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Innholdssøk er ikke tilgjengelig"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5407,56 +5486,87 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "For å utføre et raskt søk, krever «Finn» en indeks over filene på ditt "
 "system. Din datamaskin holder på å bygge opp denne indeksen. Fordi \"Find\" "
 "ikke kan bruke en indeks nå vil dette søket kunne ta flere minutter."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "For å utføre et innholdssøk, krever «Finn» en indeks over innholdet på ditt "
 "system. Din datamaskin holder på å bygge opp denne indeksen. Innholdssøket "
 "vil være tilgjengelig når indekseringen er fullført."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Indekserte søk er ikke tilgjengelig"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Indeksert søk er ikke tilgjengelig"
+
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"For å utføre et innholdssøk krever «Finn» en indeks over filene på ditt "
+"system. «Finn» kan ikke aksessere din indeks akkurat nå."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"For å utføre et innholdssøk krever «Finn» en indeks over filene på ditt "
+"system. «Finn» kan ikke aksessere din indeks akkurat nå."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "For å utføre et raskt søk, krever «Finn» en indeks over filene på ditt "
 "system. En indeks er ikke er tilgjengelig akkurat nå. Du kan opprette en "
 "indeks ved å kjøre «medusa-indexd» fra kommandolinjen som root. Så lenge en "
 "komplett indeks ikke er tilgjengelig vil søk kunne ta flere minutter."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "For å utføre et innholdssøk, krever «Finn» en indeks over innholdet på ditt "
 "system. Din datamaskin har ingen indeks nå. Du kan  opprette en indeks ved å "
 "kjøre \"medusa-indexd\" fra kommandolijen som root. Så lenge en komplett "
 "indeks ikke er tilgjengelig vil du ikke kunne utføre innholdssøk."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Raske søk er ikke aktivert på din datamaskin"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5466,11 +5576,12 @@ msgstr ""
 "system. Din systemadministrator har slått av indeksering, så ingen indeks er "
 "tilgjengelig."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Raske søk er ikke aktivert på din datamaskin"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Raskt søk er ikke tilgjengelig"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Hvor"
 
@@ -5479,7 +5590,7 @@ msgstr "Hvor"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Ã…pne i et nytt vindu"
@@ -5490,7 +5601,7 @@ msgstr "_Ã…pne i et nytt vindu"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Ã…pne i %d _nye vinduer"
@@ -5499,15 +5610,21 @@ msgstr "Ã…pne i %d _nye vinduer"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus fant flere søkeresultater enn den kan vise. Noen treff vil ikke "
 "kunne vises."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus fant flere søkeresultater enn den kan vise. Noen treff vil ikke "
+"kunne vises."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "For mange treff"
 
@@ -5521,12 +5638,12 @@ msgid "Create L_auncher"
 msgstr "Opprett oppst_arter"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Opprett en ny oppstarter"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Slett alle oppføringer i søppelkurven"
 
@@ -5546,7 +5663,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Bruk _forvalgt bakgrunn"
@@ -5568,58 +5685,67 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Velg et annet visningsprogram du vil vise valgt oppføring med"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "_Opprett mappe"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "_Opprett mappe"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Lag en ny tom mappe i denne mappen"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Lag en ny tom mappe i denne mappen"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Opprett en symbolsk lenke for hver valgt oppføring"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_upliser"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Slett hver valgt oppføring, uten å flytte dem til søppelkurven"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Dupliser alle valgte oppføringer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Rediger oppstarter"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Rediger informasjon for oppstarteren"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formater valgt volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Egensk_aper for medie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Avmonter valgt volum"
+msgstr "Monter valgt volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Flytt eller kopier filer som er valgt tidligere med kommandoene Klipp ut "
 "filer eller Kopier filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5627,130 +5753,134 @@ msgstr ""
 "Flytt eller kopier filer som er valgt tidligere med kommandoene Klipp ut "
 "filer eller Kopier filer til valgt mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Ingen maler er installert"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ã…_pne med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Åpne hver valgt oppføring i et nytt vindu"
+msgstr "Åpne hver valgt oppføring i et navigeringsvindu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "Ã…pne _i et nytt vindu"
+msgstr "Ã…pne i et navigeringsvindu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Åpne valgt oppføring i dette vinduet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Gjør klar valgte filer for kopiering med kommandoen Lim inn filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Gjør klar valgte filer for flytting med kommandoen Lim inn filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "B_eskytt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Beskytt valgt volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Endre navn på valgt oppføring"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "_Nullstill visning til forvalg"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Nullstill sorteringsrekkefølge og zoom-nivå til brukervalg for denne "
 "visningen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Kjør eller håndter skript fra ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Velg _alle filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "_Mønstre"
+msgstr "Velg _mønster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Velg alle oppføringer i dette vinduet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Velg alle oppføringer i dette vinduet"
+msgstr "Velg oppføringer i dette vinduet som passer et gitt mønster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Vis medie-egenskapene for valgt volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Vis mappen som inneholder skriptene som vises i denne menyen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Avmonter valgt volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Bruk forvalgt bakgrunn for denne lokasjonen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Vis eller modifiser egenskapene for hver av de valgte oppføringene"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopier fil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formater"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "_Avmonter volum"
+msgstr "_Monter volum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Ã…pne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Ã…pne skript-mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Lim inn filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Lim filer inn i mappe"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "E_genskaper"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Gi _nytt navn..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skript"
 
@@ -5837,7 +5967,12 @@ msgstr "_Manuelt"
 msgid "Indexing is %d%% complete."
 msgstr "%d%% av indeksering fullført."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Dine filer ble sist indeksert %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5845,25 +5980,29 @@ msgstr ""
 "En gang om dagen blir dine filer og tekstinnhold indeksert slik at dine søk "
 "blir raske."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indekseringsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Dine filer ble sist indeksert %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "En gang om dagen blir dine filer og tekstinnhold indeksert slik at dine søk "
-"blir raske. Dine file blir nå indeksert."
+"blir raske."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Det finnes ingen indeks for dine filer akkurat nå."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5873,15 +6012,19 @@ msgstr ""
 "Raske søk er ikke aktivert på din datamaskin, så du har ingen indeks akkurat "
 "nå."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Det finnes ingen indeks for dine filer akkurat nå."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Finner ikke filindeks"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Beklager, men Medusa-søketjenesten ikke tilgjengelig."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Vennligst sjekk at medusa er konfigurert korrekt."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H.%M, %x"
 
@@ -5905,59 +6048,62 @@ msgstr "Vis _indekseringsstatus"
 msgid "Show status of indexing used when searching"
 msgstr "Vis status for indeksering som brukes for søk"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Kunne ikke opprette nødvendig mappe"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Kunne ikke opprette nødvendige mapper"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus kunne ikke opprette den nødvendige mappen «%s». Opprett denne "
 "mappen før du kjører Nautilus, eller endre rettighetene slik at Nautilus kan "
 "opprette den."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Kunne ikke opprette nødvendige mapper"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus kunne ikke opprette følgende mapper som kreves: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus kunne ikke opprette følgende nødvendige mapper:\n"
-"\n"
-"%s\n"
-"\n"
 "Vennligst opprett disse mappene før du kjører Nautilus, eller sett "
 "rettigheter slik at Nautilus kan opprette dem."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Lenke til gammelt skrivebord"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"En lenke med navn «Lenke til gammelt skrivebord» ble opprettet på "
+"skrivebodet."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Plasseringen for skrivebordskatalogen er endret i GNOME 2.4. En lenke som "
-"har navnet «Lenke til gammelt skrivebord» er opprettet på skrivebordet. Du "
-"kan åpne denne for å flytte over filene du ønsker før du eventuelt sletter "
-"lenken."
+"Plasseringen for skrivebordskatalogen er endret i GNOME 2.4. Du kan åpne "
+"lenken for å flytte over filene du ønsker før du eventuelt sletter lenken."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr "Migrerte gammelt skrivebord"
 
 #. Can't register myself due to trouble locating the
@@ -5970,7 +6116,7 @@ msgstr "Migrerte gammelt skrivebord"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5981,7 +6127,7 @@ msgstr ""
 "datamaskinen på nytt eller installere Nautilus på nytt."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6027,12 +6173,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus kan ikke brukes nå, pga en uventet feil."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6040,7 +6186,7 @@ msgstr ""
 "Nautilus kan ikke brukes nå pga en uventet feil fra Bonobo under forsøk på å "
 "registrere visningstjeneren i filbehandleren."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6050,7 +6196,7 @@ msgstr ""
 "å finne factory. Du kan fikse problemet ved å drepe bonobo-activation-server "
 "og starte Nautilus på nytt."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6060,6 +6206,17 @@ msgstr ""
 "Ã¥ finne skall-objektet. Hvis du dreper bonobo-activation-server og starter "
 "Nautilus på nytt vil dette kunne fikse problemet."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"En feil oppsto under vising av hjelp: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Ingen bokmerker definert"
@@ -6093,38 +6250,43 @@ msgstr "Færre alternativer"
 msgid "Find Them!"
 msgstr "Finn dem!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Du må oppgi et navn for tjeneren."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Kan ikke flytte til seg selv"
+msgid "Please enter a name and try again."
+msgstr "Vennligst oppgi et navn og prøv igjen."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Kan ikke koble til tjener"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"«%s» er ikke en gyldig lokasjon. Vennligst sjekk stavingen og forsøk igjen."
+msgid "\"%s\" is not a valid location."
+msgstr "«%s» er ikke en gyldig lokasjon."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Vennligst sjekk stavingen og prøv igjen."
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Nettverkstjenere"
+msgstr "Koble til tjener"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Navn:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Lokasjon:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "_Koble til"
+msgstr "Koble til"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6323,6 +6485,14 @@ msgstr ""
 "Du kan slette denne filen manuelt for å vise veiviseren igjen.\n"
 "\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "Du kan ikke tilegne mer enn ett egendefinert ikon om gangen."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Du kan kun bruke bilder som egendefinerte ikoner."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6333,26 +6503,21 @@ msgstr "Ã…pne med %s"
 msgid "Open with..."
 msgstr "Ã…pne med..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Kan ikke starte CD-brennerapplikasjonen:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Kan ikke starte programmet for brenning av CDer."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr "Kan ikke starte CD-brenner"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
-msgstr "_Tøm søppelkurv"
+msgstr "_Tøm papirkurv"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Skriv innholdet til CD"
 
@@ -6360,119 +6525,124 @@ msgstr "_Skriv innholdet til CD"
 msgid "Go To:"
 msgstr "GÃ¥ til:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Vil du vise disse %d lokasjonene i forskjellige vinduer?"
+msgid "Do you want to view %d locations?"
+msgstr "Vil du vise %d lokasjoner?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Vis i flere vinduer?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Kan ikke åpne lokasjon"
+msgstr "Ã…pne lokasjon"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Utfør et raskt sett med selvsjekk-tester."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Opprett startvinduet med en oppgitt geometri."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Kun opprett Nautilus-vinduer for eksplisitt spesifiserte URIer."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Ikke tegn opp skrivebordet (ignorer brukervalg satt i brukervalg-dialogen)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "Ã¥pne et nettleservindu"
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Avslutt Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Start Nautilus på nytt."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Filhåndterer"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check kan ikke brukes med sammen med andre flagg.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan ikke brukes med URIer.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry kan ikke brukes med mer enn én 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Er du sikker på at du ønsker å glemme historikken? Hvis det er tilfelle, vil "
-"du være dømt til å gjenta den."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Er du sikker på at du vil slette historikken?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Hvis det er tilfelle, vil du være dømt til å gjenta den."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Er du sikker på at du ønsker å tømme listen over stedene du har besøkt?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Hvis du tømmer lokasjonslisten vil oppføringene bli slettet permanent."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Tøm historikk"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
-msgstr ""
-"Lokasjonen «%s» eksisterer ikke. Ønsker du å fjerne alle bokmerker med denne "
-"lokasjonen fra din liste?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr "Ønsker du å fjerne alle bokmerker med denne lokasjonen fra din liste?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Lokasjonen «%s» eksisterer ikke."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bokmerke for ikke-eksisterende lokasjon"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Fjern"
 
@@ -6505,15 +6675,13 @@ msgid "Close _All Windows"
 msgstr "Lukk _alle vinduer"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Lukk alle Nautilus-vinduer"
+msgstr "Lukk alle navigeringsvinduer"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Koble til _tjener..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6528,107 +6696,116 @@ msgid "Forward"
 msgstr "Fremover"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "GÃ¥ til malmappen"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Gå til neste besøkte lokasjon"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Gå til forrige besøkte lokasjon"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Gå til søppelkurv-mappen"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Hjem"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "A_dresselinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Oppdater"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Søk etter filer på denne datamaskinen"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_atuslinje"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Opp"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Skriv til CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Legg til bokmerke"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Tilbake"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Tøm historikk"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Benketopp"
+msgstr "_Datamaskin"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "R_ediger bokmerker"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Fremover"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_GÃ¥"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Hjem"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "P_lassering..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Sidepanel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Maler"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
-msgstr "_Søppelkurv"
+msgstr "_Papirkurv"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Opp"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vis"
 
@@ -6642,38 +6819,36 @@ msgid "View as..."
 msgstr "Vis som..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Fileier:"
+msgstr "Filvisning: %s"
 
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"Ett av sidepanelene ble utsatt for en feil og kan ikke fortsette. "
-"Beklageligvis kan jeg ikke si hvilket dette gjelder."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Ett av sidepanelene ble utsatt for en feil og kan ikke fortsette."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Sidepanelet %s ble utsatt for en feil og kan ikke fortsette. Hvis dette "
-"fortsetter, kan du slå av dette panelet."
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Kan beklageligvis ikke si hvilket."
 
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#: src/nautilus-navigation-window.c:1109
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Sidepanelet %s ble utsatt for en feil og kan ikke fortsette."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Hvis dette fortsetter å skje kan du deaktivere dette panelet."
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Sidelinjepanel feilet"
+msgstr "Sidepanel feilet"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Sidepanel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Inneholder en sidepanelvisning"
 
@@ -6707,147 +6882,175 @@ msgstr "_Legg til ny..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Beklager, men mønster %s kunne ikke slettes."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Sjekk at du har rettigheter til å slette mønsteret."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Kunne ikke slette mønster"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Beklager, men emblem %s kunne ikke slettes."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Sjekk at du har rettigheter til å slette emblemet."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Kunne ikke slette emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Lag et nytt emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Nø_kkelord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "B_ilde:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Velg en bildefil for det nye emblemet:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Lag en ny farge:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Farge_navn:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Farge_verdi:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Beklager, men «%s» er ikke et gyldig filnavn."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Beklager, men du oppga ikke et gyldig filnavn."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Vennligst prøv igjen."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Kunne ikke installere mønster"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Beklager, men du kan ikke erstatte nullstill-bildet."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ikke et bilde"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Beklager, men mønster %s kunne ikke installeres."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Velg en bildefil som skal legges til som mønster"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Fargen kan ikke installeres."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Beklager, men du må spesifisere et navn for den nye fargen."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Kunne ikke installere farge"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Velg en farge som skal legges til"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Beklager, men «%s» er ikke en brukbar bildefil!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Beklager, men «%s» kan ikke brukes som bildefil."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Filen er ikke et bilde."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Velg en kategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Avbryt fjern"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Legg til et nytt mønster..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Legg til en ny farge..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Legg til et nytt emblem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Klikk på et mønster for å fjerne det."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Klikk på en farge for å fjerne den"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klikk på et emblem for å fjerne den"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mønstre:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Farger:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemer:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Fje_rn et mønster..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Fje_rn en farge..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Fje_rn et emblem..."
 
@@ -7232,43 +7435,43 @@ msgid "Show %s"
 msgstr "Vis %s"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "_CD-brenner"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
-msgstr "Lukk _alle vinduer"
+msgid "Close P_arent Folders"
+msgstr "Lukk _alle opphav"
 
-#: src/nautilus-spatial-window-ui.xml.h:5
+#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
+msgid "Close this folder's parents"
+msgstr "Lukk sidepanelet"
+
+#: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
-msgstr "GÃ¥ til tom CD-mappe"
+msgstr "GÃ¥ til tom datamaskin"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "Gå til søppelkurv-mappen"
-
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
-msgid "Open _Location..."
-msgstr "P_lassering..."
+msgstr "GÃ¥ til CD-brenner"
 
 #: src/nautilus-spatial-window-ui.xml.h:9
-msgid "Open _Pa_rent"
-msgstr ""
+msgid "Open _Location..."
+msgstr "Ã…pne _lokasjon..."
 
 #: src/nautilus-spatial-window-ui.xml.h:10
 #, fuzzy
+msgid "Open _Pa_rent"
+msgstr "Ã…pne _opphav"
+
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Oppføringer som er ]mapper"
+msgstr "Ã…pne opphavsmappen"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Mønstre"
+msgstr "_Steder"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7288,7 +7491,7 @@ msgstr "aktivt utvalg"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "type vindu visningen bakes inn i"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
@@ -7296,106 +7499,123 @@ msgstr "Visning feilet"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"%s-visningen ble utsatt for en feil og kan ikke fortsette. Du kan velge en "
-"annen visning eller gå til en annen lokasjon."
+msgid "The %s view encountered an error and can't continue."
+msgstr "Visningen %s ble utsatt for en feil og kan ikke fortsette."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Du kan velge en annen visning eller gå til en annen lokasjon."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "%s-visningen ble utsatt for en feil under oppstart."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Lokasjonen kan ikke vises med denne visningen."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Innholdsvisning"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Visning av aktiv fil eller mappe"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Kunne ikke finne «%s». Vennligst sjekk stavingen og forsøk igjen."
+msgid "Couldn't find \"%s\"."
+msgstr "Kunne ikke finne «%s»."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Kunne ikke vise «%s» fordi Nautilus ikke fant ut hvilken filtype det er."
+msgid "Couldn't display \"%s\"."
+msgstr "Kunne ikke vise «%s»."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus har ingen installerte visningsprogrammer som kan vise «%s»."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus kunne ikke bestemme hvilken filtype dette er."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr "Kunne ikke vise «%s», fordi Nautilus ikke kan håndtere %s: lokasjoner."
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "Nautilus har ingen installerte visningsprogrammer som kan vise filen."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "Kunne ikke vise «%s», fordi påloggingsforsøket feilet."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus ikke kan håndtere %s-lokasjoner."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Kunne ikke vise «%s», fordi tilgang ble nektet."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Påloggingsforsøket feilet."
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Tilgang ble nektet."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Kunne ikke vise «%s», fordi verten «%s» ikke ble funnet."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
-msgstr ""
-"Kunne ikke vise «%s», fordi verten, «%s», ikke ble funnet. Sjekk at "
-"stavingen er korrekt og at proxy-innstillingene er korrekte."
+"Check that the spelling is correct and that your proxy settings are correct."
+msgstr "Sjekk at stavingen er korrekt og at proxy-innstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr "Kunne ikke vise «%s». Sjekk at proxy-innstillingene er korrekte."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Sjekk at proxy-innstillingene er korrekte."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"Kunne ikke vise «%s» fordi Nautilus ikke kan kontakte SMB master browser.\n"
-"Sjekk at en SMB-tjener kjører på det lokale nettverket."
+"Kunne ikke vise «%s», fordi Nautilus ikke kan kontakte SMB master browser."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Sjekk om en SMB-tjener kjører på det lokale nettverket."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Søking er ikke tilgjengelig akkurat nå fordi du enten ikke har en indeks, "
-"eller så kjører ikke søketjenesten. Forsikre deg om at du har startet "
-"søketjenesten Medusa, og hvis du ikke har en indeks, at Medusa "
-"indekseringsmotoren kjører."
+"eller fordi søketjenesten ikke kjører."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Sjekk om at du har startet søketjenesten medusa, og hvis du ikke har en "
+"indeks, at indekseringsmotoren for medusa kjører."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Søk ikke tilgjengelig"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan ikke vise «%s»."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Vennligst velg et annet visningsprogram og prøv igjen."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Kan ikke vise lokasjon"
 
@@ -7407,7 +7627,7 @@ msgstr "GÃ¥ til lokasjonen spesifisert i dette bokmerket"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7415,14 +7635,14 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Oversatt til norsk av\n"
 "Kjartan Maraas\n"
 "<kmaraas@gnome.org>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7438,39 +7658,40 @@ msgstr "GÃ¥ tilbake noen sider"
 msgid "Go forward a number of pages"
 msgstr "FÃ¥ fremover et antall sider"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Vis denne lokasjonen med «%s»"
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Nettverk"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Prikker"
+msgstr "Skrifter"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Tema"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "_CD-brenner"
+msgstr "CD-brenner"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Applikasjons-ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Applikasjons-ID for vinduet"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Applikasjon"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication assosiert med dette vinduet."
 
@@ -7506,102 +7727,239 @@ msgstr "Nettverkstjenere"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Vis dine nettverkstjenere i Nautilus"
 
-#~ msgid "Unknown"
-#~ msgstr "Ukjent"
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory for maskinvarevisning"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Maskinvarevisning"
 
-#~ msgid "Floppy"
-#~ msgstr "Diskett"
+#~ msgid "Hardware view"
+#~ msgstr "Maskinvarevisning"
 
-#~ msgid "CD-ROM"
-#~ msgstr "CD-ROM"
+#~ msgid "View as Hardware"
+#~ msgstr "Vis som maskinvare"
 
-#~ msgid "Zip Drive"
-#~ msgstr "Zip-disk"
+#~ msgid "hardware view"
+#~ msgstr "maskinvarevisning"
 
-#~ msgid "Audio CD"
-#~ msgstr "Lyd-CD"
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "navn på ikon for maskinvarevisning"
 
-#~ msgid "Root Volume"
-#~ msgstr "Rot-volum"
+#~ msgid "summary of hardware info"
+#~ msgstr "sammendrag for maskinvarevisning"
 
 #~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. There is probably no "
-#~ "floppy in the drive."
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
 #~ msgstr ""
-#~ "Nautilus klarte ikke å montere disketten. Det er sannsynligvis ingen "
-#~ "diskett i stasjonen."
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache størrelse"
+
+#~ 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 "Oppetiden er %d dager, %d timer, %d minutter"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Oversikt over maskinvare"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Dette er en plassholder for CPU-siden."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Dette er en plassholder for RAM-siden."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Dette er en plassholder for IDE-siden."
 
 #~ msgid ""
-#~ "Nautilus was unable to mount the volume. There is probably no media in "
-#~ "the device."
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
 #~ msgstr ""
-#~ "Nautilus klarte ikke å montere volumet. Det er sannsynligvis ikke noe "
-#~ "media i enheten."
+#~ "Feil under kopiering til «%s».\n"
+#~ "\n"
+#~ "Ikke nok plass på målet."
 
 #~ msgid ""
-#~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
-#~ "a format that cannot be mounted."
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
 #~ msgstr ""
-#~ "Nautilus klarte ikke å montere diskettstasjonen. Disketten er "
-#~ "sannsynligvis i et format som ikke kan monteres."
+#~ "Feil under oppretting av lenke i «%s».\n"
+#~ "\n"
+#~ "Ikke nok plass på målet."
 
 #~ msgid ""
-#~ "Nautilus was unable to mount the selected volume. The volume is probably "
-#~ "in a format that cannot be mounted."
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
 #~ msgstr ""
-#~ "Nautilus klarte ikke å montere det valgte volumet. Volumet er "
-#~ "sannsynligvis i et format som ikke kan monteres."
+#~ "Feil under flytting av oppføringer til «%s».\n"
+#~ "\n"
+#~ "Du har ikke skriverettigheter til denne mappen."
 
-#~ msgid "Nautilus was unable to mount the selected floppy drive."
-#~ msgstr "Nautilus klarte ikke å montere valgt diskettstasjon."
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Feil under flytting av oppføringer til «%s».\n"
+#~ "\n"
+#~ "MÃ¥ldisken er skrivebeskyttet."
 
-#~ msgid "Nautilus was unable to mount the selected volume."
-#~ msgstr "Nautilus kunne ikke montere det valgte volumet."
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Feil under oppretting av lenker i «%s».\n"
+#~ "\n"
+#~ "Du har ikke skriverettigheter i denne mappen."
 
-#~ msgid "Nautilus was unable to unmount the selected volume."
-#~ msgstr "Nautilus kunne ikke avmontere det valgte volumet."
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Feil under oppretting av lenker i «%s».\n"
+#~ "\n"
+#~ "MÃ¥ldisken er skrivebeskyttet."
 
-#~ msgid "ISO 9660 Volume"
-#~ msgstr "ISO 9660 volum"
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under kopiering av «%s».\n"
+#~ "\n"
+#~ "Vil du fortsette?"
 
-#~ msgid "Error executing utility program '%s': %s"
-#~ msgstr "Feil under kjøring av verktøyprogram «%s»: %s"
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under flytting av «%s».\n"
+#~ "\n"
+#~ "Vil du fortsette?"
 
-#~ msgid "Dis_ks"
-#~ msgstr "Dis_ker"
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under sletting av «%s».\n"
+#~ "\n"
+#~ "Vil du fortsette?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under kopiering.\n"
+#~ "\n"
+#~ "Vil du fortsette?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under oppretting av lenke.\n"
+#~ "\n"
+#~ "Vil du fortsette?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Feil «%s» under sletting.\n"
+#~ "\n"
+#~ "Vil du fortsette?"
 
-#~ msgid "Mount or unmount disks"
-#~ msgstr "Monter eller avmonter disker"
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Kan ikke kopiere til søppelkurv"
 
-#~ msgid "Open _in This Window"
-#~ msgstr "Ã…pne _i et dette vinduet"
+#~ 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 ""
+#~ "Forvalgt handling kan ikke åpne «%s» fordi den ikke kan aksessere filer i "
+#~ "lokasjoner som «%s». Ingen andre handlinger er tilgjengelige for å vise "
+#~ "denne filen. Hvis du kopierer denne filen til din datamaskin, vil du "
+#~ "kanskje kunne åpne den."
 
-#~ msgid "_Open activated item in a new window"
-#~ msgstr "_Åpne aktivert oppføring i et nytt vindu"
+#~ msgid "Searching Disks"
+#~ msgstr "Søker på diskene"
 
-#~ msgid "Change the visibility of this window's toolbar"
-#~ msgstr "Endre synligheten for dette vinduets verktøylinje"
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus søker etter søppelmapper på dine disker."
 
-#~ msgid "Go to the Start Here folder"
-#~ msgstr "GÃ¥ til mappen Start her"
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "De %d valgte oppføringene kan ikke flyttes til søppelkurven. Vil du "
+#~ "slette dem med én gang?"
 
-#~ msgid "Open New _Window"
-#~ msgstr "Ã…pne i nytt _vindu"
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d av de valgte oppføringene kan ikke flyttes til søppelkurven. Vil du "
+#~ "slette disse %d oppføringene med én gang?"
 
-#~ msgid "Open another Nautilus window for the displayed location"
-#~ msgstr "Ã…pne et nytt Nautilus-vindu for vist lokasjon"
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Filen du slapp er ikke et bilde. Du kan kun bruke lokale bilder som "
+#~ "egendefinerte ikoner."
 
-#~ msgid "_Find"
-#~ msgstr "_Finn"
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Beklager, men Medusa-søketjenesten ikke tilgjengelig fordi den ikke er "
+#~ "installert."
 
-#~ msgid "_Start Here"
-#~ msgstr "_Start her"
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "En gang om dagen blir dine filer og tekstinnhold indeksert slik at dine "
+#~ "søk blir raske. Dine file blir nå indeksert."
 
-#~ msgid "_Toolbar"
-#~ msgstr "Verk_tøylinje"
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "«%s» er ikke en gyldig lokasjon. Vennligst sjekk stavingen og forsøk "
+#~ "igjen."
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Lokasjonen «%s» eksisterer ikke lenger."
+#~ 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 ""
+#~ "Kunne ikke vise «%s» fordi Nautilus ikke kan kontakte SMB master "
+#~ "browser.\n"
+#~ "Sjekk at en SMB-tjener kjører på det lokale nettverket."
 
-#~ msgid "Go to Nonexistent Location"
-#~ msgstr "GÃ¥ til ikke-eksisterende lokasjon"
+#~ msgid "file icon"
+#~ msgstr "ikon for fil"
diff --git a/po/pl.po b/po/pl.po
index 6a75e02df..13ee7366f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-09-12 12:56+0100\n"
 "Last-Translator: Gnome PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -42,8 +42,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Funkcja bonobo_ui_init() zakończona niepowodzeniem."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Symbole"
 
@@ -56,48 +56,60 @@ msgid "Nautilus Emblem view"
 msgstr "Widok Nautilusa z symbolami"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Nie można usunąć symbolu"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nie można usunąć symbolu \"%s\". Oznacza to prawdopodobnie, że jest to "
 "symbol trwały, a nie utworzony samodzielnie."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Nie można usunąć symbolu"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Nie można zmienić nazwy symbolu"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nie można zmienić nazwy symbolu \"%s\". Oznacza to prawdopodobnie, że jest "
 "to symbol trwały, a nie utworzony samodzielnie."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Nie można zmienić nazwy symbolu"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Zmiana nazwy symbolu"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Wprowadź nową nazwę wyświetlanego symbolu:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Nowe symbole..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -105,7 +117,7 @@ msgstr ""
 "Przy każdym symbolu wprowadź opisową nazwę. Będzie ona używana w różnych "
 "miejscach do identyfikacji symbolu."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -113,139 +125,64 @@ msgstr ""
 "Przy symbolu wprowadź opisową nazwę. Będzie ona używana w różnych miejscach "
 "do identyfikacji symbolu."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Niektórych z plików nie można dodać jako symboli, ponieważ nie są one "
 "poprawnymi obrazami."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Plik \"%s\" nie jest poprawnym obrazem."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Nie można dodać symboli"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Żadnego z plików nie można dodać jako symbolu, ponieważ nie są one "
 "poprawnymi obrazami."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Przeciągnięty tekst nie jest poprawnym położeniem pliku."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Nie można dodać symbolu"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Plik \"%s\" nie jest poprawnym obrazem."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Przeciągnięty plik nie jest poprawnym obrazem."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Wyczyść"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Generator widoku sprzętu"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Sprzęt"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Przeglądarka sprzętu"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Widok sprzętu"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Wyświetlanie jako Sprzęt"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "widok sprzętu"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nazwa ikony widoku sprzętu"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "zestawienie informacji o sprzęcie"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"CPU %s\n"
-"%s MHz\n"
-"Rozmiar cache: %s KB"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Czas aktywności: %d dni, %d godzin, %d minut"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Przegląd sprzętu"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "To jest puste miejsce na stronę poświęconą CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "To jest puste miejsce na stronę poświęconą pamięci RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "To jest puste miejsce na stronę poświęconą urządzeniom RAM."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historia"
@@ -911,6 +848,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Sprzęt"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Międzynarodowe"
@@ -1195,30 +1136,19 @@ msgid "Desktop trash icon name"
 msgstr "Nazwa ikony śmietnika biurka"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Katalogi przekraczające podany rozmiar zostaną przycięte. Dzięki temu "
-"zapobiega się zaśmiecaniu stosu i ubijaniu nautilusa na wielkich katalogach. "
-"Wartość ujemna oznacza brak limitu. Limit jest przybliżony, ze względu na "
-"odczytywane ważne części katalogów."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "WÅ‚Ä…czony znacznik \"specjalny\" w oknie dialogowym preferencji pliku"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Nazwa pliku dla domyślnego tła katalogu. Opcja używana tylko gdy zmienna "
 "background_set jest prawdziwa."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1226,6 +1156,19 @@ msgstr ""
 "Nazwa pliku dla domyślnego tła panelu bocznego. Opcja używana tylko gdy "
 "zmienna side_pane_background_set jest prawdziwa."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Katalogi przekraczające podany rozmiar zostaną przycięte. Dzięki temu "
+"zapobiega się zaśmiecaniu stosu i ubijaniu nautilusa na wielkich katalogach. "
+"Wartość ujemna oznacza brak limitu. Limit jest przybliżony, ze względu na "
+"odczytywane ważne części katalogów."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Ukrywanie domyślnych zakładek w menu zakładek"
@@ -1235,9 +1178,10 @@ msgid "Home icon visible on desktop"
 msgstr "Ikona poczÄ…tkowa widoczna na biurku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Określa, czy Nautilus ma wyświetlać same katalogi w drzewie paska bocznego, "
 "czy też katalogi i pliki."
@@ -1268,9 +1212,10 @@ msgstr ""
 "oknie preferencji."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Określa, czy Nautilus ma wyświetlać katalogi przed plikami w widokach ikon i "
 "listy."
@@ -1313,8 +1258,9 @@ msgstr ""
 "Określa, czy Nautilus będzie wyświetlał zakładki użytkownika w menu ulubione."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Określa, czy Nautilus użyje katalogu domowego użytkownika jako pulpitu. "
@@ -1331,9 +1277,10 @@ msgstr ""
 "zapasowe."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Określa czy menedżer plików wyświetla pliki ukryte. Plikami ukrytymi są "
 "zarówno pliki z kropką na początku nazwy jak i wymienione w pliku .hidden."
@@ -1354,8 +1301,9 @@ msgid ""
 msgstr "Określa, czy na pulpicie będzie umieszczona ikona kosza."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Określa, czy na pulpicie będzie umieszczona ikona z odnośnikiem do katalogu "
@@ -1390,7 +1338,8 @@ msgstr ""
 "sortowane według rozmiaru, wtedy zamiast rosnąco, będą sortowane malejąco."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Określa, czy domyślnie ikony mają być ciaśniej rozmieszczone w nowych oknach."
 
@@ -1419,7 +1368,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista możliwych podpisów na ikonach"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maksymalna liczba obsługiwanych plików w katalogu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1439,11 +1389,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus obsługuje rysowanie na biurku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus używa katalog domowy użytkownika jako biurka"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Wyświetlanie katalogów tylko w pasku bocznym z drzewem katalogów"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1464,7 +1416,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Odwrócona kolejność uporządkowania w nowych oknach"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Wyświetlanie katalogów jako pierwszych w nowych oknach"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1501,10 +1454,11 @@ msgstr ""
 "Jeżeli ustawiono \"never\" wtedy dźwięk nie jest odtwarzany."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1515,12 +1469,13 @@ msgstr ""
 "\" wtedy nie sÄ… odczytywane dane do podglÄ…du."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Ustawienie wydajności przy wyświetlaniu miniatur plików graficznych. Jeżeli "
 "ustawiono \"always\" wtedy zawsze pokazywana jest miniaturka, nawet jeśli "
@@ -1529,10 +1484,11 @@ msgstr ""
 "zamiast miniaturek wyświetlane są standardowe ikony."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Ustawienie wydajności przy wyświetlaniu ilości elementów w katalogu. Jeżeli "
@@ -1542,17 +1498,19 @@ msgstr ""
 "\"never\" wtedy elementy nie sÄ… liczone."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Domyślny porządek sortowania elementów w widoku ikon. Dopuszczalne wartości "
 "to: \"name\", \"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Domyślny porządek sortowania elementów w widoku listy. Dopuszczalne wartości "
 "to: name, size, type i modification_date."
@@ -1598,7 +1556,8 @@ msgid "Use manual layout in new windows"
 msgstr "Użycie ręcznego rozmieszczenia w nowych oknach"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Użycie ciaśniejszego ułożenia w nowych oknach"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1628,7 +1587,8 @@ msgstr ""
 "\" oraz \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Kiedy wyświetlić liczbę elementów w katalogu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1640,7 +1600,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Kiedy wyświetlać miniaturki plików graficznych"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Określa, czy zostało ustawione inne tło domyślne katalogu."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1799,67 +1760,81 @@ msgstr "wyczyść"
 msgid "on the desktop"
 msgstr "na biurku"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Nie można usunąć wolumenu"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Nie można usunąć ikony wolumenu. Jeśli chcesz wysunąć nośnik, użyj pozycji "
 "Wysuń menu podręcznego wyświetlanego po kliknięciu prawym przyciskiem myszy."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Nie można usunąć wolumenu"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Åšmietnik"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_PrzenieÅ› tutaj"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "S_kopiuj tutaj"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Utwórz tutaj d_owiązanie symboliczne"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Ustaw jako _tło"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Ustaw jako tło we _wszystkich folderach"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Ustaw jako tło w _tym folderze"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Niestety, słowo kluczowe dla nowego symbolu nie może być puste."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Nie można zainstalować symbolu"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1869,18 +1844,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Niestety, symbol o nazwie \"%s\" już istnieje. Użyj innej nazwy."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Nie można zainstalować symbolu"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Niestety, nie można zapisać dodatkowego symbolu."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Niestety, nie można zapisać nazwy dodatkowego symbolu."
 
@@ -1899,22 +1880,28 @@ msgstr "Z:"
 msgid "To:"
 msgstr "Do:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "BÅ‚Ä…d podczas przenoszenia."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "BÅ‚Ä…d podczas przenoszenia.\n"
 "\n"
 "Nie można przenieść \"%s\", ponieważ jest on na dysku tylko do odczytu."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "BÅ‚Ä…d podczas usuwania."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1923,22 +1910,17 @@ msgstr ""
 "Nie można usunąć \"%s\" z powodu braku uprawnień do modyfikacji folderu "
 "nadrzędnego."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "BÅ‚Ä…d podczas usuwania.\n"
 "\n"
 "Nie można usunąć \"%s\", ponieważ jest on na dysku tylko do odczytu."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1947,12 +1929,15 @@ msgstr ""
 "Nie można przenieść \"%s\" z powodu braku uprawnień do modyfikacji folderu "
 "nadrzędnego."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "BÅ‚Ä…d podczas przenoszenia."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "BÅ‚Ä…d podczas przenoszenia.\n"
@@ -1960,12 +1945,10 @@ msgstr ""
 "Nie można przenieść \"%s\", ponieważ położenie to lub położenie nadrzędne "
 "zawiera siÄ™ w celu."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "BÅ‚Ä…d podczas przenoszenia.\n"
@@ -1973,238 +1956,178 @@ msgstr ""
 "Nie można przenieść \"%s\" do śmietnika z powodu braku uprawnień do "
 "modyfikacji folderu nadrzędnego lub jego samego."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "BÅ‚Ä…d podczas kopiowania."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "BÅ‚Ä…d podczas kopiowania.\n"
 "\n"
 "Nie można skopiować \"%s\" z powodu braku uprawnień do jego odczytu."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"BÅ‚Ä…d podczas kopiowania do \"%s\".\n"
-"\n"
-"W miejscu docelowym brakuje miejsca."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "BÅ‚Ä…d podczas kopiowania."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "BÅ‚Ä…d podczas przenoszenia do \"%s\".\n"
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"BÅ‚Ä…d podczas dowiÄ…zywania w \"%s\".\n"
-"\n"
-"W miejscu docelowym brakuje miejsca."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "BÅ‚Ä…d podczas przenoszenia."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "BÅ‚Ä…d podczas dowiÄ…zywania."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "BÅ‚Ä…d podczas kopiowania do \"%s\".\n"
 "\n"
 "Brak uprawnień do zapisu w tym folderze."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "BÅ‚Ä…d podczas kopiowania do \"%s\".\n"
 "\n"
 "Dysk docelowy jest tylko do odczytu."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Błąd podczas przenoszenia elementów do \"%s\".\n"
-"\n"
-"Brak uprawnień do zapisu w tym folderze."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Błąd podczas przenoszenia elementów do \"%s\".\n"
-"\n"
-"Dysk docelowy jest tylko do odczytu."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Błąd podczas tworzenia dowiązań w \"%s\".\n"
-"\n"
-"Brak uprawnień do zapisu w tym folderze."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "BÅ‚Ä…d podczas przenoszenia."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Błąd podczas tworzenia dowiązań w \"%s\".\n"
-"\n"
-"Dysk docelowy jest tylko do odczytu."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas kopiowania \"%s\".\n"
-"\n"
-"Czy chcesz kontynuować?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "BÅ‚Ä…d podczas dowiÄ…zywania."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "BÅ‚Ä…d podczas kopiowania."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"BÅ‚Ä…d \"%s\" podczas przenoszenia \"%s\".\n"
+"BÅ‚Ä…d \"%s\" podczas przenoszenia.\n"
 "\n"
 "Czy chcesz kontynuować?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas usuwania \"%s\".\n"
-"\n"
-"Czy chcesz kontynuować?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "BÅ‚Ä…d podczas przenoszenia."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "BÅ‚Ä…d \"%s\" podczas usuwania \"%s\".\n"
 "\n"
 "Czy chcesz kontynuować?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas kopiowania.\n"
-"\n"
-"Czy chcesz kontynuować?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "BÅ‚Ä…d podczas usuwania."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas przenoszenia.\n"
-"\n"
-"Czy chcesz kontynuować?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "BÅ‚Ä…d podczas kopiowania."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas dowiÄ…zywania.\n"
-"\n"
-"Czy chcesz kontynuować?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "BÅ‚Ä…d podczas przenoszenia."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"BÅ‚Ä…d \"%s\" podczas usuwania.\n"
-"\n"
-"Czy chcesz kontynuować?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "BÅ‚Ä…d podczas dowiÄ…zywania."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "BÅ‚Ä…d podczas usuwania."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "BÅ‚Ä…d podczas kopiowania."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "BÅ‚Ä…d podczas przenoszenia."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "BÅ‚Ä…d podczas dowiÄ…zywania."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "BÅ‚Ä…d podczas usuwania."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Pomiń"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Ponów"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nie można zakończyć określonej operacji."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Nie można przenieść \"%s\" w nowe miejsce, ponieważ nazwa ta jest już "
 "wykorzystana przez specjalny element, którego nie można usunąć, ani "
@@ -2212,13 +2135,16 @@ msgstr ""
 "\n"
 "Jeśli nadal chcesz przenieść \"%s\", zmień nazwę na inną i spróbuj ponownie."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nie można zakończyć określonej operacji."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Nie można skopiować \"%s\" w nowe miejsce, ponieważ nazwa ta jest już "
 "wykorzystana przez specjalny element, którego nie można usunąć, ani "
@@ -2226,44 +2152,50 @@ msgstr ""
 "\n"
 "Jeśli nadal chcesz skopiować \"%s\", zmień nazwę na inną i spróbuj ponownie."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Nie można zastąpić pliku."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "\n"
 "Czy chcesz go zastąpić?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt podczas kopiowania"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "ZastÄ…p"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "ZastÄ…p wszystkie"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "dowiÄ…zanie do %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "kolejne dowiÄ…zanie do %s"
@@ -2272,25 +2204,25 @@ msgstr "kolejne dowiÄ…zanie do %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. dowiÄ…zanie do %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. dowiÄ…zanie do %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. dowiÄ…zanie do %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. dowiÄ…zanie do %s"
@@ -2300,561 +2232,600 @@ msgstr "%d. dowiÄ…zanie do %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (kolejna kopia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kopia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kopia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (kolejna kopia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Nieznany GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Przenoszenie plików do śmietnika"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Wyrzuconych plików:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Przygotowywanie do przeniesienia do śmietnika..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Przenoszenie plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Przeniesionych plików:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Przygotowanie do przeniesienia..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Wykańczanie przeniesienia..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Tworzenie dowiązań do plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Dowiązanych plików:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "DowiÄ…zywanie"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Przygotowanie do tworzenia dowiązań..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Wykańczanie tworzenia dowiązań..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopiowanie plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Skopiowanych plików:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Przygotowywanie do kopiowania..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Nie można kopiować elementów do śmietnika."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nie można kopiować do śmietnika"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Nie można przenieść folderu śmietnika."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Nie można kopiować folderu śmietnika."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Nie można zmieniać położenia śmietnika"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Nie można kopiować śmietnika"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Nie można przenieść folderu do niego samego."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Nie można skopiować folderu do niego samego."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Tworzy nowy pusty folder w bieżącym"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Nie można przenieść do siebie samego"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Nie można skopiować do siebie samego"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Nie można skopiować pliku do niego samego."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Nie można skopiować do siebie samego"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Podczas tworzenia folderu wystąpił błąd.\n"
 "\n"
 "Brak uprawnień do zapisu w miejscu docelowym."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Podczas tworzenia folderu wystąpił błąd.\n"
 "\n"
 "W miejscu docelowym brakuje miejsca."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Podczas tworzenia nowego folderu wystąpił błąd \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Podczas tworzenia nowego folderu wystąpił błąd"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Podczas tworzenia nowego folderu wystąpił błąd"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "folder bez nazwy"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Podczas tworzenia nowego folderu wystąpił błąd \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Podczas tworzenia nowego folderu wystąpił błąd"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Podczas tworzenia nowego folderu wystąpił błąd"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 plik"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Usuwanie plików"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Usuniętych plików:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Usuwanie"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Przygotowywanie do usunięcia plików..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Opróżnianie śmietnika"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Przygotowywanie do opróżnienia śmietnika..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Czy na pewno chcesz trwale usunąć wszystkie elementy ze śmietnika?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Op_różnij"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (kolejna kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (kolejna kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (kolejna kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (kolejna kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (222. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. kopia).txt"
 
@@ -2873,64 +2844,64 @@ msgstr "foo (124. kopia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "dzisiaj o 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "dzisiaj o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "dzisiaj o 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "dzisiaj o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "dzisiaj, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "dzisiaj, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "dzisiaj"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "wczoraj o 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "wczoraj o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "wczoraj o 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "wczoraj o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "Wczoraj, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "wczoraj, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "wczoraj"
 
@@ -2939,133 +2910,133 @@ msgstr "wczoraj"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Środa, 00 września 0000 o 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d %B %Y o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mon, 00 Paź 0000 o 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pon, 00 Paź 0000 o 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Paź 0000 o 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Paź 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elementów"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 folderów"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 plików"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 folder"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 plik"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elementów"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u folderów"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u plików"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elementów"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bajtów"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "nieznany typ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "nieznany typ MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "nieznane"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3075,7 +3046,7 @@ msgstr ""
 "to, że plik gnome-vfs.keys znajduje się w niewłaściwym miejscu lub nie "
 "został odnaleziony z innego powodu."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3084,11 +3055,11 @@ msgstr ""
 "Nie odnaleziono opisu typu MIME \"%s\" (plik \"%s\"), napisz na listÄ™ gnome-"
 "vfs (w języku angielskim)."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "dowiÄ…zanie"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "dowiÄ…zanie (uszkodzone)"
 
@@ -3209,11 +3180,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Wyszukiwanie plików według nazwy i właściwości"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Wyświetlanie ikon"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Wyświetlanie listy"
@@ -3357,149 +3330,154 @@ msgstr "Folder użytkownika %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Blat"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikona pliku"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "modyfikowalny tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "modyfikowalna etykieta"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "Dodatkowy tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "Dodatkowy tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "Podświetlanie przy zaznaczeniu"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "Określa, czy element powinien być wyróżniany przy zaznaczeniu"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "Podświetlanie przy skupieniu klawiatury"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "Określa, czy element powinien być wyróżniany przy skupieniu klawiatury"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "wyróżnianie przy upuszczaniu"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 "Określa, czy element powinien być wyróżniany jako cel upuszczenia obiektu"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "ProstokÄ…t zaznaczenia"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Tekst w ramce"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Określa, czy wokół niezaznaczonego tekstu będzie rysowana ramka"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Kolor prostokÄ…ta zaznaczenia"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Kolor prostokÄ…ta zaznaczenia"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Wartość alfa prostokąta zaznaczenia"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Nieprzepuszczalność prostokąta zaznaczenia"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Wartość alfa wyróżnienia"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Nieprzepuszczalność wyróżnienia zaznaczonych ikon"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Jasny kolor informacji"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Kolor używany przy tekstach informacyjnych na ciemnym tle"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Ciemny kolor informacji"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Kolor używany przy tekstach informacyjnych na jasnym tle"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Ten folder wykorzystuje automatyczny układ elementów. Czy chcesz przejść na "
 "układ ręczny i pozostawić element w miejscu upuszczenia? Spowoduje to "
 "odtworzenie zapisanego ręcznego układu.0"
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Ten folder wykorzystuje automatyczny układ elementów. Czy chcesz przejść na "
 "układ ręczny i pozostawić elementy w miejscu upuszczenia? Spowoduje to "
 "odtworzenie zapisanego ręcznego układu."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Ten folder wykorzystuje automatyczny układ elementów. Czy chcesz przejść na "
 "układ ręczny i pozostawić element w miejscu upuszczenia? "
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Ten folder wykorzystuje automatyczny układ elementów. Czy chcesz przejść na "
 "układ ręczny i pozostawić elementy w miejscu upuszczenia? "
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Przełączyć na ręczny układ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Przełącz"
 
@@ -3608,72 +3586,72 @@ msgstr "Jest wartością domyślną dla elementów \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Jest domyślny dla wszystkich elementów \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Zmiana ustawienia \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Dołączany do menu dla elementów \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Domyślny dla elementów \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Dołączany do menu tylko dla \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Domyślny tylko dla \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nieobecny w menu dla elementów \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nazwa"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stan"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Wybierz"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Gotowe"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Zmień..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Typy plików i programy"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Przejdź tam"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3681,48 +3659,48 @@ msgstr ""
 "To, jakie programy są oferowane dla których typów plików, można "
 "skonfigurować, korzystając z okna Typy plików i programy."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Otwarcie za pomocÄ… innej aplikacji"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Wybierz aplikację, za której pomocą otworzyć \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Otwarcie za pomocÄ… innej przeglÄ…darki"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Wybierz sposób wyświetlania \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Brak przeglÄ…darek dla \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Brak przeglÄ…darek"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Z \"%s\" nie jest powiązana żadna aplikacja."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Brak powiÄ…zanych aplikacji"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Z \"%s\" nie jest powiązana żadna czynność."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Brak powiązanych czynności"
 
@@ -3730,11 +3708,9 @@ msgstr "Brak powiązanych czynności"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3743,42 +3719,41 @@ msgstr ""
 "Można skonfigurować GNOME, wiążąc aplikacje z typami plików. Czy chcesz "
 "teraz powiązać aplikację z tym typem plików?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "PowiÄ…zanie aplikacji"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Z \"%s\" jest powiÄ…zana niepoprawna przeglÄ…darka."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "PowiÄ…zana niepoprawna przeglÄ…darka"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Z \"%s\" jest powiÄ…zana niepoprawna aplikacja."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "PowiÄ…zana niepoprawna aplikacja"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Z \"%s\" jest powiązana niepoprawna czynność."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Powiązana niepoprawna czynność"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3788,95 +3763,136 @@ msgstr ""
 "Można skonfigurować GNOME, wiążąc różne aplikacje lub przeglądarkę z tym "
 "typem plików. Czy chcesz teraz utworzyć takie powiązanie?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "PowiÄ…zanie akcji"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"Za pomocą aplikacji \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie "
+"obsługuje odczytów położenia typu \"%s\". Czy chcesz wybrać inną aplikację?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "Za pomocą aplikacji \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie "
 "obsługuje odczytów położenia typu \"%s\". Czy chcesz wybrać inną aplikację?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Nie można otworzyć za pomocą domyślnej akcji \"%s\", ponieważ nie obsługuje "
 "ona odczytów położenia typu \"%s\". Czy chcesz wybrać inną akcję?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nie można otworzyć położenia"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Za pomocą aplikacji \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie "
+"obsługuje odczytów położenia typu \"%s\". Czy chcesz wybrać inną aplikację?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "Za pomocą aplikacji \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie "
 "obsługuje odczytów położenia typu \"%s\". Żadna inna dostępna aplikacja nie "
 "obsługuje tego typu plików. Prawdopodobnie otwarcie pliku będzie możliwe po "
 "skopiowaniu go na lokalny dysk."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Nie można otworzyć za pomocą domyślnej akcji \"%s\", ponieważ nie obsługuje "
-"ona odczytów położenia typu \"%s\". Żadna inna dostępna akcja nie obsługuje "
-"tego typu plików. Prawdopodobnie otwarcie pliku będzie możliwe po "
+"ona odczytów położenia typu \"%s\". Czy chcesz wybrać inną akcję?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"Za pomocą aplikacji \"%s\" nie można otworzyć \"%s\", ponieważ \"%s\" nie "
+"obsługuje odczytów położenia typu \"%s\". Żadna inna dostępna aplikacja nie "
+"obsługuje tego typu plików. Prawdopodobnie otwarcie pliku będzie możliwe po "
 "skopiowaniu go na lokalny dysk."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Niestety, ze względu na bezpieczeństwo nie można wykonywać poleceń ze "
 "zdalnych adresów."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Nie można wykonywać zdalnych dowiązań"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Przy uruchamianiu aplikacji wystąpił błąd.\n"
 "\n"
 "Szczegóły: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "BÅ‚Ä…d przy uruchamianiu aplikacji"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Upuszczanie jest obsługiwane tylko dla plików lokalnych"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Upuszczanie w tym miejscu jest obsługiwane tylko dla plików lokalnych.\n"
@@ -3884,15 +3900,15 @@ msgstr ""
 "Aby otworzyć plik dostępny zdalnie, skopiuj go do folderu lokalnego, a "
 "następnie przeciągnij ponownie."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Upuszczanie jest obsługiwane tylko dla plików lokalnych"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4148,16 +4164,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elementy zawierające \"medusa\" w nazwie i będące folderami"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Przeszukiwane dysków"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-"Nautilus przeszukuje dyski w poszukiwaniu folderów zawierających dane "
-"śmietnika."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Edycja"
@@ -4362,97 +4368,107 @@ msgstr "TÅ‚o"
 msgid "Empty Trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"To spowoduje otwarcie %d niezależnych okien. Czy na pewno chcesz to zrobić?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Otworzyć %d okien?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"To spowoduje otwarcie %d niezależnych okien. Czy na pewno chcesz to zrobić?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Czy na pewno chcesz trwale usunąć %d zaznaczonych elementów?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Usuń trwale wszystkie zaznaczone elementy"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Usunąć?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Wybierz kategoriÄ™:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "D_esenie"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Zaznaczone \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "Zaznaczony 1 folder"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "Zaznaczone %d folderów"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (zawartość: 0 elementów)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (zawartość: 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (zawartość: %d elementów)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (ogólna zawartość: 0 elementów)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (ogólna zawartość: 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (ogólna zawartość: %d elementów)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Zaznaczone \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "Zaznaczone %d elementów (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "Zaznaczony 1 inny element (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "Zaznaczonych %d innych elementów (%s)"
@@ -4464,7 +4480,7 @@ msgstr "Zaznaczonych %d innych elementów (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4473,105 +4489,121 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Folder \"%s\" zawiera więcej plików, niż może obsłużyć program Nautilus. "
 "Część z nich nie zostanie wyświetlona."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Zbyt wiele plików"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Nie można przenieść \"%s\" do śmietnika. Czy chcesz go trwale usunąć?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Nie można przenieść do śmietnika %d zaznaczonych elementów. Czy chcesz je "
-"trwale usunąć?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Nie można przenieść \"%s\" do śmietnika. Czy chcesz go trwale usunąć?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"Nie można przenieść do śmietnika %d spośród zaznaczonych elementów. Czy "
-"chcesz trwale usunąć te %d elementów?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Nie można przenieść \"%s\" do śmietnika. Czy chcesz go trwale usunąć?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Usunąć natychmiast?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Czy na pewno chcesz trwale usunąć \"%s\" ze śmietnika?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Czy na pewno chcesz trwale usunąć %d zaznaczonych elementów ze śmietnika?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Usunąć ze śmietnika?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Otwiera zaznaczony element za pomocÄ… \"%s\""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Inna _aplikacja..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Aplikacja..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Inna p_rzeglÄ…darka..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "P_rzeglÄ…darka..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nie można zakończyć określonej operacji: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nie można zakończyć określonej operacji."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Uruchamia skrypt \"%s\" na zaznaczonych elementach"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Wszystkie pliki wykonywalne umieszczone w tym folderze pojawiÄ… siÄ™ w menu "
+"Skrypty. Wybranie skryptu z menu spowoduje uruchomienie go wraz z "
+"przekazaniem wszystkich zaznaczonych elementów."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4579,11 +4611,11 @@ msgstr ""
 "Skrypty. Wybranie skryptu z menu spowoduje uruchomienie go wraz z "
 "przekazaniem wszystkich zaznaczonych elementów."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Informacje o skryptach"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4625,183 +4657,190 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: położenie i rozmiar bieżącego okna"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "Po wybraniu polecenia Wklej pliki zostanie przeniesiony \"%s\""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "Po wybraniu polecenia Wklej pliki zostanie skopiowany \"%s\""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "Przeniesienie %d elementów nastąpi po wybraniu polecenia Wklej pliki"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "Skopiowanie %d elementów nastąpi po wybraniu polecenia Wklej pliki"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Schowek nie zawiera niczego do wklejenia."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "BÅ‚Ä…d przy montowaniu"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "BÅ‚Ä…d przy odmontowywaniu"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "BÅ‚Ä…d przy montowaniu"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Wy_suń"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "O_dmontuj wolumin"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "O_twórz w nowym oknie"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Otwórz _w %d nowych oknach"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Folder domowy"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Folder domowy"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Usuń ze ś_mietnika"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Usuń trwale wszystkie zaznaczone elementy"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Wyrzuć do śmie_tnika"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Przenosi każdy z zaznaczonych elementów do śmietnika"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Utwórz _dowiązania"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Utwórz _dowiązanie"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Opróżnij śmietnik"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Wytnij plik"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Wytnij pliki"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "S_kopiuj plik"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "S_kopiuj pliki"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Nie można użyć dowiązania, ponieważ nie ma ono przypisanego celu. Czy chcesz "
 "umieścić to dowiązanie w śmietniku?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Nie można użyć dowiązania, ponieważ nie ma ono przypisanego celu. Czy chcesz "
+"umieścić to dowiązanie w śmietniku?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Nie można użyć dowiązania, ponieważ przypisany mu cel \"%s\" nie istnieje. "
 "Czy chcesz umieścić to dowiązanie w śmietniku?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Uszkodzone dowiÄ…zanie"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" jest wykonywalnym plikiem tekstowym. Czy chcesz go uruchomić, czy też "
 "wyświetlić jego zawartość?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Uruchomić czy wyświetlić?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Wyświetl"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Uruchom w _terminalu"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Wyświetl"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "U_ruchom"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Otwieranie \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Anulować otwarcie?"
 
@@ -4822,16 +4861,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Niestety, nie można wyświetlić całej zawartości \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Nie można określić uprawnień \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Błąd przy wyświetlaniu folderu"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "Nazwa \"%s\" została już użyta w folderze. Użyj innej nazwy."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4839,12 +4883,12 @@ msgstr ""
 "Folder nie zawiera \"%s\". Może element został właśnie przeniesiony lub "
 "usunięty?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Brak uprawnień potrzebnych do zmiany nazwy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4853,64 +4897,79 @@ msgstr ""
 "Nazwa \"%s\" nie jest poprawna, ponieważ zawiera znak \"/\". Użyj innej "
 "nazwy."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Nazwa \"%s\" nie jest poprawna. Użyj innej nazwy."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie można zmienić nazwy \"%s\", ponieważ jest on na dysku tylko do odczytu."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Niestety, nie można zmienić nazwy \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Nie można określić uprawnień \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "BÅ‚Ä…d przy zmianie nazwy"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Brak uprawnień do zmiany grupy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nie można zmienić grupy \"%s\", ponieważ jest on na dysku tylko do odczytu."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Niestety, nie można zmienić grupy \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Nie można określić uprawnień \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "BÅ‚Ä…d przy zmianie grupy"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nie można zmienić właściciela \"%s\", ponieważ jest on na dysku tylko do "
 "odczytu."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Niestety, nie można zmienić właściciela \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Nie można określić uprawnień \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Błąd przy zmianie właściciela"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4918,21 +4977,26 @@ msgstr ""
 "Niestety, nie można zmienić uprawnień \"%s\", ponieważ jest on na dysku "
 "tylko do odczytu."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Niestety, nie można zmienić uprawnień \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Nie można określić uprawnień \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Błąd przy zmianie uprawnień"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Zmienianie nazwy \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Anulować zmianę nazwy?"
 
@@ -4990,130 +5054,154 @@ msgstr "Przywróć p_ierwotny rozmiar ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Przywróć p_ierwotny rozmiar ikony"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "Wskazanie \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr ""
 "Przeciąganie i upuszczanie obiektów jest obsługiwane tylko w lokalnym "
 "systemie plików."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr ""
+"Przeciąganie i upuszczanie obiektów jest obsługiwane tylko w lokalnym "
+"systemie plików."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Błąd przy obsłudze przeciąganych danych"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Użyto niepoprawnego typu przeciąganych danych."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Czas modyfikacji"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Nie można przypisać więcej niż jednego obrazu użytkownika jednocześnie! "
 "Przeciągnij dokładnie jeden obraz, aby ustawić wygląd ikony."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Nie można przypisać więcej niż jednego obrazu użytkownika jednocześnie! "
+"Przeciągnij dokładnie jeden obraz, aby ustawić wygląd ikony."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Więcej niż jeden obraz"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Przeciągnięty plik nie jest lokalny. Jako ikony użytkownika mogą być "
+"wykorzystywane tylko lokalne obrazy."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Przeciągnięty plik nie jest lokalny. Jako ikony użytkownika mogą być "
 "wykorzystywane tylko lokalne obrazy."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Tylko lokalne obrazy"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Przeciągnięty przez ciebie plik nie zawiera obrazu. Jako ikony użytkownika "
-"mogą być wykorzystywane tylko lokalne obrazy."
+"Przeciągnięty plik nie jest lokalny. Jako ikony użytkownika mogą być "
+"wykorzystywane tylko lokalne obrazy."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Tylko obrazy"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Właściwości %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Anulować zmianę grupy?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Zmienianie grupy"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Anulować zmianę właściciela?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Zmienianie właściciela"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nic"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "nieodczytywalny"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element o rozmiarze %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elementów, ogółem %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(część zawartości nieodczytywalna)"
 
@@ -5123,191 +5211,191 @@ msgstr "(część zawartości nieodczytywalna)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Zawartość:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Proste"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nazwy:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Położenie:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Wolumin:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Wolna przestrzeń:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Cel dowiÄ…zania:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modyfikacja:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Dostęp:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Wybierz własną ikonę..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Usuń własną ikonę"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Od_czyt"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Zapis"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Wykonanie"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Ustawianie ID _użytkownika"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Znaczniki specjalne:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Ustawianie ID g_rupy"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Przyklejony"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nie będąc właścicielem nie możesz zmienić tych uprawnień."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Właściciel pliku:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Właściciel pliku:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Właśc_iciel grupowy:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Właściciel grupowy:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Właściciel:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupa:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Inni:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Zapis tekstowy:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Zapis liczbowy:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Ostatnia zmiana:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Nie można określić uprawnień \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Nie można określić uprawnień wybranego pliku."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Przy wyświetlaniu pomocy wystąpił błąd:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Przy wyświetlaniu pomocy wystąpił błąd: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Nie można wyświetlić pomocy"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Anulować wyświetlenie okna właściwości?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Tworzenie okna właściwości"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Wybór ikony"
 
@@ -5325,71 +5413,109 @@ msgid "Search Results"
 msgstr "Wyniki przeszukiwania"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Niestety, usługa wyszukiwania Medusa nie jest dostępna, ponieważ nie została "
-"zainstalowana."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Usługa wyszukiwania nie jest dostępna."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Usługa wyszukiwania nie jest dostępna"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Wybrane kryteria wyszukiwania dotyczą plików nowszych od czasu ostatniego "
 "utworzenia indeksu plików w systemie, więc lista wyników wyszukiwania będzie "
 "pusta. Aby utworzyć nowy indeks, należy uruchomić z wiersza poleceń \"medusa-"
 "indexd\" jako użytkownik root."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Nie można odnaleźć indeksu plików w systemie. Plik z indeksem nie istnieje "
+"lub jest uszkodzony. Aby utworzyć nowy indeks, należy uruchomić z wiersza "
+"poleceń \"medusa-indexd\" jako użytkownik root."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Wyszukiwanie zbyt nowych elementów"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Każdy ze zindeksowanych plików odpowiada wybranym kryteriom. Sprawdź "
+"poprawność zapisu lub dodaj kolejne kryteria, aby zawęzić wybór."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Każdy ze zindeksowanych plików odpowiada wybranym kryteriom. Sprawdź "
 "poprawność zapisu lub dodaj kolejne kryteria, aby zawęzić wybór."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "BÅ‚Ä…d podczas wyszukiwania"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Nie można odnaleźć indeksu plików w systemie. Plik z indeksem nie istnieje "
 "lub jest uszkodzony. Aby utworzyć nowy indeks, należy uruchomić z wiersza "
 "poleceń \"medusa-indexd\" jako użytkownik root."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Podczas odczytu indeksu plików wystąpił błąd"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Wystąpił błąd podczas odczytywania listy wyników wyszukiwania: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
+"systemie. Obecnie nie można odnaleźć indeksu."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
+"systemie. Obecnie nie można odnaleźć indeksu."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5397,25 +5523,23 @@ msgstr ""
 "systemie. Obecnie nie można odnaleźć indeksu, więc zostanie wykonane "
 "wolniejsze przeszukiwanie, które nie korzysta z indeksu."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
-"systemie. Obecnie nie można odnaleźć indeksu."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Szybkie wyszukiwanie nie jest dostępne"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Wyszukiwanie zawartości nie jest dostępne"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5428,39 +5552,66 @@ msgstr ""
 "uruchomić z wiersza poleceń poprzez wykonanie \"medusa-searchd\" jako "
 "użytkownik root."
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Aby przeprowadzić szybkie wyszukiwanie, wymagany jest indeks plików w "
 "systemie. Obecnie trwa tworzenie tego indeksu i nie może on zostać "
 "wykorzystany. Zostanie wykonane wolniejsze przeszukiwanie, które może "
 "potrwać kilka minut."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
 "systemie. Obecnie trwa tworzenie tego indeksu i nie może on zostać "
 "wykorzystany. Przeszukiwanie zawartości będzie możliwe po zakończeniu "
 "indeksowania plików."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indeksowane wyszukiwanie nie jest dostępne"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
+"systemie. Obecnie nie można odnaleźć indeksu."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
+"systemie. Obecnie nie można odnaleźć indeksu."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Aby przeprowadzić szybkie wyszukiwanie, wymagany jest indeks plików w "
 "systemie. Obecnie nie jest dostępny żaden indeks i dopóki nie zostanie "
@@ -5468,12 +5619,12 @@ msgstr ""
 "nowy indeks, należy uruchomić z wiersza poleceń \"medusa-indexd\" jako "
 "użytkownik root."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Aby wykonać przeszukiwanie zawartości, wymagany jest indeks plików w "
 "systemie. Obecnie nie jest dostępny żaden indeks i dopóki nie zostanie "
@@ -5481,7 +5632,12 @@ msgstr ""
 "indeks, należy uruchomić z wiersza poleceń \"medusa-indexd\" jako użytkownik "
 "root."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Szybie wyszukiwanie nie jest aktywne w systemie"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5491,11 +5647,12 @@ msgstr ""
 "systemie.  Administrator systemu wyłączył szybkie wyszukiwanie, więc indeks "
 "plików nie jest dostępny."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Szybie wyszukiwanie nie jest aktywne w systemie"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Szybkie wyszukiwanie nie jest dostępne"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Położenie"
 
@@ -5504,7 +5661,7 @@ msgstr "Położenie"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Wyświetl w nowym _oknie z folderem mieszczącym element"
@@ -5515,7 +5672,7 @@ msgstr "Wyświetl w nowym _oknie z folderem mieszczącym element"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Wyświetl w %d nowych o_knach z folderami zawierającymi elementy"
@@ -5524,15 +5681,21 @@ msgstr "Wyświetl w %d nowych o_knach z folderami zawierającymi elementy"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Liczba odnalezionych elementów przekracza tę, którą można wyświetlić. "
 "Niektóre z elementów nie zostaną wyświetlone."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Liczba odnalezionych elementów przekracza tę, którą można wyświetlić. "
+"Niektóre z elementów nie zostaną wyświetlone."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Zbyt wiele odnalezionych elementów"
 
@@ -5546,12 +5709,12 @@ msgid "Create L_auncher"
 msgstr "Utwórz _aktywator"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Tworzy nowy aktywator"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Usuwa wszystkie elementy ze śmietnika"
 
@@ -5571,7 +5734,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Ustaw _domyślne tło"
@@ -5597,59 +5760,69 @@ msgstr ""
 "zaznaczony element"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Ut_wórz folder"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Ut_wórz folder"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Tworzy nowy pusty folder w bieżącym"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Tworzy nowy pusty folder w bieżącym"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Tworzy dowiązanie symboliczne do każdego z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Zd_uplikuj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 "Usuwa każdy z zaznaczonych elementów, bez przenoszenia ich do śmietnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplikuje każdy z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Zmodyfikuj aktywator"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Modyfikuje informacje opisujÄ…ce aktywator"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatuje wybrany wolumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Właściwości _nośnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Odmontowuje wybrany wolumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocÄ… polecenia Skopiuj "
 "pliki lub Wytnij pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5657,133 +5830,142 @@ msgstr ""
 "Przenosi lub kopiuje pliki poprzednio zaznaczone za pomocÄ… polecenia Skopiuj "
 "pliki lub Wytnij pliki do wybranego folderu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Otwórz _za pomocą"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Otwiera każdy z zaznaczonych elementów w nowym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "O_twórz w nowym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otwiera zaznaczony element w bieżącym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Przygotowuje zaznaczone pliki do skopiowania za pomocÄ… polecenia Wklej pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Przygotowuje zaznaczone pliki do przeniesienia za pomocÄ… polecenia Wklej "
 "pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Za_bezpiecz"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Zabezpiecza wybrany wolumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Zmienia nazwÄ™ zaznaczonego elementu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Przywróć _domyślne ustawienia widoku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Przywraca porządek sortowania i powiększenie zgodne z preferencjami "
 "bieżącego widoku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Uruchamia lub pozwala na zarzÄ…dzanie skryptami w ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Z_aznacz wszystkie pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "D_esenie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Zaznacza wszystkie elementy w bieżącym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Zaznacza wszystkie elementy w bieżącym oknie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Wyświetla właściwości nośnika dla zaznaczonego woluminu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Wyświetla folder zawierający skrypty pojawiające się w tym menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Odmontowuje wybrany wolumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Ustawia domyślne tło dla wyświetlanego położenia"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Wyświetla lub modyfikuje właściwości każdego z zaznaczonych elementów"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "S_kopiuj plik"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Sformatuj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "O_dmontuj wolumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Otwórz folder ze skryptami"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Wk_lej pliki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Wklej pliki do folder_u"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Zmi_eń nazwę..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skrypty"
 
@@ -5870,7 +6052,12 @@ msgstr "_Ręcznie"
 msgid "Indexing is %d%% complete."
 msgstr "Indeksowanie zakończone w %d%%."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Pliki w systemie były ostatnio indeksowane %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5878,25 +6065,29 @@ msgstr ""
 "Raz dziennie wykonywane jest indeksowanie plików i ich zawartości, co "
 "pozwala na przyśpieszenie ich przeszukiwania."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Stan indeksowania"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Pliki w systemie były ostatnio indeksowane %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Raz dziennie wykonywane jest indeksowanie plików i ich zawartości, co "
-"pozwala na przyśpieszenie ich przeszukiwania. Właśnie trwa indeksowanie."
+"pozwala na przyśpieszenie ich przeszukiwania."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Indeks plików w systemie nie jest dostępny."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5906,15 +6097,19 @@ msgstr ""
 "wszystkich plików. Obecnie szybkie wyszukiwanie nie jest aktywne, więc "
 "indeks nie jest dostępny."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Indeks plików w systemie nie jest dostępny."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Usługa wyszukiwania nie jest dostępna."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5938,32 +6133,37 @@ msgstr "Wyświetl stan indeksowania"
 msgid "Show status of indexing used when searching"
 msgstr "Wyświetla stan indeksowania wykorzystywanego przy wyszukiwaniu"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nie można utworzyć wymaganego folderu"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nie można utworzyć wymaganych folderów"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nie można utworzyć wymaganego folderu \"%s\". Utwórz te foldery przed "
 "uruchomieniem Nautilusa lub ustal uprawnienia tak, aby możliwe było ich "
 "utworzenie przez Nautilusa."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nie można utworzyć wymaganych folderów"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5974,22 +6174,27 @@ msgstr ""
 "Utwórz te foldery przed uruchomieniem Nautilusa lub ustal uprawnienia tak, "
 "aby możliwe było ich utworzenie przez Nautilusa."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Odnośnik do starego biurka"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Położenie katalogu biurka zmieniło się w GNOME 2.4. Utworzone zostało "
 "dowiązanie o nazwie \"Odnośnik do starego biurka\". Można otworzyć je aby "
 "przenieść żądane pliki, a następnie usunąć dowiązanie."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Przeniesione stare biurko"
 
 #. Can't register myself due to trouble locating the
@@ -6002,7 +6207,7 @@ msgstr "Przeniesione stare biurko"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6014,7 +6219,7 @@ msgstr ""
 "przeinstalować Nautilusa."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6059,12 +6264,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Z powodu nieoczekiwanego błędu nie można teraz używać Nautilusa."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6073,7 +6278,7 @@ msgstr ""
 "nieoczekiwanego błędu zgłoszonego przez Bonobo przy próbie zarejestrowania "
 "serwera widoku menedżera plików."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6084,7 +6289,7 @@ msgstr ""
 "generatora obiektów. W naprawieniu problemu może pomóc usunięcie procesu "
 "bonobo-activation-server i ponowne uruchomienie Nautilusa."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6095,6 +6300,17 @@ msgstr ""
 "obiektu powłoki. W naprawieniu problemu może pomóc usunięcie procesu bonobo-"
 "activation-server i ponowne uruchomienie Nautilusa."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Przy wyświetlaniu pomocy wystąpił błąd:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nie zdefiniowano żadnych Ulubionych"
@@ -6128,35 +6344,45 @@ msgstr "Mniej opcji"
 msgid "Find Them!"
 msgstr "Szukaj!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Nie można przenieść do siebie samego"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Niestety, \"%s\" nie jest poprawnÄ… nazwÄ… pliku."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" nie jest poprawnym położeniem. Sprawdź zapis i spróbuj ponownie."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Nie można odnaleźć \"%s\". Sprawdź zapis i spróbuj ponownie."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Serwery sieciowe"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Nazwa:"
+msgid "_Location:"
+msgstr "Położenie:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Połącz"
@@ -6357,6 +6583,20 @@ msgstr ""
 "\n"
 "Aby okno pojawiło się ponownie, możesz ręcznie usunąć ten plik.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Nie można przypisać więcej niż jednego obrazu użytkownika jednocześnie! "
+"Przeciągnij dokładnie jeden obraz, aby ustawić wygląd ikony."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Przeciągnięty plik nie jest lokalny. Jako ikony użytkownika mogą być "
+"wykorzystywane tylko lokalne obrazy."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6367,26 +6607,25 @@ msgstr "Otwórz za pomocą %s"
 msgid "Open with..."
 msgstr "Otwórz za pomocą..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Nie można uruchomić aplikacji nagrywarki CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Nie można uruchomić nagrywarki CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Opróżnij ś_mietnik"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Zapisz zawartość na płycie CD"
 
@@ -6394,118 +6633,131 @@ msgstr "_Zapisz zawartość na płycie CD"
 msgid "Go To:"
 msgstr "Przejdź do:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Czy chcesz wyświetlić %d położeń w osobnych oknach"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Wyświetlić w osobnych oknach?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Nie można otworzyć położenia"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Przeprowadza krótkie automatyczne testy sprawdzające."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Tworzy poczÄ…tkowe okno z podanÄ… geometriÄ…"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Tworzenie okien tylko dla podanych jawnie URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Nie obsługuje biurka (ignoruje ustawienia w oknie Preferencje)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Kończy pracę Nautilusa."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Ponownie uruchamia Nautilusa."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Menedżer plików"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nie może być użyte z URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nie może być użyte z innymi opcjami.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nie może być użyte z URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nie może być użyte z URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nie może być użyte z więcej niż jednym URI.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Czy na pewno chcesz zapomnieć historię? Jeśli to zrobisz, skażesz się na jej "
 "powtórzenie."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Czy na pewno chcesz wyczyścić listę położeń odwiedzonych przez Nautilusa?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Czyszczenie historii"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Położenie \"%s\" nie istnieje. Czy chcesz usunąć ze swojej listy pozycje "
 "Ulubionych zawierające to położenie?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Położenie \"%s\" już nie istnieje."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Pozycja Ulubionych dla nieistniejącego położenia"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Usuń"
 
@@ -6538,7 +6790,6 @@ msgid "Close _All Windows"
 msgstr "Zamknij w_szystkie okna"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Zamyka wszystkie okna Nautilusa"
@@ -6561,107 +6812,118 @@ msgid "Forward"
 msgstr "Naprzód"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Przechodzi do śmietnika"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Przechodzi do położenia odwiedzonego w następnej kolejności"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Przechodzi do odwiedzonego ostatnio położenia"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Przechodzi do śmietnika"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Dom"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Pasek p_ołożenia"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Odśwież"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Przeszukuje komputer w poszukiwaniu plików"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Pasek _stanu"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Góra"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Zapis na płytę CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Dodaj do Ulubionych"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Wstecz"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "Ulu_bione"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Wyc_zyść historię"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Blat"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Z_modyfikuj Ulubione"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Naprzód"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "Przej_dź"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "Do_m"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "P_ołożenie..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Panel paska _bocznego"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Åš_mietnik"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Góra"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Widok"
 
@@ -6679,34 +6941,39 @@ msgstr "Wyświetlanie jako..."
 msgid "File Browser: %s"
 msgstr "Właściciel pliku:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Jeden z paneli paska bocznego został zakończony z powodu błędu. Niestety, "
 "nie można stwierdzić, o który panel chodzi."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Podczas uruchamiania widoku \"%s\" wystąpił błąd."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Panel paska bocznego %s został zakończony z powodu błędu. Jeśli będzie się "
 "to zdarzać częściej, wyłącz ten panel."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Uruchomienie panelu paska bocznego nie powiodło się"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Pasek boczny"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Zawiera widok paska bocznego"
 
@@ -6740,147 +7007,180 @@ msgstr "_Dodaj nowy..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Niestety, nie można usunąć desenia %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Nie można usunąć desenia"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Niestety, nie można usunąć symbolu %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Nie można usunąć symbolu"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Tworzenie nowego symbolu"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_SÅ‚owo kluczowe:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Obraz:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Wybierz plik z obrazem nowego symbolu:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Utwórz nowy kolor:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nazwa koloru:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Wartość koloru:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Niestety, \"%s\" nie jest poprawnÄ… nazwÄ… pliku."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Niestety, nie podano poprawnej nazwy pliku."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Nie można zainstalować desenia"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Niestety, nie można zastąpić obrazu czyszczącego."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "To nie grafika"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Niestety, nie można zainstalować desenia %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Wybór pliku z obrazem nowego desenia"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Niestety, nazwa nowego koloru nie może być pusta."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Nie można zainstalować koloru"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Wybór dodawanego koloru"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "niestety, \"%s\" nie jest plikiem zawierajÄ…cym obraz!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Plik \"%s\" nie jest poprawnym obrazem."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Wybierz kategoriÄ™:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Anuluj usunięcie"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Dodaj nowy deseń..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Dodaj nowy kolor..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Dodaj nowy symbol..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kliknij deseń, aby go usunąć"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kliknij kolor, aby go usunąć"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kliknij symbol aby go usunąć"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Desenie:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Kolory:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Symbole:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Usuń deseń..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Usuń kolor..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Usuń symbol..."
 
@@ -7274,34 +7574,39 @@ msgstr "_Druid CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Zamknij w_szystkie okna"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Zamyka pasek boczny"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Przechodzi do pustego folderu CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Przechodzi do śmietnika"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "P_ołożenie..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Elementy będące ]folderami"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "D_esenie"
@@ -7331,10 +7636,13 @@ msgid "View Failed"
 msgstr "Wyświetlenie nie powiodło się"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Podczas uruchamiania widoku \"%s\" wystąpił błąd."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Widok %s został zakończony z powodu błędu. Możesz zmienić typ widoku lub "
 "wybrać inne położenie."
@@ -7344,97 +7652,127 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Podczas uruchamiania widoku \"%s\" wystąpił błąd."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Obiekt NautilusApplication powiÄ…zany z tym oknem."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Widok zawartości"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Widok bieżącego pliku lub katalogu"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Nie można odnaleźć \"%s\". Sprawdź zapis i spróbuj ponownie."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Nie można dodać symboli"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nie można wyświetlić \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Nie można wyświetlić \"%s\" z powodu niemożności określenia typu pliku."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nie zainstalowano przeglądarki potrafiącej wyświetlać \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Nie można wyświetlić \"%s\" z powodu niemożności obsłużenia przez Nautilusa %"
 "s."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Nie można wyświetlić \"%s\" z powodu nieudanej próby zalogowania."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Nie można wyświetlić \"%s\" z powodu braku dostępu."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Nie można wyświetlić \"%s\" z powodu niemożności odnalezienia komputera \"%s"
 "\". Sprawdź, czy nazwa została poprawnie wprowadzona i czy ustawienia "
 "pośrednika są poprawne."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Nie można wyświetlić \"%s\". Sprawdź, czy ustawienia pośrednika są poprawne."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"Nie można wyświetlić \"%s\" z powodu braku połączenia z głównym serwerem "
-"przeglÄ…dania SMB.\n"
-"Sprawdź, czy w lokalnej sieci działa serwer SMB."
+"Nie można wyświetlić \"%s\" z powodu niemożności obsłużenia przez Nautilusa %"
+"s."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Wyszukiwanie jest w tej chwili niedostępne. Nie został utworzony indeks "
 "plików w systemie lub nie uruchomiono usługi wyszukiwawczej Medusa. "
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Wyszukiwanie jest w tej chwili niedostępne. Nie został utworzony indeks "
+"plików w systemie lub nie uruchomiono usługi wyszukiwawczej Medusa. "
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Wyszukiwanie jest niedostępne"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nie można wyświetlić \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Nie można wyświetlić położenia"
 
@@ -7446,7 +7784,7 @@ msgstr "Przechodzi do położenia opisywanego przez tę pozycję Ulubionych"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7454,11 +7792,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "GNOME PL Team <translators@gnome.pl>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7474,39 +7812,43 @@ msgstr "Pozwala przejść o kilka stron wstecz"
 msgid "Go forward a number of pages"
 msgstr "Pozwala przejść o kilka stron naprzód"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Wyświetla bieżące położenie za pomocą \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Kropki"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Druid CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID aplikacji"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID aplikacji przypisany oknu"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplikacja"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Obiekt NautilusApplication powiÄ…zany z tym oknem."
 
@@ -7542,6 +7884,248 @@ msgstr "Serwery sieciowe"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Wyświetla serwery sieciowe przy użyciu menedżera plików - Nautilusa"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Generator widoku sprzętu"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Przeglądarka sprzętu"
+
+#~ msgid "Hardware view"
+#~ msgstr "Widok sprzętu"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Wyświetlanie jako Sprzęt"
+
+#~ msgid "hardware view"
+#~ msgstr "widok sprzętu"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nazwa ikony widoku sprzętu"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "zestawienie informacji o sprzęcie"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "CPU %s\n"
+#~ "%s MHz\n"
+#~ "Rozmiar cache: %s KB"
+
+#~ 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 "Czas aktywności: %d dni, %d godzin, %d minut"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Przegląd sprzętu"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "To jest puste miejsce na stronę poświęconą CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "To jest puste miejsce na stronę poświęconą pamięci RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "To jest puste miejsce na stronę poświęconą urządzeniom RAM."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "BÅ‚Ä…d podczas kopiowania do \"%s\".\n"
+#~ "\n"
+#~ "W miejscu docelowym brakuje miejsca."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "BÅ‚Ä…d podczas dowiÄ…zywania w \"%s\".\n"
+#~ "\n"
+#~ "W miejscu docelowym brakuje miejsca."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Błąd podczas przenoszenia elementów do \"%s\".\n"
+#~ "\n"
+#~ "Brak uprawnień do zapisu w tym folderze."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Błąd podczas przenoszenia elementów do \"%s\".\n"
+#~ "\n"
+#~ "Dysk docelowy jest tylko do odczytu."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Błąd podczas tworzenia dowiązań w \"%s\".\n"
+#~ "\n"
+#~ "Brak uprawnień do zapisu w tym folderze."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Błąd podczas tworzenia dowiązań w \"%s\".\n"
+#~ "\n"
+#~ "Dysk docelowy jest tylko do odczytu."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas kopiowania \"%s\".\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas przenoszenia \"%s\".\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas usuwania \"%s\".\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas kopiowania.\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas dowiÄ…zywania.\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "BÅ‚Ä…d \"%s\" podczas usuwania.\n"
+#~ "\n"
+#~ "Czy chcesz kontynuować?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Nie można kopiować do śmietnika"
+
+#~ 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 ""
+#~ "Nie można otworzyć za pomocą domyślnej akcji \"%s\", ponieważ nie "
+#~ "obsługuje ona odczytów położenia typu \"%s\". Żadna inna dostępna akcja "
+#~ "nie obsługuje tego typu plików. Prawdopodobnie otwarcie pliku będzie "
+#~ "możliwe po skopiowaniu go na lokalny dysk."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Przeszukiwane dysków"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr ""
+#~ "Nautilus przeszukuje dyski w poszukiwaniu folderów zawierających dane "
+#~ "śmietnika."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Nie można przenieść do śmietnika %d zaznaczonych elementów. Czy chcesz je "
+#~ "trwale usunąć?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Nie można przenieść do śmietnika %d spośród zaznaczonych elementów. Czy "
+#~ "chcesz trwale usunąć te %d elementów?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Przeciągnięty przez ciebie plik nie zawiera obrazu. Jako ikony "
+#~ "użytkownika mogą być wykorzystywane tylko lokalne obrazy."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Niestety, usługa wyszukiwania Medusa nie jest dostępna, ponieważ nie "
+#~ "została zainstalowana."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Raz dziennie wykonywane jest indeksowanie plików i ich zawartości, co "
+#~ "pozwala na przyśpieszenie ich przeszukiwania. Właśnie trwa indeksowanie."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nie jest poprawnym położeniem. Sprawdź zapis i spróbuj ponownie."
+
+#~ 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 ""
+#~ "Nie można wyświetlić \"%s\" z powodu braku połączenia z głównym serwerem "
+#~ "przeglÄ…dania SMB.\n"
+#~ "Sprawdź, czy w lokalnej sieci działa serwer SMB."
+
+#~ msgid "file icon"
+#~ msgstr "ikona pliku"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nazwa:"
+
 #~ msgid "Unknown"
 #~ msgstr "Nieznane"
 
@@ -7635,8 +8219,5 @@ msgstr "Wyświetla serwery sieciowe przy użyciu menedżera plików - Nautilusa"
 #~ msgid "_Toolbar"
 #~ msgstr "Pasek _narzędziowy"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Położenie \"%s\" już nie istnieje."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Przechodzi do nieistniejącego położenia"
diff --git a/po/pt.po b/po/pt.po
index e760c554b..b68ff797e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.4\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-25 20:10+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "falha no bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -55,48 +55,60 @@ msgid "Nautilus Emblem view"
 msgstr "Vista de Emblema Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Incapaz de remover emblema"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Incapaz de remover emblema de nome '%s'. Talvez se deva a este ser um "
 "emblema permanente, e não um que você tenha adicionado."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Incapaz de remover emblema"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Incapaz de renomear emblema"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Incapaz de renomear emblema de nome '%s'. Isto deve-se provavelmente a que o "
 "emblema é um permanente e não um que você tenha adicionado."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Incapaz de renomear emblema"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Renomear Emblema"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Introduza o novo nome para o emblema apresentado:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Renomear"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Adicionar Emblemas..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -104,7 +116,7 @@ msgstr ""
 "Introduza um nome descritivo junto a cada emblema. Este nome será utilizado "
 "noutros locais para identificar o emblema."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -112,139 +124,62 @@ msgstr ""
 "Introduza um nome descritivo junto ao emblema. Este nome será utilizado "
 "noutros locais para identificar o emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Alguns dos ficheiros não puderam ser adicionados como emblemas pois não "
-"aparentam ser imagens válidas."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "A imagem em %s não pode ser instalada como emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "O ficheiro '%s' não aparenta ser uma imagem válida."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Incapaz de adicionar emblemas"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Nenhum dos ficheiros pode ser adicionado como emblema pois não aparentam ser "
 "imagens válidas."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "O texto arrastado não era uma localização válida de ficheiro."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Incapaz de adicionar emblema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "O ficheiro '%s' não aparenta ser uma imagem válida."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "O ficheiro arrastado não aparenta ser uma imagem válida."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Apagar"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fábrica para a vista de dispositivos"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Dispositivos"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visualizador de Dispositivos"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vista de dispositivos"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Ver como Dispositivo"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vista de dispositivos"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nome do ícon para a vista de dispositivos"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "resumo da informação de dispositivos"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K tamanho cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "O tempo em funcionamento é de %d dias, %d horas, %d minutos"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Resumo de Dispositivos"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Este é um atalho para a página do CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Este é um atalho para a página da RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Este é um atalho para a página do IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Histórico"
@@ -910,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Dispositivos"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacional"
@@ -1195,30 +1134,19 @@ msgid "Desktop trash icon name"
 msgstr "Mome do ícone de ambiente para o lixo"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Directórios acima deste tamanho serão truncados para cerca deste tamanho. O "
-"propósito desta opção é evitar que intencionalmente se encha a pilha e mate "
-"o Nautilus com directórios muito grandes. Um valor negativo indica sem "
-"limite. O limite é aproximado devido à leitura por blocos dos directórios."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Activar parâmetros 'especiais' no diálogo de preferências de ficheiros"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Nome de ficheiro para o fundo por omissão de directórios. Apenas utilizado "
 "se background_set for verdadeiro."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1226,6 +1154,19 @@ msgstr ""
 "Nome de ficheiro para o fundo por omissão do painel lateral. Apenas "
 "utilizado se side_pane_background_set for verdadeiro."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Directórios acima deste tamanho serão truncados para cerca deste tamanho. O "
+"propósito desta opção é evitar que intencionalmente se encha a pilha e mate "
+"o Nautilus com directórios muito grandes. Um valor negativo indica sem "
+"limite. O limite é aproximado devido à leitura por blocos dos directórios."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Esconder marcadores por omissão no menu de marcadores"
@@ -1235,9 +1176,10 @@ msgid "Home icon visible on desktop"
 msgstr "�cone de directório pessoal visível no ambiente"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Se definido como verdadeiro, o Nautilus apenas mostrará directórios no "
 "painel lateral de árvore. Caso contrário mostrará directórios e ficheiros."
@@ -1274,9 +1216,10 @@ msgstr ""
 "opções mais esotéricas de um ficheiro no diálogo de preferências de ficheiro."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Se definido como verdadeiro, o Nautilus mostra os directórios antes de "
 "mostrar os ficheiros nas vistas de lista e ícones."
@@ -1322,8 +1265,9 @@ msgstr ""
 "utilizador no menu de marcadores."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Se definido como verdadeiro, o Nautilus utilizará o directório pessoal do "
@@ -1341,9 +1285,10 @@ msgstr ""
 "(~) são consideradas cópias de segurança."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Se definido verdadeiro, serão mostrados no gestor de ficheiros os ficheiros "
 "escondidos. Ficheiros escondidos são ou ficheiros cujo nome começa por um "
@@ -1368,8 +1313,9 @@ msgstr ""
 "a apontar para o lixo."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Se definido como verdadeiro, será colocado no ambiente de trabalho um ícone "
@@ -1406,7 +1352,8 @@ msgstr ""
 "incrementalmente serão ordenados decrementalmente."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Se verdadeiro, por omissão os ícones serão dispostos mais juntos nas novas "
 "janelas."
@@ -1437,7 +1384,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista de títulos possíveis para ícones"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Número máximo de ficheiros geridos num directório"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1457,11 +1405,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus gere o desenho do ambiente"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus utiliza o directório pessoal do utilizador como ambiente"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Apenas mostrar directórios na árvore lateral"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1481,7 +1431,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Inverter ordenação nas novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Mostrar primeiro directórios nas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1517,10 +1468,11 @@ msgstr ""
 "ficheiros locais. Se \"never\" não serão reproduzidos quaisquer sons."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1531,12 +1483,13 @@ msgstr ""
 "antevisão."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Compromisso de velocidade ao antever ficheiros de imagem como amostras. Se "
 "\"always\" apresentará sempre a amostra, mesmo que o ficheiro esteja num "
@@ -1545,10 +1498,11 @@ msgstr ""
 "utilizado um ícone genérico."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Compromisso de velocidade ao mostrar o número de itens num directório. Se "
@@ -1558,18 +1512,20 @@ msgstr ""
 "contagens de ícones."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "A forma de ordenação por omissão para o item na vista de ícones. Valores "
 "possíveis são \"name\", \"size\", \"type\", \"modification_date\", \"emblems"
 "\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "A forma de ordenação por omissão para o item na vista em lista. Valores "
 "possíveis são name, size, type, and modification_date."
@@ -1615,7 +1571,8 @@ msgid "Use manual layout in new windows"
 msgstr "Utilizar disposição manual nas novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Utilizar disposição mais apertada nas novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1645,7 +1602,8 @@ msgstr ""
 "possíveis são \"list_view\" e \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Quando mostrar número de itens num directório"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1657,7 +1615,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Quando mostrar amostras de ficheiros de imagem"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Se foi definido um fundo de directório costumizado por omissão."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1814,67 +1773,82 @@ msgstr "reiniciar"
 msgid "on the desktop"
 msgstr "no ambiente"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Não pode apagar volume"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Não pode apagar um ícone de volume. Se deseja ejectar o volume, utilize "
 "Ejectar no menu de botão-direito do rato sobre o volume."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Não pode apagar volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Lixo"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Ir para aqui"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copiar para aqui"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Ata_lho aqui"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Definir como _Fundo"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Definir como fundo pata _todas as pastas"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Definir como fundo para esta _pasta"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "O tema \"%s\" não pode ser instalado."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Tem de especificar uma palavra-chave não vazia para o novo emblema."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Incapaz de instalar emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1884,19 +1858,25 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Já existe um emblema de nome \"%s\". Seleccione um nome diferente a utilizar."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Incapaz de instalar emblema"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Incapaz de gravar emblema costumizado."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Incapaz de gravar nome de emblema costumizado."
 
@@ -1915,22 +1895,28 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Erro ao mover."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Erro ao mover.\n"
 "\n"
 "\"%s\" não pode ser movido pois encontra-se num disco apenas de leitura."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Erro ao apagar."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1939,22 +1925,17 @@ msgstr ""
 "\"%s\" não pode ser apagado pois você não tem permissões para o modificar ou "
 "à pasta acima."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Erro ao apagar.\n"
 "\n"
 "\"%s\" não pode ser apagado pois encontra-se num disco apenas de leitura."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1963,12 +1944,15 @@ msgstr ""
 "\"%s\" não pode ser movido pois você não tem permissões para o modificar ou "
 "à pasta acima."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Erro ao mover."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Erro ao mover.\n"
@@ -1976,12 +1960,10 @@ msgstr ""
 "\"%s\" não pode ser movido pois a própria pasta ou a pasta acima encontra-se "
 "contida no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Erro ao mover.\n"
@@ -1989,238 +1971,178 @@ msgstr ""
 "\"%s\" não pode ser movido para o Lixo pois você não tem permissões para o "
 "modificar ou à pasta acima."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Erro ao copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Erro ao copiar.\n"
 "\n"
 "\"%s\" não pode ser copiado porque você não tem as permissões para o ler."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ao copiar para \"%s\".\n"
-"\n"
-"Não existe espaço suficiente no destino."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Erro ao copiar."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Erro ao mover para \"%s\".\n"
 "\n"
 "Não existe espaço suficiente no destino."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ao criar atalho em \"%s\".\n"
-"\n"
-"Não existe espaço suficiente no destino."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Erro ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Erro ao criar atalho."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Erro ao copiar para \"%s\".\n"
 "\n"
 "Você não tem permissões para escrever nesta pasta."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Erro ao copiar para \"%s\".\n"
 "\n"
 "O disco de destino é apenas de leitura."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ao mover itens para \"%s\".\n"
-"\n"
-"Você não tem permissões para escrever nesta pasta."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ao mover itens para \"%s\".\n"
-"\n"
-"O disco de destino é apenas de leitura."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ao criar atalhos em \"%s\".\n"
-"\n"
-"Você não tem permissões para escrever nesta pasta."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Erro ao mover."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ao criar atalhos em \"%s\".\n"
-"\n"
-"O disco de destino é apenas de leitura."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao copiar \"%s\".\n"
-"\n"
-"Deseja continuar?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Erro ao criar atalho."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Erro ao copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Erro \"%s\" ao mover \"%s\".\n"
+"Erro \"%s\" ao copiar.\n"
 "\n"
 "Deseja continuar?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao criar atalho para \"%s\".\n"
-"\n"
-"Deseja continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Erro ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Erro \"%s\" ao apagar \"%s\".\n"
+"Erro \"%s\" ao criar atalho para \"%s\".\n"
 "\n"
 "Deseja continuar?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao copiar.\n"
-"\n"
-"Deseja continuar?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Erro ao apagar."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao copiar.\n"
-"\n"
-"Deseja continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Erro ao copiar."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao criar atalho.\n"
-"\n"
-"Deseja continuar?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Erro ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao apagar.\n"
-"\n"
-"Deseja continuar?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Erro ao criar atalho."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Erro ao apagar."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Erro ao copiar."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Erro ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Erro ao criar atalho."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Erro ao apagar."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Saltar"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Repetir"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Incapaz de completar a acção especificada."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" não pode ser movido para a nova localização, pois o seu nome já está "
 "a ser utilizado para um item especial que não pode ser removido ou "
@@ -2228,13 +2150,16 @@ msgstr ""
 "\n"
 "Se ainda assim deseja mover \"%s\", altere o seu nome e tente novamente."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Incapaz de completar a acção especificada."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" não pode ser copiado para a nova localização, pois o seu nome já está "
 "a ser utilizado para um item especial que não pode ser removido ou "
@@ -2242,44 +2167,50 @@ msgstr ""
 "\n"
 "Se ainda assim deseja mover \"%s\", altere o seu nome e tente novamente."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Incapaz de substituir ficheiro."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Ficheiro \"%s\" já existe.\n"
 "\n"
 "Deseja substitui-lo?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflito ao copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Substituir"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Substituir Todos"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "atalho para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "outro atalho para %s"
@@ -2288,25 +2219,25 @@ msgstr "outro atalho para %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dº atalho para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dº atalho para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dº atalho para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dº atalho para %s"
@@ -2316,561 +2247,600 @@ msgstr "%dº atalho para %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (cópia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (outra cópia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ª cópia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (cópia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (outra cópia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus Desconhecido %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "A mover ficheiros para o Lixo"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Ficheiros deitados fora:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "A Mover"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "A Prepara para Mover para o Lixo..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "A mover ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Ficheiros movidos:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "A Preparar para Mover..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "A Terminar Mover..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "A criar atalhos para ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Ficheiros com atalho:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "A Criar Atalho"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "A Preparar Para Criar Atalhos..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "A Terminar de Criar Atalhos..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "A copiar ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Ficheiros copiados:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "A Copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "A Preparar Para Copiar..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Não pode copiar itens para o Lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Não Pode Copiar para o Lixo"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Não pode mover esta pasta do lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Não pode copiar esta pasta do lixo."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Não Pode Modificar Localização do Lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Não Pode Copiar Lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Não pode mover uma pasta para dentro de si própria."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Não pode copiar uma pasta para dentro de si própria."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Criar uma nova pasta vazia dentro desta pasta"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Não Se Pode Mover Para Si Própria"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Não Se Pode Copiar Para Si Própria"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Não pode copiar um ficheiro sobre si próprio."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Não Pode Copiar Sobre o Próprio"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Erro ao criar nova pasta.\n"
 "\n"
 "Não tem permissões de escrita no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Erro ao criar nova pasta.\n"
 "\n"
 "Não existe espaço no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erro \"%s\" ao criar nova pasta."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Erro ao criar nova pasta"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Erro ao criar nova pasta"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "pasta sem nome"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Erro \"%s\" ao criar nova pasta."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Erro ao criar nova pasta"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Erro ao criar nova pasta"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 ficheiro"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "A apagar ficheiros"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Ficheiros apagados:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "A Apagar"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "A Preparar para Apagar Ficheiros..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "A Esvaziar o Lixo"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "A Preparar para Esvaziar o Lixo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Deseja mesmo apagar para sempre os itens contidos no Lixo?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Esva_ziar"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (cópia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (outra cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (outra cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (outra cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (outra cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3a cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124ª cópia).txt"
 
@@ -2889,64 +2859,64 @@ msgstr "foo (124ª cópia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hoje às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hoje às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hoje às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hoje às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hoje, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hoje, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hoje"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ontem às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ontem às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ontem às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ontem às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ontem, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ontem, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ontem"
 
@@ -2955,133 +2925,133 @@ msgstr "ontem"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Quarta-Feira, Setembro 00 0000 às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Seg, Out 00 0000 às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Seg, Out 00 0000 às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Out 00 0000 às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Out 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%-m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%-d/%-m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 itens"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 pastas"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 ficheiros"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u itens"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u pastas"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u ficheiros"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? itens"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipo desconhecido"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tipo MIME desconhecido"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "aplicação"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3091,7 +3061,7 @@ msgstr ""
 "talvez signifique que o seu ficheiro gnome-vfs.keys se encontra no local "
 "errado ou por qualquer razão não está a ser encontrado."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3100,11 +3070,11 @@ msgstr ""
 "Não foi encontrada descrição para o tipo mime \"%s\" (ficheiro é \"%s\"), "
 "por favor avise a lista de e-mail gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "atalho"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "atalho (inválido)"
 
@@ -3225,11 +3195,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Procurar ficheiros por nome e propriedades"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vista de Icon"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vista em Lista"
@@ -3373,147 +3345,152 @@ msgstr "Pasta Pessoal do %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Computador"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ícone ficheiro"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "texto editável"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "a etiqueta editável"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "texto adicional"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "mais algum texto"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "realçado para selecção"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "se está ou não realçado para uma selecção"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "realçado como focus de teclado"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "se está ou não realçado para renderizar focus de teclado"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "realçado para largar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "se está ou não realçado para largar de Arrastar&Largar"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "O rectângulo de selecção"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Texto Frame"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Desenhar uma frame à volta do texto não seleccionado"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Cor da Caixa de Selecção"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Cor da caixa de selecção"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa da Caixa de Selecção"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacidade da caixa de selecção"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Realçar Alfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacidade do realce para ícones seleccionados"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Cor Clara de Info"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Cor utilizada para texto informativo sobre um fundo escuro"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Cor Escura de Info"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Cor utilizada para texto informativo sobre um fundo claro"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Esta pasta utiliza disposição automática. Deseja passar para disposição "
 "manual e deixar este item onde o largou? Isto irá invocar a disposição "
 "manual armazenada."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Esta pasta utiliza disposição automática. Deseja passar para disposição "
 "manual e deixar estes itens onde os largou? Isto irá invocar a disposição "
 "manual armazenada."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Esta pasta utiliza disposição automática. Deseja passar para disposição "
 "manual e deixar este item onde o largou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Esta pasta utiliza disposição automática. Deseja passar para disposição "
 "manual e deixar estes itens onde os largou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Mudar para Disposição Manual"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Mudar"
 
@@ -3622,72 +3599,72 @@ msgstr "É o valor por omissão para itens \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "É o valor por omissão para todos os itens \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modificar \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Incluir no menu para itens \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Utilizar por omissão para itens \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Incluir no menu apenas para \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Utilizar por omissão apenas para \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Não incluir no menu para itens \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nome"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Se_leccione"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Terminado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modificar..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipos de Ficheiros e Aplicações"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ir Lá"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3695,48 +3672,48 @@ msgstr ""
 "Pode configurar que aplicações são disponibilizadas para cada tipo de "
 "ficheiros no diálogo de Tipos de Ficheiros e Aplicações."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Abrir com Outra Aplicação"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Seleccione uma aplicação com que abrir \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Abrir com Outro Visualizador"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Seleccione uma vista para \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Não existe nenhum visualizador disponível para \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nenhum Visualizador Disponível"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Não existe nenhuma aplicação associada a \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nenhuma Aplicação Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Não existe nenhuma acção associada a \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nenhuma Acção Associada"
 
@@ -3744,11 +3721,9 @@ msgstr "Nenhuma Acção Associada"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3757,42 +3732,41 @@ msgstr ""
 "Pode configurar o GNOME para associar aplicações com tipos de ficheiros. "
 "Deseja associar agora uma aplicação com este tipo de ficheiro?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Associar Aplicações"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "O visualizador associado a \"%s\" é inválido."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Visualizador Inválido Associado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "A aplicação associada a \"%s\" é inválida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplicação Inválida Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "A acção associada a \"%s\" é inválida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Acção Inválida Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3803,95 +3777,136 @@ msgstr ""
 "diferente a este tipo de ficheiros. Deseja associar agora uma aplicação ou "
 "visualizador a este tipo de ficheiro?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Associar Acção"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode aceder a ficheiros em "
+"locais \"%s\". Deseja seleccionar outra aplicação?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" não pode abrir \"%s\" porque \"%s\" não pode aceder a ficheiros em "
 "locais \"%s\". Deseja seleccionar outra aplicação?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "A acção por omissão é incapaz de abrir \"%s\" porque não consegue aceder a "
 "ficheiros em locais \"%s\". Deseja seleccionar outra acção?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Impossível Abrir Localização"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode aceder a ficheiros em "
+"locais \"%s\". Deseja seleccionar outra aplicação?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" não pode abrir \"%s\" porque \"%s\" não pode aceder a ficheiros em "
 "locais \"%s\". Não existem outras aplicações disponíveis para ver este "
 "ficheiro. Se copiar o ficheiro para o seu computador, poderá ser possível "
 "abri-lo."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"A acção por omissão é incapaz de abrir \"%s\" porque não pode aceder a "
-"ficheiros em locais \"%s\". Não existem outras aplicações disponíveis para "
-"ver este ficheiro. Se copiar o ficheiro para o seu computador, poderá ser "
-"possível abri-lo."
+"A acção por omissão é incapaz de abrir \"%s\" porque não consegue aceder a "
+"ficheiros em locais \"%s\". Deseja seleccionar outra acção?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode aceder a ficheiros em "
+"locais \"%s\". Não existem outras aplicações disponíveis para ver este "
+"ficheiro. Se copiar o ficheiro para o seu computador, poderá ser possível "
+"abri-lo."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "A Abrir %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Desculpe, mas não pode executar comandos de um sítio remoto devido a "
 "questões de segurança."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Impossível executar atalhos remotos"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Ocorreu um erro ao executar a aplicação.\n"
 "\n"
 "Detalhes: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Erro ao executar a aplicação"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Destino de largar apenas suporta ficheiros locais"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Este destino para largar apenas suporta ficheiros locais.\n"
@@ -3899,15 +3914,15 @@ msgstr ""
 "Para abrir ficheiros não-locais copie-os para uma pasta local e largue-os "
 "novamente."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Destino de largar apenas suporta ficheiros locais"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4161,14 +4176,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Itens que contenham \"medusa\" no seu nome e sejam pastas"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "A Procurar nos Discos"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "O Nautilus está a procurar pastas de lixo nos seus discos."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Editar"
@@ -4374,97 +4381,107 @@ msgstr "Fundo"
 msgid "Empty Trash"
 msgstr "Esvaziar Lixo"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Serão abertas %d janelas diferentes. Tem a certeza que deseja faze-lo?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Abrir %d Janelas?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Tem a certeza que quer apagar definitivamente \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Serão abertas %d janelas diferentes. Tem a certeza que deseja faze-lo?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Tem a certeza que quer apagar definitivamente \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Tem a certeza de que quer apagar definitivamente os %d itens seleccionados?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Apagar definitivamente todos os itens seleccionados"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Apagar?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Seleccione Uma Categoria:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Padrões"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seleccionados"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 pasta seleccionada"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d pastas seleccionadas"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (contendo 0 itens)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contendo 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contendo %d itens)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contendo um total de 0 itens)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contendo um total de 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contendo um total de %d itens)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d itens seleccionados (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 outro item seleccionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d outros itens seleccionados (%s)"
@@ -4476,7 +4493,7 @@ msgstr "%d outros itens seleccionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4485,106 +4502,122 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "A pasta \"%s\" contém mais ficheiros do que os que o Nautilus pode gerir. "
 "Alguns ficheiros não serão apresentados."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Demasiados Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" não pode ser movido para o Lixo. Deseja apaga-lo imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Os %d itens seleccionados não podem ser movidos para o Lixo. Deseja apaga-"
-"los imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" não pode ser movido para o Lixo. Deseja apaga-lo imediatamente?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d dos itens seleccionados não podem ser movidos para o Lixo. Deseja apagar "
-"esses %d itens imediatamente?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" não pode ser movido para o Lixo. Deseja apaga-lo imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Apagar Imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Tem a certeza de que deseja apagar definitivamente \"%s\" do Lixo?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Tem a certeza que quer apagar definitivamente os %d itens seleccionados do "
 "Lixo?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Apagar Do Lixo?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Utilizar \"%s\" para abrir o item seleccionado"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Outra _Aplicação..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Uma _Aplicação..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Outro _Visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Um _Visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Incapaz de completar a acção especificada: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Incapaz de completar a acção especificada."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Executar \"%s\" em quaisquer itens seleccionados"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Todos os ficheiros executáveis nesta pasta irão surgir no menu Scripts. "
+"Seleccionando um script do menu irá executar esse script com quaisquer itens "
+"seleccionados como sendo parâmetros de entrada."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4592,11 +4625,11 @@ msgstr ""
 "Seleccionando um script do menu irá executar esse script com quaisquer itens "
 "seleccionados como sendo parâmetros de entrada."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Sobre Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4638,17 +4671,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posição e tamanho da janela actual"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" será movida caso seleccione o comando Colar Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" será copiada caso selecione o comando Colar Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4656,7 +4689,7 @@ msgstr ""
 "Os %d itens seleccionados serão movidos caso seleccione o comando Colar "
 "Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4664,161 +4697,168 @@ msgstr ""
 "Os %d itens seleccionados serão copiados caso seleccione o comando Colar "
 "Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Não existe nada na área de transferência para colar."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Erro ao Montar"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Erro ao Desmontar"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Erro ao Montar"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_jectar"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Desmontar Vol_ume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Abr_ir em Nova Janela"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Abr_ir em %d Novas Janelas"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Pasta Home"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Pasta Home"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Apagar do Li_xo"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Apagar definitivamente todos os itens seleccionados"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mo_ver para o Lixo"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mover cada item seleccionado para o Lixo"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Apa_gar"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Criar Atal_hos"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Criar Atal_ho"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Esvaziar Lixo"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cor_tar Ficheiro"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cor_tar Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copiar Ficheiro"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copiar Ficheiros"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Este atalho não pode ser utilizado, pois não possui destino. Deseja colocar "
 "este atalho no Lixo?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Este atalho não pode ser utilizado, pois não possui destino. Deseja colocar "
+"este atalho no Lixo?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Este atalho não pode ser utilizado, pois o seu destino \"%s\" não existe. "
 "Deseja colocar este atalho no Lixo?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Atalho Inválido"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" é um ficheiro de texto executável. Deseja executa-lo, ou visualizar o "
 "seu conteudo?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Executar ou Mostrar?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Mostrar"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Execu_tar na Consola"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Mostrar"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Executa_r"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "A Abrir \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Cancelar Abertura?"
 
@@ -4840,17 +4880,22 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Desculpe, não foi possível mostrar todo o conteudo de \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Não foi possível determinar as permissões de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erro ao Mostrar Pasta"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "O nome \"%s\" já está a ser utilizado nesta pasta. Utilize um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4858,12 +4903,12 @@ msgstr ""
 "Não existe um \"%s\" nesta pasta. Talvez tenha acabado de ser movido ou "
 "apagado?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Não possui as permissões necessárias para renomear \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4872,66 +4917,81 @@ msgstr ""
 "O nome \"%s\" não é válido pois contém o caracter \"/\". Utilize um nome "
 "diferente."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "O nome \"%s\" não é válido. Utilize um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Incapaz de modificar o nome de \"%s\" porque se encontra numa unidade apenas "
 "de leitura"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Desculpe, não foi possível renomear \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Esse tema não pode ser removido!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Erro ao Renomear"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Não possui as permissões necessárias para modificar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Impossível modificar o grupo de \"%s\" porque se encontra numa unidade "
 "apenas de leitura"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Desculpe, não foi possível modificar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Não foi possível determinar as permissões de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Erro a Definir Grupo"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Impossível modificar o dono de \"%s\" porque se encontra numa unidade apenas "
 "de leitura"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Desculpe, não foi possível modificar o dono de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Não foi possível determinar as permissões de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Erro a Definir Dono"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4939,21 +4999,26 @@ msgstr ""
 "Impossível modificar as permissões de \"%s\" porque se encontra numa unidade "
 "apenas de leitura"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Desculpe, não foi possível modificar as permissões de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Não foi possível determinar as permissões de \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Erro a Definir Permissões"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "A Renomear \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Cancelar Renomeação?"
 
@@ -5011,128 +5076,150 @@ msgstr "Repor Taman_ho Original dos �cones"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Repor Taman_ho Original do �cone"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "a apontar para \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Arrastar e largar apenas é suportado em sistemas de ficheiros locais."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Arrastar e largar apenas é suportado em sistemas de ficheiros locais."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Erro de Arrastar e Largar"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Foi utilizado um tipo de arrasto inválido"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nome ficheiro"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data Modificação"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Não pode assignar simultaneamente mais do que um ícon costumizado! Arraste "
+"apenas uma imagem para definir o ícone costumizado."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Não pode assignar simultaneamente mais do que um ícon costumizado! Arraste "
 "apenas uma imagem para definir o ícone costumizado."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mais Do Que Uma Imagem"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"O ficheiro que largou não é local. Apenas pode utilizar imagens locais como "
+"ícones costumizados."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "O ficheiro que largou não é local. Apenas pode utilizar imagens locais como "
 "ícones costumizados."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Apenas Imagens Locais"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"O ficheiro que largou não é uma imagem. Apenas pode utilizar imagens locais "
-"como ícones costumizados."
+"O ficheiro que largou não é local. Apenas pode utilizar imagens locais como "
+"ícones costumizados."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Apenas Imagens"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propriedades de %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Cancelar Modificação de Grupo?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "A modificar grupo"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Cancelar Modificação de Dono?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "A modificar dono"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "vazio"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ilegível"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, com o tamanho %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d itens, totalizando %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(alguns conteudos ilegíveis)"
 
@@ -5142,191 +5229,191 @@ msgstr "(alguns conteudos ilegíveis)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Conteudo:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Básico"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nomes:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Localização:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Unidade:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Espaço livre:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Destino do atalho:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Acedido:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Seleccionar �cone Costumizado..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Remover �cone Costumizado"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Leitu_ra"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Escrita"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xecução"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Definir ID _utilizador"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Parâmetros especiais:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Definir ID gr_upo"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Pega_joso"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Não é o dono, pelo que não pode modificar estas permissões."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Dono ficheiro:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Dono ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Grupo _ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grupo ficheiro:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Vista de texto:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Vista numérica:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Última modificação:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Não foi possível determinar as permissões de \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Não foi possível determinar as permissões do ficheiro seleccionado."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Ocorreu um erro ao mostrar a ajuda: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Ocorreu um erro ao mostrar a ajuda: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Incapaz de mostrar ajuda"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Cancelar a Visualização da Janela de Propriedades?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "A Criar janela de Propriedades"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Seleccione um ícone"
 
@@ -5344,71 +5431,112 @@ msgid "Search Results"
 msgstr "Resultados da Pesquisa"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Desculpe, mas o serviço de pesquisa Medusa não está disponível pois não está "
-"instalado."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "O serviço de pesquisa medusa não está disponível."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Serviço de Pesquisa Indisponível"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "A busca que seleccionou é mais recente que a indexação do seu sistema. A "
 "busca não irá retornar resultados. Poderá criar uma nova indexação "
 "executando numa linha de comando, como root, o comando \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"A pesquisa não consegue abrir o índice do seu sistema de ficheiros. O seu "
+"índice pode não existir ou estar corrompido. Pode criar um novo índice "
+"executando numa linha de comando, como root, o comando \"medusa-indexd\"."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Pesquisa por itens que são demasiado novos"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Todos os ficheiros indexados no seu computador correspondem ao critério "
+"seleccionado. Pode verificar os seus critérios ou adicionar mais critérios "
+"para reduzir o âmbito da sua pesquisa."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Todos os ficheiros indexados no seu computador correspondem ao critério "
 "seleccionado. Pode verificar os seus critérios ou adicionar mais critérios "
 "para reduzir o âmbito da sua pesquisa."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Erro durante a pesquisa"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "A pesquisa não consegue abrir o índice do seu sistema de ficheiros. O seu "
 "índice pode não existir ou estar corrompido. Pode criar um novo índice "
 "executando numa linha de comando, como root, o comando \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Erro na leitura do ficheiro de índice"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Ocorreu um erro ao carregar o conteudo desta pesquisa: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Para realizar uma pesquisa de conteudo, a Pesquisa necessita de um índice "
+"dos ficheiros no seu sistema. A Pesquisa não está a conseguir aceder ao "
+"índice. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Para realizar uma pesquisa de conteudo, a Pesquisa necessita de um índice "
+"dos ficheiros no seu sistema. A Pesquisa não está a conseguir aceder ao "
+"índice. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5416,26 +5544,23 @@ msgstr ""
 "ficheiros no seu sistema. A Pesquisa não consegue aceder ao índice pelo que  "
 "será efectuada uma pesquisa lenta, que não utiliza o índice."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Para realizar uma pesquisa de conteudo, a Pesquisa necessita de um índice "
-"dos ficheiros no seu sistema. A Pesquisa não está a conseguir aceder ao "
-"índice. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Pesquisas rápidas não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Pesquisas de conteudo não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5449,39 +5574,68 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Para efectuar uma pesquisa rápida, a Pesquisa necessita de um índice dos "
 "ficheiros no seu sistema. O seu computador está de momento a criar esse "
 "índice. Como a Pesquisa não consegue utilizar um índice, esta pesquisa "
 "poderá demorar vários minutos."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Para efectuar uma pesquisa de conteudo, a Pesquisa necessita de um ficheiro "
 "de índice do conteudo do seu sistema. O seu computador está de momento a "
 "criar esse índice. Pesquisas de conteudo estarão disponíveis quando o índice "
 "estiver completo."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Pesquisas indexadas não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Para realizar uma pesquisa de conteudo, a Pesquisa necessita de um índice "
+"dos ficheiros no seu sistema. A Pesquisa não está a conseguir aceder ao "
+"índice. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Para realizar uma pesquisa de conteudo, a Pesquisa necessita de um índice "
+"dos ficheiros no seu sistema. A Pesquisa não está a conseguir aceder ao "
+"índice. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Para efectuar uma pesquisa rápida, a Pesquisa necessita de um índice dos "
 "ficheiros no seu sistema. Não está disponível nenhum índice. Poderá criar um "
@@ -5489,12 +5643,12 @@ msgstr ""
 "que esteja disponível um índice completo, as pesquisas demorarão vários "
 "minutos."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Para efectuar uma pesquisa de conteudo, a Pesquisa necessita de um índice do "
 "conteudo do seu sistema. Não existe nenhum índice disponível. Pode criar um "
@@ -5502,7 +5656,12 @@ msgstr ""
 "que um índice completo esteja disponível, não serão realizadas pesquisas de "
 "conteudo."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Pesquisas rápidas não estão activas no seu computador"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5512,11 +5671,12 @@ msgstr ""
 "ficheiros no seu sistema. O seu administrador desabilitou as pesquisas "
 "rápidas no seu computador, pelo que não está disponível nenhum índice."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Pesquisas rápidas não estão activas no seu computador"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Pesquisas rápidas não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Onde"
 
@@ -5525,7 +5685,7 @@ msgstr "Onde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Revelar em Nova Janela"
@@ -5536,7 +5696,7 @@ msgstr "_Revelar em Nova Janela"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Revelar em %d _Novas Janelas"
@@ -5545,15 +5705,21 @@ msgstr "Revelar em %d _Novas Janelas"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "O Nautilus encontrou mais resultados de pesquisa do que os que consegue "
 "mostrar. Alguns itens não serão apresentados. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"O Nautilus encontrou mais resultados de pesquisa do que os que consegue "
+"mostrar. Alguns itens não serão apresentados. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Demasiadas Correspondências"
 
@@ -5567,12 +5733,12 @@ msgid "Create L_auncher"
 msgstr "Criar L_ançador"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Criar um novo atalho"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Apagar todos os itens no Lixo"
 
@@ -5593,7 +5759,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Utilizar Fun_do por Omissão"
@@ -5615,58 +5781,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Seleccione outro visualizador com o qual ver o item seleccionado"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Criar _Pasta"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Criar _Pasta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Criar uma nova pasta vazia dentro desta pasta"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Criar uma nova pasta vazia dentro desta pasta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Criar um atalho para cada um dos itens seleccionados"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Apagar cada item seleccionado, sem os mover para o Lixo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada item seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Editar Atalho"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Editar a informação do atalho"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatar a unidade seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Propriedades de Medi_a"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Desmontar a unidade seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Mover ou copiar ficheiros previamente seleccionados por um comando Cortar ou "
 "Copiar Ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5674,134 +5850,143 @@ msgstr ""
 "Mover ou copiar ficheiros previamente seleccionados por um comando Cortar ou "
 "Copiar Ficheiros para a pasta seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Abrir C_om"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Abrir cada item seleccionado numa nova janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Abr_ir em Nova Janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir item seleccionado nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Preparar os ficheiros seleccionados para serem copiados com um comando Colar "
 "Ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Preparar os ficheiros seleccionados para serem movidos com um comando Colar "
 "Ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_eger"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Proteger a unidade seleccionada."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Renomear item seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Repor Omissão _da Vista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Reiniciar ordenamento e nível de zoom para activar preferências para esta "
 "vista"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Executar ou gerir scripts de ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Seleccion_ar Todos os Ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Padrões"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Seleccionar todos os itens nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Seleccionar todos os itens nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Mostrar propriedades media da unidade seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Mostrar a pasta que contém os scripts que surgem neste menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Desmontar a unidade seleccionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Utilizar o fundo por omissão para esta localização"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Ver ou modificar as propriedades de cada item seleccionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copiar Ficheiro"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "Desmontar Vol_ume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Abrir Pasta Scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Colar Ficheiros"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Colar Ficheiros Na Pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5887,7 +6072,12 @@ msgstr "_Manualmente"
 msgid "Indexing is %d%% complete."
 msgstr "A indexação está %d%% completa."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Os seus ficheiros foram indexados pela última vez em %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5895,25 +6085,29 @@ msgstr ""
 "Diariamente os seus ficheiros e conteudo de texto é indexado para as suas "
 "pesquisas serem rápidas. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Estado da Indexação"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Os seus ficheiros foram indexados pela última vez em %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Diariamente os seus ficheiros e conteudo de texto é indexado para as suas "
-"pesquisas serem rápidas. A indexação está a decorrer neste momento."
+"pesquisas serem rápidas. "
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "De momento não existe um índice dos seus ficheiros."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5923,15 +6117,19 @@ msgstr ""
 "acelerar as pesquisas. A pesquisa rápida não está activa no seu computador, "
 "pelo que de momento não possui um índice."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "De momento não existe um índice dos seus ficheiros."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "O serviço de pesquisa medusa não está disponível."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5955,32 +6153,37 @@ msgstr "Mostrar Estado da _Indexação"
 msgid "Show status of indexing used when searching"
 msgstr "Mostrar estado da indexação utilizada nas pesquisas"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Incapaz de Criar Pasta Requerida"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Incapaz de Criar Pastas requeridas"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "O Nautilus não conseguiu criar a pasta requerida \"%s\". Antes de executar o "
 "Nautilus, crie esta pasta, ou defina as permissões por forma a que o "
 "Nautilus a possa criar."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Incapaz de Criar Pastas requeridas"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5991,22 +6194,27 @@ msgstr ""
 "Antes de executar o Nautilus, crie estas pastas, ou defina as permissões por "
 "forma a que o Nautilus as possa criar."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Atalho Para Ambiente Antigo"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "A localização do directório de ambiente foi alterada no GNOME 2.4. Um atalho "
 "chamado \"Atalho Para Ambiente Antigo\" foi criado no seu ambiente. Pode "
 "abri-lo para mover os ficheiros que deseja, e depois apagar o atalho."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Migrar ambiente antigo"
 
 #. Can't register myself due to trouble locating the
@@ -6019,7 +6227,7 @@ msgstr "Migrar ambiente antigo"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6030,7 +6238,7 @@ msgstr ""
 "reiniciar o computador ou re-instalar o Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6076,13 +6284,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "De momento o Nautilus não pode ser utilizado, devido a um erro inesperado."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6090,7 +6298,7 @@ msgstr ""
 "De momento o Nautilus não pode ser utilizado, devido a um erro inesperado do "
 "Bonobo ao tentar registar o servidor de vista de gestão de ficheiros."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6100,7 +6308,7 @@ msgstr ""
 "Bonobo ao tentar localizar a fábrica. Matando o bonobo-activation-server e "
 "reiniciando o Nautilus poderá ajudar a corrigir o problema."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6110,6 +6318,17 @@ msgstr ""
 "Bonobo ao tentar localizar o objecto consola. Matando o bonobo-activation-"
 "server e reiniciando o Nautilus poderá ajudar a corrigir o problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Ocorreu um erro ao mostrar a ajuda: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nenhum marcador definido"
@@ -6143,35 +6362,44 @@ msgstr "Menos Opções"
 msgid "Find Them!"
 msgstr "Encontra-los!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Não Se Pode Mover Para Si Própria"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" não é um nome de ficheiro válido."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" não é uma localização válida. Verifique o nome e tente novamente."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "\"%s\" não encontrado. Verifique o nome e tente novamente."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Servidores Rede"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nome:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Localização:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Ligar-se"
@@ -6372,6 +6600,20 @@ msgstr ""
 "\n"
 "Poderá apagar manualmente este ficheiro para que o druida surja novamente.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Não pode assignar simultaneamente mais do que um ícon costumizado! Arraste "
+"apenas uma imagem para definir o ícone costumizado."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"O ficheiro que largou não é local. Apenas pode utilizar imagens locais como "
+"ícones costumizados."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6382,26 +6624,25 @@ msgstr "Abrir com %s"
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Incapaz de iniciar a aplicação de gravação de cd:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Incapaz de iniciar gravador de cd"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Esvaziar _Lixo"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Escrever conteudos num CD"
 
@@ -6409,37 +6650,37 @@ msgstr "_Escrever conteudos num CD"
 msgid "Go To:"
 msgstr "Ir Para:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Deseja ver estas %d localizações em janelas separadas?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Ver em Múltiplas Janelas?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Impossível Abrir Localização"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Realizar um conjunto rápido de testes de auto-análise."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Criar a janela inicial com a geometria dada."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Apena scriar janelas para URIs explicitamente especificados."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6447,79 +6688,92 @@ msgstr ""
 "Não gerir o ambiente (ignorar as preferências definidas na janela de "
 "preferências)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Sair do Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reiniciar Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Gestor Ficheiros"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check não pode ser utilizado com URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check não pode ser utilizado com outras opções.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit não pode ser utilizado com URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart não pode ser utilizado com URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry não pode ser utilizado com mais do que um 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Tem a certeza que quer apagar definitivamente \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "Deseja mesmo esquecer o histórico? Se o fizer, terá de o repetir."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Deseja mesmo limpar a lista das localizações que visitou?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Limpar Histórico"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "A localização \"%s\" não existe. Deseja remover da sua lista quaisquer "
 "marcadores com esta localização?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "A localização \"%s\" já não existe."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Marcador para Localização Inexistente"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Remover"
 
@@ -6552,7 +6806,6 @@ msgid "Close _All Windows"
 msgstr "Fechar Tod_as as Janelas"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Fechar todas as janelas do Nautilus"
@@ -6575,107 +6828,119 @@ msgid "Forward"
 msgstr "Avançar"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Ir para a pasta de lixo"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Ir para a próxima localização visitada"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Ir para a última localização visitada"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Ir para a pasta de lixo"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Casa"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Barra de Localização"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Reler"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Procurar ficheiros neste computador"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Barra de Est_ados"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Parar"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Cima"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Escrever para CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Adicionar Marcador"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Recuar"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Esque_cer Histórico"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Computador"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Editar Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Avançar"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ir"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Casa"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Localização..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Painel _Lateral"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Li_xo"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Cima"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Ver"
 
@@ -6693,34 +6958,39 @@ msgstr "Ver como..."
 msgid "File Browser: %s"
 msgstr "Dono ficheiro:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Ocorreu um erro num dos paineis laterais. Impossível continuar. Não é "
 "possível indicar em qual deles ocorreu o erro."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Ocorreu um erro ao iniciar a visualização %s."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Ocorreu um erro no painel lateral %s. Impossível continuar. Se isto "
 "continuar a acontecer, poderá desejar desligar este painel."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Falha no Painel Lateral"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Painel Lateral"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contém uma vista de painel lateral"
 
@@ -6754,147 +7024,180 @@ msgstr "_Adicionar novo..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Padrão %s não pode ser apagado."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Incapaz de apagar padrão"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Emblema %s não pode ser apagado."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Incapaz de remover emblema"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Criar um Novo Emblema:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Palavra-C_have:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imagem:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Seleccione um ficheiro de imagem para o novo emblema:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Criar Nova Cor:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nome da cor:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valor da cor:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" não é um nome de ficheiro válido."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Não indicou um nome de ficheiro válido."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Incapaz de instalar padrão"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Você não pode substituir a imagem de reiniciar."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Não é uma Imagem"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "O padrão %s não pode ser instalado."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Seleccionar um ficheiro de imagem a adicionar como padrão"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Tem de especificar um nome não vazio para a nova cor."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Incapaz de instalar cor"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Seleccione uma cor a adicionar"
 
-#: 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' não é um ficheiro de imagem utilizável!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "'%s' não é um ficheiro de imagem utilizável."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "O ficheiro '%s' não aparenta ser uma imagem válida."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Seleccione Uma Categoria:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_ancelar Remoção"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Adicionar Novo Padrão..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Adicionar Nova Cor..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Adicionar Novo Emblema..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Clique num padrão para remover"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Clique numa cor para a remover"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Clique num emblema para o remover"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Padrões:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Cores:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemas:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Remover um Padrão..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Remover uma Cor..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Remover um Emblema..."
 
@@ -7287,34 +7590,39 @@ msgstr "Criador _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Fechar Tod_as as Janelas"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Fechar painel lateral"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Computador"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Ir para a pasta de lixo"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Localização..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]pastas"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Padrões"
@@ -7344,10 +7652,13 @@ msgid "View Failed"
 msgstr "Vista Falhou"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Ocorreu um erro ao iniciar a visualização %s."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Ocorreu um erro na vista de %s. Impossível continuar. Pode seleccionar outra "
 "visualização ou ir para uma localização diferente."
@@ -7357,99 +7668,130 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Ocorreu um erro ao iniciar a visualização %s."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "A AplicaçãoNautilus associada a esta janela."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Visualizador de Conteudo"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Vista do ficheiro ou pasta actual"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "\"%s\" não encontrado. Verifique o nome e tente novamente."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Incapaz de carregar %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Incapaz de carregar %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Incapaz de mostrar \"%s\", porque o Nautilus não consegue determinar qual o "
 "tipo do ficheiro."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "O Nautilus não tem um visualizador capaz de mostrar \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Incapaz de mostrar \"%s\", porque o Nautilus não pode gerir localizações %s."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Incapaz de mostrar \"%s\", pois a tentativa de acesso (log in) falhou."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Incapaz de mostrar \"%s\", pois o acesso foi negado."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Incapaz de mostrar \"%s\", porque não foi encontrado nenhum servidor \"%s\". "
 "Verifique o nome e que as configurações de proxy estão correctas."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Incapaz de mostrar \"%s\". Certifique-se de que as suas configurações de "
 "proxy estão correctas."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"Incapaz de mostrar \"%s\", porque o Nautilus não consegue contactar o "
-"browser principal SMB.\n"
-"Verifique que o servidor SMB está a correr na rede local."
+"Incapaz de mostrar \"%s\", porque o Nautilus não pode gerir localizações %s."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"De momento a pesquisa está indisponível porque ou você não possui um índice "
+"ou o serviço de pesquisa não está a correr. Certifique-se de que iniciou o "
+"serviço de pesquisa Medusa, e se não possuir um índice, que o indexador "
+"Medusa está a correr."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "De momento a pesquisa está indisponível porque ou você não possui um índice "
 "ou o serviço de pesquisa não está a correr. Certifique-se de que iniciou o "
 "serviço de pesquisa Medusa, e se não possuir um índice, que o indexador "
 "Medusa está a correr."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Pesquisar Indisponível"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "O Nautilus não pode mostrar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Incapaz de Mostrar Localização"
 
@@ -7461,7 +7803,7 @@ msgstr "Ir para a localização especificada por este marcador"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7469,11 +7811,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Duarte Loreto <happyguy_pt@hotmail.com>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7489,38 +7831,42 @@ msgstr "Recuar algumas páginas"
 msgid "Go forward a number of pages"
 msgstr "Avançar algumas páginas"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Mostrar esta localização com \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Temas"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Criador _CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID Aplicação"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "O ID da aplicação da janela."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplicação"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "A AplicaçãoNautilus associada a esta janela."
 
@@ -7556,6 +7902,256 @@ msgstr "Servidores Rede"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Alguns dos ficheiros não puderam ser adicionados como emblemas pois não "
+#~ "aparentam ser imagens válidas."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fábrica para a vista de dispositivos"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visualizador de Dispositivos"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vista de dispositivos"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Ver como Dispositivo"
+
+#~ msgid "hardware view"
+#~ msgstr "vista de dispositivos"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nome do ícon para a vista de dispositivos"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "resumo da informação de dispositivos"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K tamanho cache"
+
+#~ 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 "O tempo em funcionamento é de %d dias, %d horas, %d minutos"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Resumo de Dispositivos"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Este é um atalho para a página do CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Este é um atalho para a página da RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Este é um atalho para a página do IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro ao copiar para \"%s\".\n"
+#~ "\n"
+#~ "Não existe espaço suficiente no destino."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro ao criar atalho em \"%s\".\n"
+#~ "\n"
+#~ "Não existe espaço suficiente no destino."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ao mover itens para \"%s\".\n"
+#~ "\n"
+#~ "Você não tem permissões para escrever nesta pasta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ao mover itens para \"%s\".\n"
+#~ "\n"
+#~ "O disco de destino é apenas de leitura."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ao criar atalhos em \"%s\".\n"
+#~ "\n"
+#~ "Você não tem permissões para escrever nesta pasta."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ao criar atalhos em \"%s\".\n"
+#~ "\n"
+#~ "O disco de destino é apenas de leitura."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao copiar \"%s\".\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao mover \"%s\".\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao apagar \"%s\".\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao copiar.\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao criar atalho.\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao apagar.\n"
+#~ "\n"
+#~ "Deseja continuar?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Não Pode Copiar para o Lixo"
+
+#~ 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 ""
+#~ "A acção por omissão é incapaz de abrir \"%s\" porque não pode aceder a "
+#~ "ficheiros em locais \"%s\". Não existem outras aplicações disponíveis "
+#~ "para ver este ficheiro. Se copiar o ficheiro para o seu computador, "
+#~ "poderá ser possível abri-lo."
+
+#~ msgid "Searching Disks"
+#~ msgstr "A Procurar nos Discos"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "O Nautilus está a procurar pastas de lixo nos seus discos."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Os %d itens seleccionados não podem ser movidos para o Lixo. Deseja apaga-"
+#~ "los imediatamente?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d dos itens seleccionados não podem ser movidos para o Lixo. Deseja "
+#~ "apagar esses %d itens imediatamente?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "O ficheiro que largou não é uma imagem. Apenas pode utilizar imagens "
+#~ "locais como ícones costumizados."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Desculpe, mas o serviço de pesquisa Medusa não está disponível pois não "
+#~ "está instalado."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Diariamente os seus ficheiros e conteudo de texto é indexado para as suas "
+#~ "pesquisas serem rápidas. A indexação está a decorrer neste momento."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" não é uma localização válida. Verifique o nome e tente novamente."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' não é um ficheiro de imagem utilizável!"
+
+#~ 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 ""
+#~ "Incapaz de mostrar \"%s\", porque o Nautilus não consegue contactar o "
+#~ "browser principal SMB.\n"
+#~ "Verifique que o servidor SMB está a correr na rede local."
+
+#~ msgid "file icon"
+#~ msgstr "ícone ficheiro"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nome:"
+
 #~ msgid "Unknown"
 #~ msgstr "Desconhecido"
 
@@ -7651,9 +8247,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Barra de Ferramen_tas"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "A localização \"%s\" já não existe."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Ir para Localização Inexistente"
 
@@ -7703,9 +8296,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "Authentication Required"
 #~ msgstr "Autenticação Requerida"
 
-#~ msgid "_Location:"
-#~ msgstr "_Localização:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "O Lixo tem de se manter no ambiente."
 
@@ -7751,9 +8341,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvética"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Content Loser"
 #~ msgstr "Libertador Conteudo"
 
@@ -8303,9 +8890,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Definir Imagem da Capa"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "'%s' não é um ficheiro de imagem utilizável."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Seleccione um ficheiro de imagem para a capa do album:"
 
@@ -8446,9 +9030,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "Remove any custom images from selected icons"
 #~ msgstr "Remover quaisquer imagens costumizadas dos ícones seleccionados"
 
-#~ msgid "Themes"
-#~ msgstr "Temas"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Comportamento de Nova Janela"
 
@@ -8548,9 +9129,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "Preferences"
 #~ msgstr "Preferências"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "A imagem em %s não pode ser instalada como emblema."
-
 #~ msgid "Click on a theme to remove it."
 #~ msgstr "Clique num tema para o remover."
 
@@ -8560,9 +9138,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "\"%s\" não é uma pasta de tema válida."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "O tema \"%s\" não pode ser instalado."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Incapaz de instalar tema"
 
@@ -8579,9 +9154,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ "Não pode remover o tema actual. Modifique a aparência para outro tema "
 #~ "antes de remover este."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Esse tema não pode ser removido!"
-
 #~ msgid "_Add Theme..."
 #~ msgstr "_Adicionar Tema..."
 
@@ -8630,9 +9202,6 @@ msgstr "Ver os seus servidores de rede no gestor de ficheiros do Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Incapaz de carregar %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "A carregar %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c48426f36..6e6483a6f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.4.0\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-10-01 14:28-0400\n"
-"Last-Translator: Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-22 03:49-0200\n"
+"Last-Translator: Gustavo Noronha Silva <kov@debian.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() falhou."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemas"
 
@@ -55,47 +55,55 @@ msgstr "Visão de emblemas do Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Não foi possível remover o emblema com nome '%s'"
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Não foi possível remover o emblema com o nome '%s'. Isto provavelmente "
-"ocorreu porque o emblema é permanente e não foi adicionado por você."
+"Isto provavelmente aconteceu porque o emblema é permanente e não foi "
+"adicionado por você."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr "Não foi possível remover o emblema"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Não foi possível renomear o emblema com nome '%s'."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Não foi possível renomear o emblema com o nome '%s'. Isto provavelmente "
-"ocorreu porque o emblema é permanente e não foi adicionado por você."
+"Isto provavelmente aconteceu porque o emblema é permanente e não foi "
+"adicionado por você."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
-msgstr "Não foi possível renomear o emblema"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
+msgstr "Não foi possível remover o emblema"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Renomear Emblema"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Digite um novo nome para o emblema exibido:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Renomear"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "_Adicionar Emblemas..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +111,7 @@ msgstr ""
 "Digite um nome descritivo para cada emblema. O nome será utilizado em outros "
 "lugares para identificar o emblema."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +119,55 @@ msgstr ""
 "Digite um nome descritivo para o emblema. O nome será utilizado em outros "
 "lugares para identificar o emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Alguns arquivos não puderam ser adicionados como emblemas porque eles não "
-"são arquivos de imagem válidos."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Alguns arquivos não puderam ser adicionados como emblemas."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Os emblemas não parecem ser imagens válidas."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr "Não foi possível adicionar emblemas"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Nenhum dos arquivos pôde ser adicionado como emblema porque eles não parecem "
-"ser imagens válidas."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Nenhum dos arquivos pôde ser adicionado como emblema."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "O emblema não pôde ser adicionado."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
-msgstr "O texto arrastado não era um local de arquivo válido."
+msgstr "O texto arrastado não era uma localização de arquivo válido."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr "Não foi possível adicionar o emblema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "O arquivo '%s' não parece ser uma imagem válida."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "O arquivo arrastado não parece ser uma imagem válida."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Apaga"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fábrica para visão de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Visualizador de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Visão de hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Ver como hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "visão de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "nome do ícone para a visão de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "resumo de dados de hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"CPU %s\n"
-"%s MHz\n"
-"Tamanho do cache %s K"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "O tempo no ar é %d dias, %d horas, %d minutos"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Resumo do hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Este é um marcador para a página de CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Este é um marcador para a página de RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Este é um marcador para a página de IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Histórico"
@@ -269,51 +193,48 @@ msgid "Nautilus Image Properties view"
 msgstr "Visão Propriedades de Imagem do Nautilus"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "Câmera"
+msgstr "Marca da Câmera"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "Câmera"
+msgstr "Modelo da Câmera"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "Data da Foto"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "Tempo de Exposição"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "programa"
+msgstr "Programa de Exposição"
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "Valor da Abertura"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "Modo de Medição"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "Flash Disparado"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "Tamanho Focal"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "Velocidade da Veneziana"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "Taxa de Velocidade ISO"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
@@ -909,6 +830,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacional"
@@ -1111,9 +1036,8 @@ msgid "Bring up a new window for every opened file"
 msgstr "Abrir uma nova janela para cada arquivo aberto"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
-#, fuzzy
 msgid "Computer icon visible on desktop"
-msgstr "�cone de Diretório Pessoal (home) visível na área de trabalho"
+msgstr "�cone do computador visível na área de trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1137,11 +1061,11 @@ msgstr "Tema atual do Nautilus (obsoleto)"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "Custom Background Set"
-msgstr "Fundo de Tela customizado"
+msgstr "Fundo de Tela personalizado"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Custom Side Pane Background Set"
-msgstr "Fundo de Tela do Painel Lateral Customizado"
+msgstr "Fundo de Tela do Painel Lateral Personalizado"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid "Default Background Color"
@@ -1185,41 +1109,29 @@ msgstr "Definir o nível de aproximação da visão de lista"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Desktop font"
-msgstr "Fonte do Desktop"
+msgstr "Fonte da �rea de Trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Desktop home icon name"
-msgstr "Nome do ícone do diretório pessoal para o Desktop"
+msgstr "Nome do ícone da pasta pessoal para a �rea de Trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Desktop trash icon name"
-msgstr "Nome do ícone da lixeira para o Desktop"
+msgstr "Nome do ícone da lixeira para a �rea de Trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Diretórios acima deste tamanho será truncados para aproximadamente este "
-"tamanho. O objetivo disto é evitar abusos e o término inesperado do Nautilus "
-"em diretórios muito grandes. Um valor negativo pode ser usado para não ter "
-"limite. O limite é aproximadamente devido à leitura de diretórios em partes."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Habilitar opções 'especiais' no diálogo de preferências"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
-"Nome de arquivo para o fundo de tela padrão. Apenas usado se background_set "
+"Nome de arquivo para o fundo de tela padrão. Usado apenas se background_set "
 "for verdadeiro."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1227,6 +1139,18 @@ msgstr ""
 "Nome de arquivo para o fundo padrão da barra lateral. Apenas usado se "
 "side_pane_background_set for verdadeiro."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Pastas com tamanhos acima desse serão truncadas para um tamanho aproximado a "
+"esse. O propósito disso é evitar que se exceda o heap sem intenção e que o "
+"Nautilus morra em pastas grandes demais. Um valor negativo significa não ter "
+"limite. O limite é aproximado porque a leitura das pastas é feita em blocos."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Esconder os marcadores padrão no menu de marcadores"
@@ -1237,11 +1161,11 @@ msgstr "�cone de Diretório Pessoal (home) visível na área de trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
-"Se verdadeiro o Nautilus irá mostrar apenas diretórios na árvore do painel "
-"lateral. Caso contrário mostrará diretórios e arquivos."
+"Se verdadeiro, o Nautilus irá mostrar apenas pastas na árvore do painel "
+"lateral. Caso contrário mostrará tanto pastas quanto arquivos."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid ""
@@ -1272,11 +1196,11 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
-"Se verdadeiro o Nautilus irá mostrar diretórios antes de arquivos nas "
-"visualizações �cones e Lista."
+"Se verdadeiro, o Nautilus irá mostrar as pastas antes dos arquivos nas "
+"visualizações de ícones e lista."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1318,11 +1242,11 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
-"Se verdadeiro o Nautilus irá utilizar o diretório pessoal (home) do usuário "
-"como área de trabalho. Se falo, irá mostrar o diretório ~/Desktop."
+"Se verdadeiro, o Nautilus usará a pasta pessoal (home) do usuário como área "
+"de trabalho. Se falso, usará a pasta ~/Desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1336,11 +1260,11 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
-"Se verdadeiro arquivos ocultos são mostrados no gerenciador de arquivos. "
+"Se verdadeiro, arquivos ocultos são mostrados no gerenciador de arquivos. "
 "Arquivos ocultos são iniciados por um . ou estão listados no arquivo .hidden "
-"do diretório."
+"da pasta."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
@@ -1351,21 +1275,20 @@ msgstr ""
 "significa que ele será iniciado na próxima vez que você entrar no GNOME."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
-#, fuzzy
 msgid ""
 "If this is set to true, an icon linking to the computer location will be put "
 "on the desktop."
 msgstr ""
-"Se verdadeiro, um ícone apontando para a lixeira será colocado na área de "
-"trabalho."
+"Se verdadeiro, um ícone apontando para a localização computador será "
+"colocado na área de trabalho."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
-"Se verdadeiro, um link apontando para o diretório pessoal (home) será "
-"colocado na área de trabalho."
+"Se verdadeiro, um ícone apontando para a pasta pessoal (home) será colocado "
+"na área de trabalho."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid ""
@@ -1398,10 +1321,10 @@ msgstr ""
 "mostrar antes os menores arquivos, serão mostrados os maiores."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
-"Se verdadeiro os ícones serão dispostos mais perto uns dos outros por padrão "
-"em novas janelas"
+"Se verdadeiro os ícones serão dispostos mais próximos uns dos outros por "
+"padrão em novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1429,8 +1352,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista de legendas possíveis em ícones"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
-msgstr "Máximo de arquivos manipuláveis em um diretório"
+msgid "Maximum handled files in a folder"
+msgstr "Máximo de arquivos manipuláveis em uma pasta"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid "Maximum image size for thumbnailing"
@@ -1449,12 +1372,12 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus é responsável pela área de trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr "Nautilus usa o diretório pessoal (home) como área de trabalho"
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "O Nautilus usa a pasta pessoal (home) como área de trabalho"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr "Apenas mostrar diretórios no painel lateral �rvore"
+msgid "Only show folders in the tree sidebar"
+msgstr "Mostrar apenas pastas no painel lateral de árvore"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -1473,8 +1396,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Reverter ordem de organização em novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr "Mostrar diretórios antes dos arquivos em janelas"
+msgid "Show folders first in windows"
+msgstr "Mostrar pastas antes nas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1513,60 +1436,59 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
 "Perda de desempenho para quando mostrar uma pré-visualização de arquivos de "
-"texto.Se definido como \"always\" então sempre mostrar previsão, mesmo se o "
-"arquivo estiver em um servidor remoto. Se definido como \"local_only\" "
-"apenas mostrar previsões para sistemas de arquivo locais. Se definido como "
-"\"never\" nunca ler dados para prever."
+"texto. Se for \"always\" então sempre mostrar pré-visualização, mesmo se o "
+"arquivo estiver em um servidor remoto. Se \"local_only\" mostrar previsões "
+"apenas para sistemas de arquivo locais. Se definido como \"never\" nunca "
+"criar a pre-visualização."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
-"Perda de desempenho para quando mostrar uma pré-visualização de imagens como "
-"miniatura.Se definido como \"always\" então sempre mostrar miniatura, mesmo "
-"se o arquivo estiver em um servidor remoto. Se definido como \"local_only\" "
-"apenas mostrar miniaturas para sistemas de arquivo locais. Se definido como "
-"\"never\" nunca gerar miniatura, apenas mostrar um ícone genérico."
+"Perda de desempenho para quando mostrar imagens como miniaturas. Se for "
+"\"always\" então sempre mostrar miniatura, mesmo se o arquivo estiver em um "
+"servidor remoto. Se \"local_only\" mostrar miniaturas apenas para sistemas "
+"de arquivo locais. Se definido como \"never\" nunca gerar miniatura, mostrar "
+"apenas um ícone genérico."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
-"Perda de desempenho para quando contar o número de itens de um diretórioSe "
-"definido como \"always\" então sempre contar os itens, mesmo se o arquivo "
-"estiver em um servidor remoto. Se definido como \"local_only\" apenas contar "
-"para sistemas de arquivo locais. Se definido como \"never\" nunca contar o "
-"número de itens."
+"Perda de desempenho para quando contar o número de itens de uma pasta. Se "
+"for \"always\" então sempre contar os itens, mesmo se o arquivo estiver em "
+"um servidor remoto. Se \"local_only\" contar apenas para sistemas de arquivo "
+"locais. Se definido como \"never\" nunca contar o número de itens."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
-"A ordem de organização padrão para itens na visualizão de ícones. Valores "
+"A sequência de ordenações padrão para itens na visualizão de ícones. Valores "
 "possíveis são \"name\" (nome), \"size\" (tamanho), \"type\" (tipo), "
-"\"modification_data\" (data da última modificação) e \"emblems\" (emblemas)."
+"\"modification_date\" (data da última modificação) e \"emblems\" (emblemas)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"O nível de organização padrão para a visualização em Lista. Valores "
-"possíveis são name (nome), size (tamanho), type (tipo) e modification_data "
-"(data de modificação)."
+"A sequência de ordenações padrão para a visualização em Lista. Valores "
+"possíveis são \"name\" (nome), \"size\" (tamanho), \"type\" (tipo) e "
+"\"modification_date\" (data de modificação)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
 msgid "The default width of the side pane in new windows."
@@ -1585,16 +1507,16 @@ msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
 msgstr ""
-"Este nome pode ser definido se você quer um nome customizado para o ícone do "
-"Diretório Pessoal (home) da área de trabalho."
+"Este nome pode ser definido se você quer um nome personalizado para o ícone "
+"do Diretório Pessoal (home) da área de trabalho."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:80
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
 msgstr ""
-"Este nome pode ser definido se você quer um nome customizado para o ícone da "
-"Lixeira na área de trabalho."
+"Este nome pode ser definido se você quer um nome personalizado para o ícone "
+"da Lixeira na área de trabalho."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:81
 msgid "Trash icon visible on desktop"
@@ -1609,8 +1531,8 @@ msgid "Use manual layout in new windows"
 msgstr "Usar organização manual em novas janelas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr "Organizar ícones mais perto uns dos outros em novas janelas"
+msgid "Use tighter layout in new windows"
+msgstr "Usar layout mais rígido em novas janelas."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1639,8 +1561,8 @@ msgstr ""
 "\"list_view\" (Lista) e \"icon_view\" (�cones)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
-msgstr "Quando mostrar número de itens de um diretório"
+msgid "When to show number of items in a folder"
+msgstr "Quando mostrar número de itens de uma pasta"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
 msgid "When to show preview text in icons"
@@ -1651,12 +1573,12 @@ msgid "When to show thumbnails of image files"
 msgstr "Quando mostrar miniaturas de arquivos de imagens"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
-msgstr "Se um fundo customizado para o diretório foi definido."
+msgid "Whether a custom default folder background has been set."
+msgstr "Se um fundo personalizado foi definido para a pasta."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
 msgid "Whether a custom default side pane background has been set."
-msgstr "Se um fundo customizado para o painel lateral foi definido."
+msgstr "Se um fundo personalizado para o painel lateral foi definido."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:93
 msgid "Whether to ask for confirmation when moving files to trash"
@@ -1808,69 +1730,79 @@ msgstr "reconfigurar"
 msgid "on the desktop"
 msgstr "na área de trabalho"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Você não pode excluir um ícone de volume."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Não é possível apagar um ícone de um volume. Se você deseja ejetar o volume, "
-"clique com o botão direito no ícone e selecione a opção Ejetar do menu."
+"Se você quer ejetar o volume, por favor use o item Ejetar no menu de "
+"contexto do volume, que é acionado com o botão direito."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
-msgstr "Não foi possível deletar o volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Não é possível excluir volume"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Lixeira"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Mover para aqui"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copiar para aqui"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
-msgstr "Criar L_ink aqui"
+msgstr "Criar L_igação aqui"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Definir como _Fundo de Tela"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Definir como fundo p_ara todos as pastas"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Definir como fundo para es_ta pasta"
 
 #: 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 "O emblema não pôde ser instalado."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Desculpe, mas você deve especificar uma palavra chave não-vazia para o novo "
 "emblema."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
-msgstr "Não foi possível instalar emblema"
+#: 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 "Não foi possível instalar Emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1881,20 +1813,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr ""
-"Desculpe, mas já existe um emblema com o nome \"%s\". Por favor use um nome "
-"diferente."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Desculpe, mas já existe um emblema com o nome \"%s\"."
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Por favor escolha um nome de emblema diferente."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Não foi possível instalar emblema"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Não foi possível salvar emblema personalizado."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Não foi possível salvar o nome de emblema personalizado."
 
@@ -1913,962 +1849,888 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Erro ao mover."
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
-"Erro ao mover.\n"
-"\n"
-"\"%s\" não pode ser movido porque ele está em um disco de apenas leitura."
+"\"%s\" não pode ser movido porque ele está em um disco somente para leitura."
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Erro ao excluir."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Erro ao excluir.\n"
-"\n"
-"\"%s\" não pode ser excluído porque você não possui permissões para "
+"\"%s\" não pode ser excluído porque você não possui as permissões para "
 "modificar sua pasta pai."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
-"Erro ao excluir.\n"
-"\n"
-"\"%s\" não pode ser excluído porque ele está em um disco de apenas leitura."
+"\"%s\" não pode ser excluído porque ele está em um disco somente para "
+"leitura."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Erro ao mover.\n"
-"\n"
 "\"%s\" não pode ser movido porque você não possui permissões para modificá-"
 "lo ou modificar a sua pasta pai."
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr "Erro ao mover."
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Erro ao mover.\n"
-"\n"
-"\"%s\" não pode ser movida porque ela ou a pasta em que ela está estão "
-"contidas no destino."
+"Não foi possível mover \"%s\" porque ele ou sua pasta pai estão contidos no "
+"destino."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Erro ao mover.\n"
-"\n"
-"\"%s\" não pode ser movido para a lixeira porque você não possui permissões "
-"para modificá-lo ou modificar a sua pasta pai."
+"Não foi possível mover \"%s\" para a lixeira porque você não tem permissões "
+"para modificá-lo ou sua pasta pai."
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Erro ao copiar."
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Erro ao copiar.\n"
-"\n"
 "\"%s\" não pode ser copiado porque você não possui permissões para lê-lo."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ao copiar para \"%s\".\n"
-"\n"
-"Não há espaço suficiente no destino."
+msgid "Error while copying to \"%s\"."
+msgstr "Erro ao copiar para \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ao mover para \"%s\".\n"
-"\n"
-"Não há espaço suficiente no destino."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
+msgstr "Não há espaço em disco suficiente no destino."
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Erro ao criar vínculo em \"%s\".\n"
-"\n"
-"Não há espaço suficiente no destino."
+msgid "Error while moving to \"%s\"."
+msgstr "Erro ao mover para \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ao copiar para \"%s\".\n"
-"\n"
-"Você não possui permissões para escrever nesta pasta."
+msgid "Error while creating link in \"%s\"."
+msgstr "Erro ao criar ligação em \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ao copiar para \"%s\".\n"
-"\n"
-"O disco destino é apenas para leitura."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
+msgstr "Você não possui permissões para escrever nesta pasta."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ao mover itens para \"%s\".\n"
-"\n"
-"Você não possui permissões para escrever nesta pasta."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
+msgstr "O disco de destino é somente para leitura."
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ao mover itens para \"%s\".\n"
-"\n"
-"O disco destino é apenas para leitura."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Erro ao criar vínculos em \"%s\".\n"
-"\n"
-"Você não possui permissões para escrever nesta pasta."
+msgid "Error while moving items to \"%s\"."
+msgstr "Erro ao mover itens para \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Erro ao criar vínculos em \"%s\".\n"
-"\n"
-"O disco destino é apenas para leitura."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao copiar \"%s\".\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Erro ao criar ligações em \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao mover \"%s\".\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Erro \"%s\" ao copiar \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
+msgstr "Você deseja continuar?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao criar um vínculo para \"%s\".\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Erro \"%s\" ao mover \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao excluir \"%s\".\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Erro \"%s\" ao criar uma ligação para \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao copiar.\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Erro \"%s\" ao excluir \"%s\"."
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao mover.\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while copying."
+msgstr "Erro \"%s\" ao copiar."
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao criar vínculo.\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while moving."
+msgstr "Erro \"%s\" ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Erro \"%s\" ao excluir.\n"
-"\n"
-"Você deseja continuar?"
+msgid "Error \"%s\" while linking."
+msgstr "Erro \"%s\" ao criar ligação."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Erro \"%s\" ao excluir."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr "Erro ao copiar."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr "Erro ao mover."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Erro ao criar vínculo."
-
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
+msgstr "Erro ao criar ligação."
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
 msgstr "Erro ao excluir."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Pular"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
+msgstr "_Pular"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Repetir"
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr "_Repetir"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Não foi possível mover \"%s\" para a nova localização."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" não pôde ser movido para o novo local porque seu nome já está sendo "
-"usado por um item especial que não pode ser removido ou substituído.\n"
-"\n"
-"Se você ainda quiser mover \"%s\", troque seu nome e tente novamente."
+"O nome já está em uso para um item especial que não pode ser removido ou "
+"substituído. Se você ainda quer mover o item, troque seu nome e tente de "
+"novo."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Não foi possível copiar \"%s\" para a nova localização."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"\"%s\" não pôde ser copiado para o novo local porque seu nome já está sendo "
-"usado por um item especial que não pode ser removido ou substituído.\n"
-"\n"
-"Se você ainda quiser copiar \"%s\", troque seu nome e tente novamente."
+"O nome já está em uso para um item especial que não pode ser removido ou "
+"substituído. Se você ainda quer copiar o item troque seu nome e tente "
+"novamente."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Não é possível substituir arquivo."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
+msgstr "Não foi possível substituir arquivo"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "O arquivo \"%s\" já existe. Você deseja substituí-lo?"
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
-"O arquivo \"%s\" já existe.\n"
-"\n"
-"Você deseja substituí-lo?"
+"Se você substituir um arquivo existente o seu conteúdo será sobrescrito."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr "Conflito ao copiar"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Substituir"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
+msgstr "_Substituir"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Substituir todos"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
+msgstr "Substituir _Todos"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
-msgstr "vínculo para %s"
+msgstr "criar ligação para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
-msgstr "outro vínculo para %s"
+msgstr "outra ligação para %s"
 
 #. Localizers: Feel free to leave out the "st" suffix
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
-msgstr "%dº vínculo para %s"
+msgstr "%dª ligação para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
-msgstr "%dº vínculo para %s"
+msgstr "%dª ligação para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
-msgstr "%dº vínculo para %s"
+msgstr "%dª ligação para %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
-msgstr "%dº vínculo para %s"
+msgstr "%dª ligação para %s"
 
 #. Localizers:
 #. * Feel free to leave out the st, nd, rd and th suffix or
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (cópia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (outra cópia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ª cópia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ª cópia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (cópia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (outra cópia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dª cópia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus desconhecido %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Movendo arquivos para a lixeira"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Arquivos descartados:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Movendo"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Preparando para mover para a lixeira..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Movendo arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Arquivos movidos:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Preparando para mover..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Concluindo mover..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
-msgstr "Criando vínculos para arquivos"
+msgstr "Criando ligações para arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
-msgstr "Arquivos com vínculo:"
+msgstr "Arquivos com ligação:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
-msgstr "Criando vínculo para"
+msgstr "Criando ligação para"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
-msgstr "Preparando para criar vínculos..."
+msgstr "Preparando para criar ligaçõess..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
-msgstr "Concluindo a criação de vínculos..."
+msgstr "Concluindo a criação de ligações..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copiando arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Arquivos copiados:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copiando"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Preparando para copiar..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Não é possível copiar itens para a lixeira."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
+msgstr "Você não pode copiar itens para a lixeira."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Não é possível copiar para a lixeira"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr "Você só pode mover arquivos e pastas para a lixeira."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Não é possível mover esta pasta da lixeira."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Não é possível copiar esta pasta da lixeira."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+"Uma pasta de lixeira é usada para guardar itens movidos para a lixeira."
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
-msgstr "Não é possível mudar o local da lixeira"
+msgstr "Não é possível mudar a localização da lixeira"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Não é possível copiar a lixeira"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Não é possível mover uma pasta para dentro dela mesma."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Não é possível copiar uma pasta para dentro dela mesma."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr "A pasta de destino está dentro da pasta de origem."
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Não é possível mover para si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Não é possível copiar para si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Não é possível copiar um arquivo sobre si mesmo."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr "O destino e a origem são o mesmo arquivo."
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Não é possível copiar sobre si mesmo"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Erro ao criar nova pasta.\n"
-"\n"
-"Você não possui as permissões para escrever no destino."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
+msgstr "Você não possui as permissões para escrever no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Erro ao criar nova pasta.\n"
-"\n"
-"Não há espaço no destino."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
+msgstr "Não há espaço no destino."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Erro \"%s\" ao criar nova pasta."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
+msgstr "Erro ao criar nova pasta."
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error Creating New Folder"
 msgstr "Erro ao criar nova pasta"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "pasta sem título"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Erro \"%s\" ao criar novo documento."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr "Erro ao criar novo documento."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr "Erro ao criar novo documento"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr "novo arquivo"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Excluindo arquivos"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Arquivos excluídos:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Excluindo"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Preparando para excluir arquivos..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Esvaziando a lixeira"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparando para esvaziar a lixeira..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Você tem certeza que deseja excluir permanentemente todos os itens da "
 "lixeira?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "Se você esvaziar a lixeira, os itens serão permanentemente excluídos."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Esvaziar"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (cópia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (outra cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (outra cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (outra cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (outra cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123ª cópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124ª cópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124ª cópia).txt"
 
@@ -2887,64 +2749,64 @@ msgstr "foo (124ª cópia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hoje às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hoje às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hoje às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hoje às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hoje, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hoje, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hoje"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ontem às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ontem às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ontem às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ontem às %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ontem, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ontem, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ontem"
 
@@ -2953,133 +2815,133 @@ msgstr "ontem"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Segunda-feira, 00 de fevereiro de 0000 às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Seg, 00 de Out de 0000 às 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y às %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Seg, 00 de Out de 0000 às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 de Out de 0000 às 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y às %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 de Out de 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 itens"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 pastas"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 arquivos"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 item"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u itens"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u pastas"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u arquivos"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? itens"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tipo desconhecido"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tipo MIME desconhecido"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programa"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3089,7 +2951,7 @@ msgstr ""
 "provavelmente significa que o seu arquivo gnome-vfs.keys está no lugar "
 "errado ou não está sendo encontrado por uma outra razão."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3098,13 +2960,13 @@ msgstr ""
 "Não foi encontrada descrição para o tipo MIME \"%s\" (arquivo é \"%s\"), por "
 "favor notifique a lista de discussão do gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
-msgstr "vínculo"
+msgstr "ligação"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
-msgstr "vínculo (com problema)"
+msgstr "ligação (com problema)"
 
 #: libnautilus-private/nautilus-global-preferences.c:102
 msgid "_Always"
@@ -3223,11 +3085,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Buscar arquivos por nome de arquivo e por propriedades de arquivo"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Visualizar �cones"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Visualizar Lista"
@@ -3371,148 +3235,143 @@ msgstr "Pasta pessoal de %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Countertop"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ícone do arquivo"
+msgstr "Computador"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "texto editável"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "o rótulo editável"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "texto adicional"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "mais um pouco de texto"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "realçado para seleção"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "se está ou não realçado para uma seleção"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "realçado como foco de teclado"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "se está ou não realçado para renderizar foco do teclado"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "realçado para arrastar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "se está ou não realçado para Arrastar&Soltar"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "O retângulo da seleção"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Texto do Frame"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Desenhar um frame ao redor do texto selecionado"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Cor da Caixa de Seleção"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Cor da caixa de seleção"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Caixa de Seleção Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacidade da caixa de seleção"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Realçar Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacidade do realce para os ícones selecionados"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Informação da cor clara"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Cor usada para texto informativo em fundo escuro"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Informação da cor escura"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Cor usada para texto informativo em fundo claro"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"Este diretório usa aparência automática. Você que mudar para aparência "
-"manual e deixar este item onde você o colocou? Isto vai se sobrepor a "
-"aparência manual armazenada."
+"Você quer usar layout manual e deixar esse item onde você o colocou? Isso "
+"irá sobrepor o layout manual armanezado."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Essa pasta usa layout automático."
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Este diretório usa aparência automática. Você que mudar para aparência "
-"manual e deixar estes itens onde você os colocou? Isto vai se sobrepor a "
-"aparência manual armazenada."
+"Você quer usar aparência manual e deixar esses itens onde você os colocou? "
+"Isso irá sobrepor o layout manual armazenado."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
-msgstr ""
-"Este diretório usa aparência automática. Você que mudar para aparência "
-"manual e deixar este item onde você o colocou?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
+msgstr "Você quer usar layout manual e deixar esse item onde você o colocou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Este diretório usa aparência automática. Você que mudar para aparência "
-"manual e deixar estes itens onde você os colocou?"
+"Você quer usar layout manual e deixar esses itens onde você os colocou?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Mudar para aparência manual?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Mudar"
 
@@ -3622,72 +3481,72 @@ msgstr "É o padrão para itens \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "É o padrão para todos os itens \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modificar \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Incluir no menu para itens \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Usar como padrão para itens \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Incluir no menu para \"%s\" apenas"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Usar como padrão para \"%s\" apenas"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Não incluir no menu para itens \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nome"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Escol_ha"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Concluído"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modificar..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Programas e Tipos de Arquivos"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Ir Para Lá"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3695,48 +3554,48 @@ msgstr ""
 "Você pode configurar quais programas são disponibilizados para cada tipo de "
 "arquivo no diálogo Programas e Tipos de Arquivos"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Abrir com Outra Aplicação"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Escolha uma aplicação com a qual abrir \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Abrir com outro Visualizador"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Escolha um visualizador para \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Não existem visualizadores disponíveis para \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Não existem visualizadores disponíveis"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Nem existem aplicações associadas com \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nenhuma Aplicação Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Não existe nenhuma ação associada com \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nenhuma Ação Associada"
 
@@ -3744,177 +3603,183 @@ msgstr "Nenhuma Ação Associada"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
-"Você pode configurar o GNOME para associar aplicações com tipos de arquivos."
-"Deseja associar uma aplicação com este tipo de arquivo agora?"
+"Você pode configurar o GNOME para associar aplicações a tipos de arquivos. "
+"Deseja associar uma aplicação a este tipo de arquivo agora?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Associar Aplicação"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Associar Aplicação"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "O visualizador associado com \"%s\" é inválido."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Visualizador Inválido Associado"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "A aplicação associada  com \"%s\" é inválida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplicação Inválida Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "A ação associada com \"%s\" é inválida."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Ação Inválida Associada"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"Você pode configurar o GNOME para associar outra aplicação ou visualizador a "
-"este tipo de arquivo. Deseja associar uma aplicação ou visualizador com este "
-"tipo de arquivo agora?"
+"Você pode configurar o GNOME para associar uma aplicação ou visualizador "
+"diferente a este tipo de arquivo. Deseja associar uma aplicação ou "
+"visualizador com este tipo de arquivo agora?"
+
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Associar Ação"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Associar Ação"
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Falha ao abrir, você quer escolher outra aplicação?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
-"\"%s\" não pôde abrir \"%s\" porque \"%s\" não pode acessar arquivos nos "
-"locais \"%s\". Você gostaria de escolher uma outra aplicação?"
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos em "
+"locais \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Falha ao abrir, você gostaria de escolher outra ação?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
-"A ação padrão não pôde abrir \"%s\" porque não pode acessar arquivos nos "
-"locais \"%s\". Você gostaria de escolher uma outra ação?"
+"A ação padrão não pode abrir \"%s\" porque não pode acessar arquivos em "
+"locais \"%s\"."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
-msgstr "Não foi possível abrir local"
+msgstr "Não foi possível abrir localização"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" não pode abrir \"%s\" porque \"%s\" não pode acessar arquivos em "
+"locais \"%s\"."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
-"\"%s\" não pôde abrir \"%s\" porque \"%s\" não pode acessar arquivos nos "
-"locais \"%s\". Nenhuma outra aplicação está disponível para ver este "
-"arquivo. Se você copiar este arquivo para o seu computador, você pode ser "
-"capaz de abri-lo."
+"Nenhuma outra aplicação está disponível para ver esse arquivo. Se você "
+"copiar este arquivo para o seu computador, você pode ser capaz de abri-lo."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"A ação padrão não pôde abrir \"%s\" porque não pode acessar arquivos nos "
-"locais \"%s\". Nenhuma outra ação está disponível para ver este arquivo. Se "
-"você copiar este arquivo para o seu computador, você pode ser capaz de abri-"
-"lo."
+"A ação padrão não pode abrir \"%s\" porque não pode acessar arquivos em "
+"locais \"%s\"."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Nenhuma outra ação está disponível para ver este arquivo. Se você copiar "
+"este arquivo para o seu computador, você pode ser capaz de abri-lo."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
-"Desculpe, mas não é possível executar comandos a partir de um local remoto "
-"devido a considerações de segurança."
+"Desculpe, mas não é possível executar comandos a partir de uma localização "
+"remota."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "Não é possível executar vínculos remotos"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Isso está desabilitado por questões de segurança."
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Ocorreu um erro ao iniciar a aplicação.\n"
-"\n"
-"Detalhes: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "Não é possível executar ligações remotas"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detalhes: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Houve um erro ao iniciar a aplicação."
+
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Erro ao iniciar aplicação"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Esse alvo só suporta arquivos locais."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Este local só permite que lhe sejam arrastados arquivos locais.\n"
-"\n"
 "Para abrir arquivos externos copie-os para uma pasta local e arraste-os "
 "novamente."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
-msgstr "Arrastar e soltar só é suportado em sistemas de arquivos locais."
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "O alvo só suporta arquivos locais"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Este local só permite que lhe sejam arrastados arquivos locais.\n"
-"\n"
 "Para abrir arquivos externos copie-os para uma pasta local e arraste-os "
-"novamente.Os arquivos locais que você arrastou já foram abertos."
+"novamente. Os arquivos locais que você arrastou já foram abertos."
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4116,7 +3981,7 @@ msgstr "[Itens ]sem algumas das palavras \"%s\""
 
 #: libnautilus-private/nautilus-search-uri.c:555
 msgid "[Items larger than 400K] and [without all the words \"apple orange\"]"
-msgstr "[Items larger than 400K] e [without all the words \"apple orange\"]"
+msgstr "[Itens maiores que 400K] e [sem todas as palavras \"maçã laranja\"]"
 
 #. Human readable description for a criterion in a search for
 #. files. Bracketed items are context, and are message
@@ -4159,15 +4024,7 @@ msgstr ""
 
 #: libnautilus-private/nautilus-search-uri.c:713
 msgid "Items containing \"medusa\" in their names and that are folders"
-msgstr "Itens contendo \"medusa\" em seus nomes e que são diretórios"
-
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Buscando nos discos"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "O Nautilus está buscando pastas de lixeira em seus discos."
+msgstr "Itens contendo \"medusa\" em seus nomes e que são pastas"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
@@ -4237,7 +4094,7 @@ msgstr "C_olar texto"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "Ver o dispositivo de armazenamento do seu computador"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4252,13 +4109,12 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "Visualizar"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "Sistema de Arquivos"
+msgstr "Navegar no Sistema de Arquivos"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
-msgstr ""
+msgstr "Navegar no sistema de arquivos com o gerenciador de arquivos"
 
 #: src/Nautilus_shell.server.in.h:1
 msgid "Factory for Nautilus shell and file manager"
@@ -4376,97 +4232,103 @@ msgstr "Segundo plano"
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Isto irá abrir %d janela separadas. Você está certo que deseja isto?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Abrir %d janelas?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Você tem certeza que deseja abrir todos os arquivos?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, c-format
+msgid "This will open %d separate windows."
+msgstr "Isso abrirá %d janelas separadas."
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Você tem certeza que deseja excluir permanentemente \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Você tem certeza que deseja excluir permanentemente os %d itens selecionados?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Se você excluir um item ele será permanentemente perdido."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Excluir?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "Selecione uma Categoria:"
+msgstr "Selecione um Padrão"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "_Padrões"
+msgstr "_Padrão:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" selecionado"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 pasta selecionada"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d pastas selecionadas"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (contendo 0 itens)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (contendo 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (contendo %d itens)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (contendo um total de 0 itens)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (contendo um total de 1 item)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (contendo um total de %d itens)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" selecionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d itens selecionados (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 outro item selecionado (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d outros itens selecionados (%s)"
@@ -4478,7 +4340,7 @@ msgstr "%d outros itens selecionados (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4487,120 +4349,127 @@ 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:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
-msgstr ""
-"A pasta \"%s\" contém mais arquivos do que o Nautilus pode suportar. Alguns "
-"arquivos não serão exibidos."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
+msgstr "A pasta \"%s\" contém mais arquivos do que o Nautilus pode suportar."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Alguns arquivos não serão mostrados."
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Arquivos demais"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
-"\"%s\" não pode ser movido para a lixeira. Você deseja excluí-lo "
-"imediatamente?"
+"Não é possível mover o arquivo para a lixeira, quer deletá-lo imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "O arquivo \"%s\" não pode ser movido para a lixeira."
+
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
-"Os %d itens selecionados não podem ser movidos para a lixeira. Você deseja "
-"excluí-los imediatamente?"
+"Não é possível mover os itens para a lixeira, quer excluí-los imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d dos itens selecionados não podem ser movidos para a lixeira. Você deseja "
-"excluir estes %d itens imediatamente?"
+"Não foi possível mover alguns itens para a lixeira, você quer excluir esses "
+"itens permanentemente?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Excluir imediatamente?"
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Você tem certeza que deseja excluir permanentemente \"%s\" da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Você tem certeza que deseja excluir permanentemente os %d itens selecionados "
 "da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Se você excluir um item, ele será perdido permanentemente."
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Excluir da lixeira?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Usar \"%s\" para abrir o item selecionado"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Outro _aplicativo..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Um _aplicativo..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Outro _visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Um _visualizador..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Não foi possível completar a ação especificada: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Não foi possível completar a ação especificada."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Executar \"%s\" em qualquer item selecionado"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Criar Documento a partir do modelo \"%s\""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr "Todos os arquivos executáveis desta pasta aparecerão no menu Scripts."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Todos os arquivos executáveis nesta pasta aparecerão no meno Scripts. Ao "
-"escolher um script no menu, este será executado com os itens selecionados "
+"Ao escolher um script no menu, este será executado com os itens selecionados "
 "como entrada."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Sobre Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4638,21 +4507,21 @@ msgstr ""
 "NAUTILUS_SCRIPT_SELECTED_URIS: URIs delimitadas por fim-de-linha para os "
 "arquivos selecionados\n"
 "\n"
-"NAUTILUS_SCRIPT_CURRENT_URI: URI para o local atual\n"
+"NAUTILUS_SCRIPT_CURRENT_URI: URI para a localização atual\n"
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: posição e tamanho da janela atual"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" será movido se você selecionar o comando Colar arquivos"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" será copiado se você selecionar o comando Colar arquivos"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4660,7 +4529,7 @@ msgstr ""
 "Os %d itens selecionados não podem ser movidos se você selecionar o comando "
 "Colar arquivos"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4668,161 +4537,154 @@ msgstr ""
 "Os %d itens selecionados serão copiados se você selecionar o comando Colar "
 "arquivos"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Não há nada na área de transferência para ser colado."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Erro ao montar"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Erro ao desmontar"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Erro ao montar"
+msgstr "Erro ao ejetar"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_jetar"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "Desmontar Vol_ume"
 
-#: src/file-manager/fm-directory-view.c:5041
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
-msgstr "Abrir em uma n_ova janela"
+msgstr "Abrir em Nova Janela"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "Abrir em %d _novas janelas"
+msgstr "Abrir em %d Novas Janelas"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "Pasta Pessoal"
+msgstr "Navegar Pasta"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "Pasta Pessoal"
+msgstr "Navegar Pastas"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Excluir da _Lixeira"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Excluir permanentemente todos os itens selecionados"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mo_ver para a Lixeira"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mover cada item selecionado para a lixeira"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Excluir"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
-msgstr "Criar L_inks"
+msgstr "Criar L_igações"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
-msgstr "Criar L_ink"
+msgstr "Criar L_igação"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Esvaziar Lixeira"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Recor_tar arquivo"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Recor_tar Arquivos"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copiar Arquivo"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copiar Arquivos"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Não é possível usar este vínculo porque ele não possui um destino. Você "
-"deseja movê-lo para a Lixeira?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "A ligação está quebrada, você quer movê-la para a lixeira?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Não é possível usar esta ligação porque ela não possui um destino."
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Não é possível usar este vínculo porque o destino \"%s\" não existe. Você "
-"deseja movê-lo para a Lixeira?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Não é possível usar esta ligação porque o destino \"%s\" não existe."
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
-msgstr "Link Quebrado"
+msgstr "Ligação Quebrado"
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"\"%s\" é um arquivo texto executável. Você deseja executá-lo ou exibir o seu "
-"conteúdo?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Você deseja executar \"%s\" ou exibir seu conteúdo?"
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "\"%s\" é um arquivo de texto executável."
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Executar ou Exibir?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Exibir"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Executar em _Terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Exibir"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Executa_r"
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Abrindo \"%s\""
+msgid "Opening \"%s\"."
+msgstr "Abrindo \"%s\"."
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Cancelar Abertura?"
 
@@ -4845,28 +4707,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Desculpe, não foi possível exibir todo o conteúdo de \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "O conteúdo da pasta não pôde ser exibido."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Erro ao exibir pasta"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "O nome \"%s\" já é usado nesta pasta. Por favor use um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 "Não existe \"%s\" nesta pasta. Talvez ele tenha sido movido ou excluído?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Você não possui as permissões necessárias para renomear \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4875,67 +4741,79 @@ msgstr ""
 "O nome \"%s\" não é válido pois contém o caracter \"/\". Por favor use um "
 "nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "O nome \"%s\" não é válido. Por favor use um nome diferente."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Não foi possível mudar o nome de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Não foi possível renomear \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "O item não pôde ser renomeado."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Erro ao renomear"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 "Você não possui as permissões necessárias para mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Não foi possível mudar o grupo de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Não foi possível mudar o grupo de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "O grupo não pôde ser alterado."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Erro ao atribuir grupo"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Não foi possível mudar o dono de \"%s\" pois ele está em um disco de apenas "
 "leitura"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Não foi possível mudar o dono de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "O dono não pôde ser alterado."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Erro ao atribuir dono"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4943,21 +4821,25 @@ msgstr ""
 "Não foi possível mudar as permissões de \"%s\" pois ele está em um disco de "
 "apenas leitura"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Não foi possível mudar as permissões de \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "As permissões não puderam ser alteradas."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Erro ao atribuir permissões"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renomeando \"%s\" para \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Cancelar mudança de nome?"
 
@@ -5015,128 +4897,131 @@ msgstr "Restaurar _Tamanho Original dos �cones"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Rest_aurar Tamanho Original do �cone"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "apontando para \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Arrastar e soltar não é suportado."
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Arrastar e soltar só é suportado em sistemas de arquivos locais."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
-msgstr "Erro de arrastar e soltar"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr "Erro ao arrastar e soltar"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Um tipo de arraste inválido foi usado."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tipo"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data de modificação"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "Você não pode atribuir mais de um ícone personalizado de uma vez!"
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
-"Não é possível atribuir mais de uma imagem personalizada por vez! Por favor, "
-"arraste apenas uma imagem para configurar um ícone personalizado."
+"Por favor arraste apenas uma imagem para definir um ícone personalizado."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mais de uma imagem"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"O arquivo que você arrastou não é local. Você só pode usar imagens locais "
-"como ícones personalizados."
+msgid "The file that you dropped is not local."
+msgstr "O arquivo que você arrastou não é local."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Você só pode usar imagens locais como ícones personalizados."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Apenas imagens locais"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"O arquivo que você arrastou não é uma imagem. Você só pode usar imagens "
-"locais como ícones personalizados."
+msgid "The file that you dropped is not an image."
+msgstr "O arquivo que você arrastou não é uma imagem."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Imagens apenas"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Propriedades de %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Cancelar mudança de grupo?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
-msgstr "Mudando grupo"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Mudando grupo."
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Cancelar mudança de dono?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
-msgstr "Mudando dono"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Mudando dono."
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nada"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ilegível"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 item, com tamanho %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d itens, totalizando %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(algumas partes ilegíveis)"
 
@@ -5146,191 +5031,187 @@ msgstr "(algumas partes ilegíveis)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Conteúdo:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Básico"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nomes:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
-msgstr "Local:"
+msgstr "Localização:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Espaço livre:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
-msgstr "Destino do link:"
+msgstr "Destino da ligação:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Acessado:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Selecionar �cone Personalizado..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Remover �cone Personalizado"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Leitura"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Escrita"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xecução"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Definir ID do _usuário"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Indicadores especiais:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Definir ID do gr_upo"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Pegajoso"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Você não é o dono, logo você não pode alterar as permissões."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "D_ono do arquivo:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Dono do arquivo:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Grupo do arquivo:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grupo do arquivo:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupo:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Como texto:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Como números:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Última alteração:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "As permissões de \"%s\" não puderam ser determinadas."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "As permissões do arquivo selecionado não puderam ser determinadas."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Ocorreu um erro ao exibir ajuda: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Houve um erro ao exibir a ajuda."
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr "Não foi possível exibir ajuda"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Cancelar exibição da janela Propriedades?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
-msgstr "Criando janela Propriedades"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Criando janela de Propriedades"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Selecione um ícone"
 
@@ -5348,97 +5229,113 @@ msgid "Search Results"
 msgstr "Resultados de busca"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Desculpe, mas o serviço de busca Medusa não está disponível porque ele não "
-"foi instalado."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Desculpe mas o serviço de busca Medusa não está disponível."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "O Medusa não está instalado."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Serviço de busca não está disponível"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 "A busca que você selecionou é mais nova que o índice no seu sistema. A busca "
-"não retornará resultados neste momento. Você pode criar um novo índice "
-"executando \"medusa-indexd\" como superusuário na linha de comando."
+"não retornará resultados neste momento."
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Você pode criar um índice manualmente executando \"medusa-indexd\" como root "
+"em uma linha de comando."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr "Buscar por itens que são novos demais"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Todos os arquivos indexados em seu computador correspondem ao critério "
+"selecionado."
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Todos os arquivos indexados em seu computador correspondem ao critério "
-"selecionado. Você pode verificar a ortografia de suas seleções ou adicionar "
-"mais critérios para estreitar a busca."
+"Você pode verificar a ortografia de suas seleções ou adicionar mais "
+"critérios para estreitar a busca."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Erro durante a busca"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Não foi possível para o Localizar abrir seu arquivo de índice. Seu índice "
-"pode estar faltando ou corrompido. Você pode criar um índice manualmente "
-"executando \"medusa-indexd\" como root em uma linha de comando."
+"A busca não pôde abrir seu arquivo de índice. Seu índice pode estar faltando "
+"ou corrompido."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr "Erro lendo índice de arquivos"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Ocorreu um erro ao carregar o conteúdo desta busca: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Um erro aconteceu ao carregar o conteúdo dessa busca."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Para executar uma busca rápida, Localizar exige um índice dos arquivos de "
-"seu sistema. Localizar não pode acessar o seu índice no momento então será "
-"realizada uma busca mais lenta que não usa o índice."
+"Para executar uma busca rápida é necessário um índice dos arquivos do seu "
+"sistema."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Para executar uma busca por conteúdo é necessário um índice de arquivos do "
+"seu sistema."
+
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
 msgstr ""
-"Para executar uma busca por conteúdo, Localizar exige um índice dos arquivos "
-"de seu sistema. Localizar não pode acessar o seu índice no momento."
+"A busca não pôde acessar seu índice agora então uma pesquisa mais lenta será "
+"executada sem usar o índice."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "A busca não pode acessar seu índice agora."
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr "Buscas rápidas não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr "Buscas por conteúdo não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5452,58 +5349,78 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Para executar uma busca rápida, Localizar exige um índice dos arquivos de "
-"seu sistema. Seu computador está criando este índice agora. Já que Localizar "
-"não pode usar um índice, esta busca pode levar vários minutos."
+"Para executar uma busca rápida é necessário um índice de arquivos do seu "
+"sistema. Seu computador está criando o índice nesse instante."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"Para executar uma busca por conteúdo é necessário um íńdice do conteúdo do "
+"seu sistema. Seu computador está criando o índice nesse instante."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+"Já que a busca não pode usar um índice essa busca pode levar vários minutos."
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
 msgstr ""
-"Para executar uma busca por conteúdo, Localizar exige um índice do conteúdo "
-"em seu sistema. Seu computador está criando este índice agora. Buscas por "
-"conteúdo estarão disponíveis quando o índice estiver concluído."
+"Buscas por conteúdo só estarão disponíveis quando o índice for completo."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr "Buscas indexadas não estão disponíveis"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
-"Para executar uma busca rápida, Localizar exige um índice dos arquivos de "
-"seu sistema. Não há nenhum índice disponível no momento. Você pode criar um "
-"índice manualmente executando \"medusa-indexd\" como root em uma linha de "
-"comando. Até que um índice completo esteja disponível, as buscas podem levar "
-"vários minutos."
+"Para executar uma busca rápida é necessário um índice de arquivos do seu "
+"sistema. Não há um índice disponível agora."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
+msgstr ""
+"Para executar uma busca por conteúdo é necessário um índice de conteúdo do "
+"seu sistema. Não há índice disponível agora."
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Você pode criar um índice executando \"medusa-indexd\" como root na linha de "
+"comando. Até que um índice completo esteja disponível as buscas levarão "
+"vários minutos."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
-"Para executar uma busca por conteúdo, Localizar exige um índice do conteúdo "
-"em seu sistema. Seu computador não possui um índice no momento. Você pode "
-"criar um índice manualmente executando \"medusa-indexd\" como root em uma "
-"linha de comando. Até que um índice completo esteja disponível, as buscas "
-"por conteúdo não podem ser executadas."
+"Você pode criar um índice executando \\\"medusa-indexd\\\" como root na "
+"linha de comando. Até que um índice completo esteja disponível buscas de "
+"conteúdo não poderão ser executadas."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Buscas rápidas não estão habilitadas em seu computador."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5513,11 +5430,11 @@ msgstr ""
 "seu sistema. O seu administrador de sistema desligou as buscas rápidas no "
 "seu computador, logo não existe um índice disponível."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Buscas rápidas não estão habilitadas em seu computador"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Buscas rápidas não estão habilitadas"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Onde"
 
@@ -5526,7 +5443,7 @@ msgstr "Onde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Revelar em uma nova janela"
@@ -5537,7 +5454,7 @@ msgstr "_Revelar em uma nova janela"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Revelar em %d _novas janelas"
@@ -5546,15 +5463,15 @@ msgstr "Revelar em %d _novas janelas"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"O Nautilus encontrou mais resultados de busca do que ele pode exibir. Alguns "
-"itens não serão exibidos. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "O Nautilus encontrou mais resultados de busca do que ele pode exibir."
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Alguns itens que correspondem com a busca não serão exibidos."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Ocorrências demais"
 
@@ -5568,12 +5485,12 @@ msgid "Create L_auncher"
 msgstr "Criar L_ançador"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Criar um novo lançador"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Excluir todos os itens na Lixeira"
 
@@ -5594,7 +5511,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Utilizar Fun_do de Tela padrão"
@@ -5616,58 +5533,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Escolher outro visualizador para ver o item selecionado"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+msgid "Create _Document"
+msgstr "Criar _Documento"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "Criar _Pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Criar um arquivo vazio dentro dessa pasta"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Criar uma nova pasta vazia dentro desta pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
-msgstr "Criar um vínculo simbólico para cada item selecionado"
+msgstr "Criar uma ligação simbólica para cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplicar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Excluir cada item selecionado, sem movê-los para a Lixeira"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplicar cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Editar Lançador"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Editar informações do lançador"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatar o volume selecionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Propriedades da Mídia"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "Desmontar o volume selecionado."
+msgstr "Montar o volume selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Move ou copia arquivos selecionados previamente por um comando Recortar "
 "arquivos ou Copiar arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5675,134 +5599,137 @@ msgstr ""
 "Move ou copia arquivos selecionados previamente por um comando Recortar "
 "arquivos ou Copiar arquivos na pasta selecionada"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Não há modelos Instalados"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "A_brir com"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
-msgstr "Abrir o item selecionado em uma nova janela"
+msgstr "Abrir cada item selecionado em uma janela de navegação"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
-msgstr "Abrir em uma n_ova janela"
+msgstr "Abrir em Janela de Navegação"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Abrir o item selecionado nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Preparar os arquivos selecionados a serem copiados com um comando Colar "
 "arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Preparar os arquivos selecionados a serem movidos com um comando Colar "
 "arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_eger"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Proteger o volume selecionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Renomear o item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Restaurar para Visualização Pa_drão"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Reinicializar ordem de classificação para corresponder às preferências para "
 "esta visualização"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Executar ou gerenciar scripts em ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Selecionar Todos os Arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "_Padrões"
+msgstr "Selecionar _Padrões"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Selecionar todos os itens nesta janela"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "Selecionar todos os itens nesta janela"
+msgstr "Selecionar itens nessa janela que correspondam a um padrão"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Mostrar as propriedades da mídia para o volume selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Mostrar a pasta contendo os scripts que aparecem neste menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Desmontar o volume selecionado."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
-msgstr "Utilizar o fundo padrão para este local"
+msgstr "Utilizar o fundo padrão para esta localização"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Ver ou modificar as propriedades de cada item selecionado"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "Arquivo _Vazio"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "Desmontar Vol_ume"
+msgstr "_Montar Volume"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Abrir Pasta de Scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "C_olar Arquivos"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "C_olar Arquivos na Pasta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5888,7 +5815,12 @@ msgstr "_Manualmente"
 msgid "Indexing is %d%% complete."
 msgstr "A criação do índice está %d%% concluída."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Seus arquivos foram indexados pela última vez em %s."
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5896,25 +5828,27 @@ msgstr ""
 "Uma vez por dia seus arquivos e conteúdo de texto são indexados para que "
 "suas buscas sejam rápidas. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Estado da indexação"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Seus arquivos foram indexados pela última vez em %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Seus arquivos estão sendo indexados no momento."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Uma vez por dia seus arquivos e conteúdo de texto são indexados para que "
-"suas buscas sejam rápidas. Seus arquivos estão sendo indexados agora."
+"suas buscas sejam rápidas. "
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Não existe atualmente um índice de seus arquivos"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5924,15 +5858,19 @@ msgstr ""
 "as pesquisas. A Busca rápida não está habilitada em seu computador, então "
 "você atualmente não dispõe desse índice."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Não existe atualmente um índice de seus arquivos"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Não há Arquivos de �ndice"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Desculpe, serviço de busca Medusa não está disponível."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Por favor verifique que o medusa foi instalado corretamente."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5956,59 +5894,62 @@ msgstr "Exibir estado da _indexação"
 msgid "Show status of indexing used when searching"
 msgstr "Exibe o estado da indexação usada pela busca"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Não foi possível criar pasta necessária"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+"O Nautilus não pôde criar a pasta \"%s\", necessária ao seu funcionamento."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus não pôde criar a pasta \"%s\". Antes de executar o Nautilus, por "
-"favor crie esta pasta ou atribua permissões tais que o Nautilus possa criá-"
-"la."
+"Antes de executar o Nautilus, por favor crie a pasta a seguir ou configure "
+"as permissões de forma que o Nautilus possa criá-la."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Não foi possível criar pastas necessárias"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "O Nautilus não pôde criar as pastas requeridas a seguir: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus não pôde criar as seguintes pastas necessárias:\n"
-"\n"
-"%s\n"
-"\n"
-"Antes de executar o Nautilus, por favor crie estas pastas ou atribua "
-"permissões tais que o Nautilus possa criá-las."
+"Antes de executar o Nautilus, por favor crie essas pastas ou configure as "
+"permissões de forma que o Nautilus possa criá-las."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
-msgstr "Link para Desktop antigo"
+msgstr "Ligação para a �rea de Trabalho antiga"
+
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Uma ligação chamada \"Ligação para a �rea de Trabalho Antiga\" foi criado na "
+"área de trabalho."
 
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"O local do diretório do desktop mudou no GNOME 2.4. Um link chamado \"Link "
-"para Desktop antigo\" foi criado no desktop. Você pode abrí-lo e mover os "
-"arquivos para onde você deseja, e depois deletar o link."
+"A localização da pasta da área de trabalho mudou no GNOME 2.4. Você pode "
+"abrir a ligação e mover os arquivos que quiser, e então excluir a ligação."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr "Desktop antigo migrado"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
+msgstr "�rea de Trabalho Antiga Migrada"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -6020,7 +5961,7 @@ msgstr "Desktop antigo migrado"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6031,7 +5972,7 @@ msgstr ""
 "reiniciar o computador ou reinstalar o Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6056,8 +5997,8 @@ msgstr ""
 "reiniciar o computador ou reinstalar o Nautilus.\n"
 "\n"
 "Bonobo não pôde localizar o arquivo Nautilus_shell.server. Uma causa disto "
-"aparenta ser um LD_LIBRARY_PATH que não inclui o diretório de biblioteca "
-"bonobo-activation. Outra possibilidade seria uma instalação defeituosa sem o "
+"aparenta ser um LD_LIBRARY_PATH que não inclui a pasta de biblioteca bonobo-"
+"activation. Outra possibilidade seria uma instalação defeituosa sem o "
 "arquivo Nautilus_Shell.server.\n"
 "\n"
 "Executar \"bonobo-slay\" terminará todos os processos do Bonobo Activation e "
@@ -6077,12 +6018,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Não é possível usar o Nautilus agora devido a um erro inesperado."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6090,7 +6031,7 @@ msgstr ""
 "Não é possível usar o Nautilus agora devido a um erro inesperado do Bonobo "
 "ao tentar registrar o servidor de visão do gerenciador de arquivos."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6100,7 +6041,7 @@ msgstr ""
 "ao tentar localizar a fábrica. Terminar o bonobo-activation-server e "
 "reiniciar o Nautilus pode ajudar a resolver o problema."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6110,6 +6051,17 @@ msgstr ""
 "ao tentar localizar um objeto shell. Terminar o bonobo-activation-server e "
 "reiniciar o Nautilus pode ajudar a resolver o problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Ocorreu um erro ao exibir ajuda: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nenhum marcador definido"
@@ -6120,7 +6072,7 @@ msgstr "<b>_Marcadores</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:2
 msgid "<b>_Location</b>"
-msgstr "<b>_Local</b>"
+msgstr "<b>_Localização</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
@@ -6143,38 +6095,43 @@ msgstr "Menos opções"
 msgid "Find Them!"
 msgstr "Localizá-los!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr ""
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Você deve digitar um nome para o servidor."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-#, fuzzy
-msgid "Can't connect to server"
-msgstr "Não é possível mover para si mesmo"
+msgid "Please enter a name and try again."
+msgstr "Por favor digite um nome e tente de novo."
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr "Não foi Possível Conectar ao Servidor"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" não é um local válido. Por favor verifique a grafia e tente novamente."
+msgid "\"%s\" is not a valid location."
+msgstr "\"%s\" não é uma localização válida."
 
-#: src/nautilus-connect-server-dialog.c:174
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Por favor verifique a grafia e tente novamente."
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "Servidores de Rede"
+msgstr "Conectar a Servidor"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nome:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Localização:"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "_Conectar"
+msgstr "Conectar"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6373,6 +6330,14 @@ msgstr ""
 "Você pode apagar manualmente este arquivo para exibir o assistente "
 "novamente.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "Você não pode atribuir mais de um ícone personalizado de uma vez."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Você só pode usar imagens como ícones personalizados."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6383,26 +6348,21 @@ msgstr "Abrir com %s"
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Não foi possível iniciar aplicação de gravação de cd:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
+msgstr "Não foi possível iniciar a aplicação de gravação de cd."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "Não foi possível iniciar gravador de cd"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
+msgstr "Não foi Possível Iniciar Gravador de CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Esvaziar _Lixeira"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "E_screver conteúdo em um CD"
 
@@ -6410,37 +6370,36 @@ msgstr "E_screver conteúdo em um CD"
 msgid "Go To:"
 msgstr "Ir para:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Você deseja ver estes %d locais em janelas separadas?"
+msgid "Do you want to view %d locations?"
+msgstr "Você deseja ver estas %d localizações?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Ver em várias janelas?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "Não foi possível abrir local"
+msgstr "Abrir Localização"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Realizar um rápido conjunto de auto testes."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Criar a janela inicial com a geometria dada."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Apenas criar janelas para URIs especificadas explicitamente."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6448,87 +6407,96 @@ msgstr ""
 "Não gerencia a área de trabalho (ignora o conjunto de preferências no "
 "diálogo de preferências)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
-msgstr ""
+msgstr "abrir uma janela do navegador."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Sair do Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reiniciar o Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Gerenciador de Arquivos"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check não pode ser usado com outras opções.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart não pode ser usado com URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry não pode ser usado com mais de uma URI.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Você tem certeza que deseja esquecer o histórico? Se você o fizer, estará "
-"condenado a repeti-lo."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Você tem certeza que deseja esquecer o histórico?"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Se tiver, você estará condenado a repetí-lo."
+
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Você tem certeza que deseja limpar a lista de locais que você visitou?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+"Se você limpar a lista de localizações elas serão permanentemente excluídas."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Limpar Histórico?"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"O local \"%s\" não existe. Você gostaria de remover da sua lista todos os "
-"marcadores com este local?"
+"Você quer remover quaisquer marcadores com localizações não-existentes da "
+"sua lista?"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "A localização \"%s\" não existe."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
-msgstr "Marcador para um local inexistente"
+msgstr "Marcador para uma localização inexistente"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Remover"
 
 #: src/nautilus-navigation-window-ui.xml.h:1
 msgid "Add a bookmark for the current location to this menu"
-msgstr "Inclui um marcador para o local atual neste menu"
+msgstr "Inclui um marcador para a localização atual neste menu"
 
 #: src/nautilus-navigation-window-ui.xml.h:2
 msgid "Back"
@@ -6536,7 +6504,7 @@ msgstr "Voltar"
 
 #: src/nautilus-navigation-window-ui.xml.h:3
 msgid "Change the visibility of this window's location bar"
-msgstr "Muda a visibilidade da barra de local desta janela"
+msgstr "Muda a visibilidade da barra de localização desta janela"
 
 #: src/nautilus-navigation-window-ui.xml.h:4
 msgid "Change the visibility of this window's sidebar"
@@ -6555,15 +6523,13 @@ msgid "Close _All Windows"
 msgstr "Fechar _Todas as Janelas"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
-msgstr "Fecha todas as janelas do Nautilus"
+msgstr "Fechar todas as janelas de navegação"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "Conectar ao _Servidor..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6578,107 +6544,116 @@ msgid "Forward"
 msgstr "Avançar"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
-msgstr "Vai para o próximo local visitado"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Ir para a pasta de modelos"
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
-msgstr "Vai para o último local visitado"
+msgid "Go to the next visited location"
+msgstr "Vai para a próxima localização visitada"
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+msgid "Go to the previous visited location"
+msgstr "Vai para a última localização visitado"
+
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Ir para a pasta Lixeira"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Início"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
-msgstr "_Barra de Local"
+msgstr "_Barra de Localização"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Recarregar"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Busca arquivos neste computador"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "B_arra de estado"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Parar"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Acima"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Escrever em CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Adicionar Marcador"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Voltar"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Limpar _Histórico"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "Countertop"
+msgstr "_Computador"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Editar Marcadores"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Avançar"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Ir"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Início"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
-msgstr "_Local..."
+msgstr "_Localização..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Painel Lateral"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Modelos"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Li_xeira"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "A_cima"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Ver"
 
@@ -6692,38 +6667,37 @@ msgid "View as..."
 msgstr "Ver como..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "Dono do arquivo:"
+msgstr "Gerenciador de Arquivos: %s"
 
-#: src/nautilus-navigation-window.c:1099
-#, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
-"Um dos painéis da barra lateral encontrou um erro e não pode continuar. "
-"Infelizmente, não é possível dizer qual deles."
+"Um dos painéis da barra lateral encontrou um erro e não pode continuar."
 
-#: src/nautilus-navigation-window.c:1103
-#, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"O painel da barra lateral %s encontrou um erro e não pode continuar. Se isto "
-"continuar a ocorrer, você pode querer desligá-lo."
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Infelizmente eu não pude descobrir qual."
 
-#: src/nautilus-navigation-window.c:1108
-#, fuzzy
+#: src/nautilus-navigation-window.c:1109
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "O painel lateral %s encontrol um erro e não pode continuar."
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Se isso continuar acontecendo você pode querer desligar esse painel."
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
-msgstr "Falha do painel da barra lateral"
+msgstr "Painel Lateral Falhou"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Painel Lateral"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Contem uma visão de painel lateral"
 
@@ -6757,147 +6731,175 @@ msgstr "_Adicionar novo..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Desculpe, não foi possível excluir o padrão %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Confira que você tem permissões para excluir o padrão."
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr "Não foi possível excluir padrão"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Desculpe, não foi possível excluir o emblema %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Confira se você tem permissões para excluir o emblema."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Não foi possível excluir o emblema"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Criar um novo emblema:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Palavra chave:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "Imagem:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Selecione um arquivo de imagem para o novo emblema:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Criar uma Nova Cor:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nome da cor:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valor da cor:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Desculpe, mas \"%s\" não é um nome de arquivo válido."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Desculpe, mas você não forneceu um nome de arquivo válido."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Por favor tente novamente."
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr "Não foi possível instalar padrão"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Desculpe, mas não é possível substituir a imagem reconfigurada."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "O reconfigurar é uma imagem especial que não pode ser excluída."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Não é uma imagem"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Desculpe, não foi possível instalar o padrão %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Selecione um arquivo de imagem para adicionar como padrão"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "A cor não pôde ser instalada."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Desculpe, mas você deve especificar um nome não-vazio para a nova cor."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr "Não foi possível instalar cor"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Selecione uma cor para incluir"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Desculpe, mas '%s' não é um arquivo de imagem conhecido!"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Desculpe, mas \"%s\" não é um arquivo de imagem usável."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "O arquivo não é uma imagem."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Selecione uma Categoria:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "C_ancelar remoção"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Adicionar um novo padrão..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Adicionar uma nova cor..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Adicionar um novo emblema..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Clique sobre um padrão para removê-lo."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Clique sobre uma cor para removê-la"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Clique sobre um emblema para removê-lo."
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Padrões:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Cores:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemas:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Remover um Padrão..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Remover uma Cor..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Remover um Emblema..."
 
@@ -7103,8 +7105,8 @@ msgstr "_Conectar"
 #: src/nautilus-shell-ui.xml.h:2
 msgid "Choose a view for the current location, or modify the set of views"
 msgstr ""
-"Inclui um marcador para o local atual neste menu, ou modifica o conjunto de "
-"visualizações"
+"Inclui um marcador para a localização atual neste menu, ou modifica o "
+"conjunto de visualizações"
 
 #: src/nautilus-shell-ui.xml.h:3
 msgid "Close this window"
@@ -7128,7 +7130,7 @@ msgstr ""
 
 #: src/nautilus-shell-ui.xml.h:8
 msgid "Display the latest contents of the current location"
-msgstr "Exibe o conteúdo mais atualizado do local atual"
+msgstr "Exibe o conteúdo mais atualizado da localização atual"
 
 #: src/nautilus-shell-ui.xml.h:9
 msgid "Edit Nautilus preferences"
@@ -7140,7 +7142,7 @@ msgstr "Ir para a pasta CD Vazio"
 
 #: src/nautilus-shell-ui.xml.h:12
 msgid "Go to the home location"
-msgstr "Vai para o local inicial"
+msgstr "Vai para a localização inicial"
 
 #: src/nautilus-shell-ui.xml.h:13
 msgid "Go up one level"
@@ -7184,7 +7186,7 @@ msgstr "Parar Profiling"
 
 #: src/nautilus-shell-ui.xml.h:25
 msgid "Stop loading this location"
-msgstr "Para de carregar este local"
+msgstr "Parar de carregar esta localização"
 
 #: src/nautilus-shell-ui.xml.h:26
 msgid "Undo the last text change"
@@ -7284,43 +7286,40 @@ msgid "Show %s"
 msgstr "Exibir %s"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
-#, fuzzy
 msgid "CD _Creator"
 msgstr "Criador de _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-#, fuzzy
-msgid "Close _All Parents"
-msgstr "Fechar _Todas as Janelas"
+msgid "Close P_arent Folders"
+msgstr "Fechar Pastas P_ai"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Fechar os pais dessa pasta"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
-#, fuzzy
 msgid "Go to Computer"
-msgstr "Ir para a pasta CD Vazio"
+msgstr "Ir para Computador"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "Ir para a pasta Lixeira"
+msgstr "Ir para Criador de CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "_Local..."
+msgstr "Abrir _Localização..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
-msgstr ""
+msgstr "Abrir _Pai"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Itens que são ]pastas"
+msgstr "Abrir a pasta pai"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "_Padrões"
+msgstr "_Lugares"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7340,7 +7339,7 @@ msgstr "a seleção atual"
 
 #: src/nautilus-view-frame.c:622
 msgid "the type of window the view is embedded in"
-msgstr ""
+msgstr "o tipo de janela em que a visualização está embutida"
 
 #: src/nautilus-window-manage-views.c:817
 msgid "View Failed"
@@ -7348,129 +7347,142 @@ msgstr "Falhou a visão"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"A visão de %s encontrou um erro e não pode continuar. Você pode escolher "
-"outra visão ou ir para um local diferente."
+msgid "The %s view encountered an error and can't continue."
+msgstr "A visão %s encontrou um erro e não pode continuar."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Você pode escolher outra visão ou ir para uma localização diferente."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "A visão %s encontrou um erro ao iniciar."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "A localização não pode ser exibida com esse visualizador."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Visualização do Conteúdo"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Visualização da pasta ou arquivo atual"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Não foi possível localizar \"%s\". Por favor verifique a grafia e tente "
-"novamente."
+msgid "Couldn't find \"%s\"."
+msgstr "Não foi possível encontrar \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Não foi possível exibir \"%s\", pois o Nautilus não pode determinar o seu "
-"tipo de arquivo."
+msgid "Couldn't display \"%s\"."
+msgstr "Não foi possível exibir \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus não possui um visualizador instalado capaz de exibir \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "O Nautilus não pôde determinar que tipo de arquivo é esse."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
-"Não foi possível exibir \"%s\", pois Nautilus não pode manipular %s: locais."
+"O Nautilus não possui um visualizador capaz de exibir o arquivo instalado."
+
+#: src/nautilus-window-manage-views.c:1292
+#, c-format
+msgid "Nautilus cannot handle %s: locations."
+msgstr "O Nautilus não consegue lidar com localizações %s:."
 
 # Eh, vou colocar um comentário.
 # Log in aqui parece ser ao tentar acessar uma URI, estou supondo que
 # é um problema de conexão à uma máquina remota.
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "Não foi possível exibir \"%s\", pois falhou a tentativa de conexão."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "A tentativa de log in falhou."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Não foi possível exibir \"%s\", pois o acesso foi negado."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Acesso negado."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Não foi possível exibir \"%s\" pois não foi encontrado um host \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"Não foi possível exibir \"%s\", pois a máquina \"%s\" não pode ser "
-"localizada. Verifique se a grafia do nome está correta ou se as suas "
-"configurações de proxy estão corretas."
+"Verifique que a grafia está correta e que suas configurações de proxy estão "
+"corretas."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
-"Não foi possível exibir \"%s\". Verifique se as suas configurações de proxy "
-"estão corretas."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Verifique que suas configurações de proxy estão corretas."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"Não foi possível exibir \"%s\", pois o Nautilus não pôde contactar o "
-"navegador SMB master.\n"
-"Verifique se um servidor SMB está rodando na rede local."
+"Não foi possível exibir \"%s\" porque o Nautilus não pôde contactar o "
+"navegador mestre SMB."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Verifique se há um servidor SMB rodando na rede local."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"A busca não está disponível no momento ou porque você não possui um índice "
+"ou porque o serviço de busca não está sendo executado."
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
-"A busca não está disponível no momento porque você não possui um índice ou o "
-"serviço de busca não está sendo executado. Verifique se você iniciou o "
-"serviço de busca Medusa e, caso não possua um índice, que o indexador do "
-"Medusa esteja sendo executado."
+"Verifique se você iniciou o serviço de busca Medusa e, caso não possua um "
+"índice, que o indexador do Medusa esteja sendo executado."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Busca não está disponível"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus não pode exibir \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Por favor selecione outro visualizador e tente novamente."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
-msgstr "Não é possível exibir local"
+msgstr "Não é possível exibir localização"
 
 #: src/nautilus-window-menus.c:214
 msgid "Go to the location specified by this bookmark"
-msgstr "Vai para o local especificado por este marcador"
+msgstr "Vai para a localização especificado por este marcador"
 
 #. Localize to deal with issues in the copyright
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7478,13 +7490,13 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Evandro Fernandes Giovanini <evandrofg@ig.com.br>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7500,39 +7512,40 @@ msgstr "Voltar algumas páginas"
 msgid "Go forward a number of pages"
 msgstr "Avançar um certo número de páginas"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
-msgstr "Exibir este local com \"%s\""
+msgstr "Exibir esta localização com \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "Rede"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "Pontos"
+msgstr "Fontes"
 
-#: src/nautilus-window.c:1178
-#, fuzzy
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Temas"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "Criador de _CD"
+msgstr "Criador de CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID da Aplicação"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "O ID da aplicação da janela"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplicação"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "A NautilusApplication associada a esta janela."
 
@@ -7568,6 +7581,247 @@ msgstr "Servidores de Rede"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Visualizar seus servidores de rede no gerenciador de arquivos Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fábrica para visão de hardware"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Visualizador de hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Visão de hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Ver como hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "visão de hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "nome do ícone para a visão de hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "resumo de dados de hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "CPU %s\n"
+#~ "%s MHz\n"
+#~ "Tamanho do cache %s K"
+
+#~ 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 "O tempo no ar é %d dias, %d horas, %d minutos"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Resumo do hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Este é um marcador para a página de CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Este é um marcador para a página de RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Este é um marcador para a página de IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro ao copiar para \"%s\".\n"
+#~ "\n"
+#~ "Não há espaço suficiente no destino."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Erro ao criar ligação em \"%s\".\n"
+#~ "\n"
+#~ "Não há espaço suficiente no destino."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ao mover itens para \"%s\".\n"
+#~ "\n"
+#~ "Você não possui permissões para escrever nesta pasta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ao mover itens para \"%s\".\n"
+#~ "\n"
+#~ "O disco destino é apenas para leitura."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Erro ao criar ligações em \"%s\".\n"
+#~ "\n"
+#~ "Você não possui permissões para escrever nesta pasta."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Erro ao criar ligações em \"%s\".\n"
+#~ "\n"
+#~ "O disco destino é apenas para leitura."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao copiar \"%s\".\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao mover \"%s\".\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao excluir \"%s\".\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao copiar.\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao criar ligação.\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Erro \"%s\" ao excluir.\n"
+#~ "\n"
+#~ "Você deseja continuar?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Não é possível copiar para a lixeira"
+
+#~ 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 ""
+#~ "A ação padrão não pôde abrir \"%s\" porque não pode acessar arquivos nos "
+#~ "locais \"%s\". Nenhuma outra ação está disponível para ver este arquivo. "
+#~ "Se você copiar este arquivo para o seu computador, você pode ser capaz de "
+#~ "abri-lo."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Buscando nos discos"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "O Nautilus está buscando pastas de lixeira em seus discos."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Os %d itens selecionados não podem ser movidos para a lixeira. Você "
+#~ "deseja excluí-los imediatamente?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d dos itens selecionados não podem ser movidos para a lixeira. Você "
+#~ "deseja excluir estes %d itens imediatamente?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "O arquivo que você arrastou não é uma imagem. Você só pode usar imagens "
+#~ "locais como ícones personalizados."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Desculpe, mas o serviço de busca Medusa não está disponível porque ele "
+#~ "não foi instalado."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Uma vez por dia seus arquivos e conteúdo de texto são indexados para que "
+#~ "suas buscas sejam rápidas. Seus arquivos estão sendo indexados agora."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" não é um local válido. Por favor verifique a grafia e tente "
+#~ "novamente."
+
+#~ 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 ""
+#~ "Não foi possível exibir \"%s\", pois o Nautilus não pôde contactar o "
+#~ "navegador SMB master.\n"
+#~ "Verifique se um servidor SMB está rodando na rede local."
+
+#~ msgid "file icon"
+#~ msgstr "ícone do arquivo"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nome:"
+
 #~ msgid "Unknown"
 #~ msgstr "Desconhecido"
 
@@ -7662,8 +7916,5 @@ msgstr "Visualizar seus servidores de rede no gerenciador de arquivos Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Barra de Ferramen_tas"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "O local \"%s\" não existe mais."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Ir para o local inexistente"
diff --git a/po/ro.po b/po/ro.po
index 92e57eb63..2c905e349 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus.HEAD.ro\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-10-05 16:40+0300\n"
 "Last-Translator: Mugurel Tudor <mugurelu@go.ro>\n"
 "Language-Team:  <@li.org>\n"
@@ -43,8 +43,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() a eÅŸuat."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Embleme"
 
@@ -57,48 +57,60 @@ msgid "Nautilus Emblem view"
 msgstr "Vizualizare Embleme"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "N-am putut elimina emblema"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "N-am putut elimina emblema cu numele '%s', probabil din cauză că emblema "
 "este permanentă şi nu a fost adăugată de dvs."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "N-am putut elimina emblema"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "N-am putut redenumi emblema"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "N-am putut redenumi emblema cu numele '%s', probabil din cauză că emblema "
 "este permanentă şi nu a fost adăugată de dvs."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "N-am putut redenumi emblema"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "RedenumeÅŸte emblema"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Introduceţi un nume pentru emblema afişată:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "RedenumeÅŸte"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Adaugă embleme..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -106,7 +118,7 @@ msgstr ""
 "Introduceţi un nume descriptiv lângă fiecare emblemă. Acest nume va fi "
 "folosit în alte locuri pentru a  identifica emblema."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -114,139 +126,64 @@ msgstr ""
 "Introduceţi un nume descriptiv lângă emblemă. Acest nume va fi folosit în "
 "alte locuri pentru a  identifica emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Unele din fişiere n-au putut fi adăugate ca embleme deoarece nu păreau a fi "
 "imagini valide."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Fişierul '%s' nu pare a fi o imagine validă."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "N-am putut adăuga emblemele"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Niciunul din fişiere n-a putut fi adăugat ca emblemă deoarece nu păreau a fi "
 "imagini valide."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Textul tras nu a fost o locaţie validă."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "N-am putut adăuga emblema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Fişierul '%s' nu pare a fi o imagine validă."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Fişierul tras nu pare a fi o imagine validă."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Åžterge"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrică pentru vizualizare hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Vizualizator hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vizualizare hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vizualizează ca Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vizualizare hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "numele iconiţei pentru vizualizare hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "sumarul informaţiilor hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K dimensiune cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Timpul de activitate (uptime) este de %d zile, %d ore, %d minute"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Sumar hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Acesta este un loc pentru pagina CPU."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Acesta este un loc pentru pagina RAM."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Acesta este un loc pentru pagina IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Istorie"
@@ -912,6 +849,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internaţional"
@@ -1197,30 +1138,19 @@ msgid "Desktop trash icon name"
 msgstr "Numele iconiţei pentru Gunoi"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Dosarele peste această mărime vor fi trunchiate la această valoare. Scopul "
-"este de a nu depăşi accidental memoria heap şi a omorî Nautilus la dosare "
-"foarte mari. O valoare negativă înseamnă fără nici o limită. Limita este "
-"aproximativă din cauză citirii dosarelor în tranşe."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Arată flagurile 'speciale' în fereastra proprietăţi"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Numele fiÅŸierului pentru dosarul implicit cu fundaluri. Este folosit doar "
 "dacă este setată variabla background_set la true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1228,6 +1158,19 @@ msgstr ""
 "Numele fiÅŸierului pentru fundalul implicit al panoului lateral. Folosit doar "
 "dacă variabila side_pane_background_set este true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Dosarele peste această mărime vor fi trunchiate la această valoare. Scopul "
+"este de a nu depăşi accidental memoria heap şi a omorî Nautilus la dosare "
+"foarte mari. O valoare negativă înseamnă fără nici o limită. Limita este "
+"aproximativă din cauză citirii dosarelor în tranşe."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Nu include semnele de carte implicite în meniul Semne de carte"
@@ -1237,9 +1180,10 @@ msgid "Home icon visible on desktop"
 msgstr "Iconiţa Acasă vizibilă pe desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Dacă este setat la true, Nautilus va afişa dosarele doar în panoul lateral "
 "arbore. În caz contrar, va afişa atât dosarele cât şi fişierele."
@@ -1278,9 +1222,10 @@ msgstr ""
 "ascunse pentru fişier din dialogul de preferinţe pentru fişiere."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Dacă este setat la true, atunci Nautilus va afişa dosarele înaintea "
 "fişierelor în vizualizările ca iconiţe şi ca listă."
@@ -1325,8 +1270,9 @@ msgstr ""
 "utilizatorului în meniul Semne de carte."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Dacă este setat la true, atunci Nautilus va folosi dosarul Acasă al "
@@ -1344,9 +1290,10 @@ msgstr ""
 "tilda (~) sunt considerate copii de siguranţă."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Dacă este setat la true, fişierele ascunse sunt afişate în managerul de "
 "fişiere. Fişierele ascunse sunt fie cele ce încep cu un punct or care sunt "
@@ -1370,8 +1317,9 @@ msgstr ""
 "pe desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Dacă este setat la true, o iconiţă ce trimite către dosarul Acasă va fi pusă "
@@ -1408,7 +1356,8 @@ msgstr ""
 "mărime, vo fi sortate de la mai mare către mai mic."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Dacă este true, iconiţele vor fi afişate mai strâns în noile ferestre."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1436,7 +1385,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista posibilelor antete pentru iconiţe"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Numărul maxim de fişiere gestionate dintr-un dosar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1456,11 +1406,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus desenează desktopul"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus foloseşte dosarul dvs. Acasă ca desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Afişează dosarele doar în panoul lateral arbore"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1480,7 +1432,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Ordine de sortare inversă în noile ferestre"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Listează dosarele mai întâi în ferestre"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1518,10 +1471,11 @@ msgstr ""
 "previzualizat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1533,12 +1487,13 @@ msgstr ""
 "fi previzualizat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Compromisul de viteză pentru previzualizarea fişierelor imagine ca miniaturi "
 "la deplasarea mausului peste iconiţă. Dacă este setat la \"always\" atunci "
@@ -1548,10 +1503,11 @@ msgstr ""
 "fi previzualizat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Compromisul de viteză pentru afişarea numărului de elemente dintr-un dosar. "
@@ -1561,18 +1517,20 @@ msgstr ""
 "locale. Dacă este setat la \"never\", atunci numărul nu va fi afişat."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Ordinea implicită de sortare pentru elemente în vizualizarea ca iconiţe. "
 "Valori posibile sunt \"name\", \"size\", \"type\", \"modification_date\", "
 "\"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Ordinea implicită de sortare pentru elemente în vizualizarea ca listă. "
 "Valori posibile sunt name, size, type, ÅŸi modification_date."
@@ -1618,7 +1576,8 @@ msgid "Use manual layout in new windows"
 msgstr "Foloseşte aranjare manuală pentru noile ferestre"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Foloseşte aranjare strânsă pentru noile ferestre"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1648,7 +1607,8 @@ msgstr ""
 "\" ÅŸi \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Când să afişeze numărul de elemente în dosare"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1660,7 +1620,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Când să afişeze miniaturi pentru fişiere imagine"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Dacă a fost setat un fundal implicit pentru dosare."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1817,67 +1778,82 @@ msgstr "resetează"
 msgid "on the desktop"
 msgstr "pe desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Nu pot ÅŸterge volumul"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Nu puteţi şterge iconiţa unui volum.Dacă doriţi să ejectaţi volumul, vă "
 "rugăm selectaţi Eject din meniul la clic dreapta pe volum."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Nu pot ÅŸterge volumul"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Gunoi"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Mută aici"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copiază aici"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Leagă aici"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Setează ca fundal"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Setează ca fundal pentru to_ate dosarele"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "FoloseÅŸte ca fundal pentru aces_t dosar"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Îmi pare rău, dar tema \"%s\" nu a putut fi instalată."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Îmi pare rău, dar trebuie să specificaţi un nume cheie."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "N-am putut instala emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1888,20 +1864,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Îmi pare rău, dar există deja o emblemă numită \"%s\". Vă rog să alegeţi un "
 "nume diferit."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "N-am putut instala emblema"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Îmi pare rău, nu pot salva emblema personalizată."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Îmi pare rău, n-am putu salva numele personalizat al emblemei."
 
@@ -1920,22 +1902,28 @@ msgstr "De la:"
 msgid "To:"
 msgstr "Către:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Eroare la mutare."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Eroare la mutare.\n"
 "\n"
 "\"%s\" nu poate fi mutat deoarece este pe un disc doar-citire."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Eroare la ÅŸtergere."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1944,22 +1932,17 @@ msgstr ""
 "\"%s\" nu poate fi şters deoarece nu aveţi drepturi să modificaţi dosarul "
 "părinte al său."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Eroare la ÅŸtergere.\n"
 "\n"
 "\"%s\" nu poate fi ÅŸters deoarece este pe un disc doar-citire."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1968,12 +1951,15 @@ msgstr ""
 "\"%s\" nu poate fi mutat deoarece nu aveţi drepturi să modificaţi dosarul "
 "părinte al său."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Eroare la mutare."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Eroare la mutare.\n"
@@ -1981,12 +1967,10 @@ msgstr ""
 "\"%s\" nu poate fi mutat deoarece el sau dosarul părinte este conţinut în "
 "destinaţie."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Eroare la mutare.\n"
@@ -1994,295 +1978,244 @@ msgstr ""
 "\"%s\" nu poate fi mutat la Gunoi deoarece nu aveţi drepturi să modificaţi "
 "dosarul părinte al său."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Eroare la copiere."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Eroare la Copiere.\n"
 "\n"
 "\"%s\" nu poate fi copiat deoarece nu aveţi drepturi să îl citiţi."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Eroare la copierea \"%s\".\n"
-"\n"
-"Nu este destul spaţiu la destinaţie."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Eroare la copiere."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Eroare la mutarea \"%s\".\n"
 "\n"
 "Nu este destul spaţiu la destinaţie."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Eroare la crearea legăturii \"%s\".\n"
-"\n"
-"Nu este destul spaţiu la destinaţie."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Eroare la mutare."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Eroare la crearea legăturii."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Eroare la copierea către \"%s\".\n"
 "\n"
 "Nu aveţi drepturi de scriere în acest dosar."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Eroare la copierea către \"%s\".\n"
 "\n"
 "Destinaţia este doar-citire."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Eroare la mutarea către \"%s\".\n"
-"\n"
-"Nu aveţi drepturi de scriere în acest dosar."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Eroare la mutarea către \"%s\".\n"
-"\n"
-"Destinaţia este doar-citire."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Eroare la crearea legăturilor în \"%s\".\n"
-"\n"
-"Nu aveţi drepturi de scriere în acest dosar."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Eroare la mutare."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Eroare la crearea legăturilor în \"%s\".\n"
-"\n"
-"Destinaţia este doar-citire."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la copierea \"%s\".\n"
-"\n"
-"Doriţi să continuaţi?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Eroare la crearea legăturii."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Eroare la copiere."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Eroare \"%s\" la mutarea \"%s\".\n"
+"Eroare \"%s\" la mutare.\n"
 "\n"
 "Doriţi să continuaţi?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la crearea unei legături către \"%s\".\n"
-"\n"
-"Doriţi să continuaţi?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Eroare la mutare."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Eroare \"%s\" la ÅŸtergerea \"%s\".\n"
+"Eroare \"%s\" la crearea unei legături către \"%s\".\n"
 "\n"
 "Doriţi să continuaţi?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la copiere.\n"
-"\n"
-"Doriţi să continuaţi?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Eroare la ÅŸtergere."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la mutare.\n"
-"\n"
-"Doriţi să continuaţi?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Eroare la copiere."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la crearea legăturii.\n"
-"\n"
-"Doriţi să continuaţi?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Eroare la mutare."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Eroare \"%s\" la ÅŸtergere.\n"
-"\n"
-"Doriţi să continuaţi?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Eroare la crearea legăturii."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Eroare la ÅŸtergere."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Eroare la copiere."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Eroare la mutare."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Eroare la crearea legăturii."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Eroare la ÅŸtergere."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Sări"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Reîncearcă"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "N-am putut completa acţiunea specificată."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nu a putut fi mutat în locaţia nouă deoarece numele său este deja "
 "folosit pentru un element special ce nu poate fi şters sau înlocuit.\n"
 "\n"
 "Dacă tot doriţi să mutaţi \"%s\", redenumiţi-l şi încercaţi din nou."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "N-am putut completa acţiunea specificată."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nu a putut fi copiat în locaţia nouă deoarece numele său este deja "
 "folosit pentru un element special ce nu poate fi şters sau înlocuit.\n"
 "\n"
 "Dacă tot doriţi să copiaţi \"%s\", redenumiţi-l şi încercaţi din nou."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Nu pot înlocui fişierul"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Fişierul \"%s\" există deja.\n"
 "\n"
 "Doriţi să-l înlocuiţi?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Conflict în timpul copierii"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "ÃŽnlocuieÅŸte"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "ÃŽnlocuieÅŸte pe toate"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "legătură la %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "altă legătura la %s"
@@ -2291,25 +2224,25 @@ msgstr "altă legătura la %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "legătura nr. %d către %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "legătura nr. %d către %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "legătura nr. %d către %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "legătura nr. %d către %s"
@@ -2319,563 +2252,602 @@ msgstr "legătura nr. %d către %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copie)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (altă copie)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "-a copie)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "-a copie)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "-a copie)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "-a copie)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copie)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (altă copie)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (a %d-a copie)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (a %d-a copie)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (a %d-a copie)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (a %d-a copie)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus necunoscut %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Mut fiÅŸierele la gunoi"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "FiÅŸiere aruncate:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Mut"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Pregătire pentru a muta la gunoi..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Mut fiÅŸierele"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "FiÅŸiere mutate:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Pregătire pentru a muta..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Termin mutarea..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Creez legături la fişiere"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "FiÅŸiere legate:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Leg"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Pregătire pentru a crea legături..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Termin crearea legăturilor..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Copiez fiÅŸierele"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "FiÅŸiere copiate:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Copiez"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Pregătire pentru a copia..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Nu puteţi copia elemente la gunoi."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nu pot copia la gunoi"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Nu puteţi muta acest dosar din gunoi."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Nu puteţi copia acest dosar din gunoi."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Nu pot schimba locaţia gunoiului"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Nu pot copia gunoiul"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Nu puteţi muta un dosar in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Nu puteţi copia un dosar in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Creează un dosar gol în dosarul curent"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Nu pot muta in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Nu pot copia in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Nu puteţi copia un fişier in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Nu pot copia in el însuşi."
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Eroare la crearea noului dosar.\n"
 "\n"
 "Nu aveţi drepturi pentru a scrie în destinaţie."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Eroare la crearea noului dosar.\n"
 "\n"
 "Nu este spaţiu liber în destinaţie."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Eroare \"%s\" la crearea noului dosar"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Eroare la crearea noului dosar"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Eroare la crearea noului dosar"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "dosar fără nume"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Eroare \"%s\" la crearea noului dosar"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Eroare la crearea noului dosar"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Eroare la crearea noului dosar"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fiÅŸier"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Åžterg fiÅŸierele"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "FiÅŸiere ÅŸterse:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Åžterg"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Pregătire pentru a şterge fişierele..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Golesc gunoiul"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Pregătire pentru a goli gunoiul..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Sunteţi sigur că vreţi să ştergeţi pentru totdeauna toate elementele din "
 "gunoi?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_GoleÅŸte"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th copy).txt"
 
@@ -2894,64 +2866,64 @@ msgstr "foo (124th copy).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "azi la 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "azi la %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "azi la 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "azi la %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "azi, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "azi, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "azi"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ieri la at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ieri la %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ieri la 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ieri la %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ieri, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ieri, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ieri"
 
@@ -2960,133 +2932,133 @@ msgstr "ieri"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Miercuri, Septembrie 00 0000 la 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y la %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Lun, Oct 00 0000 la 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y la %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Lun, Oct 00 0000 la 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y la %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Oct 00 0000 la 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y la %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Oct 00 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%d.%m.%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 elemente"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 dosare"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 fiÅŸiere"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 element"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 dosar"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fiÅŸier"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u elemente"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u dosare"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fiÅŸiere"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? elemente"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? octeţi"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tip necunoscut"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tip MIME necunoscut"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "necunoscut"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3096,7 +3068,7 @@ msgstr ""
 "înseamnă că fişierul gnome-vfs.keys este într-o locaţie greşită, sau nu "
 "poate fi găsit dintr-un alt motiv."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3105,11 +3077,11 @@ msgstr ""
 "Nici o descriere găsită pentru tipul mime \"%s\" (fişierul este \"%s\"), vă "
 "rugăm comunicaţi acest lucru listei de discuţii gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "legătură"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "legătură (invalidă)"
 
@@ -3230,11 +3202,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Caută fişiere după nume şi proprietăţi"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vizualizare iconiţe"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vizualizare listă"
@@ -3378,147 +3352,152 @@ msgstr "Casa %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Computer"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "fişier iconiţă"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "text editabil"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "eticheta editabil"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "text adiţional"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "încă un text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "evidenţiat pentru selecţie"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "dacă sunt evidenţiat pentru selecţie"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "evidenţiat pentru focalizare tastatură"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "dacă sunt evidenţiat pentru focalizare tastatură"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "evidenţiat pentru plasare"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "dacă sunt evidenţiat pentru tragere şi plasare"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Dreptunghiul de selecţie"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Încadrează text"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Desenează un cadru în jurul textului neselectat"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Culoarea cutiei de selecţie"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Culoarea cutiei de selecţie"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa cutiei de selecţie"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacitatea cutiei de selecţie"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alfa iluminare"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacitatea iluminării pentru iconiţele selectate"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Culoare info deschisă"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Culoarea folosită pentru text informaţie afişat pe un fundal închis"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Culoare info închisă"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Culoarea folosită pentru text informaţie afişat pe un fundal deschis"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Acest dosar foloseşte o aranjare automată. Doriţi să schimbaţi la aranjare "
 "manuală şi să lăsaţi elementul unde i-aţi dat drumul? Aceasta va suprascrie "
 "aranjarea curentă."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Acest dosar foloseşte o aranjare automată. Doriţi să schimbaţi la aranjare "
 "manuală şi să lăsaţi elementele unde le-aţi dat drumul? Aceasta va "
 "suprascrie aranjarea curentă."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Acest dosar foloseşte o aranjare automată. Doriţi să schimbaţi la aranjare "
 "manuală şi să lăsaţi elementul unde i-aţi dat drumul?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Acest dosar foloseşte o aranjare automată. Doriţi să schimbaţi la aranjare "
 "manuală şi să lăsaţi elementele unde le-aţi dat drumul?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Schimb la aranjare manuală?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Schimbă"
 
@@ -3627,72 +3606,72 @@ msgstr "Este implicit pentru \"%s\" elemente."
 msgid "Is the default for all \"%s\" items."
 msgstr "Este implicit pentru toate \"%s\" elementele."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Modifică \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Include în meniu pentru \"%s\" elemente"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "FoloseÅŸte ca implicit pentru \"%s\" elemente"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Include în meniu doar pentru \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "FoloseÅŸte ca implicit doar pentru \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nu include în meniu pentru \"%s\" elemente"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Nume"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Alegeţi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Gata"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modifică..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Tipuri fiÅŸiere ÅŸi programe"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Du-te acolo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3700,48 +3679,48 @@ msgstr ""
 "Puteţi configura ce programe sunt oferite pentru care tipuri de fişiere în "
 "dialogul Tipuri de fiÅŸiere ÅŸi programe."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Deschide cu altă aplicaţie"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Alegeţi o aplicaţie pentru a deschide \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Deschide cu alt vizualizator"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Alegeţi o vizualizare pentru \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Nici un vizualizator nu este disponibil pentru \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nici un vizualizator disponibil"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Nu este nici o aplicaţie asociată cu \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nici o aplicaţie asociată"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Nu există nici o acţiune asociată cu \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nici o acţiune asociată"
 
@@ -3749,11 +3728,9 @@ msgstr "Nici o acţiune asociată"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3762,42 +3739,41 @@ msgstr ""
 "Puteţi configura GNOME să asocieze aplicaţii cu tipuri de fişiere. Doriţi să "
 "asociaţi o aplicaţie cu acest tip de fişiere acum?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Asociază aplicaţie"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Vizualizatorul asociat cu \"%s\" este invalid."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Vizualizator asociat invalid"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplicaţia asociată cu \"%s\" este invalidă."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplicaţie asociată invalidă"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Actiunea asociată cu \"%s\" este invalidă."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Acţiune asociată invalidă"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3808,95 +3784,136 @@ msgstr ""
 "tip de fişier. Doriţi să asociaţi o aplicaţie sau vizualizator cu acest tip "
 "de fiÅŸiere acum?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Asociază acţiune"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" nu poate deschide \"%s\" deoarece \"%s\" nu poate accesa fiÅŸierele de "
+"la locaţiile \"%s\". Doriţi să alegeţi altă aplicaţie?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nu poate deschide \"%s\" deoarece \"%s\" nu poate accesa fiÅŸierele de "
 "la locaţiile \"%s\". Doriţi să alegeţi altă aplicaţie?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Acţiunea implicită nu poate deschide \"%s\" deoarece nu poate accesa "
 "fişierele de la locaţiile \"%s\". Doriţi să alegeţi altă acţiune?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nu pot deschide locaţia"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nu poate deschide \"%s\" deoarece \"%s\" nu poate accesa fiÅŸierele de "
+"la locaţiile \"%s\". Doriţi să alegeţi altă aplicaţie?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nu poate deschide \"%s\" deoarece \"%s\" nu poate accesa fiÅŸierele de "
 "la locaţiile \"%s\". Nu sunt alte aplicaţii disponibile pentru a vizualiza "
 "acest fişiere. Dacă îl copiaţi pe calculatorul dvs, s-ar putea să poată fi "
 "deschis."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Acţiunea implicită  nu poate deschide \"%s\" deoarece nu poate accesa "
-"fişierele de la locaţiile \"%s\". Nu sunt alte acţiuni disponibile pentru a "
-"vizualiza acest fişiere. Dacă îl copiaţi pe calculatorul dvs, s-ar putea să "
-"poată fi deschis."
+"Acţiunea implicită nu poate deschide \"%s\" deoarece nu poate accesa "
+"fişierele de la locaţiile \"%s\". Doriţi să alegeţi altă acţiune?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" nu poate deschide \"%s\" deoarece \"%s\" nu poate accesa fiÅŸierele de "
+"la locaţiile \"%s\". Nu sunt alte aplicaţii disponibile pentru a vizualiza "
+"acest fişiere. Dacă îl copiaţi pe calculatorul dvs, s-ar putea să poată fi "
+"deschis."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Deschid %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Îmi pare rău, dar nu puteţi rula comenzi dintr-un site la distanţă din "
 "motive de securitate."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Nu pot executa legături la distanţă"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "A fost o eroare la lansarea aplicaţiei.\n"
 "\n"
 "Detalii: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Eroare la lansarea aplicaţiei"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Renunţarea la ţintă este suportată doar pe sisteme de fişiere locale."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Nu sunt suportate decât fişierele locale.\n"
@@ -3904,15 +3921,15 @@ msgstr ""
 "Pentru a deschide fişiere non-locale copiaţi-le mai întâi într-un dosar "
 "local şi încercaţi din nou."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Renunţarea la ţintă este suportată doar pe sisteme de fişiere locale."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4165,14 +4182,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Elemente conţinând \"medusa\" în numele lor şi care sunt dosare"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Caut discurile"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus caută discurile dvs pentru dosare gunoi."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Editare"
@@ -4371,97 +4380,107 @@ msgstr "Fundal"
 msgid "Empty Trash"
 msgstr "GoleÅŸte gunoiul"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Aceasta va deschide %d ferestre separate. Sunteţi sigur(ă)?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Deschide %d ferestre?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Aceasta va deschide %d ferestre separate. Sunteţi sigur(ă)?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să ştergeţi permanent cele %d elemente selectate?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Åžterge permanent toate elementele selectate"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Åžterg?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Selectează o categorie:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Modele"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" selectat"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 dosar selectat"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d dosare selectate"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (conţinând 0 elemente)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (conţinând 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (conţinând %d elemente)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (conţinând un total de 0 elemente)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (conţinând un total de 1 element)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (conţinând un total de %d elemente)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" selectat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d elemente selectate (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 alt element selectat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d alte elemente selectate (%s)"
@@ -4473,7 +4492,7 @@ msgstr "%d alte elemente selectate (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4482,106 +4501,122 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Dosarul \"%s\" conţine mai multe fişiere decât capacitatea lui Nautilus. "
 "Unele fiÅŸiere Nu vor fi afiÅŸate."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Prea multe fiÅŸiere"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" nu poate fi mutat la gunoi. Doriţi să-l ştergeţi imediat?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Elementele selectate %d nu pot fi mutate la gunoi. Doriţi să le ştergeţi "
-"imediat?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" nu poate fi mutat la gunoi. Doriţi să-l ştergeţi imediat?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d din elementele selectate nu pot fi mutate la gunoi. Doriţi să ştergeţi "
-"imediat aceste %d elemente?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" nu poate fi mutat la gunoi. Doriţi să-l ştergeţi imediat?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Åžterg imediat?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\" din Gunoi?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să ştergeţi permanent din Gunoi cele %d elemente "
 "selectate?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Åžterge din Gunoi?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "FoloseÅŸte \"%s\" pentru a deschide elementul selectat"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Altă _Aplicaţie..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "O _Aplicaţie..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Alt _Vizualizator..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Un _Vizualizator..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "N-am putut completa acţiunea specificată: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "N-am putut completa acţiunea specificată."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Rulează \"%s\" pe orice elemente selectate"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Toate fişierele executabile din acest dosar vor apare în meniul Scripturi. "
+"Alegând un script din meniu va rula acel script cu elementele selectate ca "
+"parametru."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4589,11 +4624,11 @@ msgstr ""
 "Alegând un script din meniu va rula acel script cu elementele selectate ca "
 "parametru."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Despre scripturi"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4634,17 +4669,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: poziţia şi mărimea ferestrei curente"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" va fi mutat dacă selectaţi comanda Lipeşte fişiere"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" va fi copiat dacă selectaţi comanda Lipeşte fişiere"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4652,7 +4687,7 @@ msgstr ""
 "Cele %d elemente selectate vor fi mutate dacă selectaţi comanda Lipeşte "
 "fiÅŸiere"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4660,160 +4695,167 @@ msgstr ""
 "Cele %d elemente selectate vor fi copiate dacă selectaţi comanda Lipeşte "
 "fiÅŸiere"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Nu este nimic în memorie pentru a fi lipit."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Eroare la montare"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Eroare la demontare"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Eroare la montare"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_jectează"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Demontează volumul"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Deschide în fereastră nouă"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Deschide în %d ferestre noi"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Dosar Acasă"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Dosar Acasă"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Åžterge din Gunoi"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Åžterge permanent toate elementele selectate"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Mută la _Gunoi"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Mută elementele selectate la Gunoi"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Åžterge"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Creează legături"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Creează legătură"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "GoleÅŸte Gunoiul"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Taie fiÅŸierul"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Taie fiÅŸierele"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copiază fişierul"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copiază fişierele"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Aceată legătură nu poate fi folosită deoarece nu are ţintă. Doriţi să o "
 "mutaţi la Gunoi?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Aceată legătură nu poate fi folosită deoarece nu are ţintă. Doriţi să o "
+"mutaţi la Gunoi?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Aceată legătură nu poate fi folosită deoarece ţinta sa \"%s\" nu există. "
 "Doriţi să o mutaţi la Gunoi?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Legătură greşită"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" este un fişier executabil. Doriţi să-l rulaţi sau să-l vizualizaţi?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "FiÅŸiere text executabile"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Rulează sau vizualizează"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Afişează"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Rulează în _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Afişează"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Rulează"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Deschid \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Renunţă la deschidere?"
 
@@ -4834,28 +4876,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Îmi pare rău, nu am putut afişa conţinutul lui \"%s\""
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Drepturile lui \"%s\" nu au putut fi determinate."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Eroare la afiÅŸarea dosarului"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
 "Numele \"%s\" este deja folosit în acest dosar. Vă rog să alegeţi alt nume."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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\" nu există în acest dosar. Poate a fost şters sa mutat recent?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nu aveti permisiunile necesare pentru a renumi \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4864,84 +4911,104 @@ msgstr ""
 "Numele \"%s\" nu este valid deoarece conţine caracterul \"/\". Vă rog "
 "alegeţi alt nume."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Numele \"%s\" nu este valid. Vă rog alegeţi alt nume."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Nu am putut schimba numele lui \"%s\" deoarece este pe disc doar-citire"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Îmi pare rău, n-am putut renumi \"%s\" la \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Îmi pare rău, dar tema nu a putut fi eliminată"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Eroare la renumire"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nu aveti permisiunile necesare pentru a schimba grupul lui \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nu am putut schimba grupul lui \"%s\" deoarece este pe disc doar-citire"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Îmi pare rău, n-am putut schimba grupul lui \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Drepturile lui \"%s\" nu au putut fi determinate."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Eroare la setarea grupului"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nu am putut schimba deţinătorul lui \"%s\" deoarece este pe disc doar-citire"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Îmi pare rău, n-am putut schimba deţinătorul lui \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Drepturile lui \"%s\" nu au putut fi determinate."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Eroare la setarea deţinătorului"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Nu am putut schimba drepturile lui \"%s\" deoarece este pe disc doar-citire"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Îmi pare rău, n-am putut schimba drepturile lui \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Drepturile lui \"%s\" nu au putut fi determinate."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Eroare la setarea drepturilor"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renumesc \"%s\" la \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Renunţ la renumire?"
 
@@ -4999,128 +5066,150 @@ msgstr "Restaurea_ză mărimile iniţiale ale iconiţelor"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Restaurea_ză mărimea originală a iconiţei"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "arată către \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Tragere şi plasare este suportată doar pe sisteme de fişiere locale."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Tragere şi plasare este suportată doar pe sisteme de fişiere locale."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Eroare tragere ÅŸi plasare"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "A fost folosit un tip de tragere invalid."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Nume fiÅŸier"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Mărime"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tip"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data modificării"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Nu puteţi atribui mai mult de o iconiţă personalizată la un moment dat! Vă "
 "rog trageţi doar o singură imagine pentru a seta o iconiţă personalizată."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Nu puteţi atribui mai mult de o iconiţă personalizată la un moment dat! Vă "
+"rog trageţi doar o singură imagine pentru a seta o iconiţă personalizată."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Mai mult de o imagine"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Fişierul tras nu este local. Puteţi folosi doar fişiere locale pentru "
+"iconiţe personalizate."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Fişierul tras nu este local. Puteţi folosi doar fişiere locale pentru "
 "iconiţe personalizate."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Doar imagini locale"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Fişierul tras nu este o imagine. Puteţi folosi doar fişiere imagine locale "
-"pentru iconiţe personalizate."
+"Fişierul tras nu este local. Puteţi folosi doar fişiere locale pentru "
+"iconiţe personalizate."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Doar imagini"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Proprietăţi"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Proprietăţile %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Renunţă la schimbarea grupului?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Schimb grupul"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Renunţă la schimbarea deţinătorului?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Schimb deţinătorul"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "nimic"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ne-citibil"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 element, cu mărimea %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d elemente, cu mărimea totală %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(o parte din conţinut necitibil)"
 
@@ -5130,191 +5219,191 @@ msgstr "(o parte din conţinut necitibil)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Cuprins:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Simplu"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nume:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tip:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Mărime:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Locaţie:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volum:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Spaţiu liber:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Ţinta legăturii:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tip MIME"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Modificat:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Accesat:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Selectează iconiţă personalizată..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Elimină iconiţa personalizată..."
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Citire"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Scriere"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_xecuţie"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Setează ID _utilizator"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Opţiuni speciale:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Setează ID _grup"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Lipicio_s"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permisii"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nu sunteţi deţinătorul, nu puteţi schimba drepturile"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Deţinător fişier:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Deţinător fişier:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Grup _fiÅŸier:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grup fiÅŸier:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Deţinător:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grup:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Alţii:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Vizualizare text:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Vizualizare număr:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Ultima schimbare:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Drepturile lui \"%s\" nu au putut fi determinate."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Drepturile asupra fiÅŸierului selectat nu au putut fi determinate."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"A fost o eroare la afiÅŸarea ajutorului: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "A fost o eroare la afiÅŸarea ajutorului: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "N-am putut afiÅŸa ajutorul"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Renuţă la afişarea ferestrei cu proprităţi?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Creez ferestra cu proprităţi"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Selectaţi o iconiţă"
 
@@ -5332,71 +5421,110 @@ msgid "Search Results"
 msgstr "Rezultate căutare"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Îmi pare rău, dar serviciul de căutare Medusa nu este disponibil pentru că "
-"nu a fost instalat."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Îmi pare rău, dar serviciul medusa nu este disponibil."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Serviciul de căutare nu este disponibil"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Căutarea selectată este mai nouă decât indexul de pe sistemul dvs. Căutarea "
 "nu va returna nici un rezultat acum. Puteţi crea un index nou rulând "
 "\"medusa-indexd\" ca root în linia de comandă."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find nu poate deschide indexul sistemul de fiÅŸiere. Indexul poate lipsi sau "
+"poate fi corupt. Puteţi crea un nou index rulând ca root \"medusa-indexd\" "
+"din linia de comandă."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Caută elemente care sunt prea noi"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Fiecare fiÅŸier indexat de pe sistemul dvs. corespunde criteriului selectat. "
+"Puteţi verifica corectitudinea selecţiei sau adauga mai multe criterii "
+"pentru a fi mai selectiv."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Fiecare fiÅŸier indexat de pe sistemul dvs. corespunde criteriului selectat. "
 "Puteţi verifica corectitudinea selecţiei sau adauga mai multe criterii "
 "pentru a fi mai selectiv."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Eroare în timpul căutării"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find nu poate deschide indexul sistemul de fiÅŸiere. Indexul poate lipsi sau "
 "poate fi corupt. Puteţi crea un nou index rulând ca root \"medusa-indexd\" "
 "din linia de comandă."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Eroare la citirea indexului de fiÅŸier"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Eroare la încărcarea rezultatelor căutării: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
+"de pe sistemul dvs. Acest index nu poate fi accesat acum."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
+"de pe sistemul dvs. Acest index nu poate fi accesat acum."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5404,25 +5532,23 @@ msgstr ""
 "sistemul dvs. Acest index nu poate fi accesat acum astfel că se va face o "
 "căutare mai înceată."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
-"de pe sistemul dvs. Acest index nu poate fi accesat acum."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Căutări rapide nu sunt disponibile"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Căutări de conţinut nu sunt disponibile"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5433,52 +5559,84 @@ msgstr ""
 "Indexul dvs. este disponibil, dar daemonul de căutare Medusa nu rulează. "
 "Pentru a porni acest program, rulaţi comanda \"medusa-searchd\" ca root."
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Pentru a face o căutare rapidă este nevoie de un index al fişierelor de pe "
 "sistemul dvs. Acest index este creat acum."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
 "de pe sistemul dvs. Acest index este creat acum."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Căutarea indexată nu este disponibilă"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
+"de pe sistemul dvs. Acest index nu poate fi accesat acum."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
+"de pe sistemul dvs. Acest index nu poate fi accesat acum."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Pentru a face o căutare rapidă este nevoie de un index al fişierelor de pe "
 "sistemul dvs. Acest index nu este disponibil. Puteţi crea un index rulând "
 "\"medusa-indexd\" ca root"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Pentru a face o căutare după conţinut este nevoie de un index al fişierelor "
 "de pe sistemul dvs. Acest index nu este disponibil. Puteţi crea un index "
 "rulând \"medusa-indexd\" ca root"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Căutările rapide nu sunt disponibile pe calculatorul dvs."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5488,11 +5646,12 @@ msgstr ""
 "sistemul dvs. Acest index nu este disponibil deoarece administratorul "
 "sistemului dvs. a dezactivat căutările rapide."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Căutările rapide nu sunt disponibile pe calculatorul dvs."
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Căutări rapide nu sunt disponibile"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Unde"
 
@@ -5501,7 +5660,7 @@ msgstr "Unde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Descoperă într-o fereastră nouă"
@@ -5512,7 +5671,7 @@ msgstr "_Descoperă într-o fereastră nouă"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Descoperă în %d ferestre noi"
@@ -5521,15 +5680,21 @@ msgstr "Descoperă în %d ferestre noi"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus a găsit mai multe rezultate decât poate afişa. Unele elemente nu "
 "vor fi afiÅŸate."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus a găsit mai multe rezultate decât poate afişa. Unele elemente nu "
+"vor fi afiÅŸate."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Prea multe potriviri"
 
@@ -5543,12 +5708,12 @@ msgid "Create L_auncher"
 msgstr "L_ansator nou"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Creează un nou lansator"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Åžterge toate elementele din gunoi"
 
@@ -5567,7 +5732,7 @@ msgstr "Arată o fereastră care vă lasă să setaţi fundalul desktop-ului"
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "FoloseÅŸte fun_dalul implicit"
@@ -5589,57 +5754,67 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Alegeţi alt vizualizator cu care să deschideţi elementul selectat"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "_Dosar nou"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "_Dosar nou"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Creează un dosar gol în dosarul curent"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Creează un dosar gol în dosarul curent"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Creează o legătură simbolică pentru fiecare element selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_uplichează"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Şterge elementele selectate, fără a le muta la Gunoi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplichează elementele selectate"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Editează lansatorul"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Editează informaţiile lansatorului"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatează volumul selectat."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Proprietăţi media"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Demontează volumul selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Mută sau copie fişierele selectate anterior printr-o comandă Taie sau Lipeşte"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5647,130 +5822,139 @@ msgstr ""
 "Mută sau copie fişierele selectate anterior printr-o comandă Taie sau "
 "Lipeşte în dosarul selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Deschide _cu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Deschide fiecare element selectat într-o fereastră nouă"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Navigare"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Deschide elementele selectate în această fereastră"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Pregăteşte fişierele selectate pentru a fi copiate cu comanda Lipeşte"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Pregăteşte fişierele selectate pentru a fi mutate cu comanda Lipeşte"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Prot_ejează"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Protejează volumul selectat."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "RedenumeÅŸte elementul selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Resetează vizualizarea la setările implicite"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Resetează ordinea sortării şi nivelul de mărire pentru a se potrivi cu "
 "preferinţele"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Rulează sau setează scripturile din ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Selectează _toate fişierele"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Modele"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Selectează toate elementele din această fereastră"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Selectează toate elementele din această fereastră"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Arată proprietăţile media ale volumului selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Arată dosarul care conţine scripturile ce apar în acest meniu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Demontează volumul selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Foloseşte fundalul implicit pentru această locaţie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Vizualizează sau modifică proprietăţile fiecărui element selectat"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copiază fişierul"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Format"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Demontează volumul"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Deschide"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Deschide dosarul cu scripturi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_LipeÅŸte fiÅŸierele"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Lipeşte fişierele în dosar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Proprietăţi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_RedenumeÅŸte..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripturi"
 
@@ -5855,7 +6039,12 @@ msgstr "_Manual"
 msgid "Indexing is %d%% complete."
 msgstr "Indexarea este %d%% completă."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Fişierele dvs. au fost indexate ultima oară la %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5863,25 +6052,29 @@ msgstr ""
 "Zilnic fişierele şi conţinutul text este indexat astfel încât căutarile vor "
 "fi mai rapide."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Stare indexare"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Fişierele dvs. au fost indexate ultima oară la %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Odată pe zi fişierele şi textul dvs. sunt indexate pentru a mări viteza "
-"căutărilor. Fişierele dvs. sunt indexate acum."
+"Zilnic fişierele şi conţinutul text este indexat astfel încât căutarile vor "
+"fi mai rapide."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Nu există nici un index al fişierelor dvs. acum."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5891,15 +6084,19 @@ msgstr ""
 "căutărilor. Căutarea rapidă nu este activată pe acest calculator, deci nu "
 "aveţi indexul în prezent."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Nu există nici un index al fişierelor dvs. acum."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Îmi pare rău, dar serviciul medusa nu este disponibil."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5923,32 +6120,37 @@ msgstr "Arată starea _indexării"
 msgid "Show status of indexing used when searching"
 msgstr "Arată starea indexării folosite când se efectuează căutarea"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nu s-a putut crea dosarul cerut"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus nu a putut crea dosarul %s."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus nu a putut crea dosarul \"%s\". Înainte de a rula Nautilus, vă "
 "rugăm creaţi acest dosar, sau setaţi permisiunile astfel încât Nautilus să "
 "îl poată crea."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nu s-au putut crea dosarele cerute"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus nu a putut crea dosarul %s."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5959,22 +6161,27 @@ msgstr ""
 "Înainte de a rula Nautilus, vă rugăm creaţi acest dosar, sau setaţi "
 "permisiunile astfel încât Nautilus să îl poată crea."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Legătură către vechiul desktop"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Locaţia dosarului desktop s-a schimbat în GNOME 2.4. O legătură numită "
 "\"Legătură către vechiul desktop\" a fost creată pe desktop. O puteţi "
 "deschide pentru a copia fişierele dorite, apoi o puteţi şterge."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Vechiul desktop migrat"
 
 #. Can't register myself due to trouble locating the
@@ -5987,7 +6194,7 @@ msgstr "Vechiul desktop migrat"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5998,7 +6205,7 @@ msgstr ""
 "sau să instalaţi din nou Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6044,12 +6251,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus nu poate fi folosit acum, din cauza unei erori neaÅŸteptate."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6058,7 +6265,7 @@ msgstr ""
 "survenită la încercarea de a înregistra serverul de vizualizare al "
 "managerului de fiÅŸiere."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6068,7 +6275,7 @@ msgstr ""
 "la încercarea de a localiza uzina. Omorârea lui bonobo-activation-server şi "
 "restartarea lui Nautilus ar putea soluţiona problema."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6078,6 +6285,17 @@ msgstr ""
 "la încercarea de a obiectul shell. Omorârea lui bonobo-activation-server şi "
 "restartarea lui Nautilus ar putea soluţiona problema."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"A fost o eroare la afiÅŸarea ajutorului: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nici un semn de carte definit"
@@ -6111,36 +6329,45 @@ msgstr "Mai puţine opţiuni"
 msgid "Find Them!"
 msgstr "Găseşte-le!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Nu pot muta in el însuşi."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "nu este un dispozitiv valid"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" nu este o locaţie validă. Vă rog verificaţi ortografia şi încercaţi "
-"din nou."
+"N-am putu găsi \"%s\". Vă rog verificaţi ortografia şi încercaţi din nou."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Servere reţea"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Nume:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Locaţie:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Conectare"
@@ -6341,6 +6568,20 @@ msgstr ""
 "\n"
 "Puteţi şterge manual acest fişier pentru a porni druidul din nou.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Nu puteţi atribui mai mult de o iconiţă personalizată la un moment dat! Vă "
+"rog trageţi doar o singură imagine pentru a seta o iconiţă personalizată."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Fişierul tras nu este local. Puteţi folosi doar fişiere locale pentru "
+"iconiţe personalizate."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6351,26 +6592,25 @@ msgstr "Deschide cu %s"
 msgid "Open with..."
 msgstr "Deschide cu..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Nu am putut porni aplicaţia de scris cd-uri:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Nu am putut porni aplicaţia pentru scris cd-uri"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "GoleÅŸte _gunoiul"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Scrie conţinutul pe CD"
 
@@ -6378,117 +6618,130 @@ msgstr "_Scrie conţinutul pe CD"
 msgid "Go To:"
 msgstr "Du-te la:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Doriţi să vizualizaţi aceste %d locaţii în ferestre separate?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Vizualizează ferestre multiple?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "_Locaţie..."
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Efectuează o suită rapidă de auto-testări."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Creează fereastra iniţială cu geometria dată."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Creează ferestre doar pentru URI-urile specificate."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Nu administra desktopul (ignoră preferinţa setată)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "IeÅŸi din Nautilus"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "ReporneÅŸte Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Manager de fiÅŸiere"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nu poate fi folosit cu URI-uri.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nu poate fi folosit cu alte opţiuni.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nu poate fi folosit cu URI-uri.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nu poate fi folosit cu URI-uri.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nu poate fi folosit cu mai mult de un 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să uitaţi istoria? Daca da, veţi fi blestemat(ă) "
 "să o repetaţi."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Sunteţi sigur(ă) că doriţi ca Nautilus să uite ce locaţii a vizitat?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Uită istoria"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Locaţia \"%s\" nu mai există. Doriţi să eliminaţi semnele de carte cu "
 "această locaţie din lista dvs.?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Locaţia \"%s\" nu mai există."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Semn de carte pentru locaţie inexistentă"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Elimină"
 
@@ -6521,7 +6774,6 @@ msgid "Close _All Windows"
 msgstr "ÃŽnchide _toate ferestrele"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "ÃŽnchide toate ferestrele Nautilus"
@@ -6545,107 +6797,119 @@ msgid "Forward"
 msgstr "ÃŽnainte"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Mergi la dosarul Gunoi"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Mergi la locaţia vizitată următoare"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Mergi la locaţia vizitată precedentă"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Mergi la dosarul Gunoi"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Acasă"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Bara locaţie"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Reîncarcă"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Caută fişiere acest computer"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Bara st_atus"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Sus"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Scrie pe CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Adaugă semn de carte"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_ÃŽnapoi"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Semne de carte"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Uită _istoria"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Computer"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Editează semne de carte"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "ÃŽn_ainte"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Du-te"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Acasă"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Locaţie..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Panou lateral"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Gunoi"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Sus"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vizualizare"
 
@@ -6663,32 +6927,37 @@ msgstr "Vizualizează ca..."
 msgid "File Browser: %s"
 msgstr "Deţinător fişier:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr "Unul din panourile laterale a a avut o eroare ÅŸi nu poate continua."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Vizualizarea %s a avut o eroare la pornire."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Panoul lateral %s a a avut o eroare şi nu poate continua. Dacă continuă să "
 "se întâmple, poate veţi dori să dezactivaţi acest panou."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Panoul lateral a eÅŸuat"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Panou lateral"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Conţine un panou lateral"
 
@@ -6722,147 +6991,180 @@ msgstr "_Adaugă nou..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Îmi pare rău, dar %s nu a putut fi şters."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "N-am putut ÅŸterge modelul"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Îmi pare rău, dar emblema %s nu a putut fi ştearsă."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "N-am putut elimina emblema"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Crează o emblemă nouă:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Cuvânt cheie:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imagine:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Selectează un fişier imagine pentru emblema nouă:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Creează o nouă culoare:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Nume culoare:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valoare culoare:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Îmi pare rău, dar \"%s\" nu este un nume valid de fişier."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Îmi pare rău, dar nu aţi introdus un nume valid de fişier."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "N-am putut instala pattern-ul"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Îmi pare rău,"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nu este imagine"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Îmi pare rău, dar tapetul %s nu a putut fi instalat."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Selectaţi un fişier imagine pentru a fi folosit ca şablon"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Îmi pare rău, dar trebuie să specificaţi un nume pentru culoare"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "N-am putut instala culoarea"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Selectaţi o culoare pentru adăugare"
 
-#: 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 "Îmi pare rău, dar '%s' nu este o imagine!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Îmi pare rău, dar '%s' nu este un fişier imagine folosibil."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Fişierul '%s' nu pare a fi o imagine validă."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Selectează o categorie:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Renunţă la elimin_are"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Adaugă un model nou..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Adaugă o _culoare nouă..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Adaugă o _emblemă nouă..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Făceţi clic pe un model pentru a-l elimina"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Făceţi clic pe un model pentru a o elimina"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Făceţi clic pe un model pentru a o elimina"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Modele:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Culori:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Embleme:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Elimină un model..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Elimină o _culoare..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Elimină o _emblemă..."
 
@@ -7255,34 +7557,39 @@ msgstr "Creare _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "ÃŽnchide _toate ferestrele"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "ÃŽnchide panoul lateral"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Computer"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Mergi la dosarul Gunoi"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Locaţie..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "dosare"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Modele"
@@ -7312,10 +7619,13 @@ msgid "View Failed"
 msgstr "Vizualizarea a eÅŸuat"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Vizualizarea %s a avut o eroare la pornire."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Vizualizarea %s a avut o eroare şi nu poate continua. Puteţi alege altă "
 "vizualizare sau să mergeţi la o locaţie diferită."
@@ -7325,99 +7635,130 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Vizualizarea %s a avut o eroare la pornire."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "NautilusApplication asociat cu această fereastră."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Vizualizare conţinut"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Vizualizarea fiÅŸierului sau dosarului curent"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"N-am putu găsi \"%s\". Vă rog verificaţi ortografia şi încercaţi din nou."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Nu s-a putut încărca %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nu s-a putut încărca %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "N-am putu afiÅŸa \"%s\", deoarece Nautilus nu poate determina ce tip de "
 "fiÅŸier este."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus nu are instalat un vizualizor capabil să afişeze \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "N-am putut afişa \"%s\", deoarece Nautilus nu poate înţelege locaţii de tip "
 "\"%s:\""
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "N-am putut afişa \"%s\", deoarece încercarea de a face login a eşuat."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "N-am putut afiÅŸa \"%s\", deoarece accesul a fost interzis."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "N-am putut afişa \"%s\", deoarece gazda \"%s\" nu a putut fi găsită. Vă rog "
 "verificaţi ortografia şi setările proxy."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "N-am putut afişa \"%s\". Vă rog verificaţi setările proxy."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"N-am putut afiÅŸa \"%s\", deoarece Nautilus nu poate contacta navigatorul "
-"master SMB.\n"
-"Vă rog verificaţi dacă un server SMB rulează în reţeaua locală."
+"N-am putut afişa \"%s\", deoarece Nautilus nu poate înţelege locaţii de tip "
+"\"%s:\""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Căutarea nu este disponibilă în acest moment, deoarece fie nu aveţi nici un "
+"index, or serviciul de căutare nu este pornit. Asiguraţi-vă că aţi pornit "
+"serviciul de căutare Medusa, şi în cazul în care nu aveţi un index, că "
+"indexarea Medusa rulează."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Căutarea nu este disponibilă în acest moment, deoarece fie nu aveţi nici un "
 "index, or serviciul de căutare nu este pornit. Asiguraţi-vă că aţi pornit "
 "serviciul de căutare Medusa, şi în cazul în care nu aveţi un index, că "
 "indexarea Medusa rulează."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Căutarea nu este disponibilă"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nu poate afişa locaţia \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Nu pot afişa locaţia"
 
@@ -7429,7 +7770,7 @@ msgstr "Mergi la locaţia specificată de acest semn de carte"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7437,13 +7778,13 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Marius Andreiana <marius galuna.ro>\n"
 "Mugurel Tudor <mugurelu@go.ro>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7459,38 +7800,42 @@ msgstr "Mergi înapoi câteva pagini"
 msgid "Go forward a number of pages"
 msgstr "Mergi înainte câteva pagini"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Afişează această locaţie cu \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Teme"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Creare _CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID aplicaţie"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID-ul aplicaţie al ferestrei."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplicaţie"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication asociat cu această fereastră."
 
@@ -7526,6 +7871,250 @@ msgstr "Servere reţea"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Vizualizează serverele de reţea în Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrică pentru vizualizare hardware"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Vizualizator hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vizualizare hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Vizualizează ca Hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "vizualizare hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "numele iconiţei pentru vizualizare hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "sumarul informaţiilor hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K dimensiune cache"
+
+#~ 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 "Timpul de activitate (uptime) este de %d zile, %d ore, %d minute"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Sumar hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Acesta este un loc pentru pagina CPU."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Acesta este un loc pentru pagina RAM."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Acesta este un loc pentru pagina IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Eroare la copierea \"%s\".\n"
+#~ "\n"
+#~ "Nu este destul spaţiu la destinaţie."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Eroare la crearea legăturii \"%s\".\n"
+#~ "\n"
+#~ "Nu este destul spaţiu la destinaţie."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Eroare la mutarea către \"%s\".\n"
+#~ "\n"
+#~ "Nu aveţi drepturi de scriere în acest dosar."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Eroare la mutarea către \"%s\".\n"
+#~ "\n"
+#~ "Destinaţia este doar-citire."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Eroare la crearea legăturilor în \"%s\".\n"
+#~ "\n"
+#~ "Nu aveţi drepturi de scriere în acest dosar."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Eroare la crearea legăturilor în \"%s\".\n"
+#~ "\n"
+#~ "Destinaţia este doar-citire."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la copierea \"%s\".\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la mutarea \"%s\".\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la ÅŸtergerea \"%s\".\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la copiere.\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la crearea legăturii.\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Eroare \"%s\" la ÅŸtergere.\n"
+#~ "\n"
+#~ "Doriţi să continuaţi?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Nu pot copia la gunoi"
+
+#~ 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 ""
+#~ "Acţiunea implicită  nu poate deschide \"%s\" deoarece nu poate accesa "
+#~ "fişierele de la locaţiile \"%s\". Nu sunt alte acţiuni disponibile pentru "
+#~ "a vizualiza acest fişiere. Dacă îl copiaţi pe calculatorul dvs, s-ar "
+#~ "putea să poată fi deschis."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Caut discurile"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus caută discurile dvs pentru dosare gunoi."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Elementele selectate %d nu pot fi mutate la gunoi. Doriţi să le ştergeţi "
+#~ "imediat?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d din elementele selectate nu pot fi mutate la gunoi. Doriţi să ştergeţi "
+#~ "imediat aceste %d elemente?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Fişierul tras nu este o imagine. Puteţi folosi doar fişiere imagine "
+#~ "locale pentru iconiţe personalizate."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Îmi pare rău, dar serviciul de căutare Medusa nu este disponibil pentru "
+#~ "că nu a fost instalat."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Odată pe zi fişierele şi textul dvs. sunt indexate pentru a mări viteza "
+#~ "căutărilor. Fişierele dvs. sunt indexate acum."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nu este o locaţie validă. Vă rog verificaţi ortografia şi "
+#~ "încercaţi din nou."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Îmi pare rău, dar '%s' nu este o imagine!"
+
+#~ 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 ""
+#~ "N-am putut afiÅŸa \"%s\", deoarece Nautilus nu poate contacta navigatorul "
+#~ "master SMB.\n"
+#~ "Vă rog verificaţi dacă un server SMB rulează în reţeaua locală."
+
+#~ msgid "file icon"
+#~ msgstr "fişier iconiţă"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Nume:"
+
 #~ msgid "Unknown"
 #~ msgstr "Necunoscut"
 
@@ -7624,9 +8213,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Bara de unel_te"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Locaţia \"%s\" nu mai există."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Mergi la locaţia inexistentă"
 
@@ -7671,9 +8257,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "Authentication Required"
 #~ msgstr "Necesită autentificare"
 
-#~ msgid "_Location:"
-#~ msgstr "_Locaţie:"
-
 #~ msgid "The Trash must remain on the desktop."
 #~ msgstr "Coşul de gunoi trebuie să rămână pe desktop."
 
@@ -7719,9 +8302,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "E_xecută scripturile când sunt clicate"
 
@@ -7791,9 +8371,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "No description available for the \"%s\" theme"
 #~ msgstr "Nici o descriere nu este disponibilă pentru tema \"%s\"."
 
-#~ msgid "Themes"
-#~ msgstr "Teme"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Comportament fereastră nouă"
 
@@ -7821,9 +8398,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "Click Behavior"
 #~ msgstr "Comportament click"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "FiÅŸiere text executabile"
-
 #~ msgid "Show Options"
 #~ msgstr "Arată opţiuni"
 
@@ -7933,9 +8507,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "Couldn't add theme"
 #~ msgstr "N-am putut adăuga tema"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Îmi pare rău, dar tema \"%s\" nu a putut fi instalată."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "N-am putut instala tema"
 
@@ -7949,9 +8520,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ "Îmi pare rău, dar nu puteţi elimina această temă. Schimbaţi tema curentă "
 #~ "înainte de a încerca să o eliminaţi pe aceasta."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Îmi pare rău, dar tema nu a putut fi eliminată"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "N-am putut elimina tema"
 
@@ -8432,9 +9000,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Setează imaginea de copertă"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Îmi pare rău, dar '%s' nu este un fişier imagine folosibil."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Selectaţi un fişier imagine pentru coperta albumului:"
 
@@ -8520,9 +9085,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Nu s-a putut încărca %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "ÃŽncarc %s"
 
@@ -9629,9 +10191,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "este protejat la scriere, montez doar-citire"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "nu este un dispozitiv valid"
-
 #~ msgid "No medium found"
 #~ msgstr "Nu a fost găsit nici un mediu"
 
@@ -9641,9 +10200,6 @@ msgstr "Vizualizează serverele de reţea în Nautilus"
 #~ msgid "scripts"
 #~ msgstr "scripts"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus nu a putut crea dosarul %s."
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "Nu există dosar pentru scripturi"
 
diff --git a/po/ru.po b/po/ru.po
index 74dd03a32..2ce3002b7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-06-15 20:07+0300\n"
 "Last-Translator: \"Andrew W. Nosenko\" <awn@bcs.zp.ua>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Произошёл �бой в функции bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Эмблемы"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "Про�мотр  в виде �мблем дл� \"�аутилу�а\""
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�е удало�ь убрать �мблему"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "�е удало�ь убрать �мблему � именем \"%s\". Это может значить, что �мблема "
 "в�троенна�, а не добавленна�."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "�е удало�ь убрать �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�е удало�ь переименовать �мблему"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "�е удало�ь переименовать �мблему � именем \"%s\". Это может значить, что "
 "�мблема в�троенна�, а не добавленна�."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "�е удало�ь переименовать �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Переименовать �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Введите новое им� дл� �мблемы:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Переименовать"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Добавить �мблемы..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Введите опи�ательное им� дл� каждой �мблемы. Это им� будет и�пользовано "
 "впо�лед�твии дл� идентификации �мблемы."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,64 @@ msgstr ""
 "Введите опи�ательное им� дл� �мблемы. Это им� будет и�пользовано "
 "впо�лед�твии дл� идентификации �мблемы."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "�екоторые из файлов не могут быть добавлены как �мблемы, по�кольку не "
 "�вл�ют�� допу�тимыми изображени�ми."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Файл \"%s\" не �вл�ет�� допу�тимым изображением.."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "�е удало�ь добавить �мблемы"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "�икакие файлы не могут быть добавлены как �мблемы, по�кольку не �вл�ют�� "
 "допу�тимыми изображени�ми."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Перене�ённый тек�т не был допу�тимым ме�тоположением файла."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "�е удало�ь добавить �мблему"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Файл \"%s\" не �вл�ет�� допу�тимым изображением.."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Перене�ённые файлы не �вл�ют�� допу�тимыми изображени�ми."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Стереть"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Фабрика дл� компонента про�мотра в виде оборудовани�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Оборудование"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Компонент про�мотра в виде оборудовани�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Про�мотр в виде оборудовани�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Про�матривать как оборудование"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "про�мотр в виде оборудовани�"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "им� значка дл� про�мотра в виде оборудовани�"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "�водка информации об оборудовании"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s ЦПУ\n"
-"%s МГц\n"
-"%s К размер к�ша"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu ГБ ОЗУ"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu мБ ОЗУ"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu гБ"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu мБ"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Врем� работы %d дней, %d ча�ов, %d минут"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Обзор оборудовани�"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ме�то дл� �траницы ЦПУ"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ме�то дл� �траницы пам�ти."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ме�то дл� �траницы IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "И�тори�"
@@ -909,6 +846,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Оборудование"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Международное"
@@ -1188,26 +1129,19 @@ msgid "Desktop trash icon name"
 msgstr "Подпи�ь дл� иконки \"му�орна� корзина\" на рабочем �толе"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Разрешить \"о�обые\" параметры в диалоге �вой�тв файла"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Им� файла, �одержащего фон по умолчанию дл� каталогов.  И�пользует�� только "
 "е�ли background_set у�тановлен в \"И�тина\"."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1215,6 +1149,14 @@ msgstr ""
 "Им� файла, �одержащего фон по умолчанию дл� боковой панели.  И�пользует�� "
 "только е�ли side_pane_background_set у�тановлен в \"И�тина\"."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
 msgid "Hide default bookmarks in the bookmark menu"
@@ -1227,8 +1169,8 @@ msgstr "Иконка домашнего каталога приÑ�утÑ�твуеÑ
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 #, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Е�ли у�тановлен в \"И�тина\", то в боковой панели в режиме \"Дерево\" будут "
 "показывать�� только каталоги.  В противном �лучае, будут показывать�� и "
@@ -1272,8 +1214,8 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Е�ли у�тановлен в \"И�тина\", то Nautilus будет показывать каталоги преде, "
 "чем файлы в режимах \"Про�матривать как значки\" и \"Про�матривать как �пи�ок"
@@ -1323,10 +1265,13 @@ msgstr ""
 "только пользователь�кие закладки."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+"Е�ли у�тановлен в \"И�тина\", то Nautilus будет отри�овывать иконки на "
+"рабочем �толе"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1341,7 +1286,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1363,8 +1308,9 @@ msgstr ""
 "��ылающа��� на \"му�орную корзину\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Е�ли у�тановлен в \"И�тина\", то на рабочий �тол будет помещена иконка, "
@@ -1403,7 +1349,8 @@ msgstr ""
 "меньшего к большему, будети и�пользован пор�док от большего к меньшему."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Е�ли у�тановлен в \"B�тина\", то по умолчанию новые окна будут и�пользовать "
 "плотное размещение иконок."
@@ -1436,7 +1383,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1454,12 +1401,14 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus управл�ет отри�овкой рабочего �тола"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 "Nautilus и�пользует домашний каталог пользовател� в каче�тве рабочего �тола"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "В боковой панели \"Дерево\" показывать только каталоги"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1479,7 +1428,8 @@ msgid "Reverse sort order in new windows"
 msgstr "И�пользовать обратный пор�док �ортировки дл� новых окон"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Показывать каталоги перед файлами в окнах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1515,7 +1465,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1523,17 +1473,17 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
@@ -1541,15 +1491,16 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Пор�док �ортировки по умолчанию дл� �лементов в режиме \"Про�матривать как "
 "значки\".  Допу�тимые значени�: name, size, type, modification_date, emblems."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Пор�док �ортировки по умолчанию дл� �лементов в режиме \"Про�матривать как "
 "�пи�ок\".  Допу�тимые значени�: name, size, type, modification_date, emblems."
@@ -1598,7 +1549,8 @@ msgid "Use manual layout in new windows"
 msgstr "И�пользовать р_учное размещение"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "И�пользовать плотное размещение иконок в новых окнах"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1625,7 +1577,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Когда показывать количе�тво �лементов в каталоге"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1637,7 +1590,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Когда показывать миниатюры дл� файлов изображений"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "У�тановлен ли пользователь�кий фон по умолчанию дл� каталогов."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1796,69 +1750,83 @@ msgstr "�бро�"
 msgid "on the desktop"
 msgstr "на рабочем �толе"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "�евозможно удалить раздел"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "�евозможно удалить раздел"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Му�орна� корзина"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Пере_не�ти �юда"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "С_копировать �юда"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Создать зде�ь _��ылку"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "У�тановить как _фон"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Отменить"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "И�пользовать как фон дл� _в�ех папок"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+msgid "The emblem cannot be installed."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Извините, но необходимо указать непу�тое ключевое �лово дл� новой �мблемы."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "�е удало�ь у�тановить �мблему"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1869,19 +1837,25 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Уже �уще�твует �мблема � именем \"%s\". Пожалуй�та, выберите другое им�."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�е удало�ь у�тановить �мблему"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "�евозможно �охранить пользователь�кую �мблему."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "�евозможно �охранить им� пользователь�кой �мблемы."
 
@@ -1900,23 +1874,29 @@ msgstr "Из:"
 msgid "To:"
 msgstr "Ð’:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Произошла ошибка при перемещении."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Произошла ошибка при перемещении.\n"
 "\n"
 "Элемент \"%s\" не может быть перемещён, потому что �тот ди�к только дл� "
 "чтени�."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Произошла ошибка при удалении."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1925,22 +1905,17 @@ msgstr ""
 "Элемент \"%s\" не может быть удален, потому что у ва� недо�таточно прав дл� "
 "изменени� его родитель�кой папки."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Произошла ошибка при удалении.\n"
 "\n"
 "Элемент \"%s\" не может быть удален, потому что �тот ди�к только дл� чтени�."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1949,12 +1924,15 @@ msgstr ""
 "Элемент \"%s\" не может быть перемещен, потому что у ва� недо�таточно прав "
 "дл� изменени� его или его родитель�кой папки."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Произошла ошибка при перемещении."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Произошла ошибка при перемещении.\n"
@@ -1962,251 +1940,189 @@ msgstr ""
 "Элемент \"%s\" не может быть перемещён, потому что он или его родитель�кий "
 "каталог �одержать�� в ме�те назначени�."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Произошла ошибка при перемещении.\n"
 "Элемент \"%s\" не может быть перемещён в му�орную корзину, потому что вы не "
 "имеете до�таточных прав дл� изменени� его или его родитель�кой папки."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Произошла ошибка при копировании."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Произошла ошибка при копировании.\n"
 "\n"
 "Элемент \"%s\" не может быть �копирован, потому что у ва� недо�таточно прав "
 "дл� чтени�."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Произошла ошибка при копировании �лемента \"%s\".\n"
-"\n"
-"�едо�таточно ме�та в ме�те назначени�."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Произошла ошибка при копировании."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Произошла ошибка при перемещении �лемента \"%s\".\n"
 "\n"
 "�едо�таточно ме�та в ме�те назначени�."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Произошла ошибка при �в�зывании �лемента \"%s\".\n"
-"\n"
-"�едо�таточно ме�та в ме�те назначени�."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Произошла ошибка при перемещении."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Произошла ошибка при �в�зывании."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Произошла ошибка при копировании в �лемента \"%s\".\n"
 "\n"
 "У ва� недо�таточно прав дл� запи�и в �ту папку."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Произошла ошибка при копировании в \"%s\".\n"
 "\n"
 "Ме�то назначени� только дл� чтени�."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Произошла ошибка при перемещении в \"%s\".\n"
-"\n"
-"У ва� недо�таточно прав дл� запи�и в �ту папку."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Произошла ошибка при перемещении �лементов в \"%s\".\n"
-"\n"
-"Ди�к назначени� только дл� чтени�."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Произошла ошибка при �в�зывании в \"%s\".\n"
-"\n"
-"У ва� недо�таточно прав дл� запи�и в �ту папку."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Произошла ошибка при перемещении."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Произошла ошибка при �оздании ��ылок в \"%s\".\n"
-"\n"
-"Ди�к назначени� только дл� чтени�."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при копировании �лемента \"%s\".\n"
-"\n"
-"Хотите продолжить?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Произошла ошибка при �в�зывании."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Произошла ошибка при копировании."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Произошла ошибка \"%s\" при перемещении �лемента \"%s\".\n"
+"Произошла ошибка \"%s\" при перемещении.\n"
 "\n"
 "Хотите продолжить?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при �оздании ��ылки в \"%s\".\n"
-"\n"
-"Хотите продолжить?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Произошла ошибка при перемещении."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Произошла ошибка \"%s\" при удалении �лемента \"%s\".\n"
+"Произошла ошибка \"%s\" при �оздании ��ылки в \"%s\".\n"
 "\n"
 "Хотите продолжить?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при копировании.\n"
-"\n"
-"Хотите продолжить?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Произошла ошибка при удалении."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при перемещении.\n"
-"\n"
-"Хотите продолжить?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Произошла ошибка при копировании."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при �в�зывании.\n"
-"\n"
-"Хотите продолжить?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Произошла ошибка при перемещении."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Произошла ошибка \"%s\" при удалении.\n"
-"\n"
-"Хотите продолжить?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Произошла ошибка при �в�зывании."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Произошла ошибка при удалении."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Произошла ошибка при копировании."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Произошла ошибка при перемещении."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Произошла ошибка при �в�зывании."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Произошла ошибка при удалении."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Пропу�тить"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Повторить"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�е удало�ь завершить команду."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Элемент \"%s\" не может быть перемещен в новое ме�тоположение, по�кольку его "
 "им� уже и�пользует�� дл� �пециального �лемента, который не может быть удалён "
@@ -2215,13 +2131,16 @@ msgstr ""
 "Е�ли вы в�ё ещё хотите переме�тить �лемент \"%s\", переименуйте его и "
 "попробуйте ещё раз."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�е удало�ь завершить команду."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Элемент \"%s\" не может быть �копирован в новое ме�тоположение, по�кольку "
 "его название уже и�пользует�� дл� �пециального �лемента, который не может "
@@ -2230,44 +2149,50 @@ msgstr ""
 "Е�ли вы в�ё ещё хотите переме�тить �лемент \"%s\", переименуйте его и "
 "попробуйте ещё раз."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "�евозможно заменить файл."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Файл %s уже �уще�твует.\n"
 "\n"
 "Хотите заменить его?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Произошёл конфликт при копировании"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Заменить"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Заменить в�ё"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "��ылка на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "друга� ��ылка на %s"
@@ -2276,25 +2201,25 @@ msgstr "друга� ��ылка на %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d-а� ��ылка на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d-а� ��ылка на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d-ь� ��ылка на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d-а� ��ылка на %s"
@@ -2304,563 +2229,602 @@ msgstr "%d-а� ��ылка на %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (копи�)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (друга� копи�)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "а� копи�)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "а� копи�)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "а� копи�)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "�� копи�)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (копи�)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (друга� копи�)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d-а� копи�)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d-а� копи�)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d-а� копи�)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�еизве�тный GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Перемещение файлов в му�орную корзину"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Перемещено файлов:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Перемещает��"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Идёт подготовка к перемещению в му�орную корзину..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Перемещение файлов"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Перемещено файлов:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Идёт подготовка к перемещению..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Завершает�� перемещение..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Создание ��ылок на файлы"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Создано ��ылок:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Создаёт�� ��ылка"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Идёт подготовка к �озданию ��ылок..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Завершает�� �оздание ��ылок..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Копирование файлов"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Скопировано файлов:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Копирует��"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Идёт подготовка к копированию..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Вы не можете копировать �лементы в му�орную корзину."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�евозможно �копировать в му�орную корзину"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Вы не можете переме�тить �ту му�орную корзину."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Вы не можете cкопировать �ту му�орную корзину."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�евозможно изменить ра�положение му�орной корзины"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�евозможно �копировать му�орную корзину"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Вы не можете переме�тить папку �аму в �еб�."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Вы не можете �копировать папку �аму в �еб�."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Создать новую пу�тую папку в �той папке"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�евозможно переме�тить в �еб�"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�евозможно �копировать в �еб�"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Вы не можете �копировать файл �ам в �еб�."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�евозможно �копировать в �еб�"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Произошла ошибка при �оздании новой папки.\n"
 "\n"
 "У ва� не до�таточно прав на запи�ь на у�трой�тво назначени�."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Произошла ошибка при �оздании новой папки.\n"
 "\n"
 "�ет ме�та на у�трой�тве назначени�."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Произошла ошибка \"%s\" �оздани� новой папки."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Произошла ошибка �оздани� новой папки"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Произошла ошибка �оздани� новой папки"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "неозаглавленна� папка"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Произошла ошибка \"%s\" �оздани� новой папки."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Произошла ошибка �оздани� новой папки"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Произошла ошибка �оздани� новой папки"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 файл"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Удаление файлов"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Файлов удалено:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Удал�ет��"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Идёт подготовка к удалению файлов..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Опу�тошение му�орной корзины"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Идёт подготовка к опу�тошению му�орной корзины..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Вы дей�твительно хотите окончательно удалить в�е �ти �лементы из му�орной "
 "корзины?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Опу�то_шить"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (копи�).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo...(копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (друга� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (друга� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (друга� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3-ь� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3-ь� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (друга� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3-ь� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23-ь� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23-ь� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "25 (25-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-а� копи�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124-а� копи�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124-а� копи�).txt"
 
@@ -2879,64 +2843,64 @@ msgstr "foo (124-а� копи�).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "�егодн� в 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "�егодн� в %-H:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "�егодн� в 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "�егодн� в %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "�егодн�, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "�егодн�, %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "�егодн�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "вчера в 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "вчера в %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "вчера в 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "вчера в %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "вчера, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "вчера, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "вчера"
 
@@ -2945,133 +2909,133 @@ msgstr "вчера"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Во�кре�енье, 00 �ент�бр� 0000 в 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y в %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Пон, 00 окт 0000 в 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y в %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Пон, 00 окт 0000 в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y в %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 окт 0000 в 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y в %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 окт 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 �лементов"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 папок"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 файлов"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 �лемент"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 папка"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 файл"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u �лементов"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u папок"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u файлов"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? �лементов"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? байт"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "неизве�тный тип"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "программа"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3081,7 +3045,7 @@ msgstr ""
 "gnome-vfs.keys находит�� не там где надо или не был найден по каким-то "
 "другим причинам."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3090,11 +3054,11 @@ msgstr ""
 "Опи�ание дл� типа MIME \"%s\" (файл \"%s\") не найдено. Сообщите пожалуй�та "
 "в �пи�ок ра��ылки gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "��ылка"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "��ылка (и�порченна�)"
 
@@ -3215,11 +3179,13 @@ msgid "Search for files by file name and file properties"
 msgstr "И�кать файлы по названию и �вой�твам"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "про�мотр в виде значков"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "про�мотр в виде �пи�ка"
@@ -3363,148 +3329,153 @@ msgstr "Домашний каталог пользовател� %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Контуры"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "значок файла"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "редактируемый тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "редактируема� метка"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "дополнительный тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ещё немного тек�та"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "под�ветка дл� выделени�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "под�вечивает�� ли выделение"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "под�ветка фоку�а ввода"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "под�вечивает�� ли фоку� ввода"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "под�веченное дл� в�тавки"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "под�вечивает�� ли файлы дл� в�тавки в перета�кивании-в�тавке"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Обла�ть выделени�"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Окаймл�ть тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Ри�овать рамку вокруг невыделенного тек�та"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Цвет обла�ти выделени�"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Цвет обла�ти выделени�"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Прозрачно�ть обла�ти выделени�"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Прозрачно�ть обла�ти выделени�"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Прозрачно�ть под�ветки"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Прозрачно�ть под�ветки дл� выделенных значков"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Светлый информационный цвет"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Цвет, и�пользуемый дл� дл� информационного тек�та на тёмном фоне"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Тёмный информационный цвет"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Цвет, и�пользуемый дл� дл� информационного тек�та на �ветлом фоне"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Этот каталог и�пользует автоматиче�кое размещение. Хотите переключить�� в "
 "ручное размещение и о�тавить �тот �лемент там, где вы его поме�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Этот каталог и�пользует автоматиче�кое размещение. Хотите переключить�� в "
 "ручное размещение и о�тавить �ти �лементы там, где вы их поме�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Переключить на размещение вручную?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Переключить"
 
@@ -3613,72 +3584,72 @@ msgstr "По умолчанию дл� �лементов типа \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "По умолчанию дл� в�ех �лементов типа \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Изменить приложение \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "включать в меню дл� �лементов типа \"%s\"."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "и�пользовать по умолчанию дл� �лементов типа \"%s\"."
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "включать в меню только дл� �лементов типа \"%s\"."
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "и�пользовать по умолчанию только дл� �лементов типа \"%s\"."
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "не включать в меню дл� �лементов типа \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Им�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Со�то�ние"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Выбрать"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Сделано"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Изменить..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Типы файлов и программы"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Перейти �юда"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3686,48 +3657,48 @@ msgstr ""
 "Вы можете на�троить �оответ�твие между программами и типами файлов в диалоге "
 "\"Типы файлов и программы\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Открыть другим приложением"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Выберите приложение  дл� открыти� файла \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Открыть другим компонентом про�мотра"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Выберите компонент про�мотра дл� \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "�ет до�тупных компонентов про�мотра дл� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "�ет до�тупных компонентов про�мотра"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "�ет приложений, а��оциированных � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�ет а��оциированных приложений"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "�ет дей�твий, а��оциированных � \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "�ет а��оциированных дей�твий"
 
@@ -3735,11 +3706,9 @@ msgstr "�ет а��оциированных дей�твий"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3748,42 +3717,41 @@ msgstr ""
 "Вы можете на�траивать �реду Гном, а��оцииру� приложени� � типами файлов.  Вы "
 "хотите а��оциировать приложение � данным типом файла �ейча�?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "���оциировать приложение"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Компонент про�мотра, а��оциированное � \"%s\", неверно."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "�еверный а��оциированный компонент про�мотра"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Приложение, а��оциированное � \"%s\", неверно."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "�еверное а��оциированное приложение"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Дей�твие, а��оциированное � \"%s\", неверно."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "�еверное а��оциированное дей�твие"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3794,97 +3762,134 @@ msgstr ""
 "компоненты про�мотра � типами файлов.  Вы хотите а��оциировать приложение "
 "или компонент про�мотра � �тим типом файла �ейча�?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "���оциировать дей�твие"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" не может открыть \"%s\" потому что \"%s\" не имеет до�тупа к файлам в "
+"\"%s\". Хотите выбрать другое приложение?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" не может открыть \"%s\" потому что \"%s\" не имеет до�тупа к файлам в "
 "\"%s\". Хотите выбрать другое приложение?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Дей�твие по умолчанию не может открыть \"%s\" потому что не имеет до�тупа к "
 "файлам в \"%s\".  Хотите выбрать другое дей�твие?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�евозможно открыть ме�тоположение"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" не может открыть \"%s\" потому что \"%s\" не имеет до�тупа к файлам в "
+"\"%s\". Хотите выбрать другое приложение?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" не может открыть \"%s\" потому что \"%s\" не имеет до�тупа к файлам в "
 "\"%s\". Другие приложени� не до�тупны дл� про�мотра данного файла. Е�ли вы "
 "�копируете данный файл на �вой компьютер, возможно, вы �можете его открыть."
 
-# FIXME: что-то надо делать � �тим `action' и переводить его как-то иначе,
-#        не как `дей�твие' или не про�то как `дей�твие'.  �о что-то мне в
-#        голову ничего путного не приходит...
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Дей�трие по умолчанию не может открыть \"%s\" потому, что не имеет до�тупа к "
-"файлам в \"%s\".  Другие дей�тви� не до�тупны дл� про�мотра данного файла.  "
-"Е�ли вы �копируете данный файл на �вой компьютер, возможно, вы �можете его "
-"открыть."
+"Дей�твие по умолчанию не может открыть \"%s\" потому что не имеет до�тупа к "
+"файлам в \"%s\".  Хотите выбрать другое дей�твие?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" не может открыть \"%s\" потому что \"%s\" не имеет до�тупа к файлам в "
+"\"%s\". Другие приложени� не до�тупны дл� про�мотра данного файла. Е�ли вы "
+"�копируете данный файл на �вой компьютер, возможно, вы �можете его открыть."
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Открывает�� \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Извините, но вы не можете выполн�ть команды � удаленной �тороны из-за "
 "�оглашений безопа�но�ти."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "�евозможно выполнить удаленные ��ылки"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Возникла ошибка при запу�ке приложени�.\n"
 "\n"
 "Подробно�ти: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Произошла ошибка запу�ка приложени�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Ме�то дл� перетащенных файлов поддерживает только локальные файлы"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Это ме�то дл� перетащенных файлов поддерживает только локальные файлы.\n"
@@ -3892,15 +3897,15 @@ msgstr ""
 "Дл� открыти� нелокальных файлов �копируйте их в локальную папку и перетащите "
 "�нова."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Ме�то дл� перетащенных файлов поддерживает только локальные файлы"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4154,14 +4159,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Элементы, имена которых �одержат \"medusa\" �вл�ющие�� каталогами."
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "О�уще�твл�ет�� пои�к на ди�ках"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus ищет му�орную корзину на ваших ди�ках."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Изменить"
@@ -4368,96 +4365,106 @@ msgstr "Фон"
 msgid "Empty Trash"
 msgstr "Опу�тошить му�орную корзину"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Будет открыто %d отдельных окон. Вы дей�твительно хотите �делать �то?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Открыть %d окон?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Вы дей�твительно хотите окончательно удалить \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Будет открыто %d отдельных окон. Вы дей�твительно хотите �делать �то?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Вы дей�твительно хотите окончательно удалить \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Вы дей�твительно хотите окончательно удалить %d выделенных �лементов?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Окончательно удалить в�е выделенные �лементы"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Удалить?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Выбрать категорию:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Шаблоны"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Элемент \"%s\" выделен"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 папка выделена"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d папок выделено"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (�одержащий 0 �лементов)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (�одержащий 1 �лемент)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (�одержащий %d �лементов)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (�одержащий в�его 0 �лементов)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (�одержащий в�его 1 �лемент)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (�одержащий в�его %d �лементов)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Элемент \"%s\" выделен (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d �лементов выделено (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 другой �лемент выделен (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d других �лементов выделено (%s)"
@@ -4469,7 +4476,7 @@ msgstr "%d других �лементов выделено (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4478,110 +4485,130 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Папка \"%s\" �одержит больше файлов, чем \"�аутилу�\" может обработать. "
 "�екоторые файлы не будут показаны."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Слишком много файлов"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "Элемент \"%s\" не может быть перемещён в му�орную корзину. Хотите удалить "
 "его немедленно?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d выбранных �лементов не могут быть перемещены в му�орную корзину. Хотите "
-"удалить их немедленно?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"Элемент \"%s\" не может быть перемещён в му�орную корзину. Хотите удалить "
+"его немедленно?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d выбранных �лементов не могут быть перемещены в му�орную корзину. Хотите "
-"удалить �ти %d �лементов немедленно?"
+"Элемент \"%s\" не может быть перемещён в му�орную корзину. Хотите удалить "
+"его немедленно?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Удалить немедленно?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "Вы дей�твительно хотите окончательно удалить \"%s\" �лементов из му�орной "
 "корзины?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Вы дей�твительно хотите окончательно удалить %d выделенных �лементов из "
 "му�орной корзины?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Удалить из му�орной корзины?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "И�пользовать приложение \"%s\" дл� открыти� выбранного �лемента"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Другое приложение..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Прило_жение..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Другой компонент _про�мотра..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Компонент _про�мотра..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�е удало�ь завершить команду:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�е удало�ь завершить команду."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "И�пользовать приложение \"%s\" дл� выбранных �лементов"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"В�е и�полн�емые файлы из �той папки будут показаны в меню \"Сценарии\". "
+"Выбор �ценари� из меню будет запу�кать �тот �ценарии � выбранными �лементами "
+"в каче�тве параметров."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4589,11 +4616,11 @@ msgstr ""
 "Выбор �ценари� из меню будет запу�кать �тот �ценарии � выбранными �лементами "
 "в каче�тве параметров."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "О �ценари�х"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4636,19 +4663,19 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: позици� и размер текущего окна"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 "Е�ли вы выберете команду \"В�тавить файлы\", �лемент \"%s\" будет перемещён"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 "Е�ли вы выберете команду \"В�тавить файлы\", �лемент \"%s\" будет �копирован"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4656,7 +4683,7 @@ msgstr ""
 "%d выбранных �лементов будут перемещены, е�ли вы выберете команду \"В�тавить "
 "файлы\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4664,161 +4691,168 @@ msgstr ""
 "%d выбранных �лементов будут �копированы, е�ли вы выберете команду "
 "\"В�тавить файлы\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "В буфере обмена нет ничего дл� в�тавки."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Произошла ошибка под�оединени�"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Произошла ошибка от�оединени�"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Произошла ошибка под�оединени�"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Извле_чь"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Отключить раздел"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Открыть _в новом окне"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Открыть _в %d новых окнах"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Домашний каталог"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Домашний каталог"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Удалить из _му�орной корзины"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Окончательно удалить в�е выделенные �лементы"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Перем_е�тить в му�орную корзину"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Переме�тить каждый выделенный �лемент в му�орную корзину"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "У_далить"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Создать ��_ылки"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Создать ��_ылку"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Опу�то_шить му�орную корзину"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Вырезать файл"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Вырезать файлы"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "С_копировать файл"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "С_копировать файлы"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Эта ��ылка не может быть и�пользована, по�кольку она не имеет цели. Хотите "
 "переме�тить ее в му�орную корзину?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Эта ��ылка не может быть и�пользована, по�кольку она не имеет цели. Хотите "
+"переме�тить ее в му�орную корзину?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "И�порченна� ��ылка"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" �вл�ет�� и�полн�емым тек�товым файлом. Хотите запу�тить его или "
 "про�мотреть его �одержимое?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Запу�тить или показать?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "По_казать"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Запу�тить в _терминале"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "По_казать"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "За_пу�тить"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Открывает�� \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Отменить открытие?"
 
@@ -4839,17 +4873,22 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Извините, невозможно показать в�е �одержимое �лемента \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Права дл� \"%s\" не могут быть определены."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Произошла ошибка отображени� папки"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Им� \"%s\" уже и�пользует�� в �той папке. Пожалуй�та, выберите другое им�."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4857,12 +4896,12 @@ msgstr ""
 "�ет �лемента \"%s\" в �той папке. Возможно он был только что перемещен или "
 "удален?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "У ва� недо�таточно прав дл� переименовани� �лемента \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4871,68 +4910,83 @@ msgstr ""
 "Им� \"%s\" недопу�тимо, потому что он �одержит �имвол \"/\".\n"
 "Пожалуй�та, выберите другое им�."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 "Им� \"%s\" недопу�тимо.\n"
 "Пожалуй�та, выберите другое им�."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "�евозможно изменить им� дл� �лемента \"%s\", потому что �то ди�к только дл� "
 "чтени�."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Извините, невозможно переименовать �лемент \"%s\" в \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Права дл� \"%s\" не могут быть определены."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Произошла ошибка переименовани�"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "У ва� недо�таточно прав дл� изменени� группы �лемента \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "�евозможно изменить группу дл� �лемента \"%s\", потому что �тот ди�к только "
 "дл� чтени�."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Извините, невозможно изменить группу дл� �лемента \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Права дл� \"%s\" не могут быть определены."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Произошла ошибка у�тановки группы"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "�евозможно изменить владельца дл� �лемента \"%s\", потому что �тот ди�к "
 "только дл� чтени�."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Извините, невозможно изменить владельца дл� �лемента \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Права дл� \"%s\" не могут быть определены."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Произошла ошибка у�тановки владельца"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4940,21 +4994,26 @@ msgstr ""
 "Извините, невозможно изменить права дл� �лемента \"%s\", потому что �тот "
 "ди�к только дл� чтени�"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Извините, невозможно изменить права дл� �лемента \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Права дл� \"%s\" не могут быть определены."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Произошла ошибка у�тановки прав"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Переименовывает�� �лемент \"%s\" в \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Отменить переименование?"
 
@@ -5012,131 +5071,156 @@ msgstr "Во��тановить и�_ходные размеры значков
 msgid "Restore Icon's Original Si_ze"
 msgstr "Во��тановить и�_ходный размер значка"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "указывает на \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Операции перета�кивани� и в�тавки поддерживают�� только на локальных "
+"файловых �и�темах."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Операции перета�кивани� и в�тавки поддерживают�� только на локальных "
 "файловых �и�темах."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Произошла ошибка перета�кивани� и в�тавки"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Был и�пользован недопу�тимый тип перета�кивани�."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Им� файла"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Размер"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Тип"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Дата модификации"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Вы не можете �в�зать больше чем � одним пользователь�ким значком "
 "одновременно! Пожалуй�та, перетащите только одно изображение, чтобы "
 "у�тановить пользователь�кий значок."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Вы не можете �в�зать больше чем � одним пользователь�ким значком "
+"одновременно! Пожалуй�та, перетащите только одно изображение, чтобы "
+"у�тановить пользователь�кий значок."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Более одного изображени�"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Файл, который вы указали, не локальный. Вы можете и�пользовать только "
 "локальные изображени� в каче�тве пользователь�ких значков."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Файл, который вы указали, не локальный. Вы можете и�пользовать только "
+"локальные изображени� в каче�тве пользователь�ких значков."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Только локальные изображени�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Файл, который вы указали, не �вл�ет�� изображением. Вы можете и�пользовать "
-"только локальные изображени� в каче�тве пользователь�ких значков."
+"Файл, который вы указали, не локальный. Вы можете и�пользовать только "
+"локальные изображени� в каче�тве пользователь�ких значков."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Только изображени�"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Свой�тва"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s �вой�тва"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Отменить �мену группы?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Изменение группы"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Отменить �мену владельца?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Изменение владельца"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ничего"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "нечитаемое"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 �лемент, размер %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d �лементов, � общим размером %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(некоторое �одержание не читаемо)"
 
@@ -5146,189 +5230,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Содержание:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "О�новные"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "�а_именовани�:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "�а_именование:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Ме�тоположение:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Раздел:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Свободное ме�то:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "С�ылка на:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Изменён:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Дата до�тупа:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Выбрать другой значок..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "У_брать пользователь�кий значок"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Про_читать"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "За_пи�ать"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Выполнить"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "У�тановить идентификатор поль_зовател� (SUID)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "О�обые флаги:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "У�тановить идентификатор _группы (SGID)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "При_клеенный"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Права"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Вы не �вл�ете�ь владельцем, по�тому вы не можете изменить �ти права."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Владелец файла:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Владелец файла:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Группа файла:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Группа файла:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Владелец:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Группа:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "О�тальные:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Про�мотр в виде тек�та:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Про�мотр в виде чи�ел:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "По�ледние изменени�:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Права дл� \"%s\" не могут быть определены."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Права до�тупа дл� выделенного файла не могут быть определены."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr "Возникла ошибка при отображении �правки: %s."
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Возникла ошибка при отображении �правки: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�евозможно показать �правку"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Отменить показ окна �вой�тв?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Создание окна �вой�тв"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Выберите значок"
 
@@ -5346,70 +5432,108 @@ msgid "Search Results"
 msgstr "Результаты пои�ка"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Извините, но �ерви� пои�ка \"Medusa\" недо�тупен, потому что он не "
-"у�тановлен."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Извините, но �ерви� пои�ка \"Medusa\" недо�тупен."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Серви� пои�ка недо�тупен"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Индек� вашей �и�темы у�тарел. Пои�к пр�мо �ейча� не вернёт результатов. "
 "�овый индек� можно �оздать, запу�тив �ерви� \"medusa-indexd\" в режиме "
 "�уперпользовател� из командной �троки."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Программа пои�ка не может открыть индек� файловой �и�темы. Индек� может "
+"от�ут�твовать или быть повреждён. Создать новый индек� можно, запу�тив "
+"�ерви� \"medusa-indexd\" в режиме �уперпользовател� в командной �троке."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Пои�к файлов, которые �лишком новы"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Каждый индек�ированный файл на компьютере подпадает под критерии пои�ка. "
+"Можно проверить напи�ание критериев или добавить дополнительные критерии."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Каждый индек�ированный файл на компьютере подпадает под критерии пои�ка. "
 "Можно проверить напи�ание критериев или добавить дополнительные критерии."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Произошла ошибка при пои�ке"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Программа пои�ка не может открыть индек� файловой �и�темы. Индек� может "
 "от�ут�твовать или быть повреждён. Создать новый индек� можно, запу�тив "
 "�ерви� \"medusa-indexd\" в режиме �уперпользовател� в командной �троке."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Произошла ошибка чтени� индек�а файлов"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "При загрузке �одержимого �того пои�ка возникла ошибка: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Дл� выполнени� пои�ка по �одержанию программе пои�ка требует�� индек� файлов "
+"�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Дл� выполнени� пои�ка по �одержанию программе пои�ка требует�� индек� файлов "
+"�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5417,25 +5541,23 @@ msgstr ""
 "�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у, так что "
 "будет о�уще�твлён более медленный пои�к, не и�пользующий индек�."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Дл� выполнени� пои�ка по �одержанию программе пои�ка требует�� индек� файлов "
-"�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Бы�трый пои�к недо�тупен"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Пои�к �одержимого недо�тупен"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5450,50 +5572,77 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Дл� выполнени� бы�трого пои�ка программе пои�ка требует�� индек� файлов в "
 "�и�теме. В на�то�щий момент такой индек� �оздаёт��. По�кольку программа "
 "пои�ка ещё не может и�пользовать �тот индек�, пои�к может зан�ть не�колько "
 "минут."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Дл� выполнени� пои�ка по �одержимому программе пои�ка требует�� индек� "
 "файлов в �и�теме. В на�то�щий момент такой индек� �оздаёт��. Пои�к по "
 "�одержимому будет до�тупен, когда индек� будет �оздан."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Индек�ированный пои�к недо�тупен"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Дл� выполнени� пои�ка по �одержанию программе пои�ка требует�� индек� файлов "
+"�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Дл� выполнени� пои�ка по �одержанию программе пои�ка требует�� индек� файлов "
+"�и�темы. Программа пои�ка �ейча� не может обратить�� к индек�у."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Дл� выполнени� бы�трого пои�ка программе пои�ка требует�� индек� файлов в "
 "�и�теме. В на�то�щий момент индек� не до�тупен. Индек� можно �оздать путём "
 "запу�ка �ерви�а \"medisa-searcd\" в режиме �уперпользовател� в командной "
 "�троке. До �оздани� индек�а пои�к будет занимать не�колько минут."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Дл� выполнени� пои�ка по �одержимому программе пои�ка требует�� индек� "
 "файлов в �и�теме. В на�то�щий момент индек� не до�тупен. Индек� можно "
@@ -5501,7 +5650,12 @@ msgstr ""
 "командной �троке. До �оздани� индек�а пои�к по �одержимому не может быть "
 "выполнен."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Бы�трый пои�к недо�тупен на вашем компьютере"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5511,11 +5665,12 @@ msgstr ""
 "�и�теме. Си�темный админи�тратор запретил бы�трый пои�к на �том компьютере, "
 "так что индек� недо�тупен."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Бы�трый пои�к недо�тупен на вашем компьютере"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Бы�трый пои�к недо�тупен"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Где"
 
@@ -5524,7 +5679,7 @@ msgstr "Где"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Открыть в новом окне"
@@ -5535,7 +5690,7 @@ msgstr "_Открыть в новом окне"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Открыть в %d _новых окнах"
@@ -5544,15 +5699,21 @@ msgstr "Открыть в %d _новых окнах"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "�айдено больше, чем можно показать на �кране. Ча�ть �лементов не будет "
 "показана."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"�айдено больше, чем можно показать на �кране. Ча�ть �лементов не будет "
+"показана."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Слишком много �овпадений"
 
@@ -5567,12 +5728,12 @@ msgid "Create L_auncher"
 msgstr "Создать значок _запу�ка"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Создать новый значок запу�ка"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Удалить в�е �лементы из му�орной корзины"
 
@@ -5594,7 +5755,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Сбро�ить фон к и�_ходному"
@@ -5617,58 +5778,68 @@ msgstr "Выбрать другую программу про�мотра дл�
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Домашний каталог"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Домашний каталог"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Создать новую пу�тую папку в �той папке"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Создать новую пу�тую папку в �той папке"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Создать �имволиче�кую ��ылку дл� каждого выделенного �лемента"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Прод_ублировать"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Удалить каждый выделенный �лемент, не перемеща� его в му�орную корзину"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Продублировать каждый выделенный �лемент"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Изменить значок запу�ка"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Изменить информацию значка запу�ка"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Отформатировать выбранный раздел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Изменить �вой�тва но�ител_�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Отключить выбранный раздел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Переме�тить или �копировать файлы выбранные ранее командой \"Вырезать файлы"
 "\" или \"Скопировать файлы\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5677,135 +5848,144 @@ msgstr ""
 "Переме�тить или �копировать файлы выбранные ранее командой \"Вырезать файлы"
 "\" или \"Скопировать файлы\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Открыть � помо_щью"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Открыть каждый выделенный �лемент в новом окне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Открыть _в новом окне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Открыть выбранный �лемент в �том окне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Подготовить выбранные файлы к копированию � помощью команды \"В�тавить файлы"
 "\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Подготовить выбранные файлы к перемещению � помощью команды \"В�тавить файлы"
 "\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "За_щитить"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Защитить выбранный раздел."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Переименовать выделенный �лемент"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Сб_ро�ить про�мотр"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Обновить пор�док �ортировки и ма�штаб дл� �овпадени� � на�тройками дл� �того "
 "про�мотра"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Запу�к или управление �ценари�ми из ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Выделить в�_е файлы"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Шаблоны"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Выделить в�е �лементы в �том окне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Выделить в�е �лементы в �том окне"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Про�мотреть �вой�тва каждого выделенного раздела"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Показать папку �одержащую �ценарии, которые показаны в �том меню"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Отключить выбранный раздел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "И�пользовать и�ходный фон дл� �того ме�тоположени�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Про�мотреть или изменить �вой�тва каждого выделенного �лемента"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "С_копировать файл"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "От_форматировать"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Отключить раздел"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Открыть"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Открыть папку �_ценариев"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "В�т_авить файлы"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "В�т_авить файлы"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Изменить �вой�тва"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Переи_меновать..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "С_ценарии"
 
@@ -5891,7 +6071,12 @@ msgstr "Вр_учную"
 msgid "Indexing is %d%% complete."
 msgstr "Индек�ирование выполнено на %d%%"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Ваши файлы были в по�ледний раз проиндек�ированы %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5899,25 +6084,29 @@ msgstr ""
 "Раз в день ваши файлы и тек�товое �одержимое индек�ируют�� дл� у�корени� "
 "пои�ка."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Со�то�ние индек�ировани�"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Ваши файлы были в по�ледний раз проиндек�ированы %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Раз в день ваши файлы и тек�товое �одержимое индек�ируют�� дл� у�корени� "
-"пои�ка. В на�то�щий момент ваши файлы проиндек�ированы."
+"пои�ка."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "В на�то�щий момент дл� ваших файлов нет индек�а."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5927,15 +6116,19 @@ msgstr ""
 "Бы�трый пои�к не до�тупен на вашем компьютере, так как у ва� �ейча� нет "
 "индек�ного файла."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "В на�то�щий момент дл� ваших файлов нет индек�а."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Извините, но �ерви� пои�ка \"Medusa\" недо�тупен."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5959,31 +6152,36 @@ msgstr "Показывать �о�то�ние _индек�ировани�"
 msgid "Show status of indexing used when searching"
 msgstr "Показывать �о�то�ние индек�ировани�, и�пользуемого дл� пои�ка"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "�евозможно �оздать требуемую папку"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�евозможно �оздать требуемые папки"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "�е удало�ь �оздать необходимую папку \"%s\". Создайте �ту папку до запу�ка "
 "\"�аутилу�а\" или у�тановите права так, чтобы \"�аутилу�\" мог �оздать её."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�евозможно �оздать требуемые папки"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5994,24 +6192,28 @@ msgstr ""
 "Создайте �ти папки до запу�ка \"�аутилу�а\" или у�тановите права так, чтобы "
 "\"�аутилу�\" мог �оздать их."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "С�ылка на �тарый рабочий �тол"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 #, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Ме�тоположение каталога, отвечающего за рабочий �толл, в Gnome 2.4 "
 "изменило�ь.  С�ылка под названием \"С�ылка на �тарый рабочий �тол\" была "
 "�оздана вашем на рабочем �толе.  Вы можете открвть её, переме�тить в�е "
 "файлы, какие хотите, на новый рабочий �тол, по�ле чего удалить её."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Старый рабочий �тол по�ле миграции"
 
 #. Can't register myself due to trouble locating the
@@ -6024,7 +6226,7 @@ msgstr "Старый рабочий �тол по�ле миграции"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6035,7 +6237,7 @@ msgstr ""
 "перезагрузить компьютер или переу�тановить \"�аутилу�\"."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6081,13 +6283,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "\"�аутилу�\" не может быть и�пользован �ейча� из-за неожиданной ошибки."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6096,7 +6298,7 @@ msgstr ""
 "�и�теме Bonobo при попытке зареги�трировать �ервер про�мотра файлового "
 "менеджера."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6106,7 +6308,7 @@ msgstr ""
 "�и�теме Bonobo при попытке обнаружить фабрику. Уничтожение проце��а bonobo-"
 "activation-server и перезапу�к \"�аутилу�а\" может помочь решить проблему."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6117,6 +6319,15 @@ msgstr ""
 "bonobo-activation-server и перезапу�к \"�аутилу�а\" может помочь решить "
 "проблему."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr "Возникла ошибка при отображении �правки: %s."
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Закладки не определены"
@@ -6150,36 +6361,45 @@ msgstr "Меньше параметров"
 msgid "Find Them!"
 msgstr "�айти их!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�евозможно переме�тить в �еб�"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Извините, но им� \"%s\" не �вл�ет�� допу�тимым именем файла."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"\"%s\" не �вл�ет�� допу�тимым ме�тоположением. Пожалуй�та, проверьте "
-"напи�ание и попробуйте �нова."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "�е удало�ь найти \"%s\". Пожалуй�та проверьте ввод и попробуйте �нова."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Сетевые �ерверы"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "�а_именование:"
+msgid "_Location:"
+msgstr "Ме�тоположение:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Соединить��"
@@ -6382,6 +6602,21 @@ msgstr ""
 "\n"
 "Вы можете удалить �тот файл вручную, чтобы �нова запу�тить помощника.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Вы не можете �в�зать больше чем � одним пользователь�ким значком "
+"одновременно! Пожалуй�та, перетащите только одно изображение, чтобы "
+"у�тановить пользователь�кий значок."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Файл, который вы указали, не локальный. Вы можете и�пользовать только "
+"локальные изображени� в каче�тве пользователь�ких значков."
+
 # "Открыть � помощью программы "%s" -- �то �лишком длинно и не помешает��
 # на боковую панель даже без ра�паковки `%s'.
 #: src/nautilus-information-panel.c:882
@@ -6395,26 +6630,25 @@ msgstr "Открыть в %s"
 msgid "Open with..."
 msgstr "Открыть в..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "�е удало�ь запу�тить прилодение запи�и на CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "�е удало�ь запу�тить прилодение запи�и на CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Опу�то_шить му�орную корзину"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "З_апи�ать �одержимое на CD"
 
@@ -6422,90 +6656,90 @@ msgstr "З_апи�ать �одержимое на CD"
 msgid "Go To:"
 msgstr "Перейти к:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Вы хотите про�мотреть �ти %d ме�тоположений в отдельных окнах?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Про�мотреть во множе�твенных окнах?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�евозможно открыть ме�тоположение"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Выполнить бы�трую �амопроверку."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Создать первоначальное окно � заданной геометрией."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕОМЕТРИЯ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Создавать окна только дл� точно определённых идентификаторов (URI)."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "�е управл�ть рабочим �толом (игнорировать на�тройки в диалоге на�троек)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Выйти из \"�аутилу�а\"."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Перезапу�тить \"�аутилу�\"."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Файловый менеджер"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "\"�аутилу�\""
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 "nautilus: параметр --check не может быть и�пользован вме�те � "
 "идентификаторами (URI).\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 "nautilus: параметр --check не может быть и�пользован вме�те � другими "
 "параметрами.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 "nautilus: параметр --quit не может быть и�пользован вме�те � "
 "идентификаторами (URI).\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 "nautilus:  параметр --restart не может быть и�пользован вме�те �  "
 "идентификаторами (URI).\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus:  параметр --geometry не может быть и�пользован вме�те � больше чем "
@@ -6514,38 +6748,51 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Вы дей�твительно хотите окончательно удалить \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Вы уверены в том что хотите �тереть и�торию? Е�ли вы �то �делаете, то не "
 "�можете во�произве�ти ее."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Вы уверены в том, что хотите очи�тить �пи�ок ме�тоположений, которые вы "
 "по�етили?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Забыть и�торию?"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Ме�тоположение \"%s\" не �уще�твует. Хотите удалить в�е закладки на него из "
 "вашего �пи�ка?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Ме�тоположение \"%s\" больше не �уще�твует."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Закладка дл� не�уще�твующего ме�тоположени�"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Убрать"
 
@@ -6578,7 +6825,6 @@ msgid "Close _All Windows"
 msgstr "Закрыть в�_е окна"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Закрыть в�е окна \"�аутилу�а\""
@@ -6601,107 +6847,119 @@ msgid "Forward"
 msgstr "Вперед"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Перейти в папку \"Му�орной корзины\""
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Перейти к �ледующему по�ещенному ме�тоположению"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Перейти к предыдущему по�ещенному ме�тоположению"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Перейти в папку \"Му�орной корзины\""
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "�ачало"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Строка _ме�тоположени�"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Перезагрузить"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "�айти файлы на �том компьютере"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Строка _�о�то�ни�"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "О�тановить"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Вверх"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Запи�ать на CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Доб_авить закладку"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "�а_зад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Закладки"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "За_быть и�торию"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Курьер"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Изменить закладки..."
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "В_перед"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "Пере_ход"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Домой"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "К _ме�тоположению..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Бокова� панель"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Тайм�"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "М_у�орна� корзина"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Вверх"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Вид"
 
@@ -6719,34 +6977,39 @@ msgstr "Про�матривать как..."
 msgid "File Browser: %s"
 msgstr "Владелец файла:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Одна из боковых панелей вызвала ошибку и не может и�пользовать�� дальше.\n"
 "К �ожалению, невозможно �казать кака� именно."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Компонент про�мотра \"%s\" обнаружил ошибку при запу�ке."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Произошёл �бой в боковой панели %s, продолжение невозможно. Е�ли �то будет "
 "�лучать�� и далее, возможно, �тоит отключить �ту панель."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Произошёл �бой боковой панели"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Бокова� панель"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Содержит боковую панель"
 
@@ -6780,147 +7043,180 @@ msgstr "Доб_авить новый... "
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Извините, но шаблон \"%s\" не может быть удален."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "�евозможно удалить шаблон"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Извините, но �мблема \"%s\" не может быть удалена."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "�е удало�ь убрать �мблему"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Создать новую �мблему:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Ключевое �лово:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Изображение:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Выберите файл изображени� дл� новой �мблемы:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Создать новый цвет:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "�аи_менование цвета:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "З_начение цвета:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Извините, но им� \"%s\" не �вл�ет�� допу�тимым именем файла."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Извините, но вы не указали допу�тимого имени файла."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "�евозможно у�тановить шаблон"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Извините, но вы не можете заменить изображение �бро�а."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�е �вл�ет�� изображением"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Извините, но шаблон \"%s\" не может быть у�тановлен."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Выбрать файл изображени� дл� добавлени� в каче�тве шаблона"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Извините, но вы должны указать не пу�тое название дл� нового цвета."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "�е удало�ь у�тановить цвет"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Выбрать цвет дл� добавлени�"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Извините, но \"%s\" не �вл�ет�� подход�щим файлом изображени�!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Файл \"%s\" не �вл�ет�� допу�тимым изображением.."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Выбрать категорию:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "О_тменить удаление"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Доб_авить новый шаблон..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Доб_авить новый цвет..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Доб_авить новую �мблему..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Щелкните на шаблоне, чтобы удалить его."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Щелкните на цвете, чтобы удалить его"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Щелкните на �мблеме, чтобы удалить ее."
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Шаблоны:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Цвета:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Эмблемы:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "У_брать шаблон..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "У_брать цвет..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "У_брать �мблему..."
 
@@ -7312,34 +7608,39 @@ msgstr "_Создание CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Закрыть в�_е окна"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Закрыть боковую панель"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Перейти в пу�тую папку дл� �оздани� CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Перейти в папку \"Му�орной корзины\""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "К _ме�тоположению..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Items that are ]-- папки"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Шаблоны"
@@ -7369,10 +7670,13 @@ msgid "View Failed"
 msgstr "Произошёл �бой про�мотра"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Компонент про�мотра \"%s\" обнаружил ошибку при запу�ке."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Возникла ошибка компонента про�мотра \"%s\", продолжить невозможно. Вы "
 "можете выбрать другую программу про�мотра или перейти в другое "
@@ -7383,104 +7687,135 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Компонент про�мотра \"%s\" обнаружил ошибку при запу�ке."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Приложение Nautilus а��оциированное � �тим окном."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Про�мотр �одержимого"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Про�мотр текущего файла или каталога"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "�е удало�ь найти \"%s\". Пожалуй�та проверьте ввод и попробуйте �нова."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "�е удало�ь добавить �мблемы"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "\"�аутилу�\" не может отобразить ме�тоположение \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "�е удало�ь показать \"%s\", потому что \"�аутилу�\" не может обрабатывать "
 "файлы такого типа."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "\"�аутилу�\" не имеет у�тановленной программы про�мотра, котора� может "
 "показать \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "�е удало�ь показать \"%s\", потому что \"�аутилу�\" не может обрабатывать %"
 "s: положени�."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "�е удало�ь показать \"%s\", потому что \"�аутилу�у\" не удала�ь попытка "
 "реги�трации."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�е удало�ь показать \"%s\", из-за отказа в до�тупе."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "�е удало�ь показать \"%s\", потому что узел \"%s\" не может быть найден. "
 "Убедите�ь, что у ва� правильно на�троен �ерви� прок�и и что вы ввели адре� "
 "правильно."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "�е удало�ь показать \"%s\", потому что им� хо�та было пу�тым. Убедите�ь, что "
 "у ва� правильно на�троен прок�и."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"�е удало�ь показать \"%s\", потому что \"�аутилу�\" не может обрабатывать %"
+"s: положени�."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"�е удало�ь показать \"%s\", потому что \"�аутилу�\" не может подключить�� к "
-"ма�теру про�мотра �ети SMB.\n"
-"Проверьте, что �ервер �ети SMB запущен в локальной �ети."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"В на�то�щий момент пои�к не до�тупен, либо потому что у ва� нет индек�а, "
+"либо потому что не запущен �ерви� пои�ка. Убедите�ь, что вы запу�тили �ерви� "
+"пои�ка Medusa и е�ли у ва� нет индек�а, что запущен индек�атор Medusa."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "В на�то�щий момент пои�к не до�тупен, либо потому что у ва� нет индек�а, "
 "либо потому что не запущен �ерви� пои�ка. Убедите�ь, что вы запу�тили �ерви� "
 "пои�ка Medusa и е�ли у ва� нет индек�а, что запущен индек�атор Medusa."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Пои�к недо�тупен"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"�аутилу�\" не может отобразить ме�тоположение \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�евозможно показать ме�тоположение"
 
@@ -7492,7 +7827,7 @@ msgstr "Перейти к меÑ�тоположению, указанному зÐ
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "�втор�кое право (C) 1999-2001 Eazel, Inc."
 
@@ -7500,7 +7835,7 @@ msgstr "�втор�кое право (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Валёк Филиппов\n"
@@ -7508,7 +7843,7 @@ msgstr ""
 "Группа глобализации компании Sun\n"
 "�ндрей �о�енко <awn@bcs.zp.ua>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7524,39 +7859,44 @@ msgstr "Перейти назад на не�колько �траниц"
 msgid "Go forward a number of pages"
 msgstr "Перейти вперёд на чи�ло �траниц"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Отобразить �то ме�тоположение � помощью компонента \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "_Шрифты"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Тайм�"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Создание CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Идентификатор приложени�"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Идентификатор приложени� в окне."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Приложение"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Приложение Nautilus а��оциированное � �тим окном."
 
@@ -7592,6 +7932,251 @@ msgstr "Сетевые �ерверы"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Окно про�мотра �етевых �ерверов файлового менеджера \"�аутилу�\""
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Фабрика дл� компонента про�мотра в виде оборудовани�"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Компонент про�мотра в виде оборудовани�"
+
+#~ msgid "Hardware view"
+#~ msgstr "Про�мотр в виде оборудовани�"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Про�матривать как оборудование"
+
+#~ msgid "hardware view"
+#~ msgstr "про�мотр в виде оборудовани�"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "им� значка дл� про�мотра в виде оборудовани�"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "�водка информации об оборудовании"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s ЦПУ\n"
+#~ "%s МГц\n"
+#~ "%s К размер к�ша"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu ГБ ОЗУ"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu мБ ОЗУ"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu гБ"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu мБ"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Врем� работы %d дней, %d ча�ов, %d минут"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Обзор оборудовани�"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ме�то дл� �траницы ЦПУ"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ме�то дл� �траницы пам�ти."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ме�то дл� �траницы IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Произошла ошибка при копировании �лемента \"%s\".\n"
+#~ "\n"
+#~ "�едо�таточно ме�та в ме�те назначени�."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Произошла ошибка при �в�зывании �лемента \"%s\".\n"
+#~ "\n"
+#~ "�едо�таточно ме�та в ме�те назначени�."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Произошла ошибка при перемещении в \"%s\".\n"
+#~ "\n"
+#~ "У ва� недо�таточно прав дл� запи�и в �ту папку."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Произошла ошибка при перемещении �лементов в \"%s\".\n"
+#~ "\n"
+#~ "Ди�к назначени� только дл� чтени�."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Произошла ошибка при �в�зывании в \"%s\".\n"
+#~ "\n"
+#~ "У ва� недо�таточно прав дл� запи�и в �ту папку."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Произошла ошибка при �оздании ��ылок в \"%s\".\n"
+#~ "\n"
+#~ "Ди�к назначени� только дл� чтени�."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при копировании �лемента \"%s\".\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при перемещении �лемента \"%s\".\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при удалении �лемента \"%s\".\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при копировании.\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при �в�зывании.\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Произошла ошибка \"%s\" при удалении.\n"
+#~ "\n"
+#~ "Хотите продолжить?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�евозможно �копировать в му�орную корзину"
+
+# FIXME: что-то надо делать � �тим `action' и переводить его как-то иначе,
+#        не как `дей�твие' или не про�то как `дей�твие'.  �о что-то мне в
+#        голову ничего путного не приходит...
+#~ 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 ""
+#~ "Дей�трие по умолчанию не может открыть \"%s\" потому, что не имеет "
+#~ "до�тупа к файлам в \"%s\".  Другие дей�тви� не до�тупны дл� про�мотра "
+#~ "данного файла.  Е�ли вы �копируете данный файл на �вой компьютер, "
+#~ "возможно, вы �можете его открыть."
+
+#~ msgid "Searching Disks"
+#~ msgstr "О�уще�твл�ет�� пои�к на ди�ках"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus ищет му�орную корзину на ваших ди�ках."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d выбранных �лементов не могут быть перемещены в му�орную корзину. "
+#~ "Хотите удалить их немедленно?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d выбранных �лементов не могут быть перемещены в му�орную корзину. "
+#~ "Хотите удалить �ти %d �лементов немедленно?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Файл, который вы указали, не �вл�ет�� изображением. Вы можете "
+#~ "и�пользовать только локальные изображени� в каче�тве пользователь�ких "
+#~ "значков."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Извините, но �ерви� пои�ка \"Medusa\" недо�тупен, потому что он не "
+#~ "у�тановлен."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Раз в день ваши файлы и тек�товое �одержимое индек�ируют�� дл� у�корени� "
+#~ "пои�ка. В на�то�щий момент ваши файлы проиндек�ированы."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" не �вл�ет�� допу�тимым ме�тоположением. Пожалуй�та, проверьте "
+#~ "напи�ание и попробуйте �нова."
+
+#~ 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 ""
+#~ "�е удало�ь показать \"%s\", потому что \"�аутилу�\" не может подключить�� "
+#~ "к ма�теру про�мотра �ети SMB.\n"
+#~ "Проверьте, что �ервер �ети SMB запущен в локальной �ети."
+
+#~ msgid "file icon"
+#~ msgstr "значок файла"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "�а_именование:"
+
 #~ msgid "Unknown"
 #~ msgstr "�еизве�тно"
 
@@ -7708,9 +8293,6 @@ msgstr "Окно про�мотра �етевых �ерверов файлов
 #~ msgid "_Toolbar"
 #~ msgstr "Панель _ин�трументов"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Ме�тоположение \"%s\" больше не �уще�твует."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Перейти к не�уще�твующему ме�тоположению"
 
@@ -7779,6 +8361,3 @@ msgstr "Окно про�мотра �етевых �ерверов файлов
 
 #~ msgid "_Helvetica"
 #~ msgstr "_Гельветика"
-
-#~ msgid "_Times"
-#~ msgstr "_Тайм�"
diff --git a/po/sk.po b/po/sk.po
index 71b6f9694..709066ba9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNOME nautilus.HEAD\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-09-03 09:52+0200\n"
 "Last-Translator: Stanislav Visnovsky <visnov@suse.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -50,8 +50,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() zlyhalo."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblémy"
 
@@ -64,48 +64,60 @@ msgid "Nautilus Emblem view"
 msgstr "Pohľad Emblémy pre Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Nie je možné odstrániť emblém"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nie je možné odstrániť emblém '%s'. Možno preto, lebo je to stály emblém a "
 "nepridali ste ho vy."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Nie je možné odstrániť emblém"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Nie je možné premenovať emblém"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nie je možné premenovať emblém '%s'. Možno preto, lebo je to stály emblém a "
 "nepridali ste ho vy."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Nie je možné premenovať emblém"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Premenovať emblém"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Zadajte meno pre zobrazený emblém:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Premenovať"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Pridať emblémy..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -113,7 +125,7 @@ msgstr ""
 "Zadajte popisné meno vedľa každého emblému. Toto meno sa bude používať pre "
 "jeho identifikáciu."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -121,139 +133,64 @@ msgstr ""
 "Zadajte popisné meno emblému. Toto meno sa bude používať pre jeho "
 "identifikáciu."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Niektoré súbory nie je možné pridať ako emblémy, pretože to asi nie sú "
 "platné obrázky."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Súbor '%s' asi nie je platný obrázok."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Nie je možné pridať emblémy"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Žiadny zo súborov nie je možné pridať ako emblém, pretože to asi nie sú "
 "platné obrázky."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Text ťahaný myšou nie je platné umiestnenie súboru."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Nie je možné pridať emblém"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Súbor '%s' asi nie je platný obrázok."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Súbor ťahaný myšou asi nie je platný obrázok."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Zmazané"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Vytváracie rozhranie pre hardwarový pohľad"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Prehliada� hardvéru"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Hardvérový pohľad"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Zobraziť ako hardvér"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hardvérový pohľad"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "meno ikony pre hardwarový pohľad"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "súhrnné informácie o hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K veľkosť cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Čas behu po�íta�a je %d dní, %d hodín, %d minút"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Prehľad hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Sem patrí stránka pre procesor."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Sem patrí stránka pre pamäť."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Sem patrí stránka pre IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "História"
@@ -919,6 +856,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "International"
@@ -1204,29 +1145,19 @@ msgid "Desktop trash icon name"
 msgstr "Meno ikony pre kôš"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Prie�inky nad túto veľkosť budú orezané. Cieľom tejto voľby je zabrániť "
-"zabitiu Nautilusu pri veľkých prie�inkoch. Záporná hodnota zruší obmedzenie. "
-"Obmedzenie je len približné, pretože prie�inky sa �ítajú po kusoch."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Povoliť špeciálne príznaky v dialógu nastavenia"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Meno súboru pre štandardné pozadie prie�inku. Používa sa iba ak je "
 "background_set nastavené na true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1234,6 +1165,18 @@ msgstr ""
 "Meno súboru pre štandardné pozadie bo�ného panelu. Používa sa iba ak je "
 "side_pane_background nastavené na true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Prie�inky nad túto veľkosť budú orezané. Cieľom tejto voľby je zabrániť "
+"zabitiu Nautilusu pri veľkých prie�inkoch. Záporná hodnota zruší obmedzenie. "
+"Obmedzenie je len približné, pretože prie�inky sa �ítajú po kusoch."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Skryť štandardné záložky v menu záložiek"
@@ -1243,9 +1186,10 @@ msgid "Home icon visible on desktop"
 msgstr "Ikona domovského prie�inku na ploche"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Ak je toto true, Nautilus bude zobrazovať v strome bo�ného panelu iba "
 "prie�inky. Inak zobrazí aj súbory."
@@ -1278,9 +1222,10 @@ msgstr ""
 "používané voľby súboru v dialógu pre nastavenie súborov."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Ak je toto nastavené na true, Nautilus zobrazí prie�inky pred súbormi v "
 "pohľade s ikonami a zoznamom."
@@ -1322,8 +1267,9 @@ msgstr ""
 "Ak je toto true, Nautilus zobrazí používateľove záložky iba v menu záložiek."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Ak je toto nastavené na true, Nautilus bude používať domovský prie�inok "
@@ -1340,9 +1286,10 @@ msgstr ""
 "kon�í ~."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Ak je toto nastavené na true, budú zobrazené skryté súbory. To sú bu� súbory "
 "za�ínajúce bodkou alebo sú uvedené v súbore .hidden prie�inku."
@@ -1363,8 +1310,9 @@ msgid ""
 msgstr "Ak je toto nastavené na true, na plochu sa umiestni ikona pre kôš."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Ak je toto nastavené na true, na plochu sa umiestni ikona s odkazom na "
@@ -1397,7 +1345,8 @@ msgstr ""
 "podľa veľkosti budú triedené zostupne."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Ak je toto nastavené na true, ikony budú v nových oknách viac zhustené k "
 "sebe."
@@ -1428,7 +1377,8 @@ msgid "List of possible captions on icons"
 msgstr "Zoznam možných titulkov ikony"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maximálny po�et súborov v prie�inku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1448,11 +1398,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus kreslí plochu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus používa domovský prie�inok ako plochu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Prie�inky zobraziť v strome bo�ného panelu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1472,7 +1424,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Opa�né triedenie v nových oknách"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Zobraziť najprv prie�inky"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1507,10 +1460,11 @@ msgstr ""
 "\"local_only\" prehrajú sa iba lokálne zvuky. \"never\" vypne náhľady zvukov."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1519,22 +1473,24 @@ msgstr ""
 "\"local_only\" zobrazia sa lokálne súbory. \"never\" vypne náhľady."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Kompromis pri náhľade obrázkov v ikone. Ak je nastavené na \"always\", "
 "náhľad sa zobrazí vždy, aj ke� je súbor na vzdialenom serveri. Ak je "
 "\"local_only\" zobrazia sa lokálne súbory. \"never\" vypne náhľady."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Kompromis pri zobrazení po�tu súborov v prie�inku. Ak je nastavené na "
@@ -1543,17 +1499,19 @@ msgstr ""
 "\"never\" vypne zobrazovanie po�tu položiek."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Štandardné triedenie pre položky v pohľade s ikonami. Možné hodnoty sú \"name"
 "\", \"size\", \"type\", \"modification_date\", \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Štandardné triedenie pre položky v zozname súborov. Možné hodnoty sú \"name"
 "\", \"size\", \"type\", \"modification_date\"."
@@ -1595,7 +1553,8 @@ msgid "Use manual layout in new windows"
 msgstr "Použiť ru�né rozloženie v nových oknách"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Použiť zhustené rozloženie v nových oknách"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1624,7 +1583,8 @@ msgstr ""
 "prie�inok nevybrali iný. Možné hodnoty sú \"list_view\" a \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Kedy zobraziť po�et položiek prie�inku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1636,7 +1596,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Kedy zobraziť náhľady obrázkov"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Či je nastavené vlastné štandardné pozadie prie�inkov."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1793,67 +1754,81 @@ msgstr "reset"
 msgid "on the desktop"
 msgstr "na ploche"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "NIe je možné odstrániť disk"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Nie je možné odstrániť ikonu disku. Ak chcete disk vysunúť, použite príkaz "
 "Vysunúť z kontextového menu disku."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "NIe je možné odstrániť disk"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Kôš"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Presunúť sem"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopírovať sem"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Odkaz sem"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Použiť ako _pozadie"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Použiť ako pozadie pre _všetky prie�inky"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Použiť ako pozadie pre _tento prie�inok"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Ľutujem, ale musíte zadať neprázdne kľú�ové slovo pre nový emblém."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Nie je možné nainštalovať emblém"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1864,18 +1839,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Ľutujem, ale \"%s\" je už existujúci emblém. Prosím, vyberte iné meno."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Nie je možné nainštalovať emblém"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Ľutujem, ale nie je možné uložiť emblém."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Ľutujem, ale nie je možné uložiť meno emblému."
 
@@ -1894,22 +1875,28 @@ msgstr "Z:"
 msgid "To:"
 msgstr "Do:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Chyba pri presune."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Chyba pri presune.\n"
 "\n"
 "\"%s\" nie je možné presunúť, pretože je na disku len pre �ítanie."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Chyba pri odstraňovaní."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1918,22 +1905,17 @@ msgstr ""
 "\"%s\" nie je možné odstrániť, pretože nemáte právo meniť jeho rodi�ovský "
 "prie�inok."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Chyba pri odstraňovaní.\n"
 "\n"
 "\"%s\" nie je možné odstrániť, pretože je na disku len na �ítanie."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1942,12 +1924,15 @@ msgstr ""
 "\"%s\" nie je možné presunúť, pretože nemáte právo meniť jeho rodi�ovský "
 "prie�inok."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Chyba pri presune."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Chyba pri presune.\n"
@@ -1955,12 +1940,10 @@ msgstr ""
 "\"%s\" nie je možné presunúť, pretože je on alebo jeho rodi�ovský prie�inok "
 "už je obsiahnutý v cieli."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Chyba pri presune.\n"
@@ -1968,295 +1951,244 @@ msgstr ""
 "\"%s\" nie je možné presunúť do koša, pretože nemáte právo ho zmeniť alebo "
 "zmeniť jeho rodi�ovský prie�inok."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Chyba pri kopírovaní."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Chyba pri kopírovaní.\n"
 "\n"
 "\"%s\" nie je možné skopírovať, pretože nemáte právo ho �ítať."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Chyba pri kopírovaní do \"%s\".\n"
-"\n"
-"V cieli nie je dosť miesta."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Chyba pri kopírovaní."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Chyba pri presune do \"%s\".\n"
 "\n"
 "V cieli nie je dosť miesta."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Chyba pri vytváraní odkazu v \"%s\".\n"
-"\n"
-"V cieli nie je dosť miesta."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Chyba pri presune."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Chyba pri vytváraní odkazu."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Chyba pri kopírovaní do \"%s\".\n"
 "\n"
 "Nemáte právo zápisu do tohto prie�inku."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Chyba pri kopírovaní do \"%s\".\n"
 "\n"
 "Cieľový disk je len na �ítanie."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Chyba pri presune položiek do \"%s\".\n"
-"\n"
-"Nemáte právo zápisu do tohto prie�inku."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Chyba pri presune položiek do \"%s\".\n"
-"\n"
-"Cieľový disk je len na �ítanie."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Chyba pri vytváraní odkazov v \"%s\".\n"
-"\n"
-"Nemáte právo zápisu do tohto prie�inku."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Chyba pri presune."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Chyba pri vytváraní odkazov v \"%s\".\n"
-"\n"
-"Cieľový disk je len na �ítanie."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri kopírovaní \"%s\".\n"
-"\n"
-"Chcete pokra�ovať?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Chyba pri vytváraní odkazu."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Chyba pri kopírovaní."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Chyba \"%s\" pri presune \"%s\".\n"
+"Chyba \"%s\" pri presune.\n"
 "\n"
 "Chcete pokra�ovať?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri vytváraní odkazu na \"%s\".\n"
-"\n"
-"Chcete pokra�ovať?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Chyba pri presune."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Chyba \"%s\" pri odstraňovaní \"%s\".\n"
+"Chyba \"%s\" pri vytváraní odkazu na \"%s\".\n"
 "\n"
 "Chcete pokra�ovať?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri kopírovaní.\n"
-"\n"
-"Chcete pokra�ovať?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Chyba pri odstraňovaní."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri presune.\n"
-"\n"
-"Chcete pokra�ovať?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Chyba pri kopírovaní."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri vytváraní odkazu.\n"
-"\n"
-"Chcete pokra�ovať?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Chyba pri presune."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Chyba \"%s\" pri odstraňovaní.\n"
-"\n"
-"Chcete pokra�ovať?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Chyba pri vytváraní odkazu."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Chyba pri odstraňovaní."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Chyba pri kopírovaní."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Chyba pri presune."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Chyba pri vytváraní odkazu."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Chyba pri odstraňovaní."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Presko�iť"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Znovu"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nepodarilo sa dokon�iť zadanú akciu."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Nie je možné presunúť \"%s\", pretože toto meno už je použité pre špeciálnu "
 "položku, ktorá nesmie byť odstránená ani nahradená.\n"
 "\n"
 "Ak chcete \"%s\" aj tak presunúť, premenujte ho a skúste to znovu."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nepodarilo sa dokon�iť zadanú akciu."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "Nie je možné skopírovať \"%s\", pretože toto meno už je použité pre "
 "špeciálnu položku, ktorá nesmie byť odstránená ani nahradená.\n"
 "\n"
 "Ak chcete \"%s\" aj tak skopírovať, premenujte ho a skúste to znovu."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Nepodarilo sa nahradiť súbor."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Súbor \"%s\" už existuje.\n"
 "\n"
 "Chcete ho nahradiť?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt pri kopírovaní"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Nahradiť"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Nahradiť všetky"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "�alší odkaz na %s"
@@ -2265,25 +2197,25 @@ msgstr "�alší odkaz na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. odkaz na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. odkaz na %s"
@@ -2293,561 +2225,600 @@ msgstr "%d. odkaz na %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kópia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (�alšia kópia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kópia)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kópia)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kópia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (�alšia kópia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kópia)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neznámy GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Presúvam súbory do koša"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Vyhodených súborov:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Presúvam"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Pripravujem presun do koša..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Presúvam súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Presunuté súbory:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Pripravujem presun..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Dokon�ujem presun..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Vytváram odkazy na súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Vytvorených odkazov:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Vytváram odkaz"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Pripravujem vytvorenie odkazov..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Dokon�ujem vytvorenie odkazov..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopírujem súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Skopírovaných súborov:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopírujem"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Pripravujem kopírovanie..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Nie je možné kopírovať položky do koša."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Nie je možné kopírovať do koša"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Toto nie je možné presunúť do prie�inku s košom."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Nemôžete kopírovať tento prie�inok s košom."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Nie je možné zmeniť umiestnenie koša"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Nie je možné kopírovať kôš"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Nie je možné presunúť prie�inok do seba samého."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Nie je možné kopírovať prie�inok do seba samého."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Vytvorí nový prázdny prie�inok v tomto prie�inku"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Nie je možný presun"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Nie je možné kopírovať do seba samého"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Nie je možné kopírovať súbor do seba samého."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Nie je možné kopírovať do seba samého"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Chyba pri vytváraní nového prie�inku.\n"
 "\n"
 "Nemáte práva na zápis."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Chyba pri vytváraní nového prie�inku.\n"
 "\n"
 "Nedostatok miesta."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Chyba \"%s\" pri vytváraní nového prie�inku."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Chyba pri vytváraní nového prie�inku"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Chyba pri vytváraní nového prie�inku"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "prie�inok bez mena"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Chyba \"%s\" pri vytváraní nového prie�inku."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Chyba pri vytváraní nového prie�inku"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Chyba pri vytváraní nového prie�inku"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 súbor"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Odstraňujem súbory"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Odstránených súborov:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Odstraňujem"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Pripravujem odstránenie súborov..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Vyprázdňujem kôš"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Pripravujem vyprázdnenie koša..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Naozaj chcete navždy odstrániť všetky položky v koši?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Prázdne"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "bla"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "bla (kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".bla.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".bla (kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "bla bla"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "bla bla (kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "bla.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "bla (kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "bla bla.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "bla bla (kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "bla bla.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "bla bla (kópia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "bla...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "bla.. (kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "bla..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "bla...(kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "bla. (kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "bla. (�alšia kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "bla (�alšia kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "bla (�alšia kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "bla (3. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "bla (3. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "bla bla (�alšia kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "bla bla (3. kópia).txt3."
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "bla (13. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "bla (14. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "bla (13. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "bla (14. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "bla (21. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "bla (22. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "bla (21. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "bla (22. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "bla (23. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "bla (23. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "bla (24. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "bla (24. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "bla (25. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "bla (25. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "bla bla (24. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "bla bla (25. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "bla bla (24. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "bla bla (25. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "bla bla (100000000000000. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "bla (10. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "bla (11. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "bla (10. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "bla (11. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "bla (12. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "bla (12. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "bla (110. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "bla (111. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "bla (110. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "bla (111. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "bla (122. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "bla (123. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "bla (122. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "bla (123. kópia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "bla (124. kópia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "bla (124. kópia).txt"
 
@@ -2866,64 +2837,64 @@ msgstr "bla (124. kópia).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "dnes o 0:0:0"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "dnes o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "dnes o 0:0"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "dnes o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "dnes o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "dnes o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "dnes"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "v�era o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "v�era o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "v�era o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "v�era o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "v�era o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "v�era o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "v�era"
 
@@ -2932,133 +2903,133 @@ msgstr "v�era"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Streda, 00. septembra 0000 o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d.%-m.%y o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pod, 00. Okt 0000 o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d.%-m.%y o %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pon, 00. Okt 0000 o 12:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %b %-d %Y o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00. Okt 0000 o 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y o %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00. Okt 0000, 12:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 12:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 položiek"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 prie�inkov"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 súborov"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 položka"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 prie�inok"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 súbor"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u položiek"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u prie�inkov"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u súborov"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? položiek"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bajtov"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "neznámy typ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "neznámy typ MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "neznámy"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3068,7 +3039,7 @@ msgstr ""
 "súbor gnome-vfs.keys nie je na správnom mieste alebo z nejakého iného dôvodu "
 "sa nedá nájsť."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3077,11 +3048,11 @@ msgstr ""
 "Pre typ MIME \"%s\" (súbor je \"%s\") nebol nájdený žiadny popis. Oznámte to "
 "v konferencii gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "odkaz"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "odkaz (neplatný)"
 
@@ -3202,11 +3173,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Hľadať súbory podľa obsahu a vlastností"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Pohľad ikony"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Pohľad zoznam"
@@ -3352,148 +3325,153 @@ msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Naopak"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikona súboru"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "upraviteľný text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "upraviteľný popis"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "prídavný text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "�alší text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "zvýrazenené pre výber"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "�o sa má zvýrazňovať pre výber"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "zvýraznené ako fokus klávesnice"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "�i sme zvýraznení pre fokus klávesnice"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "zvýraznené pre pustenie"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "�i sme zvýraznení pre pustenie pomocou myši"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Obdĺžnik výberu"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Rám okolo textu"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Kresliť rám okolo neozna�eného textu"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Farba pre zoznam výberu"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Farba pre zoznam výberu"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa pre zoznam výberu"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Priesvitnosť pre zoznam výberu"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alfa pre zvýraznenie"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Priesvitnosť zvýraznenia pre ozna�ené ikony"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Svetlá farba informácií"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Farba používaná pre zobrazenie informácií pre tmavé pozadie"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tmavá farba informácií"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Farba používaná pre zobrazenie informácií pre svetlé pozadie"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Tento prie�inok používa automatické rozmiestnenie. Chcete prepnúť do ru�ného "
 "rozmiestnenia a nechať pustenú položku tam, kam ste ju umiestnili? To "
 "rozhádže ru�né rozmiestnenie."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Tento prie�inok používa automatické rozmiestnenie. Chcete prepnúť do ru�ného "
 "rozmiestnenia a nechať pustené položky tam, kam ste ich umiestnili? To "
 "rozhádže ru�né rozmiestnenie."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Tento prie�inok používa automatické rozmiestnenie. Chcete prepnúť do ru�ného "
 "rozmiestnenia a nechať túto položku tam, kam ste ju umiestnili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Tento prie�inok používa automatické rozmiestnenie. Chcete prepnúť do ru�ného "
 "rozmiestnenia a nechať tieto položky tam, kam ste ich umiestnili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Prepnúť do ru�ného rozmiestnenia?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Prepnúť"
 
@@ -3602,72 +3580,72 @@ msgstr "Je štandardné pre položky \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Je štandardné pre všetky položky \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Zmeniť \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Vložiť do menu pre položky \"%s\"."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Použiť ako štandard pre položky \"%s\"."
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Vložiť do menu pre položky \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Použiť ako štandard iba pre \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Nevložiť do menu pre položky \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Meno"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stav"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Vybrať"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Hotovo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Upraviť..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Typy súborov a programy"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Zobraziť"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3675,48 +3653,48 @@ msgstr ""
 "V dialógu pre typy súborov môžete nastaviť, ktoré programy sú k dispozícii "
 "pre jednotlivé typy súborov."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Otvoriť inou aplikáciou"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Vyberte aplikáciu, ktorou chcete otvoriť \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Otvoriť iným prehliada�om"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Vyberte pohľad pre \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Pre \"%s\" nie je k dispozícii žiadny pohľad."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Prehliada�e nie sú k dispozícii"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "S \"%s\" nie je asociovaná žiadna aplikácia."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Žiadne aplikácie nie sú asociované"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "S \"%s\" nie je asociovaná žiadna akciaaplikácia."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Žiadne asociovaná akcia"
 
@@ -3724,11 +3702,9 @@ msgstr "Žiadne asociovaná akcia"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3737,42 +3713,41 @@ msgstr ""
 "V GNOME môžete asociovať aplikácie s typmi súborov. Chcete vytvoriť "
 "asociáciu aplikácie s týmto typom súborov?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Asociovať aplikáciu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Prehliada� asociovaný s \"%s\" je neplatný."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Neplatný asociovaný prehliada�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplikácia asociovaná s \"%s\" je neplatná."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Neplatná asociovaná aplikácia"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Akcia asociovaná s \"%s\" je neplatná."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Neplatná asociovaná akcia"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3782,93 +3757,134 @@ msgstr ""
 "V GNOME môžete asociovať rôzne aplikácie a prehliada�e s typmi súborov. "
 "Chcete vytvoriť asociáciu aplikácie alebo prehliada�a s týmto typom súborov?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Asociovať akciu"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" nemohol otvoriť \"%s\", pretože \"%s\" nemohol použiť súbory v \"%s"
+"\".  Chcete vybrať inú aplikáciu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nemohol otvoriť \"%s\", pretože \"%s\" nemohol použiť súbory v \"%s"
 "\".  Chcete vybrať inú aplikáciu?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Štandardná akcia nedokáže otvoriť \"%s\", pretože nie je možné použiť súbory "
 "v \"%s\".  Chcete vybrať inú akciu?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Nie je možné zobraziť miesto"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nemohol otvoriť \"%s\", pretože \"%s\" nemohol použiť súbory v \"%s"
+"\".  Chcete vybrať inú aplikáciu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nemohol otvoriť \"%s\", pretože \"%s\" nemohol použiť súbory v \"%s"
 "\".  Žiadna iná aplikácie pre tento typ súborov nie je k dispozícii. Ak "
 "skopírujete tento súbor na váš po�íta�, bude možné ho otvoriť."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Štandardná akcia nedokáže otvoriť \"%s\", pretože nie je možné použiť súbory "
-"v \"%s\".  Žiadne iné akcie pre tento typ súborov nie je k dispozícii. Ak "
+"v \"%s\".  Chcete vybrať inú akciu?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" nemohol otvoriť \"%s\", pretože \"%s\" nemohol použiť súbory v \"%s"
+"\".  Žiadna iná aplikácie pre tento typ súborov nie je k dispozícii. Ak "
 "skopírujete tento súbor na váš po�íta�, bude možné ho otvoriť."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Otváram %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Ľutujem, ale nie je možné vykonávať príkazy zo vzdialených po�íta�ov kvôli "
 "bezpe�nosti."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Nie je možné vykonať vzdialené odkazy"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Pri spúšťaní aplikácie nastala chyba.\n"
 "\n"
 "Detaily:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Chyba pri spúšťaní aplikácie"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "\"Ťahaj a pusť\" je podporované iba pre lokálne súbory."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Tento cieľ podporuje iba lokálne súbory.\n"
@@ -3876,15 +3892,15 @@ msgstr ""
 "Aby ste mohli otvoriť aj vzdialené súbory, musíte ich najprv skopírovať do "
 "lokálneho prie�inka a odtiaľ ich ťahať znovu."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "\"Ťahaj a pusť\" je podporované iba pre lokálne súbory."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4140,14 +4156,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Položky obsahujúce \"medusa\" v svojich menách a sú prie�inky"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Prehľadávam disky"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus hľadá na disku prie�inky s košom."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Upraviť"
@@ -4347,96 +4355,106 @@ msgstr "Pozadie"
 msgid "Empty Trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Toto otvorí %d samostatných okien. Naozaj to chcete urobiť?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Otvoriť %d okien?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Naozaj chcete úplne odstrániť \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Toto otvorí %d samostatných okien. Naozaj to chcete urobiť?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Naozaj chcete úplne odstrániť \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Naozaj chcete úplne odstrániť %d vybraných položiek?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Odstrániť úplne všetky vybrané položky"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Odstrániť?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Vyberte kategóriu:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Vzorky"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" vybraných"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "vybraný 1 prie�inok"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "vybraných %d prie�inkov"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (obsahujú 0 položiek)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (obsahujú 1 položku)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (obsahujú %d položiek)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (obsahujú celkom 0 položiek)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (obsahujúci celkom 1 položku)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (obsahujúci celkom %d položiek)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" vybraných (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d vybraných položiek (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 iná vybraná položka (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d iných vybraných položiek (%s)"
@@ -4448,7 +4466,7 @@ msgstr "%d iných vybraných položiek (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4457,115 +4475,130 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Prie�inok \"%s\" obsahuje viac súborov, než dokáže Nautilus spracovať. "
 "Niektoré súbory nebudú zobrazené."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Príliš veľa súborov"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "Nie je možné presunúť \"%s\" do koša. Chcete ho odstrániť úplne?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d vybraných položiek nie je možné presunúť do koša. Chcete ich odstrániť "
-"úplne?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Nie je možné presunúť \"%s\" do koša. Chcete ho odstrániť úplne?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d z vybraných položiek nie je možné presunúť do koša. Chcete týchto %d "
-"položiek odstrániť úplne?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "Nie je možné presunúť \"%s\" do koša. Chcete ho odstrániť úplne?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Odstrániť okamžite?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Naozaj chcete úplne odstrániť \"%s\" z koša?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "Naozaj chcete úplne odstrániť %d vybraných položiek z koša?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Odstrániť z koša?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Použiť \"%s\" pre otvorenie vybranej položky"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Iná _aplikácia..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Aplikácia..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Iný program pre _zobrazenie..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "_Prehliada�..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nepodarilo sa dokon�iť zadanú akciu: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nepodarilo sa dokon�iť zadanú akciu."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Spustiť \"%s\" na všetky vybrané položky"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Všetky spustiteľné súbory v tomto prie�inku sa objavia v menu Skripty. "
+"Vybraním skriptu z menu ho spustíte s vybranými položkami ako vstupom."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "Všetky spustiteľné súbory v tomto prie�inku sa objavia v menu Skripty. "
 "Vybraním skriptu z menu ho spustíte s vybranými položkami ako vstupom."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "O skriptoch"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4605,185 +4638,192 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: pozícia a veľkosť aktuálneho okna"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" bude presunutý, ak použijete príkaz Vložiť súbory"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" bude skopírovaný, ak použijete príkaz Vložiť súbory"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "%d vybraných položiek bude presunutých, ak použijete príkaz Vložiť súbory"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d vybraných položiek bude skopírovaných, ak použijete príkaz Vložiť súbory"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "V schránke nie je ni� na vloženie."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Chyba pripojenia"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Chyba odpojenia"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Chyba pripojenia"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Vy_sunúť"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Odpojiť disk"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Otvoriť _v %d nových oknách"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Domovský prie�inok"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Domovský prie�inok"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Odstrániť z _koša"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Odstrániť úplne všetky vybrané položky"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Presunúť do _koša"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Presunie každú vybranú položku do koša"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Odstrániť"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Vytvoriť _odkazy"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Vytvoriť odkaz"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Vyprázdniť kôš"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Vystri_hnúť súbor"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Vystri_hnúť súbory"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopírovať súbor"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopírovať súbory"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Tento odkaz nie je možné použiť, pretože nemá cieľ. Chcete tento odkaz hodiť "
 "do koša?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Tento odkaz nie je možné použiť, pretože nemá cieľ. Chcete tento odkaz hodiť "
+"do koša?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Tento odkaz nie je možné použiť, pretože jeho cieľ \"%s\" neexistuje. Chcete "
 "tento odkaz hodiť do koša?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Neplatný odkaz"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" je spustiteľný textový súbor. Chcete ho spustiť alebo zobraziť jeho "
 "obsah?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Spustiť alebo zobraziť?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Zobraziť"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Spustiť v _termináli"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Zobraziť"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Spustiť"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Otváram \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Zrušiť otvorenie?"
 
@@ -4804,27 +4844,32 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Ľutujem, nie je možné zobraziť celý obsah \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Práva pre \"%s\" nie je možné ur�iť."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Chyba pri zobrazovaní prie�inku"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 "Meno \"%s\" už je v tomto prie�inku použité. Prosím, vyberte iné meno."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "V prie�inku nie je \"%s\". Možno bol práve presunutý alebo odstránený."
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nemáte práva nutné pre premenovanie \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4833,66 +4878,81 @@ msgstr ""
 "Meno \"%s\" nie je platné, pretože obsahuje znak \"/\". Prosím, použite iné "
 "meno."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Meno \"%s\" nie je platné. Prosím, vyberte iné meno."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "Nie je možné zmeniť meno  \"%s\", pretože je na disku pripojenom len pre "
 "�ítanie."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Ľutujem, nie je možné premenovať  \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Práva pre \"%s\" nie je možné ur�iť."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Chyba pri premenovaní"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nemáte práva nutné pre zmenu skupiny pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nie je možné zmeniť skupinu pre \"%s\", pretože je na disku pripojenom iba "
 "pre �ítanie."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Ľutujem, nie je možné zmeniť skupinu pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Práva pre \"%s\" nie je možné ur�iť."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Chyba pri nastavovaní skupiny"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nie je možné zmeniť vlastníka pre \"%s\", pretože je na disku pripojenom iba "
 "pre �ítanie."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Ľutujem, nie je možné zmeniť vlastníka pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Práva pre \"%s\" nie je možné ur�iť."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Chyba pri nastavovaní vlastníka"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4900,21 +4960,26 @@ msgstr ""
 "Nie je možné zmeniť práva pre \"%s\", pretože je na disku pripojenom iba pre "
 "�ítanie."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Ľutujem, nie je možné zmeniť práva pre \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Práva pre \"%s\" nie je možné ur�iť."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Chyba pri nastavovaní práv"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Premenovávam \"%s\" na \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Zrušiť premenovanie?"
 
@@ -4972,128 +5037,150 @@ msgstr "Obnoviť pôvodné _veľkosti ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Obnoviť pôvodnú veľkosť ikony"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ukazujúci na \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "\"Ťahaj a pusť\" je podporované iba na lokálnych systémoch súborov."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "\"Ťahaj a pusť\" je podporované iba na lokálnych systémoch súborov."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Chyba \"ťahaj a pusť\""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Použitý neplatný typ ťahania."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Meno súboru"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Veľkosť"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Dátum zmeny"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Nie je možné priradiť viac ako jednu vlastnú ikonu! Prosím, pritiahnite a "
 "pusťte iba jeden obrázok pre nastavenie vlastnej ikony."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Nie je možné priradiť viac ako jednu vlastnú ikonu! Prosím, pritiahnite a "
+"pusťte iba jeden obrázok pre nastavenie vlastnej ikony."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Viac ako jeden obrázok"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Súbor, ktorý ste pustili, nie je lokálny. Ako vlastné ikony môžete použiť "
 "iba lokálne obrázky."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Súbor, ktorý ste pustili, nie je lokálny. Ako vlastné ikony môžete použiť "
+"iba lokálne obrázky."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Len lokálne obrázky"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Súbor, ktorý ste pustili, nie je obrázok. Ako vlastné ikony môžete použiť "
+"Súbor, ktorý ste pustili, nie je lokálny. Ako vlastné ikony môžete použiť "
 "iba lokálne obrázky."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Len obrázky"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Vlastnosti %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Zrušiť zmenu skupiny?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Mením skupinu"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Zrušiť zmenu vlastníka?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Mením vlastníka"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ni�"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ne�itateľné"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 položka s veľkosťou %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d položiek, celkom %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(niektorý obsah ne�itateľný)"
 
@@ -5103,191 +5190,191 @@ msgstr "(niektorý obsah ne�itateľný)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Obsah:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Základné"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Mená:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Disk:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Voľné miesto:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Cieľ odkazu:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Zmenený:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Použitý:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Vybrať vlastnú ikonu..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Odstrániť vlastnú ikonu"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "Čít_anie"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Zápis"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Spustenie"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Set _User ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Š_peciálne príznaky:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Set G_oup ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "S_ticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Práva"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nie ste vlastník, takže nemôžete meniť tieto práva."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Vlastník súboru:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Vlastník súboru:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Skupina súboru:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Skupina súboru:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Skupina:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Ostatní:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Textový pohľad:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Číselný pohľad:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Posledná zmena:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Práva pre \"%s\" nie je možné ur�iť."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Práva pre vybraný súbor nie je možné ur�iť."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Pri zobrazení Pomocníka nastala chyba:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Pri zobrazení Pomocníka nastala chyba: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Nie je možné zobraziť pomocníka"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Zrušiť zobrazovanie okna s vlastnosťami?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Vytváram okno Vlastnosti"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Vyberte ikonu"
 
@@ -5305,70 +5392,108 @@ msgid "Search Results"
 msgstr "Výsledky hľadania"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Ľutujem, ale vyhľadávacia služba Medusa nie je k dispozícii, pretože nie je "
-"nainštalovaná."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Ľutujem, ale vyhľadávacia služby medusa nie je k dispozícii."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Vyhľadávacia služba nie je k dispozícii"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Vybrali ste hľadanie, ktoré hľadá novšie položky, ako je váš index. Hľadanie "
 "momentálne ni� nevráti. Nový index môžete vytvoriť spustením príkazu "
 "\"medusa-indexd\" ako root."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Hľadanie nemohlo otvoriť index vášho systému súborov. Bu� chýba, alebo je "
+"poškodený. Nový index môžete vytvoriť spustením príkazu \"medusa-indexd\" "
+"ako root."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Hľadanie položiek, ktoré sú príliš nové"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Každý indexovaný súbor na vašom systéme odpovedá vašemu kritériu. Overte "
+"zadanie alebo pridajte �alšie kritéria pre zúženie výsledkov."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Každý indexovaný súbor na vašom systéme odpovedá vašemu kritériu. Overte "
 "zadanie alebo pridajte �alšie kritéria pre zúženie výsledkov."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Chyba pri hľadaní"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Hľadanie nemohlo otvoriť index vášho systému súborov. Bu� chýba, alebo je "
 "poškodený. Nový index môžete vytvoriť spustením príkazu \"medusa-indexd\" "
 "ako root."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Chyba pri �ítaní indexu súborov"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Nastala chyba pri na�ítavaní výsledku hľadania: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
+"tento index nie je dostupný."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
+"tento index nie je dostupný."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5376,25 +5501,23 @@ msgstr ""
 "tento index nie je dostupný a preto sa bude hľadať pomalšie bez použitia "
 "indexu."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
-"tento index nie je dostupný."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Rýchle hľadanie nie je k dispozícii"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Hľadanie obsahu nie je k dispozícii"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5408,55 +5531,87 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Pre rýchle hľadanie je treba index súborov na vašom systéme.  Váš po�íta� "
 "tento index práve vytvára. Pretože nie je index možné používať, hľadanie "
 "môže trvať niekoľko minút."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Pre hľadanie obsahu je treba index súborov na vašom systéme.  Váš po�íta� "
 "tento index práve vytvára. Hľadanie obsahuje bude k dispozícii po dokon�ení "
 "indexu."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Hľadanie pomocou indexov nie je k dispozícii"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
+"tento index nie je dostupný."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
+"tento index nie je dostupný."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Pre rýchle hľadanie je treba index súborov na vašom systéme, ale ten nie je "
 "k dispozícii. Vytvoríte ho spustením príkazu \"medusa-indexd\" ako root. Kým "
 "bude index vytvorený, hľadanie môže trvať niekoľko minút."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Pre hľadanie obsahu je treba index súborov na vašom systéme.  Momentálne "
 "takýto index nie je na vašom po�íta�i k dispozícii. Vytvoriť ho môžete "
 "spustením príkazu \"medusa-indexd\" ako root. Kým nebude index k dispozícii, "
 "nebude možné hľadať podľa obsahu."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Rýchle hľadanie nie je povolené na vašom po�íta�i"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5465,11 +5620,12 @@ msgstr ""
 "Pre rýchle hľadanie je treba index súborov na vašom systéme. Administrátor "
 "vášho systému vypol indexáciu, takže momentálne nemáte index k dispozícii."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Rýchle hľadanie nie je povolené na vašom po�íta�i"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Rýchle hľadanie nie je k dispozícii"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Umiestnenie"
 
@@ -5478,7 +5634,7 @@ msgstr "Umiestnenie"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Zobraziť v novom okne"
@@ -5489,7 +5645,7 @@ msgstr "_Zobraziť v novom okne"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Zobraziť v %d _nových oknách"
@@ -5498,15 +5654,21 @@ msgstr "Zobraziť v %d _nových oknách"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus našiel viac položiek, ako je schopný zobraziť. Niektoré položky "
+"nebudú zobrazené."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus našiel viac položiek, ako je schopný zobraziť. Niektoré položky "
 "nebudú zobrazené."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Príliš veľa odpovedajúcich"
 
@@ -5520,12 +5682,12 @@ msgid "Create L_auncher"
 msgstr "Vytvoriť _spúšťa�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Vytvoriť nový spúšťa�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Odstráni všetky položky v koši"
 
@@ -5544,7 +5706,7 @@ msgstr "Zobrazí okno,ktoré umožní nastaviť vzorku alebo farbu pozadia ploch
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Použiť š_tandardné pozadie"
@@ -5566,58 +5728,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Vyberte iný program, ktorým chcete zobraziť vybranú položku"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Vytvoriť _prie�inok"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Vytvoriť _prie�inok"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Vytvorí nový prázdny prie�inok v tomto prie�inku"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Vytvorí nový prázdny prie�inok v tomto prie�inku"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Vytvorí symbolický odkaz pre každú vybranú položku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Duplikovať"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Odstráni každú vybranú položku bez presunu do koša"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Vytvorí kópiu každej vybranej položky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Upraviť spúšťa�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Upraviť informácie o spúšťa�i"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formátovať vybraný disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Vlastnosti _média"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Odpojiť vybraný disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Presunie alebo skopíruje súbory vybrané predcházajúcim príkazom Vystrihnúť "
 "súbory alebo Kopírovať súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5625,129 +5797,138 @@ msgstr ""
 "Presunie alebo skopíruje súbory vybrané predcházajúcim príkazom Vystrihnúť "
 "súbory alebo Kopírovať súbory do vybrané prie�inku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Otvoriť _pomocou"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Otvorí každú vybranú položku v novom okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Otvoriť v _novom okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otvorí vybranú položku v tomto okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Pripraviť vybrané súbory pre kopírovanie príkazom Vložiť súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Pripraviť vybrané súbory pre presun príkazom Vložiť súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Ochrániť"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Ochrániť vybraný disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Premenovať vybranú položku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Š_tandard pohľadu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Návrat k triedeniu a úrovni lupy odpovedajúcim nastaveniu tohto pohľadu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Spustí alebo upravuje skripty z ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Vybrať vše_tky súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Vzorky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Vyberie všetky položky v tomto okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Vyberie všetky položky v tomto okne"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Zobrazí vlastnosti pre vybraný disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Ukáže prie�inok obsahujúci skripty, ktoré sú v tomto menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Odpojiť vybraný disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Použiť štandardné pozadie pre toto umiestnenie"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Zobrazí alebo upraví vlastnosti každej vybranej položky"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopírovať súbor"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formát"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Odpojiť disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Otvoriť prie�inok skriptov"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "V_ložiť súbory"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "V_ložiť súbory do prie�inku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skripty"
 
@@ -5833,32 +6014,40 @@ msgstr "_Ru�ne"
 msgid "Indexing is %d%% complete."
 msgstr "Indexácia je hotová z %d%%"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Vaše súbory naposledy indexované %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 "Raz za deň sú vaše súbory a ich obsah indexované, takže hľadanie je rýchle. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Stav indexácie"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Vaše súbory naposledy indexované %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Raz za deň sú vaše súbory a ich obsah indexované, takže hľadanie je rýchle. "
-"Momentálne prebieha indexácia vašich súborov."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Pre vaše súbory momentálne neexistuje index."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5868,15 +6057,19 @@ msgstr ""
 "hľadanie. Rýchle hľadanie na vašom po�íta�i nie je zapnuté, takže momentálne "
 "nemáte k dispozícii index."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Pre vaše súbory momentálne neexistuje index."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Ľutujem, ale vyhľadávacia služby medusa nie je k dispozícii."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5900,32 +6093,37 @@ msgstr "Ukázať stav _indexovania"
 msgid "Show status of indexing used when searching"
 msgstr "Pri hľadaní ukazovať stav použitého indexovania"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nie je možné vytvoriť požadovaný prie�inok"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nie je možné vytvoriť požadované prie�inky"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus nemohol vytvoriť požadovaný prie�inok \"%s\". Pred spustením "
 "Nautilusu vytvorte tento prie�inok, alebo nastavte práva tak, aby ho "
 "Nautilus mohol vytvoriť."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nie je možné vytvoriť požadované prie�inky"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5936,22 +6134,27 @@ msgstr ""
 "Pred spustením Nautilusu vytvorte tento prie�inok, alebo nastavte práva tak, "
 "aby ho Nautilus mohol vytvoriť."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Odkaz na starú plochu"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Umiestnenie prie�inku plochy sa v GNOME 2.4 zmenilo. Na ploche sa vytvorí "
 "odkaz \"Odkaz na starú plochu\". Tímto odkazom môžete zobraziť starú plochu "
 "a presunúť súbory. Potom odkaz odstráňte."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Prevedená stará plocha"
 
 #. Can't register myself due to trouble locating the
@@ -5964,7 +6167,7 @@ msgstr "Prevedená stará plocha"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5975,7 +6178,7 @@ msgstr ""
 "inštaláciu Nautilusu."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6020,12 +6223,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus nie je momentálne možné používať kvôli neo�akávanej chybe."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6033,7 +6236,7 @@ msgstr ""
 "Nautilus nie je momentálne možné používať kvôli neo�akávanej chybe od Bonobo "
 "pri pokuse zaregistrovať server pre pohľady správcu súborov."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6043,7 +6246,7 @@ msgstr ""
 "pri pokuse nájsť vytváracie rozhranie. Zabitím bonobo-activation-server a "
 "reštartom Nautilus by mohlo pomôcť problém vyriešiť."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6053,6 +6256,17 @@ msgstr ""
 "pri pokuse nájsť objekt shellu. Zabitím bonobo-activation-server a reštartom "
 "Nautilus by mohlo pomôcť problém vyriešiť."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Pri zobrazení Pomocníka nastala chyba:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nedefinované žiadne záložky"
@@ -6086,35 +6300,46 @@ msgstr "Menej možností"
 msgid "Find Them!"
 msgstr "Nájsť ich!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Nie je možný presun"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Ľutujem, ale \"%s\" nie je platné meno súboru."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" nie je platné miesto. Prosím, overte zadaný text a skúste to znovu."
+"Nie je možné nájsť \"%s\". Prosím, overte zadaný text a skúste to znovu."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Sieťové servery"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Meno:"
+msgid "_Location:"
+msgstr "Umiestnenie:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Pripojiť"
@@ -6316,6 +6541,20 @@ msgstr ""
 "Môžete ru�ne odstrániť tento súbor a tak znovu umožniť spustenie\n"
 "sprievodcu.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Nie je možné priradiť viac ako jednu vlastnú ikonu! Prosím, pritiahnite a "
+"pusťte iba jeden obrázok pre nastavenie vlastnej ikony."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Súbor, ktorý ste pustili, nie je lokálny. Ako vlastné ikony môžete použiť "
+"iba lokálne obrázky."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6326,26 +6565,25 @@ msgstr "Otvoriť s %s"
 msgid "Open with..."
 msgstr "Otvoriť s..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Nepodarilo sa spustiť aplikáciu pre vytváranie CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Nepodarilo sa spustiť vytváranie CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Vyprázdniť _kôš"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Zapísať obsah na CD"
 
@@ -6353,117 +6591,130 @@ msgstr "_Zapísať obsah na CD"
 msgid "Go To:"
 msgstr "Prejsť na:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Chcete zobraziť týchto %d miest v samostatných oknách?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Zobraziť vo viacerých oknách?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Nie je možné zobraziť miesto"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Vykonať rýchlu sadu testov."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Vytvoriť po�iato�né okno s danou geometriou."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Vytvárať okná Nautilus len pre explicitne zadané URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Nespravovať plochu (ignorovať nastavenie z dialógu)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Ukon�iť Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Reštartovať Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Správa súborov"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nie je možné použiť s URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nie je možné použiť s inými možnosťami.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nie je možné použiť s URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nie je možné použiť s URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nie je možné použiť s viac ako jedným URI.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Naozaj chcete úplne odstrániť \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Naozaj chcete zabudnúť históriu? Ak áno, budete ju musieť nabudúce ru�ne "
 "obnoviť."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Naozaj chcete vy�istiť zoznam miest, ktoré ste navštívili?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Vy�istiť históriu"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Umiestnenie \"%s\" neexistuje. Naozaj chcete odstrániť záložky s týmto "
 "miestom z vášho zoznamu?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Miesto \"%s\" už neexistuje."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Záložka pre neexistujúce miesto"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Odstrániť"
 
@@ -6496,7 +6747,6 @@ msgid "Close _All Windows"
 msgstr "Zavrieť _všetky okná"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Zatvorí všetky okná programu Nautilus"
@@ -6519,107 +6769,118 @@ msgid "Forward"
 msgstr "Dopredu"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Prejsť do prie�inku koša"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Prejsť na nasledujúce navštívené miesto"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Prejsť na predchádzajúce navštívené miesto"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Prejsť do prie�inku koša"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Domov"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Pruh _umiestnenia"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Obnoviť"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Hľadať súbory na tomto po�íta�i"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Stavový riadok"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stop"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Hore"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Zapísať na CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Pridať záložku"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Dozadu"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Záložky"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Za_budnúť históriu"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Naopak"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Upraviť záložky"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Dopredu"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Prejsť na"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Domov"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "U_miestnenie..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Bo�ný panel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Kôš"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Hore"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Zobraziť"
 
@@ -6637,34 +6898,39 @@ msgstr "Zobraziť ako..."
 msgid "File Browser: %s"
 msgstr "Vlastník súboru:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Jeden z bo�ných panelov narazil na chybu a nie je schopný pokra�ovať v "
 "�innosti. Bohužiaľ, nie je možné povedať, ktorý."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Pohľad %s zaznamenal chybu pri spúštaní."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Bo�ný panel %s zaznamenal chybu a nie je schopný pokra�ovať v �innosti. Ak "
 "sa to bude opakovať, možno budete chcieť tento panel vypnúť."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Bo�ný panel zlyhal"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Bo�ný panel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Obsahuje bo�ný panel"
 
@@ -6698,147 +6964,180 @@ msgstr "_Pridať nové..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Ľutujem, ale vzorku %s nie je možné odstrániť."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Nie je možné odstrániť vzorku"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Ľutujem, ale emblém %s nie je možné odstrániť."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Nie je možné odstrániť emblém"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Vytvoriť nový emblém:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Kľú�ové slovo:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Obrázok:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Vyberte súbor s obrázkom pre nový emblém:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Vytvoriť novú farbu:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Meno farby:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Hodnota farby:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Ľutujem, ale \"%s\" nie je platné meno súboru."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Ľutujem, ale nezadali ste platné meno súboru."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Nie je možné nainštalovať vzorku"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Ľutujem, ale nie je možné nahradiť obrázok pre návrat k štandardu."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nie je obrázok"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Ľutujem, ale vzorku %s nie je možné nainštalovať."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Vyberte súbor s obrázkom obsahujúci pridávanú vzorku"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Ľutujem, musíte zadať neprázdne meno pre novú farbu."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Nie je možné nainštalovať farbu"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Vyberte pridávanú farbu"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Ľutujem, ale '%s' nie je použiteľný súbor s obrázkom!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Súbor '%s' asi nie je platný obrázok."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Vyberte kategóriu:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Zrušiť odstránenie"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Pridať novú vzorku..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Pridať novú farbu..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Pridať nový emblém..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kliknutím na vzorku ju odstránite"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kliknutím na farbu ju odstránite"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kliknutím na emblém ho odstránite"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Vzorky:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Farby:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblémy:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Odstrániť vzorku..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Odstrániť farbu..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Odstrániť emblém..."
 
@@ -7229,34 +7528,39 @@ msgstr "Vytváranie _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Zavrieť _všetky okná"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Zavrieť bo�ný panel"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Prejsť do prie�inku prázdneho CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Prejsť do prie�inku koša"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "U_miestnenie..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Položky, ktoré sú ]prie�inky"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Vzorky"
@@ -7286,10 +7590,13 @@ msgid "View Failed"
 msgstr "Zobrazenie zlyhalo"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Pohľad %s zaznamenal chybu pri spúštaní."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Pohľad %s zaznamenal chybu a nie je schopný pokra�ovať v �innosti. Môžete "
 "vybrať iný pohľad alebo prejsť na iné miesto."
@@ -7299,98 +7606,128 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Pohľad %s zaznamenal chybu pri spúštaní."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "NautilusApplication asociovaná s týmto oknom."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Pohľad obsahu"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Pohľad aktuálneho súboru alebo prie�inku"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Nie je možné nájsť \"%s\". Prosím, overte zadaný text a skúste to znovu."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Nie je možné pridať emblémy"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus nemôže zobraziť \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Nie je možné zobraziť \"%s\", pretože Nautilus nie je schopný ur�iť typ "
 "súboru."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus nemá nainštalovaný žiadny program schopný zobraziť \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Nie je možné zobraziť \"%s\", pretože Nautilus nie je schopný pracovať s "
 "miestami %s:."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Nie je možné zobraziť \"%s\", pretože pokus o prihlásenie zlyhal."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Nie je možné zobraziť \"%s\", pretože bol prístup odmietnutý."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Nie je možné zobraziť \"%s\", pretože hostiteľ \"%s\" nebol nájdený. Overte, "
 "�i ste správne zadali meno a máte správne nastavené proxy."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "Nie je možné zobraziť \"%s\". Overte, že máte správne nastavené proxy."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Nie je možné zobraziť \"%s\", pretože Nautilus nie je schopný pracovať s "
+"miestami %s:."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Nie je možné zobraziť \"%s\", pretože Nautilus nie je schopný kontaktovať\n"
-"hlavný prehliada� SMB.\n"
-"Overte, že na vašej lokálnej sieti beží server SMB."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Momentálne nie je hľadanie k dispozícii, pretože bu� nemáte index, alebo "
 "vyhľadávacia služba nefunguje. Overte, že ste spustili vyhľadávaciu službu "
 "Medusa a ak nemáte index, že beží indexa�ný program pre službu Medusa."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Momentálne nie je hľadanie k dispozícii, pretože bu� nemáte index, alebo "
+"vyhľadávacia služba nefunguje. Overte, že ste spustili vyhľadávaciu službu "
+"Medusa a ak nemáte index, že beží indexa�ný program pre službu Medusa."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Hľadanie nie je k dispozícii"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nemôže zobraziť \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Nie je možné zobraziť miesto"
 
@@ -7402,7 +7739,7 @@ msgstr "Prejsť na miesto definované touto záložkou"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7410,11 +7747,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Nautilus preložil Stanislav Višňovský"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7430,39 +7767,43 @@ msgstr "Vrátiť sa späť o niekoľko stránok"
 msgid "Go forward a number of pages"
 msgstr "Prejsť dopredu o niekoľko stránok"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Zobraziť toto umiestneni pomocou \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Bodky"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Vytváranie _CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID aplikácie"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID okna aplikácie."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplikácia"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication asociovaná s týmto oknom."
 
@@ -7498,6 +7839,247 @@ msgstr "Sieťové servery"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Zobrazí vaše sieťové servery v správcovi súborov Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Vytváracie rozhranie pre hardwarový pohľad"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Prehliada� hardvéru"
+
+#~ msgid "Hardware view"
+#~ msgstr "Hardvérový pohľad"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Zobraziť ako hardvér"
+
+#~ msgid "hardware view"
+#~ msgstr "hardvérový pohľad"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "meno ikony pre hardwarový pohľad"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "súhrnné informácie o hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K veľkosť cache"
+
+#~ 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 "Čas behu po�íta�a je %d dní, %d hodín, %d minút"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Prehľad hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Sem patrí stránka pre procesor."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Sem patrí stránka pre pamäť."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Sem patrí stránka pre IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Chyba pri kopírovaní do \"%s\".\n"
+#~ "\n"
+#~ "V cieli nie je dosť miesta."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Chyba pri vytváraní odkazu v \"%s\".\n"
+#~ "\n"
+#~ "V cieli nie je dosť miesta."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Chyba pri presune položiek do \"%s\".\n"
+#~ "\n"
+#~ "Nemáte právo zápisu do tohto prie�inku."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Chyba pri presune položiek do \"%s\".\n"
+#~ "\n"
+#~ "Cieľový disk je len na �ítanie."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Chyba pri vytváraní odkazov v \"%s\".\n"
+#~ "\n"
+#~ "Nemáte právo zápisu do tohto prie�inku."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Chyba pri vytváraní odkazov v \"%s\".\n"
+#~ "\n"
+#~ "Cieľový disk je len na �ítanie."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri kopírovaní \"%s\".\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri presune \"%s\".\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri odstraňovaní \"%s\".\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri kopírovaní.\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri vytváraní odkazu.\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Chyba \"%s\" pri odstraňovaní.\n"
+#~ "\n"
+#~ "Chcete pokra�ovať?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Nie je možné kopírovať do koša"
+
+#~ 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 ""
+#~ "Štandardná akcia nedokáže otvoriť \"%s\", pretože nie je možné použiť "
+#~ "súbory v \"%s\".  Žiadne iné akcie pre tento typ súborov nie je k "
+#~ "dispozícii. Ak skopírujete tento súbor na váš po�íta�, bude možné ho "
+#~ "otvoriť."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Prehľadávam disky"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus hľadá na disku prie�inky s košom."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d vybraných položiek nie je možné presunúť do koša. Chcete ich odstrániť "
+#~ "úplne?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d z vybraných položiek nie je možné presunúť do koša. Chcete týchto %d "
+#~ "položiek odstrániť úplne?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Súbor, ktorý ste pustili, nie je obrázok. Ako vlastné ikony môžete použiť "
+#~ "iba lokálne obrázky."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Ľutujem, ale vyhľadávacia služba Medusa nie je k dispozícii, pretože nie "
+#~ "je nainštalovaná."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Raz za deň sú vaše súbory a ich obsah indexované, takže hľadanie je "
+#~ "rýchle. Momentálne prebieha indexácia vašich súborov."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nie je platné miesto. Prosím, overte zadaný text a skúste to znovu."
+
+#~ msgid ""
+#~ "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 ""
+#~ "Nie je možné zobraziť \"%s\", pretože Nautilus nie je schopný "
+#~ "kontaktovať\n"
+#~ "hlavný prehliada� SMB.\n"
+#~ "Overte, že na vašej lokálnej sieti beží server SMB."
+
+#~ msgid "file icon"
+#~ msgstr "ikona súboru"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Meno:"
+
 #~ msgid "Unknown"
 #~ msgstr "Neznámy"
 
@@ -7589,8 +8171,5 @@ msgstr "Zobrazí vaše sieťové servery v správcovi súborov Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Panel _nástrojov"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Miesto \"%s\" už neexistuje."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Prejsť na neexistujúce miesto"
diff --git a/po/sl.po b/po/sl.po
index d3aa6a65b..534a98ce9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2000-07-07 12:30+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() ni uspel."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblemi"
 
@@ -55,48 +55,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilusov pogled Emblemov"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Nisem mogel odstraniti emblema"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nisem mogel odstraniti emblema z imenom '%s'. To je verjetno zato, ker je ta "
 "emblem trajen in ne tak, ki ste ga dodali sami."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Nisem mogel odstraniti emblema"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Nisem mogel preimenovati emblema"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nisem mogel preimenovati emblema z imenom '%s'. To je verjetno zato ker je "
 "ta emblem trajen in ne tak, ki ste ga dodali sami."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Nisem mogel preimenovati emblema"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Preimenuj emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Vpiši novo ime za prikazan emblem:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Dodaj emblem..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -104,7 +116,7 @@ msgstr ""
 "Vpišite opisno ime poleg vsakega emblema.  To ime bo uporabljeno na drugih "
 "mestih za navedbo emblema."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -112,139 +124,62 @@ msgstr ""
 "Vpišite opisno ime poleg emblema.  To ime bo uporabljeno na drugih mestih za "
 "navedbo emblema."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Nekatere datoteke ne morejo biti dodane kot emblemi, ker se zdi, da niso "
-"veljavne slike."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Slika %s ne more biti nameš�ena kot emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Zdi se, da datoteka '%s' ni veljavna slika."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Nisem mogel dodati emblemov"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Nobena od datotek ni mogla biti dodana kot emblem, ker se zdi, da ni nobena "
 "veljavna slika."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Povle�eno besedilo ni bilo veljavno mesto datoteke."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Nisem mogel dodati emblema"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Zdi se, da datoteka '%s' ni veljavna slika."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Zdi se, da pov�ena datoteka ni veljavna slika."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Briši"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Tovarna za pogled strojne opreme"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Storjna oprema"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Pregledovalnik strojne opreme"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Pregled strojne opreme"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Glej kot storjno opremo"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "pregled strojne opreme"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ime ikone za pogled strojne opreme"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "povzetek pogleda strojne opreme"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"Procesor %s\n"
-"%s MHz\n"
-"velikost predpomnilnika %s K"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB pomnilnika"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB pomnilnika"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "ÄŒas delovanja je %d dni, %d ur, %d minut"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Pregled strojne opreme"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "To je držalec mesta za stran o procesorju"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "To je držalec mesta za stran o pomnilniku"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "To je držalec mesta za stran o IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Zgodovina"
@@ -910,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Storjna oprema"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Mednarodno"
@@ -1194,31 +1133,19 @@ msgid "Desktop trash icon name"
 msgstr "Ime namizne ikone Smeti"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Imeniki nad to velikostjo bodo prekinjeni približno pri tej velikosti. "
-"Namesn namen te možnosti je izogniti se nenamernemu pove�anju porabe "
-"pomnilnika in posledi�no ubitja Nautilusa pri ogromnih imenikih Negativna "
-"vrednost ozna�uje, da ni omejitve. Omejitev je približna velikosti sklopov "
-"ob branju imenikov."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Vklju�i 'posebne' zastavice v dialogu lastnosti datotek"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Ime datoteke za privzeto ozadje imenikov. Uporabljeno le, �e je klju� "
 "bacground_set nastavljen na resni�no."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1226,6 +1153,20 @@ msgstr ""
 "Ime datoteke za privzeto ozadje stranskega pulta. Uporabljeno le, �e je "
 "klju� side_panel_bacground_set nastavljen na resni�no."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Imeniki nad to velikostjo bodo prekinjeni približno pri tej velikosti. "
+"Namesn namen te možnosti je izogniti se nenamernemu pove�anju porabe "
+"pomnilnika in posledi�no ubitja Nautilusa pri ogromnih imenikih Negativna "
+"vrednost ozna�uje, da ni omejitve. Omejitev je približna velikosti sklopov "
+"ob branju imenikov."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "V menuju zaznamkov ne kaži privzetih zaznamkov"
@@ -1235,9 +1176,10 @@ msgid "Home icon visible on desktop"
 msgstr "Ali je na namizju vidna ikona Dom"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Če je nastavljeno na resni�no, bo nautilus kazal v drevesu stranskega pulta "
 "kazal le imenike. Sicer bodo prikazani imeniki in datoteke."
@@ -1271,9 +1213,10 @@ msgstr ""
 "ezoteri�nih možnosti v dialogu lastnosti datotek."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Če je nastavljeno na resni�no, potem nautilus v seznamskem in ikonskem "
 "na�inu kaže imenike pred datotekami."
@@ -1318,8 +1261,9 @@ msgstr ""
 "uporabnikove zaznamke."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Če je nastavljeno na resni�no, potem bo Nautilus uporabil za namizje "
@@ -1336,9 +1280,10 @@ msgstr ""
 "štejejo tiste, katerih ime se kon�uje s tildo (~)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Če je nastavljeno na resni�no, potem bodo v upravljalniku datotek prikazane "
 "skrite datoteke. Skrite datoteke se ali za�nejo z piko ali pa so naštete v "
@@ -1362,8 +1307,9 @@ msgstr ""
 "kazala na smeti."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Če je to nastavljeno na resni�no, bo na namizje postavljena ikona, ki bo "
@@ -1400,7 +1346,8 @@ msgstr ""
 "ve�je proti manjši urejene od manjše proti ve�ji."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Če je resni�no, bodo ikone v novih oknih postavljene tesneje skupaj."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1428,7 +1375,8 @@ msgid "List of possible captions on icons"
 msgstr "Seznam možnih oznak na ikonah"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Najve�je število obravnavanih datotek v imeniku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1448,11 +1396,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus naj izrisuje namizje"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus naj kot namizje uporabi uporabnikov doma� imenik"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Drevesu stranskega pulta kaži le imenike"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1472,7 +1422,8 @@ msgid "Reverse sort order in new windows"
 msgstr "V novih oknih obrni razvrstitev"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "V oknih najprej kaži imenike"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1509,10 +1460,11 @@ msgstr ""
 "na \"never\" potem se zvo�ne datoteke nikoli ne predvajajo."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1524,12 +1476,13 @@ msgstr ""
 "nikoli ne pokažejo v predogledu."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Kdaj prikazati predogled slikovnih datotek v ikoni datoteke. ÄŒe je "
 "nastavljeno na \"always\" potem se predolged pokaže vedno, �etudi je "
@@ -1539,10 +1492,11 @@ msgstr ""
 "predogledne sli�ice in se pokaže splošna ikona."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Kdaj prikazati Å¡tevilo predmetov v imeniku. ÄŒe je nastavljeno na \"always\" "
@@ -1553,17 +1507,19 @@ msgstr ""
 "nikoli ne prešteje."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Privzet vrstni red predmetov v ikonskem pogledu. Možne vrednosti so: \"name"
 "\"\", \"size\", \"type\", \"modification_date\" in \"emblems\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Privzet vrstni red predmetov v seznamskem pogledu. Možne vrednosti so: \"name"
 "\"\", \"size\", \"type\", \"modification_date\" in \"emblems\"."
@@ -1605,7 +1561,8 @@ msgid "Use manual layout in new windows"
 msgstr "V novih oknih uporabi ro�ni razpored"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "V novih oknih uporabi tesnejši razpored"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1634,7 +1591,8 @@ msgstr ""
 "dolo�eno mapo.Možne vrednosti sta \"list_view\" in \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Kdaj naj se pokaže število predmetov v imeniku"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1646,7 +1604,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Kdaj naj se pokažejo sli�ice datotek s slikami"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Ali je bilo nastavljeno prikrojeno privzeto ozadje imenika."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1804,67 +1763,82 @@ msgstr "ponastavi"
 msgid "on the desktop"
 msgstr "na namizju"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Ne morem zbrisati pogona"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Ne morete zbrisati ikone pogona. Če ga želite izvre�i, prosimo kliknite nanj "
 "z desnim gumbom in izberite \"Izvrži\"."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Ne morem zbrisati pogona"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Smeti"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Prestavi sem"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopiraj sem"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "P_oveži sem"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Uporabi za _ozadje"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Nastavi kot ozadje za _vse mape"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Nastavi kot ozadje za _to mapo"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Teme \"%s\" ni bilo mogo�e namestiti."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Izbrati morate ime za nov emblem."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Nisem mogel namestiti emblema"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "Ime emblema lahko vsebuje le �rke, presledke in številke."
@@ -1873,19 +1847,25 @@ msgstr "Ime emblema lahko vsebuje le �rke, presledke in številke."
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Oprostite, ime poimenovan \"%s\" že obstaja. Prosim zanj izberite drugo ime."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Nisem mogel namestiti emblema"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Oprostite, nisem mogel shraniti prikrojenega emblema."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Oprostite, nisem mogel shraniti imena prikrojenega imena."
 
@@ -1904,22 +1884,28 @@ msgstr "Iz:"
 msgid "To:"
 msgstr "V:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Napaka ob prestavljanju."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Napaka ob prestavljanju.\n"
 "\n"
 "\"%s\" ne more biti prestavljena, ker je na disku, ki je le berljiv."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Napaka ob brisanju."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1928,22 +1914,17 @@ msgstr ""
 "\"%s\" ne more biti zbrisana, ker nimate dovoljenja za spremembo njegove "
 "starševske mape."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Napaka ob brisanju.\n"
 "\n"
 "\"%s\" ne more biti zbrisana, ker je na disku, ki je le berljiv.."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1952,12 +1933,15 @@ msgstr ""
 "\"%s\" ne more biti prestavljena, ker nimate dovoljenja za spremembo nje ali "
 "njene starševske mape."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Napaka ob prestavljanju."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Napaka ob prestavljanju.\n"
@@ -1965,12 +1949,10 @@ msgstr ""
 "\"%s\" ne more biti prestavljena, ker je sama ali njena starševska mapa "
 "vsebovana v ciljni mapi."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Napaka ob prestavljanju.\n"
@@ -1978,295 +1960,244 @@ msgstr ""
 "\"%s\" ne more biti prestavljena v Smeti, ker nimate dovoljenja za spremembo "
 "nje ali njene starševske mape."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Napaka ob kopiranju."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Napaka ob kopiranju.\n"
 "\n"
 "\"%s\" ne more biti kopirana, ker nimate dovoljenja, da bi jo prebrali."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Napaka ob kopiranju v \"%s\".\n"
-"\n"
-"Na cilju ni dovolj prostora."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Napaka ob kopiranju."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Napaka ob premikanju v \"%s\".\n"
 "\n"
 "Na cilju ni dovolj prostora."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Napaka ob ustvarjanju povezave v \"%s\".\n"
-"\n"
-"Na cilju ni dovolj prostora."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Napaka ob prestavljanju."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Napaka ob povezovanu."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Napaka ob kopiranju v \"%s\".\n"
 "\n"
 "Nimate dovoljenj za pisanje v to mapo."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Napaka ob kopiranju v \"%s\".\n"
 "\n"
 "Ciljni disk je le berljiv."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Napaka ob prestavljanju predmetov v \"%s\".\n"
-"\n"
-"Nimate dovoljenj za pisanje v to mapo."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Napaka ob prestavljanju predmetov v \"%s\".\n"
-"\n"
-"Ciljni disk je le berljiv."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Napaka ob ustvarjanju povezav v \"%s\".\n"
-"\n"
-"Nimate dovoljenja za pisanje v to mapo."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Napaka ob prestavljanju."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Napaka ob ustvarjanju povezav v \"%s\".\n"
-"\n"
-"Ciljni disk je le berljiv."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob kopiranju \"%s\".\n"
-"\n"
-"Želite nadaljevati?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Napaka ob povezovanu."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Napaka ob kopiranju."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Napaka \"%s\" ob prestavljanju \"%s\".\n"
+"Napaka \"%s\" ob prestavljanju.\n"
 "\n"
 "Želite nadaljevati?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob ustvarjanju povezave do \"%s\".\n"
-"\n"
-"Želite nadaljevati?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Napaka ob prestavljanju."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Napaka \"%s\" ob brisanju \"%s\".\n"
+"Napaka \"%s\" ob ustvarjanju povezave do \"%s\".\n"
 "\n"
 "Želite nadaljevati?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob kopiranju.\n"
-"\n"
-"Želite nadaljevati?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Napaka ob brisanju."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob prestavljanju.\n"
-"\n"
-"Želite nadaljevati?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Napaka ob kopiranju."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob povezovanju.\n"
-"\n"
-"Želite nadaljevati?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Napaka ob prestavljanju."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Napaka \"%s\" ob brisanju.\n"
-"\n"
-"Želite nadaljevati?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Napaka ob povezovanu."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Napaka ob brisanju."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Napaka ob kopiranju."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Napaka ob prestavljanju."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Napaka ob povezovanu."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Napaka ob brisanju."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Presko�i"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Poskusi znova"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Nisem uspel zaklju�iti navedenega dejanja."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ne more biti prestavljena na novo lokacijo, ker je njeno ime že "
 "uporabljeno za posebni predmet, ki ne more biti odstranjen ali zamenjan.\n"
 "\n"
 "Če še vedno želite prestaviti \"%s\", jo preimenujte in poskusite znova."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Nisem uspel zaklju�iti navedenega dejanja."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" ne more biti prestavljena na novo lokacijo, ker je njeno ime že "
 "uporabljeno za posebni predmet, ki ne more biti odstranjen ali zamenjan.\n"
 "\n"
 "Če še vedno želite kopirati \"%s\", jo preimenujte in poskusite znova."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Nisem mogel zamenjati datoteke."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Datoteka \"%s\" že obstaja.\n"
 "\n"
 "Jo želite zamenjati?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt ob kopiranju"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Zamenjaj vse"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "poveži na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "Å¡e ena povezava na %s"
@@ -2275,25 +2206,25 @@ msgstr "Å¡e ena povezava na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. povezava na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. povezava na %s"
@@ -2303,561 +2234,600 @@ msgstr "%d. povezava na %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopija)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (Å¡e ena kopija)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "kopija)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "kopija)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopija)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (Å¡e ena kopija)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopija)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Neznan GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Prestavljam datoteke v Smeti"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Datoteke vržene ven:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Pripravljam se na prestavljanje v Smeti..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Prestavljam datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Prestavljenih datotek:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Pripravljam na prestavitev..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Kon�ujem prestavitev..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Ustvarjam povezave na datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Povezanih datotek:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Povezujem"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Pripravljam se na ustvarjanje povezav..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Kon�ujem ustvarjanje povezav..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopiram datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Skopiranih datotek:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopiram"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Pripravljam se na kopiranje..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "V Smeti predmetov ne morete skopirati."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Ne morem kopirati v Smeti"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Ne morete prestaviti te mape Smeti."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Ne morete kopirati te mape Smeti."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Ne morete spremeniti lokacije Smeti"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Ne morete kopirati Smeti"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Imenika ne morete prestaviti samega vase."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Imenika ne morete kopirati samega vase."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Znotraj te mape ustvari novo prazno mapo"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Ne morem prestaviti vase"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Ne morem kopirati vase"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Datoteke ne morete kopirati samo nase."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Ne morem kopirati nase"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Napaka ob ustvarjanju nove mape.\n"
 "\n"
 "Nimate dovoljenja za pisanje v cilj."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Napaka ob ustvarjanju nove mape.\n"
 "\n"
 "Na cilju ni prostora."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Napaka \"%s\" ob ustvarjanju nove mape."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Napaka ob ustvarjanju nove mape"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Napaka ob ustvarjanju nove mape"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "neimenovana mapa"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Napaka \"%s\" ob ustvarjanju nove mape."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Napaka ob ustvarjanju nove mape"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Napaka ob ustvarjanju nove mape"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 datoteka"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Brišem datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Zbrisanih datotek:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Brišem"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Pripravljam se na brisanje datotek..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Praznim Smeti"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Pripravljam se na praznjenje Smeti..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Ste prepri�ani, da želite trajno zbrisati vse predmete v Smeteh?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Sprazni"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopija).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo (kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (Å¡e ena kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (Å¡e ena kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (Å¡e ena kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (tretja kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (tretja kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (Å¡e ena kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (tretja kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24. kopija.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123. kopija).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124. kopija)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124. kopija).txt"
 
@@ -2876,64 +2846,64 @@ msgstr "foo (124. kopija).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "danes ob 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "danes ob %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "danes ob 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "danes ob %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "danes, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "danes, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "danes"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "v�eraj ob 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "v�eraj ob %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "v�eraj ob 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "v�eraj ob %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "v�eraj, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "v�eraj, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "v�eraj"
 
@@ -2942,133 +2912,133 @@ msgstr "v�eraj"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Sreda, 00. September 0000 at 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y ob %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pon, 00. Oct 0000 ob 00:00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y ob %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pon, 00. Oct 0000 at 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %Y ob %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00. Oct 0000 at 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %-b %Y ob %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00. Oct 0000, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 PM"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 predmetov"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 map"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 datotek"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 predmet"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u predmetov"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u map"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u datotek"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? predmetov"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bajtov"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "neznana vrsta"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "neznana vrsta MIME"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "neznan"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3078,7 +3048,7 @@ msgstr ""
 "vaša datoteka gnome-vfs.keys ni na pravem mestu ali ni najdena zaradi kakega "
 "drugega razloga."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3087,11 +3057,11 @@ msgstr ""
 "Opis za vrsto mime \"%s\" (datoteka je \"%s\") ni bil najden. Prosimo, "
 "pišite na dopisni seznam gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "povezava"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "povezava (prekinjena)"
 
@@ -3212,11 +3182,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Datoteke iš�i po imenu in njihovih lastnostih"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonski pogled"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Seznamski pogled"
@@ -3360,148 +3332,153 @@ msgstr "Dom %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Ra�unalnik"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikona datoteke"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "uredljivo besedilo"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "uredljiva oznaka"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "dodatno besedilo"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "nekaj ve� besedila"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "osvetljeno za izbiro"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "ali smo osvetljeni za izbiro"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "osvetljeno ob tipkovni�nem fokusu"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "ali se osvetlimo za izris fokusa tipkovnice"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "osvetljeno za spust"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "ali smo osvetleni za spust pri vleci in spusti"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Pravokotnik izbire"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Uokviri besedilo"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Riši okvir okoli neizbranega besedil"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Barva izbirne Å¡katle"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Barva izbirne Å¡katle"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa kanal izbirne Å¡katle"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Prosojnost izbirne Å¡katle"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alfa kanal osvetlitve"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Prosojnost osvetlitve za izbrane ikone"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Barva svetlih podatkov"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Barva, ki se uporabi za besedilo podatkov na temnem ozadju"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Barva temnih podatkov"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Barva, ki se uporabi za besedilo podatkov na svetlem ozadju"
 
 # FIXXXXX
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Ta mapa uporablja samodejeno postavitev. Želite preklopiti na ro�no "
 "postavitev in pustiti ta predmet tam, kjer ste ga spustili? To bo pokvarilo "
 "shranjen ro�ni izgled."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Ta mapa uporablja samodejeno postavitev. Želite preklopiti na ro�no "
 "postavitev in pustiti te predmete tam, kjer ste jih spustili? To bo "
 "pokvarilo shranjen ro�ni izgled."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Ta mapa uporablja samodejeno postavitev. Želite preklopiti na ro�no "
 "postavitev in pustiti ta predmet tam, kjer ste ga spustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Ta mapa uporablja samodejeno postavitev. Želite preklopiti na ro�no "
 "postavitev in pustiti te predmete tam, kjer ste jih spustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Preklopi na ro�no postavitev?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Preklopi"
 
@@ -3608,72 +3585,72 @@ msgstr "Je privzeto za predmete \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Je privzeto za vse predmete \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Spremeni \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Vklju�i v menu za predmete \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Uporabi kot privzeto za predmete \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Vklju�i le v menu za \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Uporabi kot privzeto, a le za \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne vklju�uj v menuju za predmete \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Ime"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stanje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Izberi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Opravljeno"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Spremeni..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Vrste datotek in programi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Pojdi tja"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3681,48 +3658,48 @@ msgstr ""
 "Kateri programi so ponujeni za katere vrste datotek lahko nastavite v "
 "dialogu \"Vrste datotek in programi\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Odpri z drugim programom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Izberite program s katerim naj se odpre \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Odpri z drugim pregledovalnikom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Izberite pogled za \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Za \"%s\" pregledovalnik ni na voljo."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Noben pregledovalnik ni na voljo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Z \"%s\" ni povezan noben program."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Ni nobenega povezanega programa"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Z \"%s\" ni povezano nobeno dejanje."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Ni nobenega povezanega dejanja"
 
@@ -3730,11 +3707,9 @@ msgstr "Ni nobenega povezanega dejanja"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3743,42 +3718,41 @@ msgstr ""
 "GNOME lahko nastavite tako, da poveže vrsto datoteke s programom.  Želite "
 "sedaj s to vrsto datoteke povezati program?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Poveži s programom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Pogled povezan s/z \"%s\" ni veljaven."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Povezan je bil neveljaven pogled"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Program povezan s/z \"%s\"ni veljaven."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Povezan je bil neveljaven program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Dejanje povezano s/z \"%s\" ni veljavno."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Povezano je bilo neveljavno dejanje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3788,92 +3762,134 @@ msgstr ""
 "GNOME lahko nastavite tako, da poveže druga�en program ali pregledovalnik s "
 "to vrsto datoteke.  Želite s to vrsto datoteke povezati program ali pogled?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Poveži dejanje"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" ne more odpreti \"%s\", ker \"%s\" ne more dostopati do datotek na "
+"lokacijah \"%s\". Želite izbrati drug program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" ne more odpreti \"%s\", ker \"%s\" ne more dostopati do datotek na "
 "lokacijah \"%s\". Želite izbrati drug program?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Privzeto dejanje ne more odpreti \"%s\", ker ne more dostopati datotek na "
 "lokacijah \"%s\". Želite izbrati drugo dejanje?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ne morem odpreti lokacije"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" ne more odpreti \"%s\", ker \"%s\" ne more dostopati do datotek na "
+"lokacijah \"%s\". Želite izbrati drug program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" ne more odpreti \"%s\", ker \"%s\" ne more dostopati do datotek na "
 "lokacijah \"%s\".Za pogled te datoteke drugi programi niso na voljo. ÄŒe "
 "skopirate to datoteko na vaš ra�unalnik, jo boste morda lahko odprli."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"Privzeto dejanje ne more odpreti \"%s\", ker ne more dostopati datotek na "
+"lokacijah \"%s\". Želite izbrati drugo dejanje?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
-"Privzeto dejanje ne more odpreti \"%s\", ker ne more dostopati do datotek na "
-"lokacijah \"%s\". Za pogled te datoteke druga dejanja niso na voljo. ÄŒe "
+"\"%s\" ne more odpreti \"%s\", ker \"%s\" ne more dostopati do datotek na "
+"lokacijah \"%s\".Za pogled te datoteke drugi programi niso na voljo. ÄŒe "
 "skopirate to datoteko na vaš ra�unalnik, jo boste morda lahko odprli."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Odpiram %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Ukazov na oddaljenem sistemu ne morete izvrševati zaradi varnostnih razlogov."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Ne morem izvesti oddaljenih povezav"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+#, fuzzy
+msgid "Details: "
+msgstr "Podrobnosti"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Prišlo je do napake ob zaganjanju programa.\n"
 "\n"
 "Podrobnosti:"
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Napaka ob zaganjanju programa"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Cilj spuš�anja podpira le krajevne datoteke"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Ta cilj spuš�anja podpira le krajevne datoteke.\n"
@@ -3881,15 +3897,15 @@ msgstr ""
 "Za odprtje ne-krajevnih datotek jih morate skopirati v krajevno mapo in "
 "spustiti znova."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Cilj spuš�anja podpira le krajevne datoteke"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4143,14 +4159,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Predmeti, ki vsebujejo \"medusa\" v njihovih imenih in so mape"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Preiskujem diske"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus preiskuje vaše diske za mape smeti."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Uredi"
@@ -4353,96 +4361,106 @@ msgstr "Ozadje"
 msgid "Empty Trash"
 msgstr "Sprazni Smeti"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "To bo odprlo %d lo�enih oken. Ste prepri�ani, da to želite?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Odpri %d oken?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ste prepri�ani, da želite trajno zbrisati \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "To bo odprlo %d lo�enih oken. Ste prepri�ani, da to želite?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ste prepri�ani, da želite trajno zbrisati \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ste prepri�ani, da želite trajno zbrisati %d izbranih predmetov?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Trajno zbriši vse izbrane predmete"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Zbriši?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Izberi kategorijo:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Vzorci"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Izbran \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 izbrana mapa"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d izbranih map"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (vsebuje 0 predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (vsebuje 1 predmet)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (vsebuje %d predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (vsebuje skupaj 0 predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (vsebuje skupaj 1 predmet)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (vsebuje skupaj %d predmetov)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "izbran \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d izbranih predmetov (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 drug izbran predmet (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d drugih predmetov izbranih (%s)"
@@ -4454,7 +4472,7 @@ msgstr "%d drugih predmetov izbranih (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4463,116 +4481,131 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mapa \"%s\" vsebuje ve� datotek kot jih zmore obvladati Nautilus. Nekatere "
 "datoteke ne bodo prikazane."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Preve� datotek"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" ne more biti prestavljena v Smeti. Jo želite zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d izbranih predmetov ne more biti prestavljenih v Smeti. Jih želite "
-"zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" ne more biti prestavljena v Smeti. Jo želite zbrisati takoj?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d od izbranih predmetov ne more biti prestavljenih v Smeti. Želite teh %d "
-"predmetov zbrisati takoj?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" ne more biti prestavljena v Smeti. Jo želite zbrisati takoj?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Zbriši takoj?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ste prepri�ani, da želite iz Smeti trajno zbrisati \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Ste prepri�ani, da želite iz Smeti trajno zbrisati %d izbranih predmetov?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Zbriši iz Smeti?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Uporabi \"%s\" za odprtje izbranega predmeta"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Drug _program..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Program..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Drug p_regledovalnik..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "P_regledovalnik..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Nisem uspel zaklju�iti navedenega dejanja:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Nisem uspel zaklju�iti navedenega dejanja."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Poženi \"%s\" na izbranih predmetih"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Vse izvršljive datoteke v tej mapi se bodo pojavile v menuju \"Skripte\"."
+"Izbira skripte iz menuja bo pognala skripto z izbranimi predmeti kot vhodom."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "Vse izvršljive datoteke v tej mapi se bodo pojavile v menuju \"Skripte\"."
 "Izbira skripte iz menuja bo pognala skripto z izbranimi predmeti kot vhodom."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "O skriptah"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4612,17 +4645,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: lega in velikost trenutnega okna"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" bo prestavljena, �e izberete ukaz \"Prilepi datoteke\""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" bo skopirana, �e izberete ukaz \"Prilepi datoteke\""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4630,167 +4663,173 @@ msgstr ""
 "\"%d\" izbranih predmetov po prestavljenih, �e izberete ukaz \"Prilepi "
 "datoteke\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d izbranih predmetov bo skopiranih, �e izberete ukaz \"Prilepi datoteke\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Na odložiš�u ni ni�esar za prilepit."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Napaka ob priklopu"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Napaka ob odklopu"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Napaka storitev"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "I_zvrzi"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Odklopi napravo"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Odpri _v novem oknu"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Odpri _v %d novih oknih"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Doma�a mapa"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Doma�a mapa"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Zbriši iz Smeti"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Trajno zbriši vse izbrane predmete"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Vrzi v Smeti"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Prestavi vsak izbran predmet v Smeti"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Zbriši"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Ustvari povezave"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Ustvari povezavo"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Sprazni Smeti"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "I_zreži datoteko"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "I_zreži datoteke"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopiraj datoteko"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopiraj datoteke"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Te povezave se ne da uporabiti, ker nima cilja. Jo želite vre�i v Smeti?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Te povezave se ne da uporabiti, ker nima cilja. Jo želite vre�i v Smeti?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Te povezave se ne da uporabiti, ker njen cilj \"%s\" ne obstaja. Jo želite "
 "vre�i v Smeti?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Pokvarjena povezava"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" je izvršljiva datoteka z besedilom. Jo želite pognati ali prikazati  "
 "njeno vsebino?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Poženi ali prikaži?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Prikaz"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Poženi v _terminalu"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Prikaz"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Poženi"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Odpiram \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Prekli�i odpiranje?"
 
@@ -4811,28 +4850,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Nisem mogel prikazati vsebine \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Napaka ob prikazovanju mape"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Ime \"%s\" je v tej mapi že uporabljeno. Prosim uporabite druga�no ime."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "V tej mapi ni \"%s\". Morda je bila le prestavljena ali zbrisana?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Nimate ustreznih dovoljenj za preimenovanje \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4841,81 +4885,101 @@ msgstr ""
 "Ime \"%s\" ni veljavno, ker vsebuje znak \"/\". Prosim uporabite druga�no "
 "ime."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Ime \"%s\" ni veljavno. Prosim uporabite drga�no ime."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Nisem mogel spremeniti imena \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Nisem mogel preimenovati \"%s\" v \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Tema ne more biti odstranjena!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Napaka ob preimenovanju"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nimate potrebnih dovoljenj za spremenitev skupine od \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "Nisem mogel spremeniti skupine od \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Nisem mogel spremeniti skupine od \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Napaka ob nastavljanju skupine"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Nisem mogel spremeniti lastnika \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Nisem mogel premeniti lastnika \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Napaka ob nastavljanju lastnika"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Nisem mogel spremeniti dovoljenj za \"%s\", ker je na le berljivem disku"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Nisem mogel spremeniti dovoljenj za \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Napaka ob nastavljanju dovoljenj"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Preimenujem \"%s\" v \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Prekli�i preimenovanje?"
 
@@ -4973,128 +5037,150 @@ msgstr "Povrni i_zvorno velikost ikon"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Povrni i_zvorno velikost ikone"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "kaže na \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Vleci in spusti je podprt le v krajevni datote�ni sistem."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Vleci in spusti je podprt le v krajevni datote�ni sistem."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Napaka vleci in spusti"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Uporabljena je bila neveljavna vrsta ve�enja."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Velikost"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Datum modifikacije"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Ne morete prirediti ve� kot eno prikrojeno ikono naenkrat! Prosim spustite "
 "le eno sliko za nastavitev ikone po meri."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Ne morete prirediti ve� kot eno prikrojeno ikono naenkrat! Prosim spustite "
+"le eno sliko za nastavitev ikone po meri."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Ve� kot ena slika"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Datoteka, ki ste jo spustili ni krajevna. Kot prikrojene ikone lahko "
+"uporabljate le krajevne slike."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Datoteka, ki ste jo spustili ni krajevna. Kot prikrojene ikone lahko "
 "uporabljate le krajevne slike."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Le krajevne slike"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Datoteka, ki ste jo spustili ni slika. Kot prikorjene ikone lahko "
+"Datoteka, ki ste jo spustili ni krajevna. Kot prikrojene ikone lahko "
 "uporabljate le krajevne slike."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Le slike"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Lastnosti %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Prekli�i spremembo skupine?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Spreminjam skupino"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Prekli�i spremembo lastnika"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Spreminjam lastnika"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ni�"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "neberljiva"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 predmet z velikostjo %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d predmetov v skupni velikosti %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(nekaj vsebine ni berljive)"
 
@@ -5104,191 +5190,191 @@ msgstr "(nekaj vsebine ni berljive)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Vsebina:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Imena:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Lokacija:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Zapis:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Neporabljen prostor"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Cilj povezave:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Vrsta MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Spremenjena:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Dostopana:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Izberi prikrojeno ikono..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Odstrani prikorjeno ikono"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Beriljiva"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Pisljiva"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Izvršljiva"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Nastavi ID _uporabnika"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Posebne zastavice:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Nastavi ID _skupine"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Lepljiv"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Niste lastnik, zato ne morete spremeniti teh dovoljenj."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Lastnik datoteke:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Lastnik datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Skupina _datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Skupina datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Lastnik:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Skupina:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Drugo:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Pogled besedila:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Pogled Å¡tevilk:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Nazadnje spremenjena:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Dovoljenja za \"%s\" niso bila ugotovljena."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Dovoljenja za izbrano datoteko ne morejo biti ugotovljena."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Ob prikazovanju pomo�i je prišlo do napake:\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Prišlo je do napake ob prikazovanju pomo�i: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Nisem mogel prikazati pomo�i"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Prekini okno z lastnostmi?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Ustvarjam okno z lastnostmi"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Izberite ikono"
 
@@ -5306,69 +5392,111 @@ msgid "Search Results"
 msgstr "Rezultati iskanja"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Storitev iskanja Medusa ni na voljo, ker ni nameš�ena."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Storitev iskanja Medusa ni na voljo."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+#, fuzzy
+msgid "Medusa is not installed."
+msgstr "%s ni nameš�en"
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Storitev iskanja ni na voljo"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Iskanje, ki ste ga izbrali je novejše kot seznam datotek vašega sistema. "
 "Iskanje zdaj ne bo vrnilo nobenih zadetkov. Novo kazalo lahko ustvarite, �e "
 "kot administrator (root) v ukazni vrstici poženete \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Iskanje ne more odpreti seznama datotek vašega sistema. Vaš seznam manjka "
+"ali je pokvarjan.Novo kazalo lahko ustvarite, �e kot administrator (root) v "
+"ukazni vrstici poženete \"medusa-indexd\"."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Iš�i za predmeti, ki so preve� novi"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Vsaka datoteka v kazalu vašega ra�unalnika ustreza izbranim kriterijem. "
+"Lahko preverite �rkovanje izbire ali dodate nove kriterije, ki bodo "
+"zmanjšali število zadetkov."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Vsaka datoteka v kazalu vašega ra�unalnika ustreza izbranim kriterijem. "
 "Lahko preverite �rkovanje izbire ali dodate nove kriterije, ki bodo "
 "zmanjšali število zadetkov."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Napaka med iskanjem"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Iskanje ne more odpreti seznama datotek vašega sistema. Vaš seznam manjka "
 "ali je pokvarjan.Novo kazalo lahko ustvarite, �e kot administrator (root) v "
 "ukazni vrstici poženete \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Napaka ob branju seznama datotek"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Ob nalaganju vsebine iskanja se je zgodila napaka: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema.  "
+"Kazalo trenutno ni dostopno. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema.  "
+"Kazalo trenutno ni dostopno. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5376,25 +5504,23 @@ msgstr ""
 "trenutno ne more dostopoati do kazala, zato bo opravljeno po�asno iskanje, "
 "ki ne uporablja kazala."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema.  "
-"Kazalo trenutno ni dostopno. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Hitra iskanja niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Iskanja po vsebini niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5408,56 +5534,87 @@ msgstr ""
 "\n"
 "\"medusa-searchd\""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Za hitro iskanje potrebuje program Find kazalo datotek vašega sistema. Vaš "
 "ra�unalnik trenutno ustvarja to kazalo. Ker Find ne more uporabiti kazala, "
 "lahko iskanje traja ve� minut."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"Za iskanje po vsebini potrebuje program Find kazalo vsebine vašega sistema. "
+"Kazalo trenutno ni dostopno."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
 msgstr ""
-"Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema. "
-"Vaš ra�unalnik trenutno ustvarja to kazalo.  Iskanje po vsebini bo na voljo, "
-"ko bo kazalo pripravljeno."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Iskanja po kazalu niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema.  "
+"Kazalo trenutno ni dostopno. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Za iskanje po vsebini potrebuje program Find kazalo vsebine vašega sistema. "
+"Kazalo trenutno ni dostopno."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Za hitro iskanje potrebuje program Find kazalo datotek vašega sistema. "
 "Kazalo trenutno ni na voljo. Novo kazalo lahko ustvarite, �e kot "
 "administrator (root) v ukazni vrstici poženete \"medusa-indexd\". Dokler ni "
 "na voljo popolno kazalo bodo iskanja trajala nekaj minut."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Za iskanje po vsebini potrebuje program Find kazalo datotek vašega sistema. "
 "Kazalo trenutno ni na voljo. Novo kazalo lahko ustvarite, �e kot "
 "administrator (root) v ukazni vrstici poženete \"medusa-indexd\". Dokler ni "
 "na voljo popolno kazalo iskanja po vsebini niso mogo�a."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Hitra iskanja na vašem ra�unalniku niso vklju�ena"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5467,11 +5624,12 @@ msgstr ""
 "sistemski administrator je hitra iskanja na vašem ra�unalniku izklopil, zato "
 "kazalo ni na voljo."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Hitra iskanja na vašem ra�unalniku niso vklju�ena"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Hitra iskanja niso na voljo"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Kje"
 
@@ -5480,7 +5638,7 @@ msgstr "Kje"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Odkrij v novem oknu"
@@ -5491,7 +5649,7 @@ msgstr "_Odkrij v novem oknu"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Odkrij v %d _novih oknih"
@@ -5500,15 +5658,21 @@ msgstr "Odkrij v %d _novih oknih"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus je našel ve� zadetkov iskanja kot jih lahko prikaže. Nekateri "
+"najdeni predmeti ne bodo prikazani."
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus je našel ve� zadetkov iskanja kot jih lahko prikaže. Nekateri "
 "najdeni predmeti ne bodo prikazani."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Preve� zadetkov"
 
@@ -5522,12 +5686,12 @@ msgid "Create L_auncher"
 msgstr "Ustvari z_aganjalnik"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Ustvari nov zaganjalnik"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Zbriši vse predmete v smeteh"
 
@@ -5547,7 +5711,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Uporabi _privzeto ozadje"
@@ -5569,58 +5733,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Izberi drug pregledovalnik s katerim naj se pogleda izbran predmet"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Nova _mapa"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Nova _mapa"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Znotraj te mape ustvari novo prazno mapo"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Znotraj te mape ustvari novo prazno mapo"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Ustvari simboli�no povezavo za vsak izbran predmet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Po_dvoji"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Zbriši vsak izbran predmet, brez prestavljanja v Smeti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Podvoji vsak izbran predmet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Uredi zaganjalnik"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Uredi podatke zaganjalnika"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatiraj izbrano napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Lastnosti _medija"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Odklopi izbrano napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Prestavi ali kopiraj daoteke prej izbrane z ukazoma \"Izreži datoteke\" ali "
 "\"Kopiraj datoteke\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5628,132 +5802,141 @@ msgstr ""
 "Prestavi ali kopiraj daoteke prej izbrane z ukazoma \"Izreži datoteke\" ali "
 "\"Kopiraj datoteke\" v izbrano mapo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Odpri _z"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Odpri vsak izbran predmet v novem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Odpri _v novem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Odpri izbran predmet v tem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Pripravi izbrane datoteke, da bodo kopirane z ukazom \"Prilepi datoteke\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Pripravi izbrane datoteke, da bodo prestavljene z ukazom \"Prilepi datoteke\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Z_aš�iti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Zaš�iti izbrano napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Preimenuj izbran predmet"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Ponastavi pogled na _privzete vrednosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Ponastavi vrstni red in stopnjo pove�ave, da bo ustrezala nastavitvam za ta "
 "pogled"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Poženi ali urejaj skripte iz ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Izberi _vse datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Vzorci"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Izberi vse predmete v tem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Izberi vse predmete v tem oknu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Kaži lastnosti medija za izbrano napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Kaži mapo, ki vsebuje skripte tega menuja"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Odklopi izbrano napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Za to lokacijo uporabi privzeto ozadje"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Poglej ali spremeni lastnosti vsakega izbranega predmeta"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopiraj datoteko"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatiraj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Odklopi napravo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Odpri"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Odpri mapo skript"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Prilepi datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Prilepi datoteke v mapo"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Lastnosti"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "P_reimenuj..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skripte"
 
@@ -5838,7 +6021,12 @@ msgstr "_ro�no"
 msgid "Indexing is %d%% complete."
 msgstr "Ustvarjanje kazala je %d%% opravljeno."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Kazalo datotek je bilo nazadnje ustvarjeno %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5846,25 +6034,29 @@ msgstr ""
 "Enkrat na dan se ustvari kazalo vaših datotek in vsebin (besedil), tako da "
 "so vaša iskanja hitra."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Stanje ustvarjanja kazala"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Kazalo datotek je bilo nazadnje ustvarjeno %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
+msgstr "Trenutno se ustvarja kazalo vaših datotek:"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Enkrat na dan se ustvari kazalo vaših datotek in vsebin (besedil), tako da "
-"so vaša iskanja hitra. Kazalo se trenutno ustvarja."
+"so vaša iskanja hitra."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Trenutno ni kazala vaših datotek."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5874,15 +6066,19 @@ msgstr ""
 "iskanja. Hitro iskanje na vašem ra�unalniku ni vklju�eno, zato trenutno "
 "nimate kazala."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Trenutno ni kazala vaših datotek."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Storitev iskanja Medusa ni na voljo."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5906,31 +6102,36 @@ msgstr "Kaži stanje _kazala"
 msgid "Show status of indexing used when searching"
 msgstr "Kaži status ustvarjanja kazala, ki se uporablja pri iskanjih"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Nisem mogel ustvariti zahtevane mape"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus ni mogel ustvariti imenika %s."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus ni mogel ustvariti potrebne mape \"%s\". Ustvarite to mapo pred "
 "zagonom Nautilusa ali spremenite dovoljenja, da jo bo lahko ustvaril sam."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Nisem mogel ustvariti zahtevanih map"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus ni mogel ustvariti imenika %s."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5941,22 +6142,27 @@ msgstr ""
 "Ustvarite to mapo pred zagonom Nautilusa ali spremenite dovoljenja, da jo bo "
 "lahko ustvaril sam."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Povezava do starega namizja"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Lokacija imenika namizja se je v GNOME 2.4 spremenila. Na namizju je bila "
 "zato ustvarjena ikona \"Povezava do starega namizja\". Ta imenik lahko "
 "odprete, prestavite datoteke, ki jih želite in ga nato zbrišete."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Preseljeno staro namizje"
 
 #. Can't register myself due to trouble locating the
@@ -5969,7 +6175,7 @@ msgstr "Preseljeno staro namizje"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5980,7 +6186,7 @@ msgstr ""
 "namestitvijo Nautilusa."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6026,12 +6232,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautlusa trenutno ni mogo�e uporabljati zaradi nepri�akovane napake."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6040,7 +6246,7 @@ msgstr ""
 "strani Bonoba, ko se je poskušalo registrirati strežnik pogleda "
 "upravljalnika datotek."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6050,7 +6256,7 @@ msgstr ""
 "strani Bonoba, ko se je poskušalo najti tovarno. Ubitje bonobo-activation-"
 "server in vnovi�en zagon Nautilusa lahko morda odpravita problem."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6060,6 +6266,17 @@ msgstr ""
 "strani Bonoba, ko je poskušal najti predmet lupine. Ubitje bonobo-activation-"
 "server in vnovi�en zagon Nautilusa lahko morda odpravita problem."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Ob prikazovanju pomo�i je prišlo do napake:\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Noben zaznamek ni naveden"
@@ -6093,35 +6310,45 @@ msgstr "Manj možnosti"
 msgid "Find Them!"
 msgstr "Poiš�i jih!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Ne morem prestaviti vase"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "ni veljavna blokovna naprava"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" ni veljavna lokacija. Prosim preverite �rkovanje in poskusite znova. "
+"Nisem mogel najti \"%s\". Prosim preverite �rkovanje in poskusite znova."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Mrežni strežniki"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Ime:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Lokacija:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Poveži se"
@@ -6324,6 +6551,20 @@ msgstr ""
 "To datoteko lahko ro�no zbrišete, �e želite vnovi�no pojavitev �arovnika.\n"
 "\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Ne morete prirediti ve� kot eno prikrojeno ikono naenkrat! Prosim spustite "
+"le eno sliko za nastavitev ikone po meri."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Datoteka, ki ste jo spustili ni krajevna. Kot prikrojene ikone lahko "
+"uporabljate le krajevne slike."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6334,26 +6575,25 @@ msgstr "Odpri z %s"
 msgid "Open with..."
 msgstr "Odpri z..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Nisem mogel zagnati programa za zapisovanje CDjev:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Nisem mogel pognati zapisovalnika CDjev"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Sprazni _Smeti"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Zapiši vsebino na CD"
 
@@ -6361,118 +6601,131 @@ msgstr "_Zapiši vsebino na CD"
 msgid "Go To:"
 msgstr "Pojdi na:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Želite pogledati teh %d lokacij v lo�enih oknih?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Glej v ve�ih oknih?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Ne morem odpreti lokacije"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Opravi hitra samo-preverjanja."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Ustvari za�etno okno s podano geometrijo."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIJA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Ustvari le okna za eksplicitno navedene URIje."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Na upravljaj namizja (ignoriraj nastavitve iz dialoga nastavitev)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Izhod iz Nautilusa."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nov zagon Nautilusa."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Upravljalnik datotek"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilsu: --check ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check ne mroe biti uporabljen z drugimi možnostmi.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart ne more biti uporabljen z URIji.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry ne more biti uporabljen z ve� kot enim URIjem.\n"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ste prepri�ani, da želite trajno zbrisati \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Ste prepri�ani, da želite pozabiti zgodovino? Če jo, potem ste obsojeni, da "
 "jo ponovite."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Ste prepri�ani, da želite, da Nautilus pozabi katere lokacije ste obiskali?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Po�isti zgodovino"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Lokacija \"%s ne obstaja. Želite zbrisati vse zaznamke te lokacije z vašega "
 "seznama?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Lokacija \"%s\" ne obstaja ve�."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Zaznamek za neobstoje�o lokacijo"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -6505,7 +6758,6 @@ msgid "Close _All Windows"
 msgstr "Zapri _vsa okna"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Zapri vsa Nautilusova okna"
@@ -6528,107 +6780,119 @@ msgid "Forward"
 msgstr "Naprej"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Pojdi v mapo \"Smeti\""
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Pojdi na naslednjo obiskano lokacijo"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Pojdi na prejšnjo obiskano lokacijo"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Pojdi v mapo \"Smeti\""
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Dom"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Vrstica _lokacije"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Vnovi� naloži"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Iš�i po ra�unalniku za datotekami"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Vrstica st_anja"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Ustavi"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Gor"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Zapiši na CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Dodaj zaznamek"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Na_zaj"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Zaznamki"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Po�_isti zgodovino"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Ra�unalnik"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Uredi zaznamke"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Naprej"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "P_ojdi"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Dom"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Lokacija..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Stranski pult"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Smeti"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Gor"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "Po_gled"
 
@@ -6646,34 +6910,39 @@ msgstr "Glej kot drugo..."
 msgid "File Browser: %s"
 msgstr "Lastnik datoteke:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Eden od stranskih pultov je naletel na napako in ne more nadaljevati. Na "
 "žalost ne morem ugotoviti kateri."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Pogled %s je naletel na napako ob zagonu."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Stranski pult %s je naletel na napako in ne more nadaljevati. ÄŒe se to "
 "ponavlja boste morda želeli izklopiti ta pult."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Polje stranskega pulta"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Stranski pult"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Vsebuje pogled stranskega pulta"
 
@@ -6707,147 +6976,183 @@ msgstr "_Dodaj novo..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Vzorca %s ni mogo�e zbrisati."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Nisem mogel zbrisati vzorca"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Emblema %s ni mogo�e zbrisati."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Nisem mogel odstraniti emblema"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Ustvari nov emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Klju�na beseda:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Slika:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Izberi slikovno datoteko za nov emblem:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Ustvari novo barvo:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "I_me barve:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Vrednost barve:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "\"%s\" ni veljavno ime datoteke."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Niste navedli veljavnega imena datoteke."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Nisem mogel namestiti vzorca"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Ne morete zamenjati slike za ponovni zagon."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Ni slika"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Vzorca %s ni mogo�e namestiti."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Izberite slikovno datoteko, ki naj se doda kot vzorec"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+#, fuzzy
+msgid "The color cannot be installed."
+msgstr ""
+"Slede�i paketi bodo odstranjeni:\n"
+"\n"
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Izbrati morate ime za novo barvo."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Nisem mogel namestiti barve"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Izberite barvo, ki naj se doda"
 
-#: 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' ni uporabna datoteka s sliko!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Oprostite, ampak '%s' ni uporabna datoteka s sliko."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Zdi se, da datoteka '%s' ni veljavna slika."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Izberi kategorijo:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "P_rekli�i odstranitev"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Dodaj nov vzorec..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Dodaj novo barvo..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Dodaj nov emblem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kliknte na vzorec za njegovo odstranitev"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kliknte na barvo za njeno odstranitev"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kliknite na emblem za njegovo odstranitev"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Vzorci:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Barve:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblemi:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Odstrani vzorec..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Odstrani barvo..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Odstrani emblem..."
 
@@ -7237,34 +7542,39 @@ msgstr "_Ustvarjalnik CDjev"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Zapri _vsa okna"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Zapri stranski pult"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Ra�unalnik"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Pojdi v mapo \"Smeti\""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Lokacija..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Predmeti, ki so ]mape"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Vzorci"
@@ -7294,10 +7604,13 @@ msgid "View Failed"
 msgstr "Pogled ni uspel"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Pogled %s je naletel na napako ob zagonu."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Pogled %s je naletel na napako in se ne more nadaljevat. Lahko izberete drug "
 "pogled ali pojdite na drugo lokacijo."
@@ -7307,99 +7620,128 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Pogled %s je naletel na napako ob zagonu."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "NautilusApplication povezan s tem oknom."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Pogled vsebine"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Pogled trenutne datoteke ali mape"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Nisem mogel najti \"%s\". Prosim preverite �rkovanje in poskusite znova."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Nisem mogel naložiti %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nisem mogel naložiti %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Nisem mogel prikazati \"%s\", ker Nautilus ne more ugotoviti katera vrsta "
 "datoteke to je."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus nima nameš�enga pregledovalnika sposobnega prikaza \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Nisem mogel prikazati \"%s\", ker nautilus ne zna obravnavati %s: lokacij."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Nisem mogel prikazati \"%s\", ker je poskus prijave spodletel."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Nisem mogel prikazati \"%s\", ker je bil dostop zavrnjen."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Nisem mogel prikazati \"%s\", ker gostitelj \"%s\" ni bil najden. Preverite, "
 "�e so �rkovanje in nastavitve posrednika pravilne."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Nisem mogel pokazati \"%s\". Preverite, ali so nastavitve posrednika "
 "pravilne."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Nisem mogel prikazati \"%s\", ker nautilus ne zna obravnavati %s: lokacij."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Nisem mogel prikazati \"%s\", ker se Nautilus ni mogel povezati z glavnim "
-"brskalnikom SMB \n"
-"Preveite ali strežnik SMB te�e na lokalni mreži."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Iskanje trenutno ni na voljo, ker nimate kazala ali pa storitev iskanja ne "
 "te�e. Prepri�ajte se, da ste pognali storitev iskanja Medusa in, �e nimate "
 "kazala, da Medusin ustvarjalec kazala te�e. "
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Iskanje trenutno ni na voljo, ker nimate kazala ali pa storitev iskanja ne "
+"te�e. Prepri�ajte se, da ste pognali storitev iskanja Medusa in, �e nimate "
+"kazala, da Medusin ustvarjalec kazala te�e. "
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Iskanje ni na voljo"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ne more prikazati \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Ne morem prikazati lokacije"
 
@@ -7411,7 +7753,7 @@ msgstr "Pojdi na lokacijo navedeno s tem zaznamkom"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Avtorske pravice pridržane (C) 1999-2001 Eazel, Inc."
 
@@ -7419,11 +7761,11 @@ msgstr "Avtorske pravice pridržane (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Andraž Tori <andraz.tori1@guest.arnes.si>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7439,38 +7781,43 @@ msgstr "Pojdi nekaj strani nazaj"
 msgid "Go forward a number of pages"
 msgstr "Pojdi nekaj strani naprej"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Kaži to lokacijo z \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Mreža Red Hat"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Pisave"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+#, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Ustvarjalnik CDjev"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID programa"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID programa tega okna."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Program"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "NautilusApplication povezan s tem oknom."
 
@@ -7506,6 +7853,263 @@ msgstr "Mrežni strežniki"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Nekatere datoteke ne morejo biti dodane kot emblemi, ker se zdi, da niso "
+#~ "veljavne slike."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Tovarna za pogled strojne opreme"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Pregledovalnik strojne opreme"
+
+#~ msgid "Hardware view"
+#~ msgstr "Pregled strojne opreme"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Glej kot storjno opremo"
+
+#~ msgid "hardware view"
+#~ msgstr "pregled strojne opreme"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ime ikone za pogled strojne opreme"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "povzetek pogleda strojne opreme"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "Procesor %s\n"
+#~ "%s MHz\n"
+#~ "velikost predpomnilnika %s K"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB pomnilnika"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB pomnilnika"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "ÄŒas delovanja je %d dni, %d ur, %d minut"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Pregled strojne opreme"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "To je držalec mesta za stran o procesorju"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "To je držalec mesta za stran o pomnilniku"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "To je držalec mesta za stran o IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Napaka ob kopiranju v \"%s\".\n"
+#~ "\n"
+#~ "Na cilju ni dovolj prostora."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Napaka ob ustvarjanju povezave v \"%s\".\n"
+#~ "\n"
+#~ "Na cilju ni dovolj prostora."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Napaka ob prestavljanju predmetov v \"%s\".\n"
+#~ "\n"
+#~ "Nimate dovoljenj za pisanje v to mapo."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Napaka ob prestavljanju predmetov v \"%s\".\n"
+#~ "\n"
+#~ "Ciljni disk je le berljiv."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Napaka ob ustvarjanju povezav v \"%s\".\n"
+#~ "\n"
+#~ "Nimate dovoljenja za pisanje v to mapo."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Napaka ob ustvarjanju povezav v \"%s\".\n"
+#~ "\n"
+#~ "Ciljni disk je le berljiv."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob kopiranju \"%s\".\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob prestavljanju \"%s\".\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob brisanju \"%s\".\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob kopiranju.\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob povezovanju.\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Napaka \"%s\" ob brisanju.\n"
+#~ "\n"
+#~ "Želite nadaljevati?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ne morem kopirati v Smeti"
+
+#~ 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 ""
+#~ "Privzeto dejanje ne more odpreti \"%s\", ker ne more dostopati do datotek "
+#~ "na lokacijah \"%s\". Za pogled te datoteke druga dejanja niso na voljo. "
+#~ "Če skopirate to datoteko na vaš ra�unalnik, jo boste morda lahko odprli."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Preiskujem diske"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus preiskuje vaše diske za mape smeti."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d izbranih predmetov ne more biti prestavljenih v Smeti. Jih želite "
+#~ "zbrisati takoj?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d od izbranih predmetov ne more biti prestavljenih v Smeti. Želite teh %"
+#~ "d predmetov zbrisati takoj?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Datoteka, ki ste jo spustili ni slika. Kot prikorjene ikone lahko "
+#~ "uporabljate le krajevne slike."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Storitev iskanja Medusa ni na voljo, ker ni nameš�ena."
+
+#~ 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 ""
+#~ "Za iskanje po vsebini potrebuje program Find kazalo datotek vašega "
+#~ "sistema. Vaš ra�unalnik trenutno ustvarja to kazalo.  Iskanje po vsebini "
+#~ "bo na voljo, ko bo kazalo pripravljeno."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Enkrat na dan se ustvari kazalo vaših datotek in vsebin (besedil), tako "
+#~ "da so vaša iskanja hitra. Kazalo se trenutno ustvarja."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" ni veljavna lokacija. Prosim preverite �rkovanje in poskusite "
+#~ "znova. "
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "'%s' ni uporabna datoteka s sliko!"
+
+#~ 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 ""
+#~ "Nisem mogel prikazati \"%s\", ker se Nautilus ni mogel povezati z glavnim "
+#~ "brskalnikom SMB \n"
+#~ "Preveite ali strežnik SMB te�e na lokalni mreži."
+
+#~ msgid "file icon"
+#~ msgstr "ikona datoteke"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Ime:"
+
 #~ msgid "Unknown"
 #~ msgstr "Neznan"
 
@@ -7598,9 +8202,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "_Orodjarna"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Lokacija \"%s\" ne obstaja ve�."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Pojdi na neobstoje�o lokacijo"
 
@@ -7643,9 +8244,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Your HTTP Proxy requires you to log in.\n"
 #~ msgstr "Vaš posrednik HTTP od vas zahteva prijavo.\n"
 
@@ -7673,9 +8271,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "_New Folder"
 #~ msgstr "_Nova mapa"
 
-#~ msgid "_Location:"
-#~ msgstr "_Lokacija:"
-
 #~ msgid "Sort in _reverse"
 #~ msgstr "Razvrsti _obrnjenem redu"
 
@@ -8231,9 +8826,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Nastavi sliko naslovnice"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Oprostite, ampak '%s' ni uporabna datoteka s sliko."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Izberite datoteko s sliko za naslovnico albuma:"
 
@@ -8332,9 +8924,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Nisem mogel naložiti %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Nalagam %s"
 
@@ -8714,9 +9303,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Display %s tab in sidebar"
 #~ msgstr "Kaži uhelj %s v stranskem pultu"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Slika %s ne more biti nameš�ena kot emblem."
-
 #~ msgid "Hide _Sidebar"
 #~ msgstr "Skrij _stranski pult"
 
@@ -8750,9 +9336,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "\"%s\" ni veljavna mapa tem."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Teme \"%s\" ni bilo mogo�e namestiti."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Nisem mogel namestiti teme"
 
@@ -8769,9 +9352,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ "Trenutne teme ne morete odstraniti. Spremenite temo pred odstranjevanjem "
 #~ "trenutne."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Tema ne more biti odstranjena!"
-
 #~ msgid "Add New Theme..."
 #~ msgstr "Dodaj novo temo..."
 
@@ -9521,9 +10101,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "je zaš�itena proti pisanju, priklapljam le za branje"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "ni veljavna blokovna naprava"
-
 #~ msgid "No medium found"
 #~ msgstr "Medij ni bil najden"
 
@@ -9537,9 +10114,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "scripts"
 #~ msgstr "skripte"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus ni mogel ustvariti imenika %s."
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "Ni mape skript"
 
@@ -10200,9 +10774,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "%s requires %s"
 #~ msgstr "%s potrebuje %s"
 
-#~ msgid "%s is not installed"
-#~ msgstr "%s ni nameš�en"
-
 #~ msgid "Check for a new version of %s"
 #~ msgstr "Preveri za novo verzijo paketa %s"
 
@@ -10417,13 +10988,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ "\n"
 
 #~ msgid ""
-#~ "These packages are about to be uninstalled:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Slede�i paketi bodo odstranjeni:\n"
-#~ "\n"
-
-#~ msgid ""
 #~ "These packages are about to be reverted:\n"
 #~ "\n"
 #~ msgstr ""
@@ -11076,9 +11640,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Error"
 #~ msgstr "Napaka"
 
-#~ msgid "Details"
-#~ msgstr "Podrobnosti"
-
 #~ msgid "Question"
 #~ msgstr "Vprašanje"
 
@@ -11113,13 +11674,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Don't Create an Index Now"
 #~ msgstr "Sedaj ne ustvari kazala"
 
-#~ msgid ""
-#~ "To do a content search, Find requires an index of the content on your "
-#~ "system.  An index can't be created right now."
-#~ msgstr ""
-#~ "Za iskanje po vsebini potrebuje program Find kazalo vsebine vašega "
-#~ "sistema. Kazalo trenutno ni dostopno."
-
 #~ msgid "Indexing is Blocked on Your Computer"
 #~ msgstr "Ustvarjanje kazala je na vašem ra�unalniku blokirano."
 
@@ -11515,9 +12069,6 @@ msgstr "Glej svoje mrežne strežnike v upravljalniku daototek Nautilus"
 #~ msgid "Error While Reindexing"
 #~ msgstr "Napaka ob ustvarjanju novega kazala"
 
-#~ msgid "Your files are currently being indexed:"
-#~ msgstr "Trenutno se ustvarja kazalo vaših datotek:"
-
 #~ msgid "Indexing Info"
 #~ msgstr "Podatki o kazalu"
 
diff --git a/po/sq.po b/po/sq.po
index 0e06afeff..ff8774690 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-09 12:17+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() dështoi."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Simbole"
 
@@ -54,48 +54,60 @@ msgid "Nautilus Emblem view"
 msgstr "Paraqitje sipas simboleve të Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "E pamundur heqja e simbolit"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Nuk mund të heq simbolin me emrin '%s'. Shkaku mund të jetë që simboli është "
 "i përhershëm, pra jo i krijuar nga ju."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "E pamundur heqja e simbolit"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "I pamundur riemërtimi i simbolit"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Nuk mund ti jap emrin '%s' simbolit.  Shkaku mund të jetë që simboli është i "
 "përhershëm, pra jo i krijuar nga ju."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "I pamundur riemërtimi i simbolit"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Riemërto simbolin"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Shkruaj emrin e ri për simbolin e shfaqur:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Riemërto"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Shto simbole..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -103,7 +115,7 @@ msgstr ""
 "Shkruaj një emër tjetër përshkrues për simbolin. Ky emër do të përdoret në "
 "pozicione të tjera për të identifikuar simbolin."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -111,139 +123,62 @@ msgstr ""
 "Shkruaj një emër tjetër për simbolin. Ky emër do të përdoret në pozicione të "
 "tjera për të identifikuar simbolin."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Disa nga filet nuk do të shtohen si emblema pasi mesa duket nuk janë figura "
-"të vlefshme."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Më vjen keq, por figura %s nuk mund të instalohet si simbol."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "File '%s' nuk është figurë e vlefshme."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "I pamundur shtimi i emblemave"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Asnjë nga filet nuk do të shtohen si emblema pasi mesa duket nuk janë figura "
 "të vlefshme."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Teksti i afruar nuk ka një pozicion të vlefshëm file."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "I pamundur shtimi i emblemës"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "File '%s' nuk është figurë e vlefshme."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Files e tërhequr nuk janë figura të vlefshme."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Fshi"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrikë për shikimin e hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Vizualizues hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Shikimi hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Shiko si hardware"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "pamja hardware"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "emri i ikonës për shikimin e hardware"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "përmbledhja e informacioneve mbi hardware"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K me cache"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Koha e aktivitetit është %d ditë, %d orë, %d minuta"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Panorama e hardware"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ky është një vendshënim për faqen e CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ky është një vendshënim për faqen e RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ky është një vendshënim për faqen e disqeve IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Kronollogjia"
@@ -910,6 +845,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardware"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internacionale"
@@ -1196,30 +1135,19 @@ msgid "Desktop trash icon name"
 msgstr "Emri i ikonës trash (koshi) të desktop-it"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Shfaq flags 'specialë' tek dialogu i pronësive"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Emri i file për sfondin e prezgjedhur të directory. Përdoret vetëm nëse "
 "sfondi_zgjedhur është e vërtetë."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1227,6 +1155,19 @@ msgstr ""
 "Emri i file për sfondin e prezgjedhur të panelit anësor. Përdoret vetëm nëse "
 "sfondi_zgjedhur_panelit_anësor është e vërtetë."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Directories 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 massive directories. A negative value denotes no limit. The "
+"limit is approximate due to the reading of directories chunk-wise."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Mos shfaq të preferuarit e prezgjedhur tek menu e të preferuarve"
@@ -1236,9 +1177,10 @@ msgid "Home icon visible on desktop"
 msgstr "Ikona shtëpi e dukshme në desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Nëse e vërtetë, Nautilus do të shfaqë vetëm directories në paraqitjen e "
 "degëzuar anësore. Përndryshe do të shfaqë si directories ashtu dhe files."
@@ -1277,9 +1219,10 @@ msgstr ""
 "të një file nga dialogu i preferimeve të file."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Nëse e vërtetë, Nautilus do të shfaqë directories para files në paraqitjet "
 "si ikona dhe listë."
@@ -1323,8 +1266,9 @@ msgstr ""
 "menu e të preferuarve."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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ëse e vërtetë, Nautilus do të përdorë directory home të përdoruesit si "
@@ -1341,9 +1285,10 @@ msgstr ""
 "files të backup."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Nëse e vërtetë, file e padukshëm do të jenë të dukshëm në manazhuesin e "
 "file. Files e padukshëm janë dotfiles ose gjenden në directory e file të ."
@@ -1367,8 +1312,9 @@ msgstr ""
 "Nëse e vërtetë, një ikonë e lidhur me koshin do të vendoset në desktop."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Nëse e vërtetë, një ikonë e lidhur me directory home do të vendoset në "
@@ -1404,7 +1350,8 @@ msgstr ""
 "madhësisë, në vend që të fillojnë në rritje do të renditen në zbritje."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "If true, icons will be layed out tighter by default in new windows."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1435,7 +1382,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista e përshkrimeve të mundëshme tek ikonat"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Numri maksimum i files në një directory"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1455,11 +1403,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Përdor Nautilus për të vizatuar desktop-in"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus përdor directory home të përdoruesit si desktop"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Vizualizo vetëm directories tek paneli i përmbajtjes së degëzuar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1479,7 +1429,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Renditje e kundërt tek dritaret e reja"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Shfaq në fillim directories në dritaret"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1515,10 +1466,11 @@ msgstr ""
 "local filesystems. If set to \"never\" then it never previews sound."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1529,12 +1481,13 @@ msgstr ""
 "read preview data."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the directory is on a remote "
@@ -1543,10 +1496,11 @@ msgstr ""
 "use a generic icon."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Speed tradeoff for when to show the number of items in a directory. If set "
@@ -1555,18 +1509,20 @@ msgstr ""
 "filesystems. If set to \"never\" then never bother to compute item counts."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Renditja e prezgjedhur për objektet në paraqitjen me ikona. Vlerat e "
 "mundëshme janë \"emri\", \"madhësia\", \"lloji\", \"data_ndryshimit\", "
 "\"emblemat\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Renditja e prezgjedhur për objektet në paraqitjen si listë. Vlerat e "
 "mundëshme janë emri, madhësia, lloji, dhe data_ndryshimit."
@@ -1612,7 +1568,8 @@ msgid "Use manual layout in new windows"
 msgstr "Përdor paraqitjen manuale tek dritaret e reja"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Përdor paraqitjen tighter për dritaret e reja"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1642,7 +1599,8 @@ msgstr ""
 "janë \"paraqitja_listë\" dhe \"paraqitja_ikona\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Kur të shfaqet numri i objekteve në një directory"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1654,7 +1612,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Kur të shfaq miniaturat e figurave"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Kur është zgjedhur sfondi i personalizuar i prezgjedhur i directory."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1812,68 +1771,83 @@ msgstr "rishkruaj"
 msgid "on the desktop"
 msgstr "në desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "E pamundur fshirja e volumit"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Nuk mund të eleminoni ikonën e volumit. Nëse dëshironi të shkëpusni volumin, "
 "klik i djathtë i mous dhe nga menu zgjidhni \"Nxirre\"."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "E pamundur fshirja e volumit"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Koshi"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Lëviz këtu"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopjoje këtu"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Lidhe këtu"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Vendose si _sfond"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Anulloje"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Zgjidhe si sfond për të gjith_a kartelat"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Zgjidhe si sfond për kë_të kartelë"
 
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Më vjen keq, por tema \"%s\" nuk mund të instalohet."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Më vjen keq, duhet të specifikoni një fjalëkyç jo bosh për simbolin e ri."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "I pamundur instalimi i simbolit"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1884,20 +1858,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Më vjen keq, por një simbol me emrin \"%s\" ekziston. Ju lutem zgjidh një "
 "emër tjetër."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "I pamundur instalimi i simbolit"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Më vjen keq, i pamundur shpëtimi i simbolit të krijuar."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Më vjen keq, i pamundur shpëtimi i emrit të simbolit të krijuar."
 
@@ -1916,22 +1896,28 @@ msgstr "Nga:"
 msgid "To:"
 msgstr "Për:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Gabim gjatë lëvizjes."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Gabim gjatë lëvizjes.\n"
 "\n"
 "\"%s\" nuk mund të lëvizet pasi ndodhet në një disk që vetëm mund të lexohet."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Gabim gjatë eleminimit."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1940,23 +1926,18 @@ msgstr ""
 "\"%s\" nuk mund të eleminohet pasi kartela superiore kërkon të drejta më të "
 "larta."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Gabim gjatë eleminimit.\n"
 "\n"
 "\"%s\" nuk mund të eleminohet pasi ndodhet në një disk që vetëm mund të "
 "lexohet."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1965,12 +1946,15 @@ msgstr ""
 "\"%s\" nuk mund të spostohet pasi ju nuk keni të drejta të mjaftueshme për "
 "të ndryshuar atë apo kartelën superiore."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Gabim gjatë lëvizjes."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Gabim gjatë lëvizjes.\n"
@@ -1978,12 +1962,10 @@ msgstr ""
 "\"%s\" nuk mund të lëvizet pasi ajo apo kartela të prejardhura ekzistojnë në "
 "pozicionin ku do të spostohet."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Gabim gjatë lëvizjes.\n"
@@ -1991,238 +1973,178 @@ msgstr ""
 "\"%s\" nuk mund të spostohet tek Koshi i Plehrave pasi ju nuk keni të drejta "
 "të mjaftueshme për të ndryshuar atë apo kartelën superiore."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Gabim gjatë kopjimit."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Gabim gjatë kopjimit.\n"
 "\n"
 "\"%s\" nuk mund të kopjohet pasi ju nuk keni të drejtë t'a lexoni atë."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Gabim gjatë kopjimit të \"%s\".\n"
-"\n"
-"Nuk ka më hapsirë në pozicionin e zgjedhur për kopjen."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Gabim gjatë kopjimit."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Gabim gjatë lëvizjes së \"%s\".\n"
 "\n"
 "Nuk ka më hapsirë në pozicionin e zgjedhur."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Gabim gjatë krijimit të lidhjes në \"%s\".\n"
-"\n"
-"Nuk ka më hapsirë në pozicionin e zgjedhur."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Gabim gjatë lëvizjes."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Gabim gjatë lidhjes."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Gabim gjatë kopjimit në \"%s\".\n"
 "\n"
 "Nuk keni të drejtat e mjaftueshme për të shkruar tek kjo kartelë."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Gabim gjatë kopjimit tek \"%s\".\n"
 "\n"
 "Disku i destinuar është vetëm për lexim."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Gabim gjatë lëvizjes së objekteve në \"%s\".\n"
-"\n"
-"Nuk keni të drejtë të shkruani tek kjo kartelë."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Gabim gjatë lëvizjes së objekteve në \"%s\".\n"
-"\n"
-"Disku i destinuar është vetëm për lexim."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Gabim gjatë krijimit të lidhjeve në \"%s\".\n"
-"\n"
-"Nuk keni të drejtë të shkruani tek kjo kartelë."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Gabim gjatë lëvizjes."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Gabim gjatë krijimit të lidhjeve në \"%s\".\n"
-"\n"
-"Disku i destinuar është vetëm për lexim."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë kopjimit të \"%s\".\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Gabim gjatë lidhjes."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Gabim gjatë kopjimit."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Gabim \"%s\" gjatë lëvizjes së \"%s\".\n"
+"Gabim \"%s\" gjatë lëvizjes.\n"
 "\n"
 "Dëshironi të vazhdoj?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë krijimit të lidhjes me \"%s\".\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Gabim gjatë lëvizjes."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Gabim \"%s\" gjatë eleminimit të \"%s\".\n"
+"Gabim \"%s\" gjatë krijimit të lidhjes me \"%s\".\n"
 "\n"
 "Dëshironi të vazhdoj?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë kopjimit.\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Gabim gjatë eleminimit."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë lëvizjes.\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Gabim gjatë kopjimit."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë lidhjes.\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Gabim gjatë lëvizjes."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Gabim \"%s\" gjatë eleminimit.\n"
-"\n"
-"Dëshironi të vazhdoj?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Gabim gjatë lidhjes."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Gabim gjatë eleminimit."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Gabim gjatë kopjimit."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Gabim gjatë lëvizjes."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Gabim gjatë lidhjes."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Gabim gjatë eleminimit."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Kapërce"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Riprovo"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "I pamundur plotësimi i aksionit të specifikuar."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nuk mund të spostohet tek pozicioni i ri, sepse emri i tij eshtë "
 "përdorur për një objekt special që nuk mund të hiqet apo zëvëndësohet.\n"
@@ -2230,13 +2152,16 @@ msgstr ""
 "Nëqoftëse akoma dëshironi t'a lëvizni \"%s\", ndryshoini emrin dhe provo "
 "edhe një herë."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "I pamundur plotësimi i aksionit të specifikuar."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" nuk mund të kopjohet tek pozicioni i ri, sepse emri i tij eshtë "
 "përdorur për një objekt special që nuk mund të hiqet apo zëvëndësohet.\n"
@@ -2244,44 +2169,50 @@ msgstr ""
 "Nëqoftëse akoma dëshironi t'a kopjoni \"%s\", ndryshoini emrin dhe provo "
 "edhe një herë."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "I pamundur zevëndësimi i file."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "File \"%s\" ekziston.\n"
 "\n"
 "Dëshironi t'a zevëndësoni atë?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt gjatë kopjimit"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Zevëndësoje"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Zevëndësoi të gjithë"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "lidhje me %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "një tjetër lidhje me %s"
@@ -2290,25 +2221,25 @@ msgstr "një tjetër lidhje me %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "lidhja %drë me %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "lidhja %dtë me %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "lidhja %dtë me %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "lidhja %drt me %s"
@@ -2318,563 +2249,602 @@ msgstr "lidhja %drt me %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopje)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (kopje tjetër)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " kopje)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ra kopje)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "ta kopje)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "ta kopje)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopje)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (kopje tjetër)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (kopja %d)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (kopja %d)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (kopja %d)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (kopja %d)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d e panjohur"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Spostimi i files në Kosh"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Files që duhen flakur:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Duke lëvizur "
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Përgatitja për spostim në Kosh..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Po spostoj files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Fles e spostuar:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Duke u përgatitur për spostim..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Fund i spostimit..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Krijimi i lidhjes me file"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Files të lidhur:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Lidhje"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Duke përgatitur krijimin e lidhjeve..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Fund i kijimit të lidhjeve..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopjimi i files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Files të kopjuar:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Duke kopjuar"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Përgatitje për kopjim..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Nuk mund të kopjoni objektet në Kosh."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "I pamundur kopjimi në Kosh"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Nuk mund të lëvizni këtë kartelë të koshit."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Nuk mund të kopjoni këtë kartelë të koshit."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "I pamundur ndryshimi i pozicionit të Koshit"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "I pamundur kopjimi i Koshit"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Nuk mund të lëvizet një kartelë në vetvete."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Nuk mund të kopjoni një kartelë në vetvete."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Krijon në këtë kartelë një kartelë tjetër bosh"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "E pamundur lëvizja në vetvete."
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "E pamundur kopja në vetvete"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Nuk është e mundur kopja e një file në vetvete."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "E pamundur kopja në vetvete"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Gabim gjatë krijimit të kartelës së re.\n"
 "\n"
 "Nuk keni të drejtat e shkrimit tek pozicioni i dëshiruar."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Gabim gjatë krijimit të kartelës së re.\n"
 "\n"
 "Nuk ka më vend tek pozicioni i dëshiruar."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Gabim \"%s\" gjatë krijimit të kartelës së re."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Gabim gjatë krijimit të kartelës së re"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Gabim gjatë krijimit të kartelës së re"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "kartelë pa emër"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Gabim \"%s\" gjatë krijimit të kartelës së re."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Gabim gjatë krijimit të kartelës së re"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Gabim gjatë krijimit të kartelës së re"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 file"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Eleminimi i files"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Files të eleminuar:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Duke eleminuar"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Përgatitje për eleminimin e files..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Duke zbrazur Koshin"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Përgatitje për zbrazjen e Koshit..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë të gjithë elementët që "
 "ndodhen në Kosh?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Zbraz"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (kopje).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (kopje tjetër)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (kopje tjetër)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (kopje tjetër).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (kopja e 3-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (kopja e 3-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (kopje tjetër).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (kopja e 3-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (kopja e 13-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (kopja e 14-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (kopja e 13-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (kopja e 14-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (kopja e 21-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (kopja e 22-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (kopja e 21-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (kopja e 22-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (kopja e 23-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (kopja e 23-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (kopja e 24-t)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (kopja e 24-t).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (kopja e 25-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (kopja e 25-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (kopja e 24-t)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (kopja e 25-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (kopja e 24-t).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (kopja e 25-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000-ta kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (kopja e 10-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (kopja e 11-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (kopja e 10-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (kopja e 11-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (kopja e 12-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (kopja e 12-të).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110-a kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111-a kopje)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110-a kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111-a kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (kopja e 122-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (kopja e 123-të)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122-ta kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123-ta kopje).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (kopja e 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (kopja e 124).txt"
 
@@ -2893,64 +2863,64 @@ msgstr "foo (kopja e 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "sot në 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "sot në %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "sot në 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "sot në %-H:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "sot, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "sot, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "sot"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "dje në 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "dje në %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "dje në 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "dje në %-H:%M "
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "dje, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "dje, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "dje"
 
@@ -2959,133 +2929,133 @@ msgstr "dje"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Të mërkurën, më 00 Shtator 0000 në 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y alle %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Hën, 00 Tet 0000 në 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y në %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Hën, 00 Tet në 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y në %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Tet 0000 në orën 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y në %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Tet 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 objekte"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 kartela"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 files"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 objekt"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 kartelë"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 file"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u objekte"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u kartela"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u files"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? objekte"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "tip i panjohur"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "tip MIME i panjohur"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "i panjohur"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3095,7 +3065,7 @@ msgstr ""
 "që ndoshta fili juaj gnome-vfs.keys ndodhet në një pozicion të gabuar ose "
 "nuk arrin të gjehet për ndonjë arsye tjetër."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3104,11 +3074,11 @@ msgstr ""
 "Nuk u gjet asnjë përshkrim për tipin mime \"%s\" (fili është \"%s\"), ju "
 "lutem lajmëroni mailing list të gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "lidhje"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "lidhje (e shkëputur)"
 
@@ -3229,11 +3199,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Kërkoi files sipas emrit dhe karakteristikave"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Paraqitje me ikona"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Paraqitje si listë"
@@ -3377,148 +3349,153 @@ msgstr "Shtëpia e %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "ikona e file"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "tekst i ndryshueshëm"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "etiketë e ndryshueshme"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "tekst shtesë"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "tekst tjetër"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "vëre në dukje për t'a zgjedhur"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "kur zgjedhja e vë në dukje"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "highlighted as keyboard focus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "whether we are highlighted to render keyboard focus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "i vënë në dukje për t'u lëshuar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "nëse D&D e vë në dukje"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Katrori i seleksionimit"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Teksti i mbajtësit"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Vizato një përmbajtës rreth tekstit të pa seleksionuar"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Kutia e zgjedhjes së ngjyrave"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Ngjyra e kutisë seleksionuese"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Selection Box Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Trasparenca e kutisë seleksionuese"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Highlight Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacity of the highlight for selected icons"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Light Info Color"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Color used for information text against a dark background"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Dark Info Color"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Color used for information text against a light background"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Kjo kartelë përdor një rregullim automatik të objekteve. Dëshironi të kaloni "
 "në një rregullim personal dhe t'a lini objektin atje ku e keni zvarritur? "
 "Kjo gjë do të anullojë rregullimin e memorizuar."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Kjo kartelë përdor një rregullim automatik të objekteve. Dëshironi të kaloni "
 "në një rregullim personal dhe t'i lini objektet atje ku i keni zvarritur? "
 "Kjo gjë do të anullojë rregullimin e memorizuar."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Kjo kartelë përdor një rregullim automatik të objekteve. Dëshironi të kaloni "
 "në një rregullim personal dhe t'a lini objektin atje ku e keni zvarritur?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Kjo kartelë përdor një rregullim automatik të objekteve. Dëshironi të kaloni "
 "në një rregullim personal dhe t'i lini objektet atje ku i keni zvarritur?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Kaloj tek rregullimi i personalizuar?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Kalo"
 
@@ -3627,72 +3604,72 @@ msgstr "Është i prezgjedhur për elementët \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Është i prezgjedhur për të gjithë elementët \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Ndrysho \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Përfshi në menu për objektet \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "E prezgjedhur për objektet \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Përfshi në menu vetëm për \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "E prezgjedhur vetëm për \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Mos përfshi në menu për objektet \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Emri"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Gjendja"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Zgjidh"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Mbarova"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Modifiko..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Lloje files dhe programesh"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Shko atje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3700,48 +3677,48 @@ msgstr ""
 "Nga dialogu Lloje files dhe programesh mund të konfigurosh se kush program "
 "shërben për të hapur një lloj të caktuar file."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Hape me një aplikacion tjetër"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Zgjidh një aplikacion me të cilin të hapësh \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Hape me një vizualizues tjetër"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Zgjidh një pamje për \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Asnjë vizualizues në dispozicion për \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Asnjë vizualizues në dispozicion"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Asnjë aplikacion nuk është i shoqëruar me \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Asnjë aplikacion i shoqëruar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Asnjë veprim nuk është i shoqëruar me \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Asnjë Veprim i shoqëruar"
 
@@ -3749,11 +3726,9 @@ msgstr "Asnjë Veprim i shoqëruar"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3763,42 +3738,41 @@ msgstr ""
 "aplikacion të caktuar. Dëshironi të shoqëroni një aplikacion me këtë lloj "
 "file tani?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Aplikacione të shoqëruara"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Shikuesi i shoqëruar me \"%s\" është i gabuar."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Shikues i Gabuar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Aplikacioni i shoqëruar me \"%s\" është i gabuar."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Aplikacion i gabuar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Veprimi i shoqëruar me \"%s\" është i gabuar."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Veprim i shoqëruar i gabuar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3809,95 +3783,136 @@ msgstr ""
 "apoaplikacion tjetër. Dëshironi të shoqëroni një aplikacion apo shikues me "
 "këtë lloj file tani?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Veprimi i shoqëruar"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" nuk mund të hapë \"%s\" sepse \"%s\" nuk ka hyrje tek files në "
+"pozicionet \"%s\".  Zgjedh një aplikacion tjetër?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" nuk mund të hapë \"%s\" sepse \"%s\" nuk ka hyrje tek files në "
 "pozicionet \"%s\".  Zgjedh një aplikacion tjetër?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Veprimi i prezgjedhur nuk mund të hapë \"%s\" sepse nuk ka hyrje tek files "
 "në pozicionet \"%s\".  Dëshironi të zgjedhni një veprim tjetër?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "E pamundur hapja e pozicionit"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" nuk mund të hapë \"%s\" sepse \"%s\" nuk ka hyrje tek files në "
+"pozicionet \"%s\".  Zgjedh një aplikacion tjetër?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" nuk mund të hapë \"%s\" sepse \"%s\" nuk ka hyrje tek files në "
 "pozicionet \"%s\".  Asnjë aplikacion tjetër në dispozicion për të shikuar "
 "këtë file.  Nëqoftëse e kopjoni këtë file në kompjuterin tuaj, do të jeni në "
 "gjendje t'a hapni atë."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"Veprimi i prezgjedhur nuk mund të hapë \"%s\" sepse ai nuk ka hyrje tek "
-"files në pozicionet \"%s\".  Asnjë veprim tjetër në dispozicion për të "
-"shikuar këtë file.  Nëqoftëse e kopjoni këtë file në kompjuterin tuaj, do të "
-"jeni në gjendje t'a hapni atë."
+"Veprimi i prezgjedhur nuk mund të hapë \"%s\" sepse nuk ka hyrje tek files "
+"në pozicionet \"%s\".  Dëshironi të zgjedhni një veprim tjetër?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" nuk mund të hapë \"%s\" sepse \"%s\" nuk ka hyrje tek files në "
+"pozicionet \"%s\".  Asnjë aplikacion tjetër në dispozicion për të shikuar "
+"këtë file.  Nëqoftëse e kopjoni këtë file në kompjuterin tuaj, do të jeni në "
+"gjendje t'a hapni atë."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Duke hapur %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Më vjen keq, nuk mund të ekzekutoni komanda nga një sit remot për arsye "
 "sigurie."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Nuk mund të ekzekutohen lidhje remote"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Gabim gjatë nisjes së aplikacionit.\n"
 "\n"
 "Hollësi: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Gabim duke nisur aplikacionin"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Pozicioni i destinuar i zvarritjes suporton vetëm filet lokalë."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Pozicioni i destinuar i zvarritjes suporton vetëm filet lokalë.\n"
@@ -3905,15 +3920,15 @@ msgstr ""
 "Për të hapur një file jo-lokal kopjojeni atë në një kartelë lokale e pastaj "
 "zvarriteni përsëri."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Pozicioni i destinuar i zvarritjes suporton vetëm filet lokalë."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4169,14 +4184,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Objekte që përmbajnë \"medusa\" në emrin e tyre dhe që janë kartela"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Kërkim nëpër disqe"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus është duke kërkuar në disqe kartelat e koshit."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Ndrysho"
@@ -4379,97 +4386,107 @@ msgstr "Sfondi"
 msgid "Empty Trash"
 msgstr "Zbraz Koshin"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Do të hapen %d dritare të veçanta. Zbatoj?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Të hap %d dritare?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Të eleminoj përgjithmonë \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Do të hapen %d dritare të veçanta. Zbatoj?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Të eleminoj përgjithmonë \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë %d objektet e zgjedhur?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Elemino përgjithmonë të gjithë objektet e zgjedhur"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Ti eleminoj?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Zgjidh një kategori:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Motive"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "zgjedhur \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 kartelë e zgjedhur"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d kartela të seleksionuara"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (përmban 0 objekte)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (përmban 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (përmban %d objekte)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (përmban gjithsej 0 objekte)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (përmban gjithsej 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (përmban gjithsej %d objekte)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "zgjedhur \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d objekte të zgjedhur (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 objekt tjetër i zgjedhur (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d objekte të tjerë të zgjedhur (%s)"
@@ -4481,7 +4498,7 @@ msgstr "%d objekte të tjerë të zgjedhur (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4490,106 +4507,122 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Kartela \"%s\" përmban më shumë files nga sa Nautilus mund të manazhojë. "
 "Disa nga files nuk do të mund të shfaqen."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Tepër files"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" nuk mund të çohet në Kosh. Dëshironi t'a eleminoni menjëherë?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d objektet e zgjedhur nuk mund të çohen në Kosh. Dëshironi t'i eleminoni "
-"menjëherë?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" nuk mund të çohet në Kosh. Dëshironi t'a eleminoni menjëherë?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d të objekteve të seleksionuar nuk mund të çohen në Kosh. Dëshironi t'i "
-"eleminoni këta %d objekte menjëherë?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" nuk mund të çohet në Kosh. Dëshironi t'a eleminoni menjëherë?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Ti eleminoj menjëherë?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Jeni i sigurt që dëshironi të eleminoni përgjithmonë \"%s\" nga Koshi?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë nga Koshi %d objektet e "
 "zgjedhur?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Ti eleminoj nga Koshi?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Përdor \"%s\" për të hapur objektin e zgjedhur"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Aplikacione të tjerë..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Një _Aplikacion..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Tjetër _Vizualizues..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Një _Vizualizues..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "I pamundur plotësimi i aksionit të specifikuar:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "I pamundur plotësimi i aksionit të specifikuar."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Zbaton \"%s\" mbi objektet e zgjedhur"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Të gjithë të zbatueshmit në këtë kartelë do të duken tek menu e Scripts. "
+"Duke zgjedhur një script nga kjo menu , ai do të niset me çdo objekt të "
+"seleksionuar si input."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4597,11 +4630,11 @@ msgstr ""
 "Duke zgjedhur një script nga kjo menu , ai do të niset me çdo objekt të "
 "seleksionuar si input."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Informacione mbi Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4643,17 +4676,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: pozicioni dhe përmasat e dritares aktuale"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" do të spostohet nëqoftëse zgjidhni komandën \"Ngjit files\""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" do të kopjohet nëqoftëse zgjidhni komandën \"Ngjit files\""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4661,7 +4694,7 @@ msgstr ""
 "%d objekte të zgjedhur do të lëvizen nëqoftëse zgjidhni komandën \"Ngjit "
 "files\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4669,161 +4702,168 @@ msgstr ""
 " %d objekte të zgjedhur do të kopjohen nëqoftëse zgjidhni komandën \"Ngjit "
 "files\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Nuk ka asgjë tek shënimet për t'u ngjitur."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Gabim i mount"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Gabim gjatë zmontimit"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Gabim i mount"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "E_ject"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Zmonto Volumin"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Hape _në një dritare të re"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Hape _në %d dritare të reja"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Kartela Home"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Kartela Home"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Elemino nga Koshi"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Elemino përgjithmonë të gjithë objektet e zgjedhur"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Lë_viz në Kosh"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Lëviz çdo objekt të zgjedhur në Kosh"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Elemino"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Krijo Lidhje"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Krijo Lidhje"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Zbraze Koshin"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Pre_je File"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Pri_t files"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopjo File"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopjo Files"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Kjo lidhje nuk mund të përdoret, pasi nuk ka një target. Dëshironi të "
 "hedhësh këtë lidhje në Kosh?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Kjo lidhje nuk mund të përdoret, pasi nuk ka një target. Dëshironi të "
+"hedhësh këtë lidhje në Kosh?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Kjo lidhje nuk mund të përdoret, pasi target i saj \"%s\" nuk ekziston. "
 "Dëshironi të hedhësh këtë lidhje në Kosh?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Lidhje e shkëputur"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" është një file teksti i ekzekutueshëm. Dëshironi t'a zbatoni, apo të "
 "shikoni përmbajtjen e tij?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Zbatoj apo paraqit?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Shfaq"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Zbato në _Terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Shfaq"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Zbato"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Hapja e \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Anulloj hapjen?"
 
@@ -4844,10 +4884,15 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Më vjen keq, e pamundur shfaqja e të gjithë përmbajtjes së \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Të drejtat e \"%s\" nuk mund të përcaktohen."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Gabim gjatë shfaqjes së kartelës"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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."
@@ -4855,18 +4900,18 @@ msgstr ""
 "Emri \"%s\" eshtë përdorur njëherë në këtë kartelë. Ju lutem përdorni një "
 "emër tjetër."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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 "Nuk ka \"%s\" në këtë kartelë. Mos e keni lëvizuar apo eleminuar?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Ju nuk keni të drejtat e nevojshme për të ndryshuar emrin e \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4875,65 +4920,80 @@ msgstr ""
 "Emri \"%s\" nuk është i vlefshëm pasi përmban karakterin \"/\". Ju lutem, "
 "përdorni një emër tjetër."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Emri \"%s\" nuk është i vlefshëm. Ju lutem përdorni një emër tjetër."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 ""
 "Nuk arrij të ndryshoj emrin e \"%s\" sepse ndodhet në një disk në vetëm lexim"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Më vjen keq, i pamundur ndryshimi i emrit \"%s\" në \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Më vjen keq, por kjo temë nuk mund të hiqet!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Gabim gjatë ndryshimit të emrit"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Nuk keni të drejta të mjaftueshme për të ndryshuar grupin e \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "Nuk arrij të ndryshoj grupin e \"%s\" pasi ndodhet në një disk vetëm për "
 "lexim"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Më vjen keq, i pamundur ndryshimi i grupit të \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Të drejtat e \"%s\" nuk mund të përcaktohen."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Gabim gjatë vendosjes së grupit."
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "Nuk mund të ndryshoj pronarin e \"%s\" pasi ndidhet në një disk për vetëm "
 "lexim"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Më vjen keq, i pamundur ndryshimi i pronarit të \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Të drejtat e \"%s\" nuk mund të përcaktohen."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Gabim gjatë vendosjes së pronarit"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -4941,21 +5001,26 @@ msgstr ""
 "Nuk arrij të ndryshoj të drejtat e \"%s\" pasi ndodhet në një disk në vetëm "
 "lexim"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Më vjen keq, i pamundur ndryshimi i së drejtave të \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Të drejtat e \"%s\" nuk mund të përcaktohen."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Gabim gjatë vendosjes së së drejtave."
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Ndryshimi i emrit të \"%s\" në \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Anulloj ndryshimin e emrit?"
 
@@ -5013,129 +5078,152 @@ msgstr "Dimensi_onet origjinale të ikonave"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Dimensi_oni origjinal i ikonës"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "ka si objektiv \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Zvarritja suportohet vetëm për file lokalë të sistemit."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Zvarritja suportohet vetëm për file lokalë të sistemit."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Gabim gjatë zvarritjes"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Është përdorur një tip drag jo i vlefshëm."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Emri i file"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Madhësia"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Lloji"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Data ndryshimit"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Është e pamundur dhënia e më shumë se një ikone të personalizuar në të "
+"njëjtën kohë. Ju lutem zvarrisni vetëm një figurë për të vendosur ikonën e "
+"personalizuar."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Është e pamundur dhënia e më shumë se një ikone të personalizuar në të "
 "njëjtën kohë. Ju lutem zvarrisni vetëm një figurë për të vendosur ikonën e "
 "personalizuar."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Më shumë se një figurë"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "File që keni zvarritur nuk është lokal. Ju mund të përdorni vetëm figurat "
 "lokale si ikona të personalizuara."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"File që keni zvarritur nuk është lokal. Ju mund të përdorni vetëm figurat "
+"lokale si ikona të personalizuara."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Vetëm figura lokale"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"File i zvarritur nuk është një figurë. Mund të përdorni vetëm figurat lokale "
-"si ikona të personalizuara."
+"File që keni zvarritur nuk është lokal. Ju mund të përdorni vetëm figurat "
+"lokale si ikona të personalizuara."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Vetëm figura"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Pronësitë"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Karakteristikat e %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Anulloj ndryshimin e grupit?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Ndryshim grupi"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Anulloj ndryshimin e pronarit?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Ndryshimi i pronarit"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "asgjë"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "e palexueshme"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 objekt, me përmasa %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d objekte, gjithsej %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(diçka e palexueshme)"
 
@@ -5145,191 +5233,191 @@ msgstr "(diçka e palexueshme)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Përmbajtja:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Të përgjithshme"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Emrat:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Emri:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tipi:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Madhësia:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Pozicioni:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volumi:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Hapësirë e lirë:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Lidhur me:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Tipi MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Ndryshimi i fundit:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Hyrja e fundit:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Seleksiono ikonën e personalizuar..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Hiq ikonën e personalizuar"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lexim"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Shkrim"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "E_kzekutim"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Vendos ID e _përdoruesit"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Special flags:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Vendos ID e gr_upit"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Të drejta"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Nuk jeni ju pronari, prandaj nuk mund të ndryshoni këto të drejta."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Pronari i file:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Pronari i file:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Grupi i _File:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grupi i file:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Pronari:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupi:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Të tjerë:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Të drejtat të shprehura në tekst:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Të drejtat të shprehura në numra:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Ndryshimi i fundit:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Të drejtat e \"%s\" nuk mund të përcaktohen."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Të drejtat e file të zgjedhur nuk mund të përcaktohen."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Gabim gjatë shfaqjes së ndihmës: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Gabim gjatë shfaqjes së ndihmës: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "E pamundur shfaqja e ndihmës"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Anulloj dritaren e pronësive?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Krijimi i dritares së pronësive"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Zgjidh një ikonë"
 
@@ -5347,72 +5435,112 @@ msgid "Search Results"
 msgstr "Rezultatet e kërkimit"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
-"Më vjen keq, por shërbimi i kërkimit të Medusa nuk mund t'ju vihet në "
-"dispozicion pasi nuk është instaluar."
+"Më vjen keq, por shërbimi i kërkimit të medusa nuk është në dispozicion."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Shërbimi i kërkimit nuk është në dispozicion"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Kërkimi që keni zgjedhur është më i ri se treguesi i sistemit. Tani për tani "
 "kërkimi do të përfundojë pa asnjë rezultat. Mund të krijoni një tregues të "
 "ri duke ekzekutuar, si root nga rreshti i komandës, \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Kërkimi nuk arrin të hapë treguesin e file të sistemit. Treguesi mungon ose "
+"është i dëmtuar.  Mund të krijoni një tregues të ri duke ekzekutuar, si root "
+"nga rreshti i komandës, \"medusa-indexd\"."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Kërko objektet më të rinj"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Çdo file i indeksuar tek kompjuteri juaj korrispondon me kriterin e kërkimit "
+"të zgjedhur. Kontrollo sintaksën e të seleksionuarve ose shtoni kritere të "
+"tjerë për të ngushtuar rezultatet."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Çdo file i indeksuar tek kompjuteri juaj korrispondon me kriterin e kërkimit "
 "të zgjedhur. Kontrollo sintaksën e të seleksionuarve ose shtoni kritere të "
 "tjerë për të ngushtuar rezultatet."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Gabim gjatë kërkimit"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Kërkimi nuk arrin të hapë treguesin e file të sistemit. Treguesi mungon ose "
 "është i dëmtuar.  Mund të krijoni një tregues të ri duke ekzekutuar, si root "
 "nga rreshti i komandës, \"medusa-indexd\"."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Gabim gjatë leximit të treguesit"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 "U verifikua një gabim gjatë ngarkimit të përmbajtjes së këtij kërkimi: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për një tregues "
+"të files së sistemit.  \"Gjej\" nuk arrin të lexojë treguesin në këtë moment."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për një tregues "
+"të files së sistemit.  \"Gjej\" nuk arrin të lexojë treguesin në këtë moment."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5420,25 +5548,23 @@ msgstr ""
 "files së sistemit.  \"Gjej\" nuk mund të lexojë treguesin në këtë moment, "
 "prandaj do të kryejë një kërkim të ngadaltë që nuk përdor treguesin."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për një tregues "
-"të files së sistemit.  \"Gjej\" nuk arrin të lexojë treguesin në këtë moment."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Kërkimet e shpejta nuk janë në dispozicion"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Kërkimet sipas përmbajtjes nuk janë në dispozicion"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5452,39 +5578,66 @@ msgstr ""
 "\n"
 "medusa-searchd "
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Për të kryer një kërkim të shpejtë \"Gjej\" ka nevojë për treguesin e files "
 "së sistemit tuaj.  Aktualisht kompjuteri është duke krijuar këtë tregues.   "
 "Meqenëse \"Gjej\" nuk mund të përdorë një tregues, ky kërkim mund të durojë "
 "shumë minuta."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për treguesin e "
 "files së sistemit tuaj.  Aktualisht kompjuteri është duke krijuar këtë "
 "tregues.  Kërkimet sipas përmbajtjes do të vihen në dispozicion kur treguesi "
 "të kompletohet."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Kërkimet e indeksuara nuk janë në dispozicion"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për një tregues "
+"të files së sistemit.  \"Gjej\" nuk arrin të lexojë treguesin në këtë moment."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Për të kryer një kërkim sipas përmbajtjes \"Gjej\" ka nevojë për një tregues "
+"të files së sistemit.  \"Gjej\" nuk arrin të lexojë treguesin në këtë moment."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Për të kryer një kërkim të shpejtë, \"Gjej\" ka nevojë për një tregues të "
 "files tek sistemi juaj.  Asnjë tregues ekziston për momentin. Mund të "
@@ -5492,12 +5645,12 @@ msgstr ""
 "indexd\".  Pa një tregues të kompletuar në dispozicion, kërkimet do të "
 "zgjasin shumë minuta."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Për të kryer një kërkim sipas përmbajtjes, \"Gjej\" ka nevojë për një "
 "tregues të files tek sistemi juaj.  Asnjë tregues ekziston për momentin. "
@@ -5505,7 +5658,12 @@ msgstr ""
 "\"medusa-indexd\".  Pa një tregues të kompletuar në dispozicion, kërkimet "
 "sipas përmbajtjes nuk mund të kryen."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Kërkimet e shpejta nuk janë në dispozicion tek kompjuteri juaj"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5515,11 +5673,12 @@ msgstr ""
 "files të sistemit tuaj. Administratori i sistemit tuaj ka bllokuar kërkimin "
 "e shpejtë tek kompjuteri juaj, prandaj treguesi nuk është në dispozicion."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Kërkimet e shpejta nuk janë në dispozicion tek kompjuteri juaj"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Kërkimet e shpejta nuk janë në dispozicion"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Ku"
 
@@ -5528,7 +5687,7 @@ msgstr "Ku"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Pa_raqiti në një dritare të re"
@@ -5539,7 +5698,7 @@ msgstr "Pa_raqiti në një dritare të re"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Paraqiti në %d _dritare të reja"
@@ -5548,15 +5707,21 @@ msgstr "Paraqiti në %d _dritare të reja"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus ka gjetur më shumë rezultate nga sa mund të shfaqë. Disa nga "
 "rezultatet korrispondues nuk do të shfaqen."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus ka gjetur më shumë rezultate nga sa mund të shfaqë. Disa nga "
+"rezultatet korrispondues nuk do të shfaqen."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Shumë korrispondues"
 
@@ -5570,12 +5735,12 @@ msgid "Create L_auncher"
 msgstr "Krijo Lë_shues"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Krijo një ikonë të re nisje"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Elemino të gjithë elementët e Koshit"
 
@@ -5596,7 +5761,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Përdor sfondin e _prezgjedhur"
@@ -5618,58 +5783,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Cakton një vizualizues tjetër për të parë objektin e zgjedhur"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Krijo _Kartelë"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Krijo _Kartelë"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Krijon në këtë kartelë një kartelë tjetër bosh"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Krijon në këtë kartelë një kartelë tjetër bosh"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Krijon një lidhje simbolike për çdo objekt të zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "D_upliko"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Elemino çdo objekt të zgjedhur, pa e lëvizur në Kosh "
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Krijon një kopje për çdo objekt të zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Ndrysho ikonën e nisjes"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Ndrysho informacionet e ikonës së nisjes"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formato volumin e zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Karakteristikat e medi_a-s"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Zmonto volumin e zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Lëviz apo kopjo files e zgjedhur më parë me anë të komandës \"Prit files\" "
 "apo \"Kopjo files\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5677,130 +5852,139 @@ msgstr ""
 "Lëviz apo kopjo files e zgjedhur më parë me anë të komandës \"Prit files\" "
 "apo \"Kopjo files\" tek kartela e seleksionuar"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Hape m_e"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Hap çdo objekt të zgjedhur në një dritare të re"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Hape _në një dritare të re"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Hap objektin e zgjedhur në këtë dritare"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Përgatit files e zgjedhur për t'u kopjuar me komandën \"Ngjit files\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Përgatit files e zgjedhur për t'i lëvizur me komandën \"Ngjit files\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Siguro"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Siguro volumin e zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Riemërton objektin e zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "_Përdor rregullimet e prezgjedhura"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Rivendos kriterin e rreshtimit dhe nivelin e zoom sipas rregullimeve të "
 "prezgjedhura"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Zbaton ose manazhon script-et nga ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Zgjidh _të gjithë files"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Motive"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Zgjidh të gjithë elementët në këtë dritare"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Zgjidh të gjithë elementët në këtë dritare"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Shfaq pronësitë e volumit të zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Shfaq kartelën ku përmbahen skriptet e dukshëm në këtë menu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Zmonto volumin e zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Përdor sfondin e prezgjedhur për këtë pozicion"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Shfaq ose ndrysho pronësitë e çdo elementi të zgjedhur"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopjo File"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formato"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Zmonto Volumin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Hap"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Hap kartelën e script-eve"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Ngjit files"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Ngjit Files në kartelë"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Pronësi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Riemërto..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Scripts"
 
@@ -5887,7 +6071,12 @@ msgstr "_Sipas dëshirës"
 msgid "Indexing is %d%% complete."
 msgstr "Indeksionimi i plotësuar për %d%% ."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Files tuaj herën e fundit janë indeksuar për %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5895,26 +6084,29 @@ msgstr ""
 "Një herë në ditë emrat e të gjithë file dhe përmbajtja e file me tekste do "
 "të indeksohen për ta bërë më të shpejtë kërkimin."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Gjëndja e indeksimit"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Files tuaj herën e fundit janë indeksuar për %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Një herë në ditë emrat e të gjithë file dhe përmbajtja e file me tekste do "
-"të indeksohen për ta bërë më të shpejtë kërkimin. Aktualisht files tuaj janë "
-"duke u indeksuar."
+"të indeksohen për ta bërë më të shpejtë kërkimin."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Aktualisht këtu nuk ka një tregues."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5924,16 +6116,20 @@ msgstr ""
 "shpejtuar kërkimet.  Kërkimi i shpejtë nuk është i aktivuar në kompjuterin "
 "tuaj, prandaj aktualisht ju nuk kini një tregues."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Aktualisht këtu nuk ka një tregues."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 "Më vjen keq, por shërbimi i kërkimit të medusa nuk është në dispozicion."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5957,32 +6153,37 @@ msgstr "Trego gjendjen e _Indeksimit"
 msgid "Show status of indexing used when searching"
 msgstr "Trego gjendjen e indeksimit të përdorur gjatë kërkimit"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "I pamundur krijimi i kartelës së kërkuar"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "I pamundur krijimi i kartelave të kërkuara"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus nuk arrin të krijojë kartelën e krijuar \"%s\". Përpara se të "
 "ekzekutoni Nautilus, ju lutem krijoni atë kartelë, ose vendosni të drejtat e "
 "duhura qe Nautilus të mund t'a krijojë atë."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "I pamundur krijimi i kartelave të kërkuara"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5993,22 +6194,27 @@ msgstr ""
 "Përpara se të ekzekutoni Nautilus, ju lutem krijoni kartelat, ose vendosni "
 "të drejtat e duhura qe Nautilus të mund t'i krijojë."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Lidhje me desktop-in e vjetër"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Pozicioni i directory të desktop ka ndryshuar tek Gnome 2.4. Një lidhje e "
 "quajtur \"Lidhje me Desktop-in e Vjetër\" është krijuar në desktop. Mund t'a "
 "hapni për të lëvizuar files që dëshironi, pastaj eleminoni lidhjen."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Desktopi i vjetër i migruar"
 
 #. Can't register myself due to trouble locating the
@@ -6021,7 +6227,7 @@ msgstr "Desktopi i vjetër i migruar"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6032,7 +6238,7 @@ msgstr ""
 "provoni të rinisni kompjuterin ose të instaloni Nautilus edhe njëherë."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6079,13 +6285,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 "Nautilus nuk mund të përdoret tani, për arsye të një difekti të papritur."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6094,7 +6300,7 @@ msgstr ""
 "ana e Bonobo gjatë përpjekjes së regjistrimit të server-it për paraqitjen e "
 "file manager. "
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6104,7 +6310,7 @@ msgstr ""
 "Bonobo gjatë përpjekjes së lokalizimit të fabrikës. Duke vrarë bonobo-"
 "activation-server dhe duke rinisur Nautilus ndoshta problemi zgjidhet."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6114,6 +6320,17 @@ msgstr ""
 "Bonobo gjatë përpjekjes së lokalizimit të objektit shell. Duke vrarë bonobo-"
 "activation-server dhe duke rinisur Nautilus ndoshta problemi zgjidhet."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Gabim gjatë shfaqjes së ndihmës: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Asnjë i preferuar është përcaktuar"
@@ -6147,36 +6364,47 @@ msgstr "Më pak opcione"
 msgid "Find Them!"
 msgstr "Gjeje!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "E pamundur lëvizja në vetvete."
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Më vjen keq, por \"%s\" nuk është një emër i vlefshëm."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" nuk është një pozicion i vlefshëm. Kontrolloje nëse e ke shkruar si "
-"duhet dhe provo përsëri."
+"Nuk arrij të gjej \"%s\". Kontrolloje nëse e ke shkruar si duhet dhe provo "
+"përsëri."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Rrjeti i Server-ve"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_Emri:"
+msgid "_Location:"
+msgstr "Pozicioni:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Lidhu"
@@ -6378,6 +6606,21 @@ msgstr ""
 "Mund të eleminoni këtë file dhe të kryeni edhe njëherë konfigurimin e "
 "udhëhequr.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Është e pamundur dhënia e më shumë se një ikone të personalizuar në të "
+"njëjtën kohë. Ju lutem zvarrisni vetëm një figurë për të vendosur ikonën e "
+"personalizuar."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"File që keni zvarritur nuk është lokal. Ju mund të përdorni vetëm figurat "
+"lokale si ikona të personalizuara."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6388,26 +6631,25 @@ msgstr "Hape me %s"
 msgid "Open with..."
 msgstr "Hape me..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "I pamundur fillimi i programit për krijimin e CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "Nuk arrij të nis krijuesin e cd"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Zbraz _Koshin"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Shkruaj përmbajtjen në CD"
 
@@ -6415,37 +6657,37 @@ msgstr "_Shkruaj përmbajtjen në CD"
 msgid "Go To:"
 msgstr "Shko tek:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Dëshiron t'i shohësh këto %d pozicione në dritare të veçanta?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Paraqit në dritare shumfishe?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "E pamundur hapja e pozicionit"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Kryen një bashkësi me teste të shpejtë auto-kontrolli."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Krijon dritaren kryesore me gjeometrinë e dhënë."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GJEOMETRI"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Krijon vetëm dritaret për URL e specifikuara qartë."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6453,80 +6695,93 @@ msgstr ""
 "Nuk manazhon desktop-in (duke injoruar preferimet tek dritarja e dialogut të "
 "rregullimeve)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Del nga Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Rinis Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Manzhuesi i file"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check nuk mund të përdoret me URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check nuk mund të përdoret me opcione të tjerë.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit nuk mund të përdoret me URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart nuk mund të përdoret me URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry nuk mund të përdoret me më shumë se një 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Të eleminoj përgjithmonë \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "Jeni sigurt që dëshiron të harrosh të kaluarën? Historia përsëritet."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Jeni i sigurt që dëshironi të pastroni listën e pozicioneve që keni vizituar?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Pastro kronollogjinë"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Pozicioni \"%s\" nuk ekziston. Dëshironi të heq çdo të preferuar që ka "
 "lidhje me këtë pozicion nga lista juaj?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Pozicioni \"%s\" nuk ekziston më."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Libërshënues për një pozicion joekzistues"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Hiq"
 
@@ -6559,7 +6814,6 @@ msgid "Close _All Windows"
 msgstr "Mbylli të _gjitha dritaret"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Mbylli të gjitha dritaret e Nautilus"
@@ -6582,107 +6836,119 @@ msgid "Forward"
 msgstr "Vazhdo"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Shko tek kartela e koshit"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Shko tek pozicioni tjetër i vizituar"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Shko tek pozicioni paraardhës i vizituar"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Shko tek kartela e koshit"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Location _Bar"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Rilexo"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Kërko për files në këtë kompjuter"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "St_atusbar"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Ndalo"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Sipër"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Shkruaj në CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Shto të preferuar"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Kthehu mbrapa"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Të Preferuar"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Pastro kronollogjinë"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Ndrysho të preferuarit"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Vazhdo"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Shko"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Pozicioni..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Paneli _anësor"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Koshi"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Sipër"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "S_hiko"
 
@@ -6700,34 +6966,39 @@ msgstr "Shikoje si..."
 msgid "File Browser: %s"
 msgstr "Pronari i file:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Njëri nga panelët anësorë u bllokua dhe nuk mund të vazhdojë. Për fat të keq "
 "nuk di të them kush ishte."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Paraqitja %s pati një difekt gjatë nisjes."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Paneli anësor %s u bllokua dhe nuk mund të vazhdojë punën. Nëse problemi "
 "vazhdon, mbylleni këtë panel."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Paneli anësor dështoi."
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Paneli anësor"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Përmban pamjen e një paneli anësor"
 
@@ -6761,147 +7032,180 @@ msgstr "_Shto të ri..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Më vjen keq, por motivi %s nuk mund të eleminohet."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "I pamundur eleminimi i motivit"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Më vjen keq, por simboli %s nuk mund të eleminohet."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "E pamundur heqja e simbolit"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Krijo një simbol të ri:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Fjal_kyçi: "
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "F_igura:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Zgjidh një figurë për simbolin e ri:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Krijo një ngjyrë të re:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Emri i ngjyrës:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Vlera e ngjyrës:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Më vjen keq, por \"%s\" nuk është një emër i vlefshëm."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Më vjen keq, emër file i pavlefshëm."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "I pamundur instalimi i motivit"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Më vjen keq, ju nuk mund të zëvëndësoni figurën e reset."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nuk është një figurë"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Më vjen keq, por motivi %s nuk mund të instalohet."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Zgjidh një figurë për ta shtuar si motiv"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Më vjen keq, duhet të shkruani një emër jo bosh për ngjyrën e re."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "I pamundur instalimi i ngjyrës"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Zgjidh një ngjyrë për ta shtuar"
 
-#: 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 "Më vjen keq, por '%s' nuk është një file imazh i përdorshëm!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Më vjen keq, por '%s' nuk është një figurë e shfrytëzueshme."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "File '%s' nuk është figurë e vlefshme."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Zgjidh një kategori:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Anullo heqjen"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Shto një motiv të ri..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Shto një ngjyrë të re..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Shto një simbol të ri..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kliko tek motivi për ta hequr"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kliko tek ngjyra për ta hequr"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kliko tek simboli për ta hequr"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Motive:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Ngjyra:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Simbole:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Hiq një motiv..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Hiq një ngjyrë..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Hiq një simbol..."
 
@@ -7295,34 +7599,39 @@ msgstr "_CD Krijuesi"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Mbylli të _gjitha dritaret"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Mbylle panelin anësor"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Shko tek kartela e Zbraz CD"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Shko tek kartela e koshit"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Pozicioni..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Objekte që janë ]kartela"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Motive"
@@ -7352,10 +7661,13 @@ msgid "View Failed"
 msgstr "Shikuesi dështoi"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Paraqitja %s pati një difekt gjatë nisjes."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Paraqitja %s pati një difekt dhe nuk mund të vazhdojë. Mund të zgjidhni një "
 "paraqitje tjetër ose të shkoni në një pozicion tjetër."
@@ -7365,101 +7677,131 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Paraqitja %s pati një difekt gjatë nisjes."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "AplikacioniNautilus i shoqëruar me këtë faqe."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Paraqitja e përmbajtjes"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Paraqitja e file apo kartelës aktuale"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Nuk arrij të gjej \"%s\". Kontrolloje nëse e ke shkruar si duhet dhe provo "
-"përsëri."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "I pamundur shtimi i emblemave"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus nuk arrin të shfaqë \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "E pamundur shfaqja e \"%s\", pasi Nautilus nuk arrin të përcaktojë se çfarë "
 "lloj file është."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus nuk ka një shikues në gjendje të shfaqë \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "E pamundur shfaqja e \"%s\", pasi Nautilus nuk mund të manazhojë %s: "
 "pozicione."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "E pamundur shfaqja e \"%s\", pasi përpjekja për identifikim dështoi."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Nuk arrij të shfaq \"%s\", pasi hyrja është e ndaluar."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "E pamundur shfaqja e \"%s\", pasi nuk u gjet asnjë host \"%s\". Verifiko që "
 "emri dhe rregullimet proxy të jenë korrekte. "
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "E pamundur shfaqja e \"%s\". Verifiko që konfigurimet e proxy janë korrekte."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"E pamundur shfaqja e \"%s\", pasi Nautilus nuk mund të lidhet me browser-in "
-"master SMB.\n"
-"Kontrollo që server-i SMB të jetë në funksion tek rrjeti lokal."
+"E pamundur shfaqja e \"%s\", pasi Nautilus nuk mund të manazhojë %s: "
+"pozicione."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Kërkimi nuk është në dispozicin tani, pasi nuk ekziston një tregues, ose "
 "shërbimi i kërkimit nuk është në ekzekutim. Sigurohuni që keni nisur "
 "shërbimin e kërkimit Medusa, dhe nëse nuk keni një tregues, që indeksuesi i "
 "Medusa të jetë në funksion."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Kërkimi nuk është në dispozicin tani, pasi nuk ekziston një tregues, ose "
+"shërbimi i kërkimit nuk është në ekzekutim. Sigurohuni që keni nisur "
+"shërbimin e kërkimit Medusa, dhe nëse nuk keni një tregues, që indeksuesi i "
+"Medusa të jetë në funksion."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Kërkimi nuk është në dispozicion "
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus nuk arrin të shfaqë \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "I pamundur shikimi i pozicionit"
 
@@ -7471,7 +7813,7 @@ msgstr "Shko tek pozicioni i shënuar tek ky libërshënues"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7479,11 +7821,11 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Laurent Dhima <laurenti@alblinux.net>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7499,39 +7841,43 @@ msgstr "Kthehu disa faqe mbrapa"
 msgid "Go forward a number of pages"
 msgstr "Shko përpara një numër faqesh"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Shiko këtë pozicion me \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "F_onts"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Temat"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD Krijuesi"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID e aplikacionit"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "ID e aplikacionit të dritares."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Aplikacion"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "AplikacioniNautilus i shoqëruar me këtë faqe."
 
@@ -7567,6 +7913,258 @@ msgstr "Rrjeti i Server-ve"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Disa nga filet nuk do të shtohen si emblema pasi mesa duket nuk janë "
+#~ "figura të vlefshme."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrikë për shikimin e hardware"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Vizualizues hardware"
+
+#~ msgid "Hardware view"
+#~ msgstr "Shikimi hardware"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Shiko si hardware"
+
+#~ msgid "hardware view"
+#~ msgstr "pamja hardware"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "emri i ikonës për shikimin e hardware"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "përmbledhja e informacioneve mbi hardware"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K me cache"
+
+#~ 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 "Koha e aktivitetit është %d ditë, %d orë, %d minuta"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Panorama e hardware"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ky është një vendshënim për faqen e CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ky është një vendshënim për faqen e RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ky është një vendshënim për faqen e disqeve IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Gabim gjatë kopjimit të \"%s\".\n"
+#~ "\n"
+#~ "Nuk ka më hapsirë në pozicionin e zgjedhur për kopjen."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Gabim gjatë krijimit të lidhjes në \"%s\".\n"
+#~ "\n"
+#~ "Nuk ka më hapsirë në pozicionin e zgjedhur."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Gabim gjatë lëvizjes së objekteve në \"%s\".\n"
+#~ "\n"
+#~ "Nuk keni të drejtë të shkruani tek kjo kartelë."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Gabim gjatë lëvizjes së objekteve në \"%s\".\n"
+#~ "\n"
+#~ "Disku i destinuar është vetëm për lexim."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Gabim gjatë krijimit të lidhjeve në \"%s\".\n"
+#~ "\n"
+#~ "Nuk keni të drejtë të shkruani tek kjo kartelë."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Gabim gjatë krijimit të lidhjeve në \"%s\".\n"
+#~ "\n"
+#~ "Disku i destinuar është vetëm për lexim."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë kopjimit të \"%s\".\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë lëvizjes së \"%s\".\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë eleminimit të \"%s\".\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë kopjimit.\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë lidhjes.\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Gabim \"%s\" gjatë eleminimit.\n"
+#~ "\n"
+#~ "Dëshironi të vazhdoj?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "I pamundur kopjimi në Kosh"
+
+#~ 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 ""
+#~ "Veprimi i prezgjedhur nuk mund të hapë \"%s\" sepse ai nuk ka hyrje tek "
+#~ "files në pozicionet \"%s\".  Asnjë veprim tjetër në dispozicion për të "
+#~ "shikuar këtë file.  Nëqoftëse e kopjoni këtë file në kompjuterin tuaj, do "
+#~ "të jeni në gjendje t'a hapni atë."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Kërkim nëpër disqe"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus është duke kërkuar në disqe kartelat e koshit."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d objektet e zgjedhur nuk mund të çohen në Kosh. Dëshironi t'i eleminoni "
+#~ "menjëherë?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d të objekteve të seleksionuar nuk mund të çohen në Kosh. Dëshironi t'i "
+#~ "eleminoni këta %d objekte menjëherë?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "File i zvarritur nuk është një figurë. Mund të përdorni vetëm figurat "
+#~ "lokale si ikona të personalizuara."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Më vjen keq, por shërbimi i kërkimit të Medusa nuk mund t'ju vihet në "
+#~ "dispozicion pasi nuk është instaluar."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Një herë në ditë emrat e të gjithë file dhe përmbajtja e file me tekste "
+#~ "do të indeksohen për ta bërë më të shpejtë kërkimin. Aktualisht files "
+#~ "tuaj janë duke u indeksuar."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" nuk është një pozicion i vlefshëm. Kontrolloje nëse e ke shkruar "
+#~ "si duhet dhe provo përsëri."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Më vjen keq, por '%s' nuk është një file imazh i përdorshëm!"
+
+#~ 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 ""
+#~ "E pamundur shfaqja e \"%s\", pasi Nautilus nuk mund të lidhet me browser-"
+#~ "in master SMB.\n"
+#~ "Kontrollo që server-i SMB të jetë në funksion tek rrjeti lokal."
+
+#~ msgid "file icon"
+#~ msgstr "ikona e file"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Emri:"
+
 #~ msgid "Unknown"
 #~ msgstr "E panjohur"
 
@@ -7661,9 +8259,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "_Toolbar"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Pozicioni \"%s\" nuk ekziston më."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Shko tek pozicioni joekzistues"
 
@@ -7752,9 +8347,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "E_kzekuto files kur klikohen"
 
@@ -8310,9 +8902,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Zgjidh kopertinën"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Më vjen keq, por '%s' nuk është një figurë e shfrytëzueshme."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Zgjidh një figurë për kopertinën e albumit:"
 
@@ -8455,9 +9044,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "Remove any custom images from selected icons"
 #~ msgstr "Heq çdo figurë të personalizuar nga ikonat e zgjedhura"
 
-#~ msgid "Themes"
-#~ msgstr "Temat"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Sjellja e dritareve të reja"
 
@@ -8551,9 +9137,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "Preferences"
 #~ msgstr "Preferime"
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Më vjen keq, por figura %s nuk mund të instalohet si simbol."
-
 #~ msgid "Click on a theme to remove it."
 #~ msgstr "Kliko mbi një temë për ta hequr."
 
@@ -8563,9 +9146,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ msgid "Sorry, but \"%s\" is not a valid theme folder."
 #~ msgstr "Më vjen keq, por \"%s\" nuk është një kartelë e vlefshme me tema."
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Më vjen keq, por tema \"%s\" nuk mund të instalohet."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "I pamundur instalimi i temës"
 
@@ -8582,9 +9162,6 @@ msgstr "Shiko rrjetin tuaj të server-ve tek file manager i Nautilus"
 #~ "Më vjen keq, por nuk mund të hiqni temën aktuale. Fillimisht ndryshojeni "
 #~ "në një temë tjetër pastaj hiqni këtë."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Më vjen keq, por kjo temë nuk mund të hiqet!"
-
 #~ msgid "_Add Theme..."
 #~ msgstr "_Shto temën..."
 
diff --git a/po/sr.po b/po/sr.po
index 7163be40d..c5312dc67 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-20 01:29+0100\n"
-"PO-Revision-Date: 2003-11-20 01:32+0100\n"
+"POT-Creation-Date: 2004-01-05 22:29+0100\n"
+"PO-Revision-Date: 2004-01-05 22:30+0100\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,8 +42,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "�еу�пешан bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2407
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Обележја"
 
@@ -57,47 +57,55 @@ msgstr "Преглед �аутилу�ових обележја"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�е могу да уклоним обележје звано „%s“."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"�е може да уклони обележје звано „%s“. Разлог овоме је вероватно то што је "
-"обележје трајно, а не неко које �те �ами додали."
+"Разлог овоме је вероватно то што је обележје трајно, а не неко које �те �ами "
+"додали."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
-msgstr "�е може да уклони обележје"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
+msgstr "�е могу да уклоним обележје"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�е могу да применујем обележје звано „%s“."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"�е може да применује обележје звано „%s“. Разлог овоме је вероватно то што "
-"је обележје тра�но, а не неко које �те �ами додали."
+"Разлог овоме је вероватно то што је обележје трајно, а не неко које �те �ами "
+"додали."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
-msgstr "�е може да преименује обележје"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
+msgstr "�е могу да преименујем обележје"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Преименуј обележје"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Уне�ите ново име за приказано обележје:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Преименуј"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Додај обележја..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -105,7 +113,7 @@ msgstr ""
 "Уне�ите опи�но име поред �ваког обележја. Ово име ће �е кори�тити на другим "
 "ме�тима за препознавање обележја."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -113,140 +121,55 @@ msgstr ""
 "Уне�ите опи�но име поред обележја. Ово име ће �е кори�тити на другим ме�тима "
 "за препознавање обележја."
 
-#: components/emblem/nautilus-emblem-view.c:740
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"�еке датотеке ни�у додате за обележја пошто изгледа да оне ни�у и�правне "
-"�лике."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "�е могу да додам неке датотеке као за обележја."
 
-#: components/emblem/nautilus-emblem-view.c:740
 #: components/emblem/nautilus-emblem-view.c:742
-msgid "Couldn't add emblems"
-msgstr "�е може да дода обележја"
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Изгледа да обележја ни�у и�правне �лике."
 
 #: components/emblem/nautilus-emblem-view.c:742
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"�иједна од датотека није додата као обележје зато што изгледа да оне ни�у "
-"и�правне �лике."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr "�е могу да додам обележја"
 
-#: components/emblem/nautilus-emblem-view.c:763
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "�иједна од датотека није додата као обележје."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "�и�ам у�пео да додам обележје."
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Превучени тек�т није и�правна путања до датотеке."
 
-#: components/emblem/nautilus-emblem-view.c:763
-#: components/emblem/nautilus-emblem-view.c:788
-#: components/emblem/nautilus-emblem-view.c:838
-msgid "Couldn't add emblem"
-msgstr "�е може да дода обележје"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
+msgstr "�е могу да додам обележје"
 
-#: components/emblem/nautilus-emblem-view.c:783
-#: components/emblem/nautilus-emblem-view.c:837
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Датотека „%s“ не пред�тавља и�правну �лику."
 
-#: components/emblem/nautilus-emblem-view.c:786
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Превучена датотека не пред�тавља и�правну �лику."
 
-#: components/emblem/nautilus-emblem-view.c:902 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Обриши"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Фабрика за преглед хардвера"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Хардвер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Преглед хардвера"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Преглед хардвера"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Гледај као хардвер"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "преглед хардвера"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "Име иконе за преглед хардвера"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "Сажетак података о хардверу"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s проце�ор\n"
-"%s MHz\n"
-"%s KB кеш меморије"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB меморије"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB меморије"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-# bug: plural-forms
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Укључен је %d дана, %d �ати, %d минута"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Општи преглед хардвера"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Овиме �е чува ме�то за ли�т проце�ора."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Овиме �е чува ме�то за ли�т меморије."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Овиме �е чува ме�то за ли�т ди�кова."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "И�торијат"
@@ -306,7 +229,7 @@ msgid "Flash Fired"
 msgstr "Блиц коришћен"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
-msgid "Focal Lenght"
+msgid "Focal Length"
 msgstr "Жижна даљина"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
@@ -390,22 +313,6 @@ msgstr "Убаци изабрани тек�т међу и�ечке"
 msgid "_Copy Text"
 msgstr "_Умножи тек�т"
 
-#: components/text/services/google.xml.h:1
-msgid "Search Google for Selected Text"
-msgstr "Пронађи изабрани тек�т помоћу Гугла"
-
-#: components/text/services/google.xml.h:2
-msgid "Use Google to search the web for the selected text"
-msgstr "Кори�ти Гугл за тражење изабраног тек�та на вебу"
-
-#: components/text/services/webster.xml.h:1
-msgid "Look Up Selected Text in Dictionary"
-msgstr "Потражи изабрани тек�т у речнику"
-
-#: components/text/services/webster.xml.h:2
-msgid "Look up the selected text in the Merriam-Webster dictionary"
-msgstr "Потражи изабрани тек�т у Меријам-Веб�теровом речнику"
-
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
 msgstr "анимација којом �е означава да је нешто у току"
@@ -916,6 +823,10 @@ msgstr "Гном"
 msgid "GNU.org"
 msgstr "Г�У"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Хардвер"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Међународно"
@@ -1199,30 +1110,18 @@ msgid "Desktop trash icon name"
 msgstr "Име за �меће на радној површини"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Занемариће �е �ве у директоријумима што превазилази ову величину. Сврха "
-"овога је да �е избегне �лучајно препуњавање меморије и гашење �аутилу�а у "
-"превеликим директоријумима. �егативна вредно�т означава да нема ограничења. "
-"Граница је приближна пошто �е директоријуми читају у блоковима."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Укључи „нарочите“ ознаке у прозорчету за по�тавке датотека"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Име датотеке за уобичајену позадину директоријума. Кори�ти �е једино ако је "
 "по�тављено background_set."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1230,6 +1129,18 @@ msgstr ""
 "Име датотеке за уобичајену позадину површи по�транце. Кори�ти �е једино ако "
 "је по�тављено side_background_set."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Директоријуми већи од овога ће бити од�ечени на приближно ову величину. "
+"Сврха овога је да �е избегне �лучајно препуњавање меморије и убијање "
+"�аутилу�а у превеликим директоријумима. �егативна вредно�т означава да нема "
+"ограничења. Граница је приближна пошто �е директоријуми читају у блоковима."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Сакриј подразумеване обележиваче у менију �а обележивачима"
@@ -1240,8 +1151,8 @@ msgstr "Лична икона је приказана на радној повр
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Уколико је по�тављено, �аутилу� ће приказати једино директоријуме у површи "
 "по�транце. Иначе, приказиваће и директоријуме и датотеке."
@@ -1281,8 +1192,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Уколико је по�тављено, �аутилу� ће приказати директоријуме пре приказивања "
 "датотека при прегледу помоћу икона или �пи�ка."
@@ -1328,7 +1239,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Уколико је по�тављено, �аутилу� ће кори�тити лични директоријум кори�ника за "
@@ -1348,7 +1259,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Уколико је по�тављено, �акривене датотеке ће �е приказивати у управнику "
 "датотека. Сакривене датотеке �у или датотеке чије име почиње тачком, или �у "
@@ -1372,7 +1283,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Уколико је ово по�тављено, икона која указује на лични директоријум ће бити "
@@ -1409,7 +1320,7 @@ msgstr ""
 "величини, уме�то у ра�тућем, биће у опадајућем поретку."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Уколико је по�тављено, иконе ће уобичајено бити згу�нуто изложене у новим "
 "прозорима."
@@ -1440,7 +1351,7 @@ msgid "List of possible captions on icons"
 msgstr "Спи�ак могућих ознака икона"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr "�ајвећи број датотека у директоријуму"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1452,20 +1363,20 @@ msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
-"Име мотива за �аутилу�. Ово је за�тарела могућно�т од �аутилу�а 2.2. Молим "
-"кори�тите тему за иконе."
+"Име мотива за �аутилу�. Ово је за�тарела могућно�т од �аутилу�а 2.2. "
+"Кори�тите тему за иконе."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "Nautilus handles drawing the desktop"
 msgstr "�аутилу� управља и�цртавањем радне површине"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "�аутилу� кори�ти лични директоријум кори�ника за радну површину"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr "Прикажи �амо директоријуме у оквиру по�транце"
+msgid "Only show folders in the tree sidebar"
+msgstr "Прикажи �амо директоријуме у �таблу по�транце"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -1484,7 +1395,7 @@ msgid "Reverse sort order in new windows"
 msgstr "Обрни уређење у новим прозорима"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Прикажи прво директоријуме у прозорима"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1524,35 +1435,35 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
-"Губитак брзине ради прегледа тек�туалних датотека при прела�ку миша преко "
-"икона датотека. Уколико је по�тављено на „always“ увек �е приказује преглед, "
-"чак и ако је датотека на удаљеном рачунару. Уколико је по�тављено на "
-"„local_only“, приказује �е преглед �амо за локалне датотеке. Уколико је "
-"по�тављено на „never“, никад �е не приказује преглед."
+"Губитак брзине ради прегледа �адржаја тек�туалних датотека у икони датотеке. "
+"Уколико је по�тављено на „always“ увек �е приказује преглед, чак и ако је "
+"датотека на удаљеном рачунару. Уколико је по�тављено на „local_only“, "
+"приказује �е преглед �амо за локалне датотеке. Уколико је по�тављено на "
+"„never“, никад �е не приказује преглед."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
-"Губитак брзине ради прегледа умањених �лика. Уколико је по�тављено на "
-"„always“ увек �е приказује умањена �лика, чак и ако је датотека на удаљеном "
-"рачунару. Уколико је по�тављено на „local_only“, приказује �е умањена �лика "
-"�амо за локалне датотеке. Уколико је по�тављено на „never“ кори�ти �е општа "
-"икона."
+"Губитак брзине ради прегледа умањених �лика за �лике. Уколико је по�тављено "
+"на „always“ увек �е приказује умањена �лика, чак и ако је датотека на "
+"удаљеном рачунару. Уколико је по�тављено на „local_only“, приказује �е "
+"умањена �лика �амо за локалне датотеке. Уколико је по�тављено на „never“ "
+"кори�ти �е општа икона."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Губитак брзине ради приказивања броја �тавки у директоријуму. Уколико је "
@@ -1564,15 +1475,15 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Уобичајени поредак за �тавке при приказивању помоћу икона. Дозвољене "
 "вредно�ти �у „name“, „size“, „type“, „modification_date“ и „emblems“."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Уобичајени поредак за �тавке при приказивању помоћу �пи�ка. Дозвољене "
 "вредно�ти �у „name“, „size“, „type“ и „modification_date“."
@@ -1618,9 +1529,8 @@ msgstr "Вр�та клика којом �е покрећу/отварају д
 msgid "Use manual layout in new windows"
 msgstr "Кори�ти ручни ра�поред у новим прозорима"
 
-# bug: Layout -> layout
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Кори�ти згу�нути ра�поред у новим прозорима"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1650,7 +1560,7 @@ msgstr ""
 "„icon_view“."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Када приказати број �тавки у директоријуму"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1662,7 +1572,7 @@ msgid "When to show thumbnails of image files"
 msgstr "Када приказати умањене �лике"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Да ли је по�тављена прилагођена подразумевана позадина."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1822,67 +1732,77 @@ msgstr "поново по�тави"
 msgid "on the desktop"
 msgstr "на радној површини"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "�е можете уклонити икону ди�ка."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
-msgstr "�е може да уклони ди�к"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "�е могу да уклоним ди�к"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5720
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Смеће"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Пребаци овде"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Умножи овде"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_�аправи везу овде"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "По�тави за _позадину"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Оду�тани"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "По�тави као позадину за _�ве директоријуме"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+msgid "The emblem cannot be installed."
+msgstr "�и�ам могао да по�тавим обележје."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "�ажало�т, морате наве�ти непразну кључну реч за ново обележје."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
-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:276
+msgid "Couldn't Install Emblem"
+msgstr "�е могу да по�тавим обележје"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1892,23 +1812,29 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr "�ажало�т, већ по�тоји обележје звано „%s“. Изаберите неко друго име."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "�ажало�т, већ по�тоји обележје звано „%s“."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Изаберите неко друго име за обележје.<"
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�е могу да по�тавим обележје"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "�ажало�т, не може да �ачува прилагођено обележје."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "�ажало�т, не може да �ачува име прилагођеног обележја."
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file-operations-progress.c:456
+#: libnautilus-private/nautilus-file-operations-progress.c:457
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld од %ld"
@@ -1918,374 +1844,273 @@ msgstr "%ld од %ld"
 msgid "From:"
 msgstr "Одакле:"
 
+# bug: comment: s/source/destination/
 #. "To" dialog label, source path gets placed next to it in the dialog
 #: libnautilus-private/nautilus-file-operations.c:365
 msgid "To:"
 msgstr "У:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:551
+#: libnautilus-private/nautilus-file-operations.c:599
+#: libnautilus-private/nautilus-file-operations.c:614
+msgid "Error while moving."
+msgstr "Грешка при премештању."
+
+#: libnautilus-private/nautilus-file-operations.c:552
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Грешка при премештању.\n"
-"\n"
-"�е може преме�тити „%s“ зато што је на ди�ку �амо за читање."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "�е може �е преме�тити „%s“ зато што је на ди�ку �амо за читање."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:568
+msgid "Error while deleting."
+msgstr "Грешка при бри�ању."
+
+#: libnautilus-private/nautilus-file-operations.c:563
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Грешка при бри�ању.\n"
-"\n"
-"�е може обри�ати „%s“ зато што немате овлашћења да мењате директоријум у ком "
-"�е налази."
+"�е може �е обри�ати „%s“ зато што немате овлашћења да мењате директоријум у "
+"ком �е налази."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:569
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Грешка при бри�ању.\n"
-"\n"
-"�е може обри�ати „%s“ зато што �е налази на ди�ку �амо за читање."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "�е може �е обри�ати „%s“ зато што �е налази на ди�ку �амо за читање."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:600
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Грешка при премештању.\n"
-"\n"
-"�е може преме�тити датотеку „%s“ зато што немате овлашћења да мењате њу или "
-"директоријум у ком �е налази."
+"�е може �е преме�тити датотека „%s“ зато што немате овлашћења да мењате њу "
+"или директоријум у ком �е налази."
+
+#: libnautilus-private/nautilus-file-operations.c:604
+msgid "Error while moving. "
+msgstr "Грешка при премештању. "
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:605
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Грешка при премештању.\n"
-"\n"
-"�е може преме�тити датотеку „%s“ зато што �е она или њен директоријум налазе "
-"у одредишту."
+"�е могу да преме�тим датотеку „%s“ зато што �е она или њен директоријум "
+"налазе у одредишту."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:615
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Грешка при премештању.\n"
-"\n"
-"�е може преме�тити датотеку „%s“ у Смеће зато што немате овлашћења да мењате "
-"њу или њен директоријум."
+"�е могу да преме�тим датотеку „%s“ у �меће зато што немате овлашћења да "
+"мењате њу или њен директоријум."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"Грешка при умножавању.\n"
-"\n"
-"�е може умножити датотеку „%s“ зато што немате овлашћења да је читате."
+#: libnautilus-private/nautilus-file-operations.c:637
+msgid "Error while copying."
+msgstr "Грешка при умножавању."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:638
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Грешка при умножавању у „%s“.\n"
-"\n"
-"�ема довољно ме�та у одредишту."
+"�е могу да умножим датотеку „%s“ зато што немате овлашћења да је читате."
 
-#: libnautilus-private/nautilus-file-operations.c:657
+#: libnautilus-private/nautilus-file-operations.c:658
+#: libnautilus-private/nautilus-file-operations.c:679
+#: libnautilus-private/nautilus-file-operations.c:683
 #, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка при премештању у „%s“.<\n"
-"\n"
-"�ема довољно ме�та у одредишту."
+msgid "Error while copying to \"%s\"."
+msgstr "Грешка при умножавању у „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Грешка при прављењу везе у „%s“.\n"
-"\n"
-"�ема довољно ме�та у одредишту."
+#: libnautilus-private/nautilus-file-operations.c:659
+#: libnautilus-private/nautilus-file-operations.c:664
+#: libnautilus-private/nautilus-file-operations.c:668
+msgid "There is not enough space on the destination."
+msgstr "�ема довољно ме�та у одредишту."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:663
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при умножавању у „%s“.\n"
-"\n"
-"�и�те овлашћени да пишете у овај директоријум."
+msgid "Error while moving to \"%s\"."
+msgstr "Грешка при премештању у „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:667
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при умножавању у „%s“.\n"
-"\n"
-"Са одредишног ди�ка �е може �амо читати."
+msgid "Error while creating link in \"%s\"."
+msgstr "Грешка при у�по�тављању везе у „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при премештању у „%s“.\n"
-"\n"
-"�и�те овлашћени да пишете у овај директоријум."
-
-#: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при премештању у „%s“.\n"
-"\n"
-"Са одредишног ди�ка �е може �амо читати."
+#: libnautilus-private/nautilus-file-operations.c:680
+#: libnautilus-private/nautilus-file-operations.c:691
+#: libnautilus-private/nautilus-file-operations.c:702
+msgid "You do not have permissions to write to this folder."
+msgstr "�и�те овлашћени да пишете у овај директоријум."
 
+#: libnautilus-private/nautilus-file-operations.c:684
 #: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Грешка при у�по�тављању веза у „%s“.\n"
-"\n"
-"�и�те овлашћени да пишете у овај директоријум."
+#: libnautilus-private/nautilus-file-operations.c:706
+msgid "The destination disk is read-only."
+msgstr "Са одредишног ди�ка �е може �амо читати."
 
-#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:690
+#: libnautilus-private/nautilus-file-operations.c:694
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Грешка при у�по�тављању веза у „%s“.\n"
-"\n"
-"Са одредишног ди�ка �е може �амо читати."
+msgid "Error while moving items to \"%s\"."
+msgstr "Грешка при премештању �тавки у „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:701
+#: libnautilus-private/nautilus-file-operations.c:705
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при умножавању „%s“.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Грешка при у�по�тављању везе у „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:733
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при премештању „%s“.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Грешка „%s“ при умножавању „%s“."
+
+#: libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:738
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:748
+#: 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
+msgid "Would you like to continue?"
+msgstr "Желите ли да на�тавите?"
 
-#: libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:737
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при у�тановљавању везе „%s“.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Грешка „%s“ при премештању „%s“."
 
 #: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при бри�ању „%s“.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Грешка „%s“ при у�тановљавању везе „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:747
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при умножавању.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Грешка „%s“ при бри�ању „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:760
+#: libnautilus-private/nautilus-file-operations.c:762
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при премештању.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while copying."
+msgstr "Грешка „%s“ при умножавању."
 
-#: libnautilus-private/nautilus-file-operations.c:764
+#: libnautilus-private/nautilus-file-operations.c:766
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при у�по�тављању везе.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while moving."
+msgstr "Грешка „%s“ при премештању."
 
 #: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Грешка „%s“ при бри�ању.\n"
-"\n"
-"Желите ли да на�тавите?"
+msgid "Error \"%s\" while linking."
+msgstr "Грешка „%s“ при у�по�тављању везе."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Грешка при умножавању."
+#: libnautilus-private/nautilus-file-operations.c:776
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Грешка „%s“ при бри�ању."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Грешка при премештању."
+#: libnautilus-private/nautilus-file-operations.c:902
+msgid "Error While Copying"
+msgstr "Грешка при умножавању"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Грешка при у�по�тављању везе."
+#: libnautilus-private/nautilus-file-operations.c:905
+msgid "Error While Moving"
+msgstr "Грешка при премештању"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Грешка при бри�ању."
+#: libnautilus-private/nautilus-file-operations.c:908
+msgid "Error While Linking"
+msgstr "Грешка при у�по�тављању везе"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Пре�кочи"
+#: libnautilus-private/nautilus-file-operations.c:913
+msgid "Error While Deleting"
+msgstr "Грешка при бри�ању"
+
+#: libnautilus-private/nautilus-file-operations.c:940
+#: libnautilus-private/nautilus-file-operations.c:961
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Skip"
+msgstr "Пре_�кочи"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Понови"
+#: libnautilus-private/nautilus-file-operations.c:961
+msgid "_Retry"
+msgstr "По_нови"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1027
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�е могу да преме�тим „%s“ на нову путању."
+
+#: libnautilus-private/nautilus-file-operations.c:1030
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"�е може да преме�ти „%s“, пошто �е његово име већ кори�ти за нарочите �тавке "
-"које �е не могу уклонити нити заменити.\n"
-"\n"
-"�ко и даље желите да преме�тите „%s“, преименујте га и покушајте поново."
+"Име �е већ кори�ти за нарочиту �тавку која �е не може уклонити нити "
+"заменити.  �ко и даље желите да преме�тите �тавку, преименујте је и "
+"покушајте поново."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1034
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�е могу да умножим „%s“ на нову путању."
+
+#: libnautilus-private/nautilus-file-operations.c:1037
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"�е може да умножи „%s“, пошто �е његово име већ кори�ти за нарочите �тавке "
-"које �е не могу уклонити нити заменити.\n"
-"\n"
-"�ко и даље желите да преме�тите „%s“, преименујте га и покушајте поново."
+"Име �е већ кори�ти за нарочиту �тавку која �е не може уклонити нити "
+"заменити.  �ко и даље желите да умножите �тавку, преименујте је и покушајте "
+"поново."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "�е може да замени датотеку."
+#: libnautilus-private/nautilus-file-operations.c:1043
+msgid "Unable to Replace File"
+msgstr "�е могу да заменим датотеку"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1056
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"Већ по�тоји датотека „%s“.\n"
-"\n"
-"Желите ли да је замените?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Већ по�тоји датотека „%s“.  Желите ли да је замените?"
+
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Уколико замените по�тојећу датотеку, њен �адржај ће бити пре�нимљен."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1070
+#: libnautilus-private/nautilus-file-operations.c:1089
+msgid "Conflict While Copying"
 msgstr "Судар при умножавању"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Замени"
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Replace"
+msgstr "_Замени"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Замени �ве"
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "Replace _All"
+msgstr "Замени _�ве"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4541
+#: libnautilus-private/nautilus-file-operations.c:1148
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "веза на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1152
 #, c-format
 msgid "another link to %s"
 msgstr "допун�ка веза на %s"
@@ -2294,25 +2119,25 @@ msgstr "допун�ка веза на %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1168
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. веза на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. веза на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1176
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. веза на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1180
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. веза на %s"
@@ -2322,560 +2147,584 @@ msgstr "%d. веза на %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (copy)"
 msgstr "(умножак)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1203
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (another copy)"
 msgstr "(додатни умножак)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
-#: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1210
+#: libnautilus-private/nautilus-file-operations.c:1220
 msgid "th copy)"
 msgstr ". умножак)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "st copy)"
 msgstr ". умножак)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "nd copy)"
 msgstr ". умножак)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1217
 msgid "rd copy)"
 msgstr ". умножак)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (умножак)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1236
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (додатни умножак)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1243
+#: libnautilus-private/nautilus-file-operations.c:1252
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. умножак)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. умножак)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. умножак)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1350
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1358
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1543
+#: libnautilus-private/nautilus-file-operations.c:2125
+#: libnautilus-private/nautilus-file-operations.c:2286
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�епознат GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Moving files to the Trash"
 msgstr "Премешта датотеке у Смеће"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1872
 msgid "Files thrown out:"
 msgstr "Одбачене датотеке:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1874
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Moving"
 msgstr "Премешта"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1875
 msgid "Preparing to Move to Trash..."
 msgstr "Припрема за премештање у Смеће..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Moving files"
 msgstr "Премешта датотеке"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Files moved:"
 msgstr "Премештених датотека:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1886
 msgid "Preparing To Move..."
 msgstr "Припрема за премештање..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1887
 msgid "Finishing Move..."
 msgstr "Завршава премештање..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Creating links to files"
 msgstr "Образује везе ка датотекама"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Files linked:"
 msgstr "Повезаних датотека:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Linking"
 msgstr "Образује везе"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1900
 msgid "Preparing to Create Links..."
 msgstr "Припрема за у�тановљавање веза..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1901
 msgid "Finishing Creating Links..."
 msgstr "Завршава у�тановљавање веза..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Copying files"
 msgstr "Умножава датотеке"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Files copied:"
 msgstr "Умножених датотека:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1911
 msgid "Copying"
 msgstr "Умножава"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1912
 msgid "Preparing To Copy..."
 msgstr "Припрема за умножавање..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "�е можете умножити датотеке у Смеће."
+#: libnautilus-private/nautilus-file-operations.c:1929
+msgid "You cannot copy items into the trash."
+msgstr "�е можете умножити �тавке у �меће."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�е може да умножи у Смеће"
+#: libnautilus-private/nautilus-file-operations.c:1930
+msgid "Files and folders can only be moved into the trash."
+msgstr "Датотеке и директоријуми �е могу једино преме�тити у �меће."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1954
 msgid "You cannot move this trash folder."
 msgstr "�е можете преме�тити овај директоријум за �меће."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1955
 msgid "You cannot copy this trash folder."
 msgstr "�е можете умножити овај директоријум за �меће."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr "Директоријум за �меће �е кори�ти за држање �тавки бачених у �меће."
+
+#: libnautilus-private/nautilus-file-operations.c:1958
 msgid "Can't Change Trash Location"
-msgstr "�е може да преме�ти Смеће"
+msgstr "�е може да преме�ти �меће"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1959
 msgid "Can't Copy Trash"
-msgstr "�е може да умножи Смеће"
+msgstr "�е може да умножи �меће"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1983
 msgid "You cannot move a folder into itself."
 msgstr "�е можете преме�тити директоријум у �ебе �амог."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1984
 msgid "You cannot copy a folder into itself."
 msgstr "�е можете умножити директоријум у �ебе �амог."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
+msgid "The destination folder is inside the source folder."
+msgstr "Одредишни директоријум је унутар полазног директоријума."
+
+#: libnautilus-private/nautilus-file-operations.c:1987
 msgid "Can't Move Into Self"
 msgstr "�е може преме�тити у �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1988
 msgid "Can't Copy Into Self"
 msgstr "�е може умножити у �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "You cannot copy a file over itself."
 msgstr "�е можете умножити датотеку преко ње �аме."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2002
+msgid "The destination and source are the same file."
+msgstr "Одредиште и извор �у и�та датотека."
+
+#: libnautilus-private/nautilus-file-operations.c:2003
 msgid "Can't Copy Over Self"
 msgstr "�е може умножити преко �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Грешка при образовању новог директоријума.\n"
-"\n"
-"�и�те овлашћени да пишете у одредишту."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "You do not have permissions to write to the destination."
+msgstr "�и�те овлашћени да пишете у одредишту."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Грешка при образовању новог директоријума.\n"
-"\n"
-"�ема ме�та у одредишту."
+#: libnautilus-private/nautilus-file-operations.c:2057
+#: libnautilus-private/nautilus-file-operations.c:2191
+msgid "There is no space on the destination."
+msgstr "�ема ме�та у одредишту."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2059
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Грешка „%s“ при образовању новог директоријума."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error creating new folder."
 msgstr "Грешка при образовању новог директоријума."
 
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error Creating New Folder"
+msgstr "Грешка при образовању новог директоријума"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2153
 msgid "untitled folder"
 msgstr "безимени директоријум"
 
+#: libnautilus-private/nautilus-file-operations.c:2193
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Грешка „%s“ при �тварању новог документа."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error creating new document."
+msgstr "Грешка при �тварању новог документа."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error Creating New Document"
+msgstr "Грешка при �тварању новог документа"
+
+#: libnautilus-private/nautilus-file-operations.c:2344
+msgid "new file"
+msgstr "нова датотека"
+
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2416
 msgid "Deleting files"
-msgstr "Брише датотеке"
+msgstr "Бришем датотеке"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Files deleted:"
 msgstr "Обри�аних датотека:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2420
+#: libnautilus-private/nautilus-file-operations.c:2455
 msgid "Deleting"
-msgstr "Брише"
+msgstr "Бришем"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2421
 msgid "Preparing to Delete files..."
 msgstr "Припрема за бри�ање датотека..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Emptying the Trash"
-msgstr "Избацивање �мећа"
+msgstr "Избацујем �меће"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2456
 msgid "Preparing to Empty the Trash..."
 msgstr "Припрема за избацивање �мећа..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2519
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Сигурно желите да избаците �ве �тавке из �мећа?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2533
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Уколико и�празните �меће, �тавке ће бити трајно уклоњене."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2545
 msgid "_Empty"
 msgstr "_И�празни"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid "foo"
 msgstr "нешто"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2592
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (copy)"
 msgstr "нешто (умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc (copy)"
 msgstr ".bashrc (умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo.txt"
 msgstr ".нешто.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo (copy).txt"
 msgstr ".нешто (умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo"
 msgstr "нешто нешто"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo (copy)"
 msgstr "нешто нешто (умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo.txt"
 msgstr "нешто.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2596
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (copy).txt"
 msgstr "нешто (умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo foo.txt"
 msgstr "нешто нешто.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2597
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (copy).txt"
 msgstr "нешто нешто (умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo.txt txt"
 msgstr "нешто нешто.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo (copy).txt txt"
 msgstr "нешто нешто (умножак).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo...txt"
 msgstr "нешто...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo.. (copy).txt"
 msgstr "нешто.. (умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo..."
 msgstr "нешто..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo... (copy)"
 msgstr "нешто... (умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (copy)"
 msgstr "нешто. (умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (another copy)"
 msgstr "нешто. (додатни умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (another copy)"
 msgstr "нешто (додатни умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (another copy).txt"
 msgstr "нешто (додатни умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (3rd copy)"
 msgstr "нешто (3. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (3rd copy).txt"
 msgstr "нешто (3. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (another copy).txt"
 msgstr "нешто нешто (додатни умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (3rd copy).txt"
 msgstr "нешто нешто (3. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (13th copy)"
 msgstr "нешто (13. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (14th copy)"
 msgstr "нешто (14. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (13th copy).txt"
 msgstr "нешто (13. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (14th copy).txt"
 msgstr "нешто (14. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (21st copy)"
 msgstr "нешто (21. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (22nd copy)"
 msgstr "нешто (22. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (21st copy).txt"
 msgstr "нешто (21. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (22nd copy).txt"
 msgstr "нешто (22. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (23rd copy)"
 msgstr "нешто (23. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (23rd copy).txt"
 msgstr "нешто (23. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (24th copy)"
 msgstr "нешто (24. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (24th copy).txt"
 msgstr "нешто (24. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (25th copy)"
 msgstr "нешто (25. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (25th copy).txt"
 msgstr "нешто (25. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (24th copy)"
 msgstr "нешто нешто (24. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (25th copy)"
 msgstr "нешто нешто (25. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (24th copy).txt"
 msgstr "нешто нешто (24. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (25th copy).txt"
 msgstr "нешто нешто (25. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "нешто нешто (100000000000000. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (10th copy)"
 msgstr "нешто (10. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (11th copy)"
 msgstr "нешто (11. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (10th copy).txt"
 msgstr "нешто (10. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (11th copy).txt"
 msgstr "нешто (11. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2622
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (12th copy)"
 msgstr "нешто (12. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2623
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (12th copy).txt"
 msgstr "нешто (12. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (110th copy)"
 msgstr "нешто (110. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (111th copy)"
 msgstr "нешто (111. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (110th copy).txt"
 msgstr "нешто (110. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (111th copy).txt"
 msgstr "нешто (111. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (122nd copy)"
 msgstr "нешто (122. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (123rd copy)"
 msgstr "нешто (123. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (122nd copy).txt"
 msgstr "нешто (122. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (123rd copy).txt"
 msgstr "нешто (123. умножак).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (124th copy)"
 msgstr "нешто (124. умножак)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (124th copy).txt"
 msgstr "нешто (124. умножак).txt"
 
@@ -2894,64 +2743,64 @@ msgstr "нешто (124. умножак).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "дана� у 14:33:24"
 
-#: libnautilus-private/nautilus-file.c:2768
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "дана� у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "дана� у 14:33"
 
-#: libnautilus-private/nautilus-file.c:2771
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "дана� у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2773
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "дана�, 14:33"
 
-#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "дана�, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2776
-#: libnautilus-private/nautilus-file.c:2777
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "дана�"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "јуче у 14:12:34"
 
-#: libnautilus-private/nautilus-file.c:2787
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "јуче у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "јуче у 14:22"
 
-#: libnautilus-private/nautilus-file.c:2790
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "јуче у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2792
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "јуче, 14:22"
 
-#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "јуче, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2795
-#: libnautilus-private/nautilus-file.c:2796
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "јуче"
 
@@ -2960,136 +2809,136 @@ msgstr "јуче"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "�реда, 23. �ептембар 2003. у 14:34:27"
 
-#: libnautilus-private/nautilus-file.c:2808
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y. у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "�ре, 23. �еп 2003. у 14:34:27"
 
-#: libnautilus-private/nautilus-file.c:2811
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y. у %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "�ре, 23. �еп 2003. у 14:34"
 
-#: libnautilus-private/nautilus-file.c:2814
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y. у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "23. �еп 2003. у 14:34"
 
-#: libnautilus-private/nautilus-file.c:2817
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y. у %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "23. �еп 2003, 14:24"
 
-#: libnautilus-private/nautilus-file.c:2820
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2822
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2823
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.'%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2825
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2826
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%-d.%m.'%y."
 
-#: libnautilus-private/nautilus-file.c:4121
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 �тавки"
 
-#: libnautilus-private/nautilus-file.c:4121
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 директоријума"
 
-#: libnautilus-private/nautilus-file.c:4122
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 датотека"
 
-#: libnautilus-private/nautilus-file.c:4126
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 датотека"
 
-#: libnautilus-private/nautilus-file.c:4126
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 директоријум"
 
-#: libnautilus-private/nautilus-file.c:4127
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 датотека"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4130
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u �тавки"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4130
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u директоријума"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4131
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u датотека"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4443
-#: libnautilus-private/nautilus-file.c:4459
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? �тавки"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4449
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? бајтова"
 
-#: libnautilus-private/nautilus-file.c:4464
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "непознат тип"
 
-#: libnautilus-private/nautilus-file.c:4467
+#: libnautilus-private/nautilus-file.c:4465
 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:4473
-#: src/file-manager/fm-properties-window.c:1151
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "непознато"
 
-#: libnautilus-private/nautilus-file.c:4505
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "програм"
 
-#: libnautilus-private/nautilus-file.c:4517
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3099,7 +2948,7 @@ msgstr ""
 "да је ваша датотека gnome-vfs.keys на погрешном ме�ти, или је не може "
 "пронаћи из неких других разлога."
 
-#: libnautilus-private/nautilus-file.c:4521
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3108,12 +2957,12 @@ msgstr ""
 "�ије нашао опи� за МИМЕ тип „%s“ (датотека је „%s“), обаве�тите допи�но "
 "друштво за gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4535
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "веза"
 
 # �е показује на право ме�то
-#: libnautilus-private/nautilus-file.c:4555
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "веза (неи�правна)"
 
@@ -3234,11 +3083,13 @@ msgid "Search for files by file name and file properties"
 msgstr "�ађи датотеке према имену и о�обинама"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Преглед помоћу икона"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Прегледај као �пи�ак"
@@ -3382,147 +3233,146 @@ msgstr "Лични директоријум (%s)"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1175
 msgid "Computer"
 msgstr "Рачунар"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2344
-msgid "file icon"
-msgstr "икона датотеке"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2727
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "измењив тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2728
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "измењива ознака"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2735
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "додатни тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2736
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "још тек�та"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2743
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "и�такнуто ради избора"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2744
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "да ли и�такнути ради избора"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2751
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "и�такнуто у жижи та�татуре"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2752
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "да ли и�такнути када је у жижи та�татуре"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2760
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "и�такнуто за пуштање"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2761
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "да ли и�такнути за пуштање у оквиру „превлачења и пуштања“"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Правоугаоник избора"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Уоквири тек�т"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "И�цртај оквир око неизабраног тек�та"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Боја површи избора"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Боја површи избора"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Провидно�т површи избора"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Провидно�т површи избора"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Провидно�т и�тицања"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Провидно�т и�тицања изабраних икона"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Светла боја обавештења"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Боја која �е кори�ти за тек�т обавештења на тамној позадини"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Тамна боја обавештења"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Боја која �е кори�ти за тек�т обавештења на �ветлој позадини"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Овај директоријум кори�ти �амора�поређивање."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Овај директоријум кори�ти �амора�поређивање. Желите ли да пређете на ручно "
-"ра�поређивање и о�тавите ову �тавку ту где �те је пу�тили?"
+"Желите ли да пређете на ручно ра�поређивање и о�тавите ову �тавку ту где �те "
+"је пу�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Овај директоријум кори�ти �амора�поређивање. Желите ли да пређете на ручно "
-"ра�поређивање и о�тавите ове �тавке ту где �те их пу�тили?"
+"Желите ли да пређете на ручно ра�поређивање и о�тавите ове �тавке ту где �те "
+"их пу�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Прећи на ручно ра�поређивање?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Пређи"
 
@@ -3541,13 +3391,13 @@ msgid ""
 "been created.  This may take a long time."
 msgstr ""
 "Уколико желите да омогућите брзу претрагу, можете уредити датотеку %s као "
-"root. По�тављање на „да“ ће укључити Медуза у�луге. Да почнете �а у�лугама "
-"индек�ирања и претраге одмах, такође покрените и �ледеће наредбе као root:\n"
+"root. По�тављање на „да“ ће укључити Медуза у�луге. Да одмах почнете �а "
+"у�лугама попи�а и претраге, такође покрените и �ледеће наредбе као root:\n"
 "\n"
 "medusa-indexd\n"
 "medusa-searchd\n"
 "\n"
-"Брзе претраге неће бити до�тупне док �е почетни индек� ваших датотека не "
+"Брзе претраге неће бити до�тупне док �е почетни попи� ваших датотека не "
 "направи. Ово може потрајати."
 
 #: libnautilus-private/nautilus-medusa-support.c:138
@@ -3631,72 +3481,72 @@ msgstr "Подразумевано је за „%s“ �тавке."
 msgid "Is the default for all \"%s\" items."
 msgstr "Подразумевано је за �ве „%s“ �тавке."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Измени „%s“"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Укључи у мени за „%s“ �тавке"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Кори�ти као подразумевано за „%s“ �тавке"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Укључи у мени �амо за „%s“"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Кори�ти као подразумевано �амо за „%s“"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�е укључуј у мени за „%s“ �тавке"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Име"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Стање"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "И_забери"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Готово"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "Из_мени..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Вр�те датотека и програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Иди тамо"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3704,48 +3554,48 @@ msgstr ""
 "Можете поде�ити који �у програми понуђени за које вр�те датотека у "
 "прозорчету „Вр�те датотека и програми“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Отвори неким другим програмом"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Изаберите програм којим да отвори „%s“:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Отвори помоћу другог прегледача"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Изабери преглед за „%s“:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "�ема до�тупних прегледача за „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "�ема до�тупних прегледача."
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "�иједан програм није намењен за отварање „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�ема намењених програма"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "�иједна акција није намењена за „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "�ема намењених акција"
 
@@ -3753,175 +3603,179 @@ msgstr "�ема намењених акција"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
-"Можете поде�ити да Гном намени програме за одређене вр�те датотека. Желите "
+"Можете поде�ити Гнома да намени програме за одређене вр�те датотека. Желите "
 "ли да �ада намените програм овој вр�ти датотека?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "�амени програм"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_�амени програм"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Прегледач намењен за отварање „%s“ је неи�праван."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "�амењен је неи�праван прегледач"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Програм намењен за отварање „%s“ је неи�праван."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "�амењен је неи�праван програм"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "�кција намењена за отварање „%s“ је неи�правна."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "�амењена је неи�правна акција"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"Можете поде�ити да Гном намени други програм или прегледач за ову вр�ту "
-"датотека. Желите ли да �ада намените програм или прегледач овој вр�ти "
+"Можете поде�ити Гнома да намени други програм или прегледач за ову вр�ту "
+"датотека. Желите ли �ада да намените програм или прегледач овој вр�ти "
 "датотека?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "�амени акцију"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_�амени акцију"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "�еу�пешно отварање, желите ли да изаберете други програм?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "„%s“ не може да отвори „%s“ зато што „%s“ не може да при�тупи датотекама на "
-"локацијама „%s“. Желите ли да изаберете други програм?"
+"локацијама „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Отварање неу�пешно, желите ли да изаберете неку другу акцију?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Подразумевана акција не може да отвори „%s“ зато што не може да при�тупи "
-"датотекама на локацијама „%s“. Желите ли да изаберете другу акцију?"
+"датотекама на путањама „%s“."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�е може да отвори путању"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "„%s“ не може да отвори „%s“ зато што „%s“ не може да при�тупи датотекама на "
-"локацијама „%s“. �ема других програма који могу да прегледају ову датотеку. "
-"Уколико пребаците ову датотеку на ваш рачунар, можда ћете моћи да га "
-"отворите."
+"путањама „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"�ема других програма који могу да прегледају ову датотеку. Уколико пребаците "
+"ову датотеку на ваш рачунар, можда ћете моћи да га отворите."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Подразумевана акција не може да отвори „%s“ зато што не може да при�тупи "
-"датотекама на локацијама „%s“. �иједна друга акција није намењена прегледању "
-"ове датотеке. Уколико прекопирате ову датотеку на ваш рачунар, можда ћете "
-"моћи да је отворите."
+"датотекама на путањама „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"�ема других програма који могу да прегледају ову датотеку. Уколико пребаците "
+"ову датотеку на ваш рачунар, можда ћете моћи да га отворите."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
-msgstr "Отвара %s"
+msgstr "Отварам %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"�ажало�т, не можете извршавати наредбе �а удаљеног ме�та ради веће "
-"безбедно�ти."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "�ажало�т, не можете извршавати наредбе �а удаљеног ме�та."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "�е може да изврши удаљене везе"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Ово је онемогућено из безбедно�них разлога."
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Дошло је до грешке при покретању програма.\n"
-"\n"
-"Детаљи:"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "�е могу да извршим удаљене везе"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Детаљи:"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Дошло је до грешке при покретању програма."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Грешка при покретању програма"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Ово одредиште превлачења подржава �амо локалне датотеке."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Ова мета за пуштање подржава �амо локалне датотеке.\n"
-"\n"
 "Да би�те отворили удаљене датотеке, пребаците их у локални директоријум, и "
 "превуците их поново."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
-msgstr "Мета превлачења подржава �амо локалне датотеке"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "Одредиште превлачења подржава �амо локалне датотеке"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Ова мета за пуштање подржава �амо локалне датотеке.\n"
-"\n"
 "Да би�те отворили удаљене датотеке, пребаците их у локални директоријум, и "
 "превуците их поново. Локалне датотеке које �те превукли �у већ отворене."
 
@@ -4168,14 +4022,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Ставке које �адрже „medusa“ у имену и које �у директоријуми"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Претражује ди�кове"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "�аутилу� тражује директоријуме �а �мећем на вашим ди�ковима"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Уреди"
@@ -4380,100 +4226,112 @@ msgid "Empty Trash"
 msgstr "И�празни Смеће"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Ово ће отворити %d одвојених прозора. Сигурно желите то да учините?"
+msgid "Open %d Windows?"
+msgstr "Отвори %d прозора?"
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Сигурно желите да отворите �ве датотеке?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:156
 #, c-format
-msgid "Open %d Windows?"
-msgstr "Отвори %d прозора?"
+msgid "This will open %d separate windows."
+msgstr "Ово ће отворити %d одвојених прозора."
 
-#: src/file-manager/fm-directory-view.c:836
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Сигурно желите да трајно уклоните „%s“?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:840
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Сигурно желите да трајно уклоните %d изабраних �тавки?"
 
-#: src/file-manager/fm-directory-view.c:846
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Уколико обришете �тавку, она ће бити трајно уклоњена."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Уклони?"
 
-#: src/file-manager/fm-directory-view.c:985
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Изаберите образац"
 
-#: src/file-manager/fm-directory-view.c:1001
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "Об_ра�ци:"
 
-#: src/file-manager/fm-directory-view.c:1598
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "„%s“ изабран"
 
-#: src/file-manager/fm-directory-view.c:1600
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 директоријум изабран"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1603
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d директоријума изабрано"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (�адржи 0 �тавки)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (�адржи 1 �тавку)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1614
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (�адржи %d �тавки)"
 
-#: src/file-manager/fm-directory-view.c:1621
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (�адржи укупно 0 �тавки)"
 
-#: src/file-manager/fm-directory-view.c:1623
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (�адржи укупно 1 �тавку)"
 
-#: src/file-manager/fm-directory-view.c:1625
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (�адржи укупно %d �тавки)"
 
-#: src/file-manager/fm-directory-view.c:1638
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "„%s“ изабран (%s)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1642
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d �тавки изабрано (%s)"
 
-#: src/file-manager/fm-directory-view.c:1649
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "Још једна �тавка изабрана (%s)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1652
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d других �тавки изабрано (%s)"
@@ -4485,7 +4343,7 @@ msgstr "%d других �тавки изабрано (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1681
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4494,119 +4352,125 @@ 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:1806
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
-"Директоријум „%s“ �адржи више датотека него што �аутилу� може да подне�е. "
-"�еке датотеке неће бити приказане."
+"Директоријум „%s“ �адржи више датотека него што �аутилу� може да подне�е."
+
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "�еке датотеке неће бити приказане."
 
-#: src/file-manager/fm-directory-view.c:1813
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Превише датотека"
 
-#: src/file-manager/fm-directory-view.c:3058
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr "�е може да пребаци „%s“ у Смеће. Желите ли да га одмах обришете?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "�е могу да пребацим „%s“ у �меће, желите ли да га одмах обришете?"
 
-# bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3063
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr ""
-"�е може да пребаци %d изабраних �тавки у Смеће. Желите ли да их одмах "
-"обришете?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "�е може �е пребацити „%s“ у �меће."
 
-# bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3067
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "�е могу да пребацим �тавке у �меће, желите ли да га их одмах обришете?"
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"�е може да пребаци %d изабраних �тавки у Смеће. Желите ли одмах да обришете "
-"тих %d �тавки?"
+"�е могу да пребацим неке �тавке у �меће, желите ли да га их одмах обришете?"
 
-#: src/file-manager/fm-directory-view.c:3075
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Обриши одмах?"
 
-#: src/file-manager/fm-directory-view.c:3107
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "Сигурно желите да трајно избаците „%s“ из Смећа?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Сигурно желите да трајно избаците „%s“ из �мећа?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3111
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
-msgstr "Сигурно желите да трајно избаците %d изабраних �тавки из Смећа?"
+"trash?"
+msgstr "Сигурно желите да трајно избаците %d изабраних �тавки из �мећа?"
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Уколико обришете �тавку, она ће бити трајно уклоњена."
 
-#: src/file-manager/fm-directory-view.c:3117
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Избаци из Смећа?"
 
-#: src/file-manager/fm-directory-view.c:3396
-#: src/file-manager/fm-directory-view.c:3438
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Кори�ти „%s“ за отварање изабране �тавке"
 
-#: src/file-manager/fm-directory-view.c:3514
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Други _програм..."
 
-#: src/file-manager/fm-directory-view.c:3514
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Програм..."
 
-#: src/file-manager/fm-directory-view.c:3536
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Други пре_гледач..."
 
-#: src/file-manager/fm-directory-view.c:3536
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Пре_гледач..."
 
-#: src/file-manager/fm-directory-view.c:3629
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�е може завршити наведено деловање: %s"
 
-#: src/file-manager/fm-directory-view.c:3653
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�е може завршити наведено деловање."
 
-#: src/file-manager/fm-directory-view.c:4162
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Покрени „%s“ на �вакој изабраној �тавци"
 
-#: src/file-manager/fm-directory-view.c:4379
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "�аправи документ према шаблону „%s“"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Све извршне датотеке у овом директоријуму ће �е појавити у менију „Скрипте“."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Све извршне датотеке у овом директоријуму ће �е појавити у менију Скрипте. "
-"Избором �крипте из менија ће �е она покренути, а �ве изабране �тавке ће јој "
-"бити улаз."
+"Избором �крипте из менија �е она покреће, а �ве изабране �тавке ће јој бити "
+"улаз."
 
-#: src/file-manager/fm-directory-view.c:4382
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "О �криптама"
 
-#: src/file-manager/fm-directory-view.c:4383
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4647,18 +4511,18 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: ме�то и величина текућег прозора"
 
-#: src/file-manager/fm-directory-view.c:4513
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "„%s“ ће бити премештен уколико изаберете наредбу Убаци датотеке"
 
-#: src/file-manager/fm-directory-view.c:4517
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "„%s“ ће бити умножен уколико изаберете наредбу Убаци датотеке"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:4524
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4667,167 +4531,165 @@ msgstr ""
 "датотеке"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:4528
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d изабраних �тавки ће бити умножено уколико изаберете наредбу Убаци датотеке"
 
-#: src/file-manager/fm-directory-view.c:4607
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "�ема ништа у �пи�ку и�ечака за убацивање"
 
-#: src/file-manager/fm-directory-view.c:4708
-#: src/file-manager/fm-directory-view.c:5594
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Грешка монтирања"
 
-#: src/file-manager/fm-directory-view.c:4769
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Грешка демонтирања"
 
-#: src/file-manager/fm-directory-view.c:4771
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr "Грешка при избацивању"
 
-#: src/file-manager/fm-directory-view.c:4993
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "И_збаци"
 
-#: src/file-manager/fm-directory-view.c:4993
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Демонтирај ди�к"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Отвори у новом прозору"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Отвори у %d нових прозора"
 
-#: src/file-manager/fm-directory-view.c:5080
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Разгледај директоријум"
 
-#: src/file-manager/fm-directory-view.c:5082
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Разгледај директоријуме"
 
-#: src/file-manager/fm-directory-view.c:5105
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Избаци из �мећа"
 
-#: src/file-manager/fm-directory-view.c:5107
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Трајно обриши �ве изабране �тавке"
 
-#: src/file-manager/fm-directory-view.c:5110
-#: src/file-manager/fm-directory-view.c:5398
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Пре_ме�ти у �меће"
 
-#: src/file-manager/fm-directory-view.c:5112
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Преме�ти �ваку изабрану �тавку у �меће"
 
-#: src/file-manager/fm-directory-view.c:5136
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: src/file-manager/fm-directory-view.c:5156
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_�аправи везе"
 
-#: src/file-manager/fm-directory-view.c:5157
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "�аправи везу"
 
-#: src/file-manager/fm-directory-view.c:5170
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Избаци �меће"
 
-#: src/file-manager/fm-directory-view.c:5186
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "И_�еци датотеку"
 
-#: src/file-manager/fm-directory-view.c:5187
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "И_�еци датотеке"
 
-#: src/file-manager/fm-directory-view.c:5196
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Умножи датотеку"
 
-#: src/file-manager/fm-directory-view.c:5197
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Умножи датотеке"
 
-#: src/file-manager/fm-directory-view.c:5389
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Ова веза �е не може кори�тити, зато што нема мету. Желите ли да преме�тите "
-"ову везу у �меће?"
+# bug: s/borken/broken/, though, one can always wonder :)
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Ова веза је забрљана, желите ли да је баците у �меће?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Ова веза �е не може кори�тити, зато што нема одредиште."
 
-#: src/file-manager/fm-directory-view.c:5392
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Ова веза �е не може кори�тити, зато њена мета „%s“ не по�тоји. Желите ли да "
-"преме�тите ову везу у �меће?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Ова веза �е не може кори�тити, зато њено одредиште „%s“ не по�тоји."
 
-#: src/file-manager/fm-directory-view.c:5398
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
-msgstr "Разбијена веза"
+msgstr "Прекинута веза"
 
-#: src/file-manager/fm-directory-view.c:5455
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"„%s“ је извршна тек�туална датотека. Желите ли да је покренете, или "
-"прикажете њен �адржај?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Желите ли да покренете „%s“, или прикажете њен �адржај?"
 
-#: src/file-manager/fm-directory-view.c:5461
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "„%s“ је извршна тек�туална датотека."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Покрени или прикажи?"
 
-#: src/file-manager/fm-directory-view.c:5462
-msgid "_Display"
-msgstr "_Прикажи"
-
-#: src/file-manager/fm-directory-view.c:5463
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Покрени у _терминалу"
 
-#: src/file-manager/fm-directory-view.c:5466
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Прикажи"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "По_крени"
 
-#: src/file-manager/fm-directory-view.c:5725
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Отвара „%s“"
+msgid "Opening \"%s\"."
+msgstr "Отварам „%s“."
 
-#: src/file-manager/fm-directory-view.c:5731
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
-msgstr "Оду�тани од отварања?"
+msgstr "Откажи отварање?"
 
 #: src/file-manager/fm-error-reporting.c:57
 #, c-format
@@ -4846,17 +4708,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "�ажало�т, не може да прикаже �ав �адржај „%s“."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "�е може �е приказати �адржај директоријума."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Грешка при приказивању директоријума"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "Већ је у употреби име „%s“ у овом директоријуму. Ставите неко друго име."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4864,12 +4730,12 @@ msgstr ""
 "�е по�тоји „%s“ у овом директоријуму. Можда је управо премештено или "
 "обри�ано?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "�и�те овлашћени да преименујете „%s“."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4877,81 +4743,97 @@ msgid ""
 msgstr ""
 "Име „%s“ је неи�правно зато што �адржи знак „/“. Кори�тите неко друго име."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Име „%s“ је неи�правно. Кори�тите неко друго име."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "�е може да преименује „%s“ зато што је на ди�ку �амо за читање"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "�ажало�т, не може да преименује „%s“ у „%s“."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Ставка �е не може преименовати."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Грешка при преименовању"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "�и�те овлашћени да промените групу за „%s“."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "�е може да промени групу за „%s“ зато што је на ди�ку �амо за читање"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "�ажало�т, не може да промени групу за „%s“."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Група �е не може изменити."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Грешка при по�тављању групе"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "�е може да промени вла�ника „%s“ зато што је на ди�ку �амо за читање"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "�ажало�т, не може да промени вла�ника „%s“."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Вла�ник �е не може изменити."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Грешка при по�тављању вла�ника"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "�е може да промени овлашћења за „%s“ зато што је на ди�ку �амо за читање"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "�е може да промени овлашћења за „%s“."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Овлашћења �е не могу променити."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Грешка при по�тављању овлашћења"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Преименује „%s“ у „%s“."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Оду�тани од преименовања?"
 
@@ -5009,129 +4891,131 @@ msgstr "Врати изворне величине икона"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Врати изворну величину иконе"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "показује на „%s“"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr "Превлачење и пуштање је подржано �амо за локалне ди�кове."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Превлачење и пуштање није подржано."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Превлачење и пуштање је подржано �амо за локалне �и�теме датотека."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Грешка превлачења и пуштања"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Употребљена је неи�правна вр�та превлачења."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Име датотеке"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Величина"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Вр�та"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Датум измене"
 
-#: src/file-manager/fm-properties-window.c:481
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
-"�е можете изабрати више од једне иконе! Повуците �амо једну �лику да би�те "
-"по�тавили икону."
+#: src/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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Превуците �амо једну �лику да би�те по�тавили икону."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Више од једне �лике"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Датотека коју �те превукли и пу�тили није локална. Можете кори�тити �амо "
-"локалне �лике за иконе."
+msgid "The file that you dropped is not local."
+msgstr "Датотека коју �те пу�тили није локална."
 
 #: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Можете кори�тити �амо локалне �лике за иконе."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Само локалне �лике"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Датотека коју �те превукли није �лика. Можете кори�тити �амо локалне �лике "
-"за иконе."
+msgid "The file that you dropped is not an image."
+msgstr "Датотека коју �те пу�тили није �лика."
 
-#: src/file-manager/fm-properties-window.c:501
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Само �лике"
 
-#: src/file-manager/fm-properties-window.c:918
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "О�обине"
 
-#: src/file-manager/fm-properties-window.c:921
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "О�обине за %s"
 
-#: src/file-manager/fm-properties-window.c:1382
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Оду�тани од измене групе?"
 
-#: src/file-manager/fm-properties-window.c:1383
-msgid "Changing group"
-msgstr "Мења групу"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Мењам групу."
 
-#: src/file-manager/fm-properties-window.c:1544
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Оду�тани од измене вла�ника?"
 
-#: src/file-manager/fm-properties-window.c:1545
-msgid "Changing owner"
-msgstr "Мења вла�ника"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Мењам вла�ника."
 
-#: src/file-manager/fm-properties-window.c:1751
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ништа"
 
-#: src/file-manager/fm-properties-window.c:1753
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "нечитљив"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 �тавка, величине %s"
 
 # bug: plural-forms
-#: src/file-manager/fm-properties-window.c:1767
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d �тавки, укупне величине %s"
 
-#: src/file-manager/fm-properties-window.c:1775
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(део �адржаја нечитљив)"
 
@@ -5141,196 +5025,187 @@ 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:1792
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Садржај:"
 
-#: src/file-manager/fm-properties-window.c:2183
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "О�новно"
 
-#: src/file-manager/fm-properties-window.c:2211
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Имена:"
 
-#: src/file-manager/fm-properties-window.c:2213
-#: src/nautilus-connect-server-dialog.c:185
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:190
 msgid "_Name:"
 msgstr "_Име:"
 
-#: src/file-manager/fm-properties-window.c:2262
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Вр�та:"
 
 # bug: is em-dash suitable in here?
-#: src/file-manager/fm-properties-window.c:2264
-#: src/file-manager/fm-properties-window.c:2274
-#: src/file-manager/fm-properties-window.c:2280
-#: src/file-manager/fm-properties-window.c:2287
-#: src/file-manager/fm-properties-window.c:2291
-#: src/file-manager/fm-properties-window.c:2299
-#: src/file-manager/fm-properties-window.c:2305
-#: src/file-manager/fm-properties-window.c:2314
-#: src/file-manager/fm-properties-window.c:2320
-#: src/file-manager/fm-properties-window.c:2893
-#: src/file-manager/fm-properties-window.c:2914
-#: src/file-manager/fm-properties-window.c:2996
-#: src/file-manager/fm-properties-window.c:3000
-#: src/file-manager/fm-properties-window.c:3004
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
+#: src/file-manager/fm-properties-window.c:2288
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "—"
 
-#: src/file-manager/fm-properties-window.c:2272
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Величина:"
 
-#: src/file-manager/fm-properties-window.c:2278 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Путања:"
 
-#: src/file-manager/fm-properties-window.c:2285
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Ди�к:"
 
-#: src/file-manager/fm-properties-window.c:2289
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Слободан про�тор:"
 
-#: src/file-manager/fm-properties-window.c:2297
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Мета везе:"
 
-#: src/file-manager/fm-properties-window.c:2303
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "МИМЕ тип:"
 
-#: src/file-manager/fm-properties-window.c:2312
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Измењен:"
 
-#: src/file-manager/fm-properties-window.c:2318
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "По�ледњи при�туп:"
 
-#: src/file-manager/fm-properties-window.c:2334
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Изабери икону..."
 
-#: src/file-manager/fm-properties-window.c:2340
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Уклони за�ебну икону"
 
-#: src/file-manager/fm-properties-window.c:2681
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Читање"
 
-#: src/file-manager/fm-properties-window.c:2683
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Пи�ање"
 
-#: src/file-manager/fm-properties-window.c:2685
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Извршавање"
 
-#: src/file-manager/fm-properties-window.c:2762
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "По�тави _ID кори�ника (SUID)"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "�арочите ознаке:"
 
-#: src/file-manager/fm-properties-window.c:2770
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "По�тави ID _групе (SGID)"
 
-#: src/file-manager/fm-properties-window.c:2772
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Лепљив"
 
-#: src/file-manager/fm-properties-window.c:2858
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: src/file-manager/fm-properties-window.c:2868
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "�и�те вла�ник, па не можете изменити ова овлашћења"
 
-#: src/file-manager/fm-properties-window.c:2882
+#: src/file-manager/fm-properties-window.c:2894
 msgid "File _owner:"
 msgstr "_Вла�ник датотеке:"
 
-#: src/file-manager/fm-properties-window.c:2888
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Вла�ник датотеке:"
 
-#: src/file-manager/fm-properties-window.c:2899
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Група датотеке:"
 
-#: src/file-manager/fm-properties-window.c:2908
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Група датотеке:"
 
-#: src/file-manager/fm-properties-window.c:2920
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Вла�ник:"
 
-#: src/file-manager/fm-properties-window.c:2921
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Група:"
 
-#: src/file-manager/fm-properties-window.c:2922
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "О�тали:"
 
-#: src/file-manager/fm-properties-window.c:2995
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Тек�туални преглед:"
 
-#: src/file-manager/fm-properties-window.c:2999
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Бројевни преглед:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "По�ледња промена:"
 
-#: src/file-manager/fm-properties-window.c:3009
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "�е може утврдити овлашћења за „%s“."
 
-#: src/file-manager/fm-properties-window.c:3012
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "�е може утврдити овлашћења за изабрану датотеку."
 
-#: src/file-manager/fm-properties-window.c:3328
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Дошло је до грешке при приказивању помоћи: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Дошло је до грешке при приказивању помоћи."
 
-#: src/file-manager/fm-properties-window.c:3330
-msgid "Couldn't show help"
-msgstr "�е може да прикаже помоћ"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "�е могу да прикажем помоћ"
 
-#: src/file-manager/fm-properties-window.c:3667
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Оду�тани од приказивања прозора �а о�обинама?"
 
-#: src/file-manager/fm-properties-window.c:3668
-msgid "Creating Properties window"
-msgstr "Образује прозор �а о�обинама"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Образујем прозор �а о�обинама."
 
-#: src/file-manager/fm-properties-window.c:3794
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Изаберите икону"
 
@@ -5341,101 +5216,118 @@ msgid ""
 "last indexed."
 msgstr ""
 "Резултати претраге можда неће �адржати �тавке измењене након %s, када је ваш "
-"ди�к по�ледњи пут индек�иран."
+"ди�к по�ледњи пут попи�ан."
 
 #: src/file-manager/fm-search-list-view.c:144
 msgid "Search Results"
 msgstr "Резултати претраге"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "�ажало�т, Медуза претрага није до�тупна зато што није ин�талирана."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "�ажало�т, у�луга претраге Медузом тренутно није до�тупна."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Медуза није ин�талирана."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "У�луга претраге није до�тупна"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+"Претрага коју �те изабрали је новија од попи�а на вашем �и�тему. Претрага "
+"�ада неће вратити никакве резултате."
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
-"Претрага коју �те изабрали је новија од индек�а на вашем �и�тему. Претрага "
-"�ада неће вратити никакве резултате. Можете направити нови индек� покретањем "
-"„%s“ наредбе као root."
+"Можете направити нови попи� покретањем наредбе „medusa-indexd“ као "
+"админи�тратор."
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr "Тражење �тавки које �у �увише нове"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
-msgstr "�ађи �тавке које �у �увише нове"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Свака попи�ана датотека на вашем рачунару �е поклапа �а мерилом које �те "
+"изабрали."
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Свака попи�ана датотека на вашем рачунару �е поклапа �а критеријумом који "
-"�те изабрали. Проверите да ли �те и�правно унели ваше изборе, или додајте "
-"још критеријума да �узите претрагу."
+"Проверите да ли �те и�правно унели ваше изборе, или додајте још ограничења "
+"да �узите претрагу."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Грешка при претрази"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Претрага не може да отвори индек� ди�ка. Ваш индек� можда недо�таје или је "
-"неи�праван. �аправите нови индек� извршавањем наредбе „%s“ као root."
+"Претрага не може да отвори попи� ди�ка. Ваш попи� можда недо�таје или је "
+"неи�праван."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "Грешка при читању индек�а датотека"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Грешка при читању попи�а датотека"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Дошло је до грешке при учитавању �адржаја ове претраге: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Дошло је до грешке при учитавању �адржаја ове претраге."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Да би�те извели брзу претрагу, неопходан вам је индек� датотека на вашем "
-"�и�тему. Претрага не може тренутно да при�тупи вашем индек�у, па ће "
-"кори�тити �пору претрагу која не кори�ти индек�."
+"Да изведете брзу претрагу, неопходан вам је попи� датотека на вашем �и�тему."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
-"Да претражите �адржај, неопходан вам је индек� датотека на вашем �и�тему. "
-"Претрага тренутно не може да при�тупи индек�у."
+"Да претражите �адржај, неопходан вам је попи� датотека на вашем �и�тему."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
-msgstr "Брза претрага није могућа"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Претрага не може тренутно да при�тупи вашем попи�у, па ће кори�тити �пору "
+"претрагу која не кори�ти попи�."
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
-msgstr "Претрага �адржаја није могућа"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Претрага не може тренутно да при�тупи вашем попи�у."
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Брза претрага није до�тупна"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Претрага �адржаја није до�тупна"
+
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5443,76 +5335,95 @@ msgid ""
 "\n"
 "medusa-searchd"
 msgstr ""
-"Индек� је до�тупан, али Медуза ђавао за претрагу, који барата захтевима у "
-"индек�у, није покренут. Да покренете овај програм, пријавите �е као root и "
+"Попи� датотека је до�тупан, али у�луга Медуза, који барата захтевима у "
+"попи�у, није покренута.  Да покренете овај програм, пријавите �е као root и "
 "уне�ите ову наредбу:\n"
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Да изведете брзу претрагу, неопходан вам је индек� датотека на вашем "
-"�и�тему. Ваш рачунар тренутно образује тај индек�. Како није могуће "
-"кори�тити индек�, претрага може потрајати неколико минута."
+"Да изведете брзу претрагу, неопходан вам је попи� датотека на вашем �и�тему. "
+"Ваш рачунар тренутно образује тај попи�."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"Да �проведете претрагу �адржаја, неопходан вам је попи� �адржаја на вашем "
+"�и�тему. Ваш рачунар тренутно образује такав попи�."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
-"Да �проведете претрагу �адржаја, неопходан вам је индек� �адржаја на вашем "
-"�и�тему. Ваш рачунар тренутно образује такав индек�. Претрага �адржаја ће "
-"бити могућа када индек� буде готов."
+"Како није могуће кори�тити попи�, претрага може потрајати неколико минута."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Индек�ирана претрага није могућа"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Претрага �адржаја ће бити могућа када попи� буде готов."
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Претраживање попи�а није до�тупно"
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
-"Да изведете брзу претрагу, неопходан вам је индек� датотека на вашем "
-"�и�тему. Тренутно нема индек�а. Индек� можете образовати покретањем наредбе "
-"„medusa-indexd“ као root. Док �е индек� не направи, претраге ће трајати по "
-"неколико минута."
+"Да изведете брзу претрагу, неопходан вам је попи� датотека на вашем �и�тему. "
+"Тренутно нема попи�а."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
-"Да изведете претрагу �адржаја, неопходан вам је индек� �адржаја на вашем "
-"�и�тему. Тренутно нема индек�а. Индек� можете образовати покретањем наредбе "
-"„medusa-indexd“ као root. Док �е индек� не направи, претраге �адржаја ни�у "
-"могуће."
+"Да изведете претрагу �адржаја, неопходан вам је попи� �адржаја на вашем "
+"�и�тему. Тренутно нема попи�а."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Попи� можете образовати покретањем наредбе „medusa-indexd“ као root. Док �е "
+"попи� не направи, претраге ће трајати по неколико минута."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Попи� можете образовати покретањем наредбе „medusa-indexd“ као root. Док �е "
+"попи� не направи, претраге �адржаја ни�у могуће."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Брзе претраге ни�у укључене на вашем рачунару."
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
-"Да �проведете брзу претрагу, неопходан вам је индек� датотека на вашем "
+"Да �проведете брзу претрагу, неопходан вам је попи� датотека на вашем "
 "�и�тему. �дмини�тратор �и�тема је онемогућио брзу претрагу на овом рачунару, "
-"па индек� не по�тоји."
+"па попи� не по�тоји."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Брзе претраге �у онемогућене на вашем рачунару"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Брза претрага није укључена"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Где"
 
@@ -5521,7 +5432,7 @@ msgstr "Где"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Разоткри у новом прозору"
@@ -5533,7 +5444,7 @@ msgstr "_Разоткри у новом прозору"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Разоткри у %d _нових прозора"
@@ -5542,15 +5453,15 @@ msgstr "Разоткри у %d _нових прозора"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"�аутилу� је пронашао више резултата него што може да прикаже. �еки резултати "
-"неће бити приказани."
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "�аутилу� је пронашао више резултата него што може да прикаже."
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "�еки резултати неће бити приказани."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Превише поклапања"
 
@@ -5564,12 +5475,12 @@ msgid "Create L_auncher"
 msgstr "�ови _покретач"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "�аправите нови покретач"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Избаци �ве �тавке из �мећа"
 
@@ -5590,7 +5501,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Кори�ти _подразумевану позадину"
@@ -5612,57 +5523,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Изабери програм којим да прегледа изабрану �тавку"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
-msgstr "�аправите _директоријум"
+msgid "Create _Document"
+msgstr "�аправи _директоријум"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
+msgid "Create _Folder"
+msgstr "�аправи _директоријум"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Образујте нову празну датотеку унутар овог директоријума"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Образујте празан директоријум унутар овог директоријума"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Образујте �имболичку везу за �ваку изабрану �тавку"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Удво�тручи"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Обриши изабрану �тавку, без премештања у �меће"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Удво�тручи �ваку изабрану �тавку"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Уреди покретач"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Уреди податке покретача"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Форматирај изабрани ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "О�обине _медија"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr "Монтирај изабрани ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Преме�ти или умножи датотеке претходно изабране помоћу наредбе И�еци "
 "датотеке или Умножи датотеке"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5670,123 +5589,131 @@ msgstr ""
 "Преме�ти или умножи датотеке претходно изабране помоћу наредбе И�еци "
 "датотеке или Умножи датотеке у изабрани директоријум"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "�ема по�тављених шаблона"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Отвори _помоћу"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Отвори �ваку изабрану �тавку у управљачком прозору"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Отвори у управљачком прозору"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Отвори изабрану �тавку у овом прозору"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Припреми изабране датотеке за умножавање помоћу наредбе Убаци датотеке"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Припреми изабране датотеке за премештање помоћу наредбе Убаци датотеке"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Заш_тити"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Заштити изабрани ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Преименуј изабрану �тавку"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "По�тави преглед на _подразумевано"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "По�тави поредак и увећање према по�тавкама за овај преглед"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Покрени или управљај �криптама из ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Изабери _�ве датотеке"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Изаберите о_бразац"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Изабери �ве �тавке у овом прозору"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr "Изаберите �тавке у овом прозору које одговарају датом обра�цу"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Прикажи о�обине медија за изабрани ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Прикажи директоријум који �адржи �крипте из овог менија"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Демонтирај изабрани ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Кори�ти подразумевану позадину за ову локацију"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Погледај или измени о�обине �вих изабраних �тавки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "Пр_азна датотека"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Форматирај"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr "_Монтирај ди�к"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Отвори"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Отвори директоријум �а �криптама"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Убаци датотеке"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "У_баци датотеке у директоријум"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_О�обине"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Скрипте"
 
@@ -5869,53 +5796,63 @@ msgstr "_Ручно"
 #: src/file-manager/nautilus-indexing-info.c:89
 #, c-format
 msgid "Indexing is %d%% complete."
-msgstr "Индек�ирање је %d%% готово."
+msgstr "Попи� је %d%% готов."
+
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Ваше датотеке �у по�ледњи пут попи�ане у %s"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
-"Једном дневно �е ваше датотеке и тек�туални �адржај индек�ирају како би "
+"Једном дневно �е ваше датотеке и тек�туални �адржај попи�ују како би "
 "претраге биле брзе."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
-msgstr "Стање индек�ирања"
+msgstr "Стање попи�а"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Ваше датотеке �у по�ледњи пут индек�иране у %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Ваше датотеке �е управо попи�ују."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Једном дневно �е ваше датотеке и тек�туални �адржај индек�ирају како би "
-"претраге биле брзе. Индек�ирање је тренутно у току."
+"Једном дневно �е ваше датотеке и тек�туални �адржај попи�ују како би "
+"претраге биле брзе."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Тренутно не по�тоји попи� ваших датотека."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
-"Када је брза претрага омогућена, образује �е индек� за убрзање претрага. "
-"Брзо претраживање није омогућено на вашем рачунару, па тренутно немате "
-"индек�."
+"Када је брза претрага омогућена, образује �е попи� за убрзање претрага. Брзо "
+"претраживање није омогућено на вашем рачунару, па тренутно немате попи�."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Тренутно не по�тоји индек� ваших датотека."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "�ема попи�а датотека"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "�ажало�т, у�луга Медуза претраге тренутно није до�тупна."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Проверите да ли је Медуза и�правно по�тављена."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5929,69 +5866,70 @@ msgstr "Разоткри у новом прозору"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 msgid "Show Indexing Status"
-msgstr "Прикажи �тање индек�ирања"
+msgstr "Прикажи �тање попи�а"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 msgid "Show _Indexing Status"
-msgstr "Прикажи �тање _индек�ирања"
+msgstr "Прикажи �тање поп_и�а"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:5
 msgid "Show status of indexing used when searching"
-msgstr "Прикажи �тање употребљеног индек�ирања при претрази"
+msgstr "Прикажи �тање употребљеног попи�а при претрази"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
-msgstr "�е може да образује тражени директоријум"
+msgstr "�е могу да образујем обавезни директоријум"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�е могу да образујем обавезни директоријум „%s“."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"�аутилу� не може да образује тражени директоријум „%s“. Пре покретања "
-"�аутилу�а, направите овај директоријум, или по�тавите овлашћења тако да га "
-"�аутилу� може направити."
+"Пре покретања �аутилу�а, направите овај директоријум, или по�тавите "
+"овлашћења тако да га �аутилу� може направити."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�е може да образује обавезне директоријуме"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "�аутилу� не може да направи �ледеће обавезне директоријуме: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"�аутилу� не може да образује �ледеће обавезне директоријуме:\n"
-"\n"
-"%s\n"
-"\n"
 "Пре покретања �аутилу�а, направите ове директоријуме, или по�тавите "
 "овлашћења тако да их �аутилу� може направити."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Веза ка �тарој радној површини"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Веза �а именом „Веза ка �тарој радној површини“ је направљена на радној "
+"површи."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Локација директоријума за радну површину је измењена у Гному 2.4. Веза �а "
-"називом „Веза ка �тарој радној површини“ је направљена на радној површини. "
-"Можете отворити ово да преме�тите датотеке које желите, а затим уклоните "
-"везу."
+"Путања директоријума за радну површину је измењена у Гному 2.4.  Можете "
+"отворити везу да преме�тите датотеке које желите, а затим уклоните везу."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr "Пре�ељена �тара радна површина"
 
 #. Can't register myself due to trouble locating the
@@ -6004,7 +5942,7 @@ msgstr "Пре�ељена �тара радна површина"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6015,7 +5953,7 @@ msgstr ""
 "ин�талирајте �аутилу�."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6061,12 +5999,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Тренутно �е не може кори�тити �аутилу�, у�лед непредвиђене грешке."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6074,7 +6012,7 @@ msgstr ""
 "Тренутно �е не може кори�тити �аутилу�, у�лед непредвиђене грешке Боноба при "
 "покушају пријаве управника датотека на �ервер."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6084,7 +6022,7 @@ msgstr ""
 "покушају да пронађе фабрику. Гашење bonobo-activation-server-а и поновно "
 "покретање �аутилу�а може можда отклонити проблем."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6094,6 +6032,17 @@ msgstr ""
 "покушају да пронађе објекат љу�ке. Гашење bonobo-activation-server-а и "
 "поновно покретање �аутилу�а може можда отклонити проблем."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Дошло је до грешке при приказивању помоћи: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "�ема обележивача"
@@ -6127,35 +6076,43 @@ msgstr "Мање опција"
 msgid "Find Them!"
 msgstr "Пронађи их!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr "Морате унети име за �ервер"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Морате унети име за �ервер."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
+msgstr "Уне�ите име и покушајте поново."
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
 msgstr "�е могу да �е повежем �а �ервером"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"„%s“ не пред�тавља и�правну адре�у. Проверите да ли �те добро укуцали и "
-"покушајте поново."
+msgid "\"%s\" is not a valid location."
+msgstr "„%s“ не пред�тавља и�правну путању."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Проверите да ли �те добро укуцали и покушајте поново."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
 msgstr "Повежи �е �а �ервером"
 
-#: src/nautilus-connect-server-dialog.c:203
+#: src/nautilus-connect-server-dialog.c:209 src/nautilus-location-dialog.c:147
 msgid "_Location:"
 msgstr "_Путања:"
 
-#: src/nautilus-connect-server-dialog.c:228
-msgid "Connect"
-msgstr "Повежи �е"
+#: src/nautilus-connect-server-dialog.c:235
+msgid "C_onnect"
+msgstr "По_вежи �е"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6354,74 +6311,77 @@ msgstr ""
 "\n"
 "Уколико желите да поново кори�тите чаробњака, обришите ову датотеку.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "�е можете доделити више од по�ебне једне иконе."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Можете кори�тити �амо �лике за по�ебне иконе."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
-msgstr "Отвори помоћу %s"
+msgstr "Отвори помоћу: %s"
 
 #. Catch-all button after all the others.
 #: src/nautilus-information-panel.c:911
 msgid "Open with..."
 msgstr "Отвори помоћу..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"�е може да покрене програм за �нимање ЦД-а:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:484
+msgid "Unable to launch the cd burner application."
+msgstr "�е могу да покренем програм за �нимање ЦД-а."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "�е може да покрене ЦД резач"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
+msgid "Can't Launch CD Burner"
+msgstr "�е могу да покренем ЦД резач"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Избаци _�меће"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Упиши �адржај на ЦД"
 
-#: src/nautilus-location-bar.c:62
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "Иди у:"
 
 # bug: plural-forms
 #: src/nautilus-location-bar.c:154
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Желите ли да видите ових %d локација у за�ебним прозорима?"
+msgid "Do you want to view %d locations?"
+msgstr "Желите ли да видите %d путања?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:166
 msgid "View in Multiple Windows?"
 msgstr "Прегледај у више прозора?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Отвори путању"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Спроведи �куп брзих �амопровера."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Образуј почетни прозор �а датим димензијама и позицијом."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕОМЕТРИЈ�"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Образуј прозоре �амо за изричито наведене адре�е."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6429,81 +6389,88 @@ msgstr ""
 "�е управљај радном површином (занемари �ве по�тавке у прозорчету �а "
 "по�тавкама)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr "отворите прозор разгледача."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "�апу�ти �аутилу�а."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Поново покрени �аутилу�а."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Управник датотека"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:271
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:173
 msgid "Nautilus"
 msgstr "�аутилу�"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check �е не може кори�тити �а адре�ама.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check �е не може кори�тити уз о�тале опције.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit �е не може кори�тити �а адре�ама.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart �е не може кори�тити �а адре�ама.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry �е не може кори�тити �а више од једне адре�е.\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Сигурно желите да заборавите и�торију? Уколико желите, о�уђени �те да је "
-"поновите."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Сигурно желите да заборавите и�торију?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Уколико желите, о�уђени �те да је поновите."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Сигурно желите да очи�тите �пи�ак по�ећених локација?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Уколико очи�тите �пи�ак путања, оне ће бити трајно обри�ане."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Очи�ти и�торијат"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"Локација „%s“ не по�тоји. Желите ли да уклоните �ве обележиваче ове локације "
-"из вашег �пи�ка?"
+"Желите ли да уклоните �ве обележиваче �а непо�тојеће путање из вашег �пи�ка?"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Путања „%s“ више не по�тоји."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Обележивач за непо�тојећу путању"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Уклони"
 
@@ -6536,7 +6503,6 @@ msgid "Close _All Windows"
 msgstr "Затвори _�ве прозоре"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Затвори �ве управљачке прозоре"
 
@@ -6558,150 +6524,160 @@ msgid "Forward"
 msgstr "�апред"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Иди у директоријум �а шаблонима"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Иди на �ледеће по�ећену локацију"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Иди на претходно по�ећену локацију"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Иди у директоријум �а �мећем"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Почетак"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Поље �а _путањом"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "О�вежи"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Пронађи датотеке на овом рачунару"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Линија �а �_тањем"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Зау�тави"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Горе"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Пиши на ЦД"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Додај обележивач"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_�азад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Обележивачи"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Очи�ти и�торијат"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr "_Рачунар"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Уреди обележиваче"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "�а_пред"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Иди"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Почетак"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Путања..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Површ по�транце"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Шаблони"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Смеће"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Горе"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "П_реглед"
 
-#: src/nautilus-navigation-window.c:338
+#: src/nautilus-navigation-window.c:337
 msgid "Information"
 msgstr "Обавештење"
 
 #. Add "View as..." extra bonus choice.
-#: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-navigation-window.c:701 src/nautilus-shell-ui.xml.h:27
 msgid "View as..."
 msgstr "Гледај као..."
 
-#: src/nautilus-navigation-window.c:734
+#: src/nautilus-navigation-window.c:733
 #, c-format
 msgid "File Browser: %s"
 msgstr "Прегледач датотека: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"Једна од површи по�транце је наишла на грешку и не може да на�тави. "
-"�ажало�т, не могу да утврдим која."
+#: src/nautilus-navigation-window.c:1104
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Једна од површи по�транце је наишла на грешку и не може да на�тави."
 
-#: src/nautilus-navigation-window.c:1103
-#, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Површ по�транце %s је наишла на грешку и не може да на�тави. Уколико �е ово "
-"на�тави, можете желети да и�кључите ову површ."
+#: src/nautilus-navigation-window.c:1105
+msgid "Unfortunately I couldn't tell which one."
+msgstr "�ажало�т, не могу да утврдим која."
 
 #: src/nautilus-navigation-window.c:1108
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Површ по�транце „%s“ је наишла на грешку и не може да на�тави."
+
+#: src/nautilus-navigation-window.c:1109
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Уколико �е ово на�тави, можете желети да и�кључите ову површ."
+
+#: src/nautilus-navigation-window.c:1112
 msgid "Side Panel Failed"
 msgstr "�еу�пешна површ по�транце"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1243
 msgid "Side Pane"
 msgstr "Површ по�транце"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1245
 msgid "Contains a side pane view"
 msgstr "Садржи и површ по�транце"
 
@@ -6735,147 +6711,175 @@ msgstr "_Додај нови..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "�ажало�т, не може да обрише образац попуњавања %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
-msgstr "�е може да обрише образац попуњавања"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Проверите да ли имате овлашћења да обришете овај образац."
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
+msgstr "�е могу да обришем образац"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
-msgstr "�ажало�т, не може да обрише обележје %s."
+msgstr "�ажало�т, обележје %s �е не може обри�ати."
+
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Проверите да ли имате овлашћења да обришете ово обележје."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "�е могу да обришем обележје"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "�аправи ново обележје:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Кључна реч:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Слика:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Изаберите �лику за ново обележје:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "�аправите нову боју:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Име боје:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Вредно�т боје:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "�ажало�т, „%s“ не пред�тавља и�правно име датотеке."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "�ажало�т, ни�те унели и�правно име датотеке."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
-msgstr "�е може да по�тави образац попуњавања"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Покушајте поново."
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr "�е могу да по�тавим образац"
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "�ажало�т, не можете заменити �лику за поновно по�тављање"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Поновно по�тављање је нарочита �лика која �е не може обри�ати."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�ије �лика"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "�ажало�т, не може по�тавити образац попуњавања %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Изаберите �лику да је додате као образац попуњавања"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Боја �е не може по�тавити."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "�ажало�т, морате уне�ти непразно име за нову боју."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
-msgstr "�е може да по�тави боју"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "�е могу да по�тавим боју"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Изаберите боју да додате"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "�ажало�т, „%s“ није употребљива �лика"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "�ажало�т, „%s“ није употребљива �лика."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Датотека не чини �лику."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Изаберите категорију:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Оду�тани од _уклањања"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Додај нови образац..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Додај нову боју..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Додај ново обележје"
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Кликните на образац да га уклоните"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Кликните на боју да је уклоните"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Кликните на обележје да га уклоните"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Обра�ци:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Боје:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Обележја:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Уклоните образац..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Уклоните боју..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Уклоните обележје..."
 
@@ -7262,31 +7266,35 @@ msgid "CD _Creator"
 msgstr "Израда _ЦД-а"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
-msgstr "Затвори _�ве наддиректоријуме"
+msgid "Close P_arent Folders"
+msgstr "Затвори _наддиректоријуме"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Затвори наддиректоријуме овог директоријума"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr "Иди у рачунар"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Иди у израду ЦД-а"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "Отвори _путању..."
 
 # bug: _Pa_rent???
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Отвори _наддиректоријум"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr "Отвори наддиректоријум"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Ме�та"
 
@@ -7316,112 +7324,128 @@ msgstr "�еу�пешан преглед"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"Преглед %s је наишао на грешку и не може да на�тави. Можете да изаберете "
-"неки други преглед или да одете на другу локацију."
+msgid "The %s view encountered an error and can't continue."
+msgstr "Преглед %s је наишао на грешку и не може да на�тави."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Можете да изаберете неки други преглед или да одете на другу путању."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Преглед %s је наишао на грешку при покретању."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Путања �е не може приказати овим прегледачем."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Преглед �адржаја"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Преглед текуће датотеке или директоријума"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"�е може да пронађе „%s“. Проверите да ли �те добро укуцали и покушајте "
-"поново."
+msgid "Couldn't find \"%s\"."
+msgstr "�е могу да нађем „%s“."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"�е може да прикажи „%s“, зато што �аутилу� не може да одреди које је вр�те "
-"датотека."
+msgid "Couldn't display \"%s\"."
+msgstr "�е могу да прикажем „%s“."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "�аутилу� нема по�тављен прегледач за приказивање „%s“."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "�аутилу� не може да одреди које је вр�те датотека."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr "�е може да прикаже „%s“, зато што �аутилу� не подржава %s: локације."
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "�аутилу� нема по�тављен прегледач за приказивање ове датотеке."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "�е може да прикаже „%s“, зато што је покушај пријаве био неу�пешан."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "�аутилу� не подржава путање „%s:“."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "�е може да прикаже „%s“, зато што је при�туп одбијен."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Покушај пријаве је неу�пешан."
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "При�туп одбијен."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "�е могу да прикажем „%s“, зато што ни�ам у�пео да нађем рачунар „%s“."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"�е може да прикаже „%s“, зато што не може пронаћи домаћина „%s“. Проверите "
-"да ли �те добро укуцали и да ли �у по�тавке вашег прок�ија и�правне. "
+"Проверите да ли �те добро укуцали и да ли �у по�тавке вашег по�редника "
+"и�правне. "
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
-"�е може да прикаже „%s“. Проверите да ли је ваш прок�и и�правно по�тављен."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Проверите да ли је ваш по�редник и�правно по�тављен."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"�е може да прикаже „%s“, зато што �аутилу� не може да �тупи у везу �а "
-"главним SMB претраживачем.\n"
-"Проверите да ли је SMB �ервер покренут у локалној мрежи."
+"�е могу да прикажем „%s“, зато што �аутилу� не може да �тупи у везу �а "
+"главним разгледачем SMB-а."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Проверите да ли је SMB �ервер покренут у локалној мрежи."
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
-"Претраживање је тренутно недо�тупно, зато што или немате индек�, или у�луга "
-"претраживања није покренута. Проверите да ли �те покренули Медуза у�лугу "
-"претраживањам, или ако немате индек�, да Медуза индек�ирање ради."
+"Претраживање је тренутно недо�тупно, зато што или немате попи�, или у�луга "
+"претраживања није покренута."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Проверите да ли �те покренули Медуза у�лугу претраживања, или ако немате "
+"попи�, да Медуза врши попи�."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Претраживање недо�тупно"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "�аутилу� не може да прикаже „%s“."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Изаберите неки други прегледач и покушајте поново."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
-msgstr "�е може да прикаже путању"
+msgstr "�е могу да прикажем путању"
 
 #: src/nautilus-window-menus.c:214
 msgid "Go to the location specified by this bookmark"
@@ -7431,24 +7455,27 @@ msgstr "Иди на локацију наведену у овом обележи
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
-msgstr "Copyright (C) 1999-2001 Eazel, Inc."
+msgstr "Copyright © 1999–2001 Eazel, Inc."
 
 #. Translators should localize the following string
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
-msgstr "Данило Шеган <danilo@prevod.org>"
+msgstr ""
+"Данило Шеган <danilo@prevod.org>\n"
+"\n"
+"Prevod.org — превод на �рп�ки језик."
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 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-toolbars.c:361
@@ -7459,36 +7486,40 @@ msgstr "Иди назад за неколико �траница"
 msgid "Go forward a number of pages"
 msgstr "Иди напред за неколико �траница"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:906
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Прикажи ову локацију помоћу „%s“"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1177
 msgid "Network"
 msgstr "Мрежа"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1179
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1181
+msgid "Themes"
+msgstr "Теме"
+
+#: src/nautilus-window.c:1183
 msgid "CD Creator"
 msgstr "Израда ЦД-а"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1623
 msgid "Application ID"
 msgstr "ID програма"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1624
 msgid "The application ID of the window."
 msgstr "ID програма овог прозора"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1630
 msgid "Application"
 msgstr "Програм"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1631
 msgid "The NautilusApplication associated with this window."
 msgstr "�аутилу� Програм везан за овај прозор."
 
@@ -7524,6 +7555,256 @@ msgstr "Мрежни �ервери"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Прегледајте ваше мрежне �ервере у �аутилу�овом управнику датотека"
 
+#~ msgid "Search Google for Selected Text"
+#~ msgstr "Пронађи изабрани тек�т помоћу Гугла"
+
+#~ msgid "Use Google to search the web for the selected text"
+#~ msgstr "Кори�ти Гугл за тражење изабраног тек�та на вебу"
+
+#~ msgid "Look Up Selected Text in Dictionary"
+#~ msgstr "Потражи изабрани тек�т у речнику"
+
+#~ msgid "Look up the selected text in the Merriam-Webster dictionary"
+#~ msgstr "Потражи изабрани тек�т у Меријам-Веб�теровом речнику"
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Фабрика за преглед хардвера"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Преглед хардвера"
+
+#~ msgid "Hardware view"
+#~ msgstr "Преглед хардвера"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Гледај као хардвер"
+
+#~ msgid "hardware view"
+#~ msgstr "преглед хардвера"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "Име иконе за преглед хардвера"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "Сажетак података о хардверу"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s проце�ор\n"
+#~ "%s MHz\n"
+#~ "%s KB кеш меморије"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB меморије"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB меморије"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+# bug: plural-forms
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Укључен је %d дана, %d �ати, %d минута"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Општи преглед хардвера"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Овиме �е чува ме�то за ли�т проце�ора."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Овиме �е чува ме�то за ли�т меморије."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Овиме �е чува ме�то за ли�т ди�кова."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Претражује ди�кове"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "�аутилу� тражује директоријуме �а �мећем на вашим ди�ковима"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка при умножавању у „%s“.\n"
+#~ "\n"
+#~ "�ема довољно ме�та у одредишту."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Грешка при прављењу везе у „%s“.\n"
+#~ "\n"
+#~ "�ема довољно ме�та у одредишту."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при премештању у „%s“.\n"
+#~ "\n"
+#~ "�и�те овлашћени да пишете у овај директоријум."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка при премештању у „%s“.\n"
+#~ "\n"
+#~ "Са одредишног ди�ка �е може �амо читати."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Грешка при у�по�тављању веза у „%s“.\n"
+#~ "\n"
+#~ "�и�те овлашћени да пишете у овај директоријум."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Грешка при у�по�тављању веза у „%s“.\n"
+#~ "\n"
+#~ "Са одредишног ди�ка �е може �амо читати."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при умножавању „%s“.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при премештању „%s“.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при бри�ању „%s“.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при умножавању.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при у�по�тављању везе.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Грешка „%s“ при бри�ању.\n"
+#~ "\n"
+#~ "Желите ли да на�тавите?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�е може да умножи у Смеће"
+
+#~ 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 ""
+#~ "Подразумевана акција не може да отвори „%s“ зато што не може да при�тупи "
+#~ "датотекама на локацијама „%s“. �иједна друга акција није намењена "
+#~ "прегледању ове датотеке. Уколико прекопирате ову датотеку на ваш рачунар, "
+#~ "можда ћете моћи да је отворите."
+
+# bug: plural-forms
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "�е може да пребаци %d изабраних �тавки у Смеће. Желите ли да их одмах "
+#~ "обришете?"
+
+# bug: plural-forms
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "�е може да пребаци %d изабраних �тавки у Смеће. Желите ли одмах да "
+#~ "обришете тих %d �тавки?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Датотека коју �те превукли није �лика. Можете кори�тити �амо локалне "
+#~ "�лике за иконе."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "�ажало�т, Медуза претрага није до�тупна зато што није ин�талирана."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Једном дневно �е ваше датотеке и тек�туални �адржај индек�ирају како би "
+#~ "претраге биле брзе. Индек�ирање је тренутно у току."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "„%s“ не пред�тавља и�правну адре�у. Проверите да ли �те добро укуцали и "
+#~ "покушајте поново."
+
+#~ 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 ""
+#~ "�е може да прикаже „%s“, зато што �аутилу� не може да �тупи у везу �а "
+#~ "главним SMB претраживачем.\n"
+#~ "Проверите да ли је SMB �ервер покренут у локалној мрежи."
+
+#~ msgid "file icon"
+#~ msgstr "икона датотеке"
+
 #~ msgid "Name:"
 #~ msgstr "Име:"
 
@@ -7623,8 +7904,5 @@ msgstr "Прегледајте ваше мрежне Ñ�ервере у Ð�аутÐ
 #~ msgid "_Toolbar"
 #~ msgstr "_�латке"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Локација „%s“ више не по�тоји."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Иди на непо�тојећу путању"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 49615c113..010653dba 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-20 01:29+0100\n"
-"PO-Revision-Date: 2003-11-20 01:32+0100\n"
+"POT-Creation-Date: 2004-01-05 22:29+0100\n"
+"PO-Revision-Date: 2004-01-05 22:30+0100\n"
 "Last-Translator: Danilo Å egan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,8 +42,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Neuspešan bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2407
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Obeležja"
 
@@ -57,47 +57,55 @@ msgstr "Pregled Nautilusovih obeležja"
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Ne mogu da uklonim obeležje zvano „%s“."
+
+#: components/emblem/nautilus-emblem-view.c:204
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
-"Ne može da ukloni obeležje zvano „%s“. Razlog ovome je verovatno to što je "
-"obeležje trajno, a ne neko koje ste sami dodali."
+"Razlog ovome je verovatno to što je obeležje trajno, a ne neko koje ste sami "
+"dodali."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
-msgstr "Ne može da ukloni obeležje"
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
+msgstr "Ne mogu da uklonim obeležje"
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Ne mogu da primenujem obeležje zvano „%s“."
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
-"Ne može da primenuje obeležje zvano „%s“. Razlog ovome je verovatno to što "
-"je obeležje trasno, a ne neko koje ste sami dodali."
+"Razlog ovome je verovatno to što je obeležje trajno, a ne neko koje ste sami "
+"dodali."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
-msgstr "Ne može da preimenuje obeležje"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
+msgstr "Ne mogu da preimenujem obeležje"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Preimenuj obeležje"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Unesite novo ime za prikazano obeležje:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Dodaj obeležja..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -105,7 +113,7 @@ msgstr ""
 "Unesite opisno ime pored svakog obeležja. Ovo ime će se koristiti na drugim "
 "mestima za prepoznavanje obeležja."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -113,140 +121,55 @@ msgstr ""
 "Unesite opisno ime pored obeležja. Ovo ime će se koristiti na drugim mestima "
 "za prepoznavanje obeležja."
 
-#: components/emblem/nautilus-emblem-view.c:740
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Neke datoteke nisu dodate za obeležja pošto izgleda da one nisu ispravne "
-"slike."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
+msgstr "Ne mogu da dodam neke datoteke kao za obeležja."
 
-#: components/emblem/nautilus-emblem-view.c:740
 #: components/emblem/nautilus-emblem-view.c:742
-msgid "Couldn't add emblems"
-msgstr "Ne može da doda obeležja"
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
+msgstr "Izgleda da obeležja nisu ispravne slike."
 
 #: components/emblem/nautilus-emblem-view.c:742
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-"Nijedna od datoteka nije dodata kao obeležje zato što izgleda da one nisu "
-"ispravne slike."
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr "Ne mogu da dodam obeležja"
 
-#: components/emblem/nautilus-emblem-view.c:763
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr "Nijedna od datoteka nije dodata kao obeležje."
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr "Nisam uspeo da dodam obeležje."
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Prevu�eni tekst nije ispravna putanja do datoteke."
 
-#: components/emblem/nautilus-emblem-view.c:763
-#: components/emblem/nautilus-emblem-view.c:788
-#: components/emblem/nautilus-emblem-view.c:838
-msgid "Couldn't add emblem"
-msgstr "Ne može da doda obeležje"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
+msgstr "Ne mogu da dodam obeležje"
 
-#: components/emblem/nautilus-emblem-view.c:783
-#: components/emblem/nautilus-emblem-view.c:837
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Datoteka „%s“ ne predstavlja ispravnu sliku."
 
-#: components/emblem/nautilus-emblem-view.c:786
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Prevu�ena datoteka ne predstavlja ispravnu sliku."
 
-#: components/emblem/nautilus-emblem-view.c:902 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Obriši"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrika za pregled hardvera"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Hardver"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Pregled hardvera"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Pregled hardvera"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Gledaj kao hardver"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "pregled hardvera"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "Ime ikone za pregled hardvera"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "Sažetak podataka o hardveru"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s procesor\n"
-"%s MHz\n"
-"%s KB keš memorije"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB memorije"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB memorije"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-# bug: plural-forms
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Uklju�en je %d dana, %d sati, %d minuta"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Opšti pregled hardvera"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Ovime se �uva mesto za list procesora."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Ovime se �uva mesto za list memorije."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Ovime se �uva mesto za list diskova."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Istorijat"
@@ -306,7 +229,7 @@ msgid "Flash Fired"
 msgstr "Blic korišćen"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
-msgid "Focal Lenght"
+msgid "Focal Length"
 msgstr "Žižna daljina"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
@@ -390,22 +313,6 @@ msgstr "Ubaci izabrani tekst među ise�ke"
 msgid "_Copy Text"
 msgstr "_Umnoži tekst"
 
-#: components/text/services/google.xml.h:1
-msgid "Search Google for Selected Text"
-msgstr "Pronađi izabrani tekst pomoću Gugla"
-
-#: components/text/services/google.xml.h:2
-msgid "Use Google to search the web for the selected text"
-msgstr "Koristi Gugl za traženje izabranog teksta na vebu"
-
-#: components/text/services/webster.xml.h:1
-msgid "Look Up Selected Text in Dictionary"
-msgstr "Potraži izabrani tekst u re�niku"
-
-#: components/text/services/webster.xml.h:2
-msgid "Look up the selected text in the Merriam-Webster dictionary"
-msgstr "Potraži izabrani tekst u Merijam-Vebsterovom re�niku"
-
 #: components/throbber/Nautilus_Control_throbber.server.in.in.h:1
 msgid "animation to indicate on-going activity"
 msgstr "animacija kojom se ozna�ava da je nešto u toku"
@@ -916,6 +823,10 @@ msgstr "Gnom"
 msgid "GNU.org"
 msgstr "GNU"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Hardver"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Međunarodno"
@@ -1199,30 +1110,18 @@ msgid "Desktop trash icon name"
 msgstr "Ime za smeće na radnoj površini"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Zanemariće se sve u direktorijumima što prevazilazi ovu veli�inu. Svrha "
-"ovoga je da se izbegne slu�ajno prepunjavanje memorije i gašenje Nautilusa u "
-"prevelikim direktorijumima. Negativna vrednost ozna�ava da nema ograni�enja. "
-"Granica je približna pošto se direktorijumi �itaju u blokovima."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Uklju�i „naro�ite“ oznake u prozor�etu za postavke datoteka"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Ime datoteke za uobi�ajenu pozadinu direktorijuma. Koristi se jedino ako je "
 "postavljeno background_set."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1230,6 +1129,18 @@ msgstr ""
 "Ime datoteke za uobi�ajenu pozadinu površi postrance. Koristi se jedino ako "
 "je postavljeno side_background_set."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Direktorijumi veći od ovoga će biti odse�eni na približno ovu veli�inu. "
+"Svrha ovoga je da se izbegne slu�ajno prepunjavanje memorije i ubijanje "
+"Nautilusa u prevelikim direktorijumima. Negativna vrednost ozna�ava da nema "
+"ograni�enja. Granica je približna pošto se direktorijumi �itaju u blokovima."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Sakrij podrazumevane obeleživa�e u meniju sa obeleživa�ima"
@@ -1240,8 +1151,8 @@ msgstr "Li�na ikona je prikazana na radnoj površini"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Ukoliko je postavljeno, Nautilus će prikazati jedino direktorijume u površi "
 "postrance. Ina�e, prikazivaće i direktorijume i datoteke."
@@ -1281,8 +1192,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Ukoliko je postavljeno, Nautilus će prikazati direktorijume pre prikazivanja "
 "datoteka pri pregledu pomoću ikona ili spiska."
@@ -1328,7 +1239,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Ukoliko je postavljeno, Nautilus će koristiti li�ni direktorijum korisnika za "
@@ -1348,7 +1259,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Ukoliko je postavljeno, sakrivene datoteke će se prikazivati u upravniku "
 "datoteka. Sakrivene datoteke su ili datoteke �ije ime po�inje ta�kom, ili su "
@@ -1372,7 +1283,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Ukoliko je ovo postavljeno, ikona koja ukazuje na li�ni direktorijum će biti "
@@ -1409,7 +1320,7 @@ msgstr ""
 "veli�ini, umesto u rastućem, biće u opadajućem poretku."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 "Ukoliko je postavljeno, ikone će uobi�ajeno biti zgusnuto izložene u novim "
 "prozorima."
@@ -1440,7 +1351,7 @@ msgid "List of possible captions on icons"
 msgstr "Spisak mogućih oznaka ikona"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr "Najveći broj datoteka u direktorijumu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1452,20 +1363,20 @@ msgid ""
 "Name of the Nautilus theme to use. This has been deprecated as of Nautilus "
 "2.2. Please use the icon theme instead."
 msgstr ""
-"Ime motiva za Nautilus. Ovo je zastarela mogućnost od Nautilusa 2.2. Molim "
-"koristite temu za ikone."
+"Ime motiva za Nautilus. Ovo je zastarela mogućnost od Nautilusa 2.2. "
+"Koristite temu za ikone."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus upravlja iscrtavanjem radne površine"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus koristi li�ni direktorijum korisnika za radnu površinu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
-msgstr "Prikaži samo direktorijume u okviru postrance"
+msgid "Only show folders in the tree sidebar"
+msgstr "Prikaži samo direktorijume u stablu postrance"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
@@ -1484,7 +1395,7 @@ msgid "Reverse sort order in new windows"
 msgstr "Obrni uređenje u novim prozorima"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "Prikaži prvo direktorijume u prozorima"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1524,35 +1435,35 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
-"Gubitak brzine radi pregleda tekstualnih datoteka pri prelasku miša preko "
-"ikona datoteka. Ukoliko je postavljeno na „always“ uvek se prikazuje pregled, "
-"�ak i ako je datoteka na udaljenom ra�unaru. Ukoliko je postavljeno na "
-"„local_only“, prikazuje se pregled samo za lokalne datoteke. Ukoliko je "
-"postavljeno na „never“, nikad se ne prikazuje pregled."
+"Gubitak brzine radi pregleda sadržaja tekstualnih datoteka u ikoni datoteke. "
+"Ukoliko je postavljeno na „always“ uvek se prikazuje pregled, �ak i ako je "
+"datoteka na udaljenom ra�unaru. Ukoliko je postavljeno na „local_only“, "
+"prikazuje se pregled samo za lokalne datoteke. Ukoliko je postavljeno na "
+"„never“, nikad se ne prikazuje pregled."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
-"Gubitak brzine radi pregleda umanjenih slika. Ukoliko je postavljeno na "
-"„always“ uvek se prikazuje umanjena slika, �ak i ako je datoteka na udaljenom "
-"ra�unaru. Ukoliko je postavljeno na „local_only“, prikazuje se umanjena slika "
-"samo za lokalne datoteke. Ukoliko je postavljeno na „never“ koristi se opšta "
-"ikona."
+"Gubitak brzine radi pregleda umanjenih slika za slike. Ukoliko je postavljeno "
+"na „always“ uvek se prikazuje umanjena slika, �ak i ako je datoteka na "
+"udaljenom ra�unaru. Ukoliko je postavljeno na „local_only“, prikazuje se "
+"umanjena slika samo za lokalne datoteke. Ukoliko je postavljeno na „never“ "
+"koristi se opšta ikona."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Gubitak brzine radi prikazivanja broja stavki u direktorijumu. Ukoliko je "
@@ -1564,15 +1475,15 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Uobi�ajeni poredak za stavke pri prikazivanju pomoću ikona. Dozvoljene "
 "vrednosti su „name“, „size“, „type“, „modification_date“ i „emblems“."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Uobi�ajeni poredak za stavke pri prikazivanju pomoću spiska. Dozvoljene "
 "vrednosti su „name“, „size“, „type“ i „modification_date“."
@@ -1618,9 +1529,8 @@ msgstr "Vrsta klika kojom se pokreću/otvaraju datoteke"
 msgid "Use manual layout in new windows"
 msgstr "Koristi ru�ni raspored u novim prozorima"
 
-# bug: Layout -> layout
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Koristi zgusnuti raspored u novim prozorima"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1650,7 +1560,7 @@ msgstr ""
 "„icon_view“."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr "Kada prikazati broj stavki u direktorijumu"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1662,7 +1572,7 @@ msgid "When to show thumbnails of image files"
 msgstr "Kada prikazati umanjene slike"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Da li je postavljena prilagođena podrazumevana pozadina."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1822,67 +1732,77 @@ msgstr "ponovo postavi"
 msgid "on the desktop"
 msgstr "na radnoj površini"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr "Ne možete ukloniti ikonu diska."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
-"Ne možete obrisati ikonu za disk. Ukoliko želite da izbacite disk, molim "
-"koristite „Izbaci“ u priru�nom meniju za disk."
+"Ukoliko želite da izbacite disk, molim koristite „Izbaci“ u priru�nom meniju "
+"za disk."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
-msgstr "Ne može da ukloni disk"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
+msgstr "Ne mogu da uklonim disk"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5720
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Smeće"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Prebaci ovde"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Umnoži ovde"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Napravi vezu ovde"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Postavi za _pozadinu"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Odustani"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Postavi kao pozadinu za _sve direktorijume"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Postavi kao pozadinu za _ovaj direktorijum"
 
 #: 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 "Nisam mogao da postavim obeležje."
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Nažalost, morate navesti nepraznu klju�nu re� za novo obeležje."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
-msgstr "Ne može da postavi obeležje"
+#: 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 "Ne mogu da postavim obeležje"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1892,23 +1812,29 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
-msgstr "Nažalost, već postoji obeležje zvano „%s“. Izaberite neko drugo ime."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr "Nažalost, već postoji obeležje zvano „%s“."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr "Izaberite neko drugo ime za obeležje.<"
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Ne mogu da postavim obeležje"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Nažalost, ne može da sa�uva prilagođeno obeležje."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Nažalost, ne može da sa�uva ime prilagođenog obeležja."
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file-operations-progress.c:456
+#: libnautilus-private/nautilus-file-operations-progress.c:457
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld od %ld"
@@ -1918,374 +1844,273 @@ msgstr "%ld od %ld"
 msgid "From:"
 msgstr "Odakle:"
 
+# bug: comment: s/source/destination/
 #. "To" dialog label, source path gets placed next to it in the dialog
 #: libnautilus-private/nautilus-file-operations.c:365
 msgid "To:"
 msgstr "U:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:551
+#: libnautilus-private/nautilus-file-operations.c:599
+#: libnautilus-private/nautilus-file-operations.c:614
+msgid "Error while moving."
+msgstr "Greška pri premeštanju."
+
+#: libnautilus-private/nautilus-file-operations.c:552
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
-msgstr ""
-"Greška pri premeštanju.\n"
-"\n"
-"Ne može premestiti „%s“ zato što je na disku samo za �itanje."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr "Ne može se premestiti „%s“ zato što je na disku samo za �itanje."
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:568
+msgid "Error while deleting."
+msgstr "Greška pri brisanju."
+
+#: libnautilus-private/nautilus-file-operations.c:563
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
-"Greška pri brisanju.\n"
-"\n"
-"Ne može obrisati „%s“ zato što nemate ovlašćenja da menjate direktorijum u kom "
-"se nalazi."
+"Ne može se obrisati „%s“ zato što nemate ovlašćenja da menjate direktorijum u "
+"kom se nalazi."
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:569
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
-msgstr ""
-"Greška pri brisanju.\n"
-"\n"
-"Ne može obrisati „%s“ zato što se nalazi na disku samo za �itanje."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
+msgstr "Ne može se obrisati „%s“ zato što se nalazi na disku samo za �itanje."
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:600
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
-"Greška pri premeštanju.\n"
-"\n"
-"Ne može premestiti datoteku „%s“ zato što nemate ovlašćenja da menjate nju ili "
-"direktorijum u kom se nalazi."
+"Ne može se premestiti datoteka „%s“ zato što nemate ovlašćenja da menjate nju "
+"ili direktorijum u kom se nalazi."
+
+#: libnautilus-private/nautilus-file-operations.c:604
+msgid "Error while moving. "
+msgstr "Greška pri premeštanju. "
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:605
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
-"Greška pri premeštanju.\n"
-"\n"
-"Ne može premestiti datoteku „%s“ zato što se ona ili njen direktorijum nalaze "
-"u odredištu."
+"Ne mogu da premestim datoteku „%s“ zato što se ona ili njen direktorijum "
+"nalaze u odredištu."
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:615
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
-"Greška pri premeštanju.\n"
-"\n"
-"Ne može premestiti datoteku „%s“ u Smeće zato što nemate ovlašćenja da menjate "
-"nju ili njen direktorijum."
+"Ne mogu da premestim datoteku „%s“ u smeće zato što nemate ovlašćenja da "
+"menjate nju ili njen direktorijum."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
-msgstr ""
-"Greška pri umnožavanju.\n"
-"\n"
-"Ne može umnožiti datoteku „%s“ zato što nemate ovlašćenja da je �itate."
+#: libnautilus-private/nautilus-file-operations.c:637
+msgid "Error while copying."
+msgstr "Greška pri umnožavanju."
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:638
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
-"Greška pri umnožavanju u „%s“.\n"
-"\n"
-"Nema dovoljno mesta u odredištu."
+"Ne mogu da umnožim datoteku „%s“ zato što nemate ovlašćenja da je �itate."
 
-#: libnautilus-private/nautilus-file-operations.c:657
+#: libnautilus-private/nautilus-file-operations.c:658
+#: libnautilus-private/nautilus-file-operations.c:679
+#: libnautilus-private/nautilus-file-operations.c:683
 #, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Greška pri premeštanju u „%s“.<\n"
-"\n"
-"Nema dovoljno mesta u odredištu."
+msgid "Error while copying to \"%s\"."
+msgstr "Greška pri umnožavanju u „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Greška pri pravljenju veze u „%s“.\n"
-"\n"
-"Nema dovoljno mesta u odredištu."
+#: libnautilus-private/nautilus-file-operations.c:659
+#: libnautilus-private/nautilus-file-operations.c:664
+#: libnautilus-private/nautilus-file-operations.c:668
+msgid "There is not enough space on the destination."
+msgstr "Nema dovoljno mesta u odredištu."
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:663
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Greška pri umnožavanju u „%s“.\n"
-"\n"
-"Niste ovlašćeni da pišete u ovaj direktorijum."
+msgid "Error while moving to \"%s\"."
+msgstr "Greška pri premeštanju u „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:667
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Greška pri umnožavanju u „%s“.\n"
-"\n"
-"Sa odredišnog diska se može samo �itati."
+msgid "Error while creating link in \"%s\"."
+msgstr "Greška pri uspostavljanju veze u „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Greška pri premeštanju u „%s“.\n"
-"\n"
-"Niste ovlašćeni da pišete u ovaj direktorijum."
-
-#: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Greška pri premeštanju u „%s“.\n"
-"\n"
-"Sa odredišnog diska se može samo �itati."
+#: libnautilus-private/nautilus-file-operations.c:680
+#: libnautilus-private/nautilus-file-operations.c:691
+#: libnautilus-private/nautilus-file-operations.c:702
+msgid "You do not have permissions to write to this folder."
+msgstr "Niste ovlašćeni da pišete u ovaj direktorijum."
 
+#: libnautilus-private/nautilus-file-operations.c:684
 #: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Greška pri uspostavljanju veza u „%s“.\n"
-"\n"
-"Niste ovlašćeni da pišete u ovaj direktorijum."
+#: libnautilus-private/nautilus-file-operations.c:706
+msgid "The destination disk is read-only."
+msgstr "Sa odredišnog diska se može samo �itati."
 
-#: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:690
+#: libnautilus-private/nautilus-file-operations.c:694
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Greška pri uspostavljanju veza u „%s“.\n"
-"\n"
-"Sa odredišnog diska se može samo �itati."
+msgid "Error while moving items to \"%s\"."
+msgstr "Greška pri premeštanju stavki u „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:701
+#: libnautilus-private/nautilus-file-operations.c:705
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri umnožavanju „%s“.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error while creating links in \"%s\"."
+msgstr "Greška pri uspostavljanju veze u „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:731
+#: libnautilus-private/nautilus-file-operations.c:733
 #, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri premeštanju „%s“.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Greška „%s“ pri umnožavanju „%s“."
+
+#: libnautilus-private/nautilus-file-operations.c:734
+#: libnautilus-private/nautilus-file-operations.c:738
+#: libnautilus-private/nautilus-file-operations.c:742
+#: libnautilus-private/nautilus-file-operations.c:748
+#: 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
+msgid "Would you like to continue?"
+msgstr "Želite li da nastavite?"
 
-#: libnautilus-private/nautilus-file-operations.c:735
+#: libnautilus-private/nautilus-file-operations.c:737
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri ustanovljavanju veze „%s“.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Greška „%s“ pri premeštanju „%s“."
 
 #: libnautilus-private/nautilus-file-operations.c:741
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri brisanju „%s“.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
+msgstr "Greška „%s“ pri ustanovljavanju veze „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:747
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri umnožavanju.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Greška „%s“ pri brisanju „%s“."
 
-#: libnautilus-private/nautilus-file-operations.c:760
+#: libnautilus-private/nautilus-file-operations.c:762
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri premeštanju.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while copying."
+msgstr "Greška „%s“ pri umnožavanju."
 
-#: libnautilus-private/nautilus-file-operations.c:764
+#: libnautilus-private/nautilus-file-operations.c:766
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri uspostavljanju veze.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while moving."
+msgstr "Greška „%s“ pri premeštanju."
 
 #: libnautilus-private/nautilus-file-operations.c:770
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Greška „%s“ pri brisanju.\n"
-"\n"
-"Želite li da nastavite?"
+msgid "Error \"%s\" while linking."
+msgstr "Greška „%s“ pri uspostavljanju veze."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
-msgstr "Greška pri umnožavanju."
+#: libnautilus-private/nautilus-file-operations.c:776
+#, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Greška „%s“ pri brisanju."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
-msgstr "Greška pri premeštanju."
+#: libnautilus-private/nautilus-file-operations.c:902
+msgid "Error While Copying"
+msgstr "Greška pri umnožavanju"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
-msgstr "Greška pri uspostavljanju veze."
+#: libnautilus-private/nautilus-file-operations.c:905
+msgid "Error While Moving"
+msgstr "Greška pri premeštanju"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
-msgstr "Greška pri brisanju."
+#: libnautilus-private/nautilus-file-operations.c:908
+msgid "Error While Linking"
+msgstr "Greška pri uspostavljanju veze"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
-msgstr "Presko�i"
+#: libnautilus-private/nautilus-file-operations.c:913
+msgid "Error While Deleting"
+msgstr "Greška pri brisanju"
+
+#: libnautilus-private/nautilus-file-operations.c:940
+#: libnautilus-private/nautilus-file-operations.c:961
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Skip"
+msgstr "Pre_sko�i"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
-msgstr "Ponovi"
+#: libnautilus-private/nautilus-file-operations.c:961
+msgid "_Retry"
+msgstr "Po_novi"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1027
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Ne mogu da premestim „%s“ na novu putanju."
+
+#: libnautilus-private/nautilus-file-operations.c:1030
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
-"Ne može da premesti „%s“, pošto se njegovo ime već koristi za naro�ite stavke "
-"koje se ne mogu ukloniti niti zameniti.\n"
-"\n"
-"Ako i dalje želite da premestite „%s“, preimenujte ga i pokušajte ponovo."
+"Ime se već koristi za naro�itu stavku koja se ne može ukloniti niti "
+"zameniti.  Ako i dalje želite da premestite stavku, preimenujte je i "
+"pokušajte ponovo."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1034
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Ne mogu da umnožim „%s“ na novu putanju."
+
+#: libnautilus-private/nautilus-file-operations.c:1037
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
-"Ne može da umnoži „%s“, pošto se njegovo ime već koristi za naro�ite stavke "
-"koje se ne mogu ukloniti niti zameniti.\n"
-"\n"
-"Ako i dalje želite da premestite „%s“, preimenujte ga i pokušajte ponovo."
+"Ime se već koristi za naro�itu stavku koja se ne može ukloniti niti "
+"zameniti.  Ako i dalje želite da umnožite stavku, preimenujte je i pokušajte "
+"ponovo."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
-msgstr "Ne može da zameni datoteku."
+#: libnautilus-private/nautilus-file-operations.c:1043
+msgid "Unable to Replace File"
+msgstr "Ne mogu da zamenim datoteku"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1056
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
-msgstr ""
-"Već postoji datoteka „%s“.\n"
-"\n"
-"Želite li da je zamenite?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr "Već postoji datoteka „%s“.  Želite li da je zamenite?"
+
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr "Ukoliko zamenite postojeću datoteku, njen sadržaj će biti presnimljen."
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1070
+#: libnautilus-private/nautilus-file-operations.c:1089
+msgid "Conflict While Copying"
 msgstr "Sudar pri umnožavanju"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
-msgstr "Zameni"
+#: libnautilus-private/nautilus-file-operations.c:1071
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "_Replace"
+msgstr "_Zameni"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
-msgstr "Zameni sve"
+#: libnautilus-private/nautilus-file-operations.c:1090
+msgid "Replace _All"
+msgstr "Zameni _sve"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4541
+#: libnautilus-private/nautilus-file-operations.c:1148
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "veza na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1152
 #, c-format
 msgid "another link to %s"
 msgstr "dopunska veza na %s"
@@ -2294,25 +2119,25 @@ msgstr "dopunska veza na %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1168
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. veza na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1172
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d. veza na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1176
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d. veza na %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1180
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d. veza na %s"
@@ -2322,560 +2147,584 @@ msgstr "%d. veza na %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (copy)"
 msgstr "(umnožak)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1203
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid " (another copy)"
 msgstr "(dodatni umnožak)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
-#: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1210
+#: libnautilus-private/nautilus-file-operations.c:1220
 msgid "th copy)"
 msgstr ". umnožak)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "st copy)"
 msgstr ". umnožak)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "nd copy)"
 msgstr ". umnožak)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1217
 msgid "rd copy)"
 msgstr ". umnožak)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (umnožak)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1236
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (dodatni umnožak)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1243
+#: libnautilus-private/nautilus-file-operations.c:1252
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. umnožak)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. umnožak)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. umnožak)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. umnožak)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1350
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1358
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1543
+#: libnautilus-private/nautilus-file-operations.c:2125
+#: libnautilus-private/nautilus-file-operations.c:2286
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Nepoznat GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Moving files to the Trash"
 msgstr "Premešta datoteke u Smeće"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1872
 msgid "Files thrown out:"
 msgstr "Odba�ene datoteke:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1874
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Moving"
 msgstr "Premešta"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1875
 msgid "Preparing to Move to Trash..."
 msgstr "Priprema za premeštanje u Smeće..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Moving files"
 msgstr "Premešta datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Files moved:"
 msgstr "Premeštenih datoteka:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1886
 msgid "Preparing To Move..."
 msgstr "Priprema za premeštanje..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1887
 msgid "Finishing Move..."
 msgstr "Završava premeštanje..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Creating links to files"
 msgstr "Obrazuje veze ka datotekama"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Files linked:"
 msgstr "Povezanih datoteka:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Linking"
 msgstr "Obrazuje veze"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1900
 msgid "Preparing to Create Links..."
 msgstr "Priprema za ustanovljavanje veza..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1901
 msgid "Finishing Creating Links..."
 msgstr "Završava ustanovljavanje veza..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Copying files"
 msgstr "Umnožava datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Files copied:"
 msgstr "Umnoženih datoteka:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1911
 msgid "Copying"
 msgstr "Umnožava"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1912
 msgid "Preparing To Copy..."
 msgstr "Priprema za umnožavanje..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr "Ne možete umnožiti datoteke u Smeće."
+#: libnautilus-private/nautilus-file-operations.c:1929
+msgid "You cannot copy items into the trash."
+msgstr "Ne možete umnožiti stavke u smeće."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Ne može da umnoži u Smeće"
+#: libnautilus-private/nautilus-file-operations.c:1930
+msgid "Files and folders can only be moved into the trash."
+msgstr "Datoteke i direktorijumi se mogu jedino premestiti u smeće."
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1954
 msgid "You cannot move this trash folder."
 msgstr "Ne možete premestiti ovaj direktorijum za smeće."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1955
 msgid "You cannot copy this trash folder."
 msgstr "Ne možete umnožiti ovaj direktorijum za smeće."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr "Direktorijum za smeće se koristi za držanje stavki ba�enih u smeće."
+
+#: libnautilus-private/nautilus-file-operations.c:1958
 msgid "Can't Change Trash Location"
-msgstr "Ne može da premesti Smeće"
+msgstr "Ne može da premesti smeće"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1959
 msgid "Can't Copy Trash"
-msgstr "Ne može da umnoži Smeće"
+msgstr "Ne može da umnoži smeće"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1983
 msgid "You cannot move a folder into itself."
 msgstr "Ne možete premestiti direktorijum u sebe samog."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1984
 msgid "You cannot copy a folder into itself."
 msgstr "Ne možete umnožiti direktorijum u sebe samog."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
+msgid "The destination folder is inside the source folder."
+msgstr "Odredišni direktorijum je unutar polaznog direktorijuma."
+
+#: libnautilus-private/nautilus-file-operations.c:1987
 msgid "Can't Move Into Self"
 msgstr "Ne može premestiti u sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1988
 msgid "Can't Copy Into Self"
 msgstr "Ne može umnožiti u sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "You cannot copy a file over itself."
 msgstr "Ne možete umnožiti datoteku preko nje same."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2002
+msgid "The destination and source are the same file."
+msgstr "Odredište i izvor su ista datoteka."
+
+#: libnautilus-private/nautilus-file-operations.c:2003
 msgid "Can't Copy Over Self"
 msgstr "Ne može umnožiti preko sebe"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
-msgstr ""
-"Greška pri obrazovanju novog direktorijuma.\n"
-"\n"
-"Niste ovlašćeni da pišete u odredištu."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "You do not have permissions to write to the destination."
+msgstr "Niste ovlašćeni da pišete u odredištu."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
-msgstr ""
-"Greška pri obrazovanju novog direktorijuma.\n"
-"\n"
-"Nema mesta u odredištu."
+#: libnautilus-private/nautilus-file-operations.c:2057
+#: libnautilus-private/nautilus-file-operations.c:2191
+msgid "There is no space on the destination."
+msgstr "Nema mesta u odredištu."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2059
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Greška „%s“ pri obrazovanju novog direktorijuma."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error creating new folder."
 msgstr "Greška pri obrazovanju novog direktorijuma."
 
+#: libnautilus-private/nautilus-file-operations.c:2064
+msgid "Error Creating New Folder"
+msgstr "Greška pri obrazovanju novog direktorijuma"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2153
 msgid "untitled folder"
 msgstr "bezimeni direktorijum"
 
+#: libnautilus-private/nautilus-file-operations.c:2193
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Greška „%s“ pri stvaranju novog dokumenta."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error creating new document."
+msgstr "Greška pri stvaranju novog dokumenta."
+
+#: libnautilus-private/nautilus-file-operations.c:2198
+msgid "Error Creating New Document"
+msgstr "Greška pri stvaranju novog dokumenta"
+
+#: libnautilus-private/nautilus-file-operations.c:2344
+msgid "new file"
+msgstr "nova datoteka"
+
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2416
 msgid "Deleting files"
-msgstr "Briše datoteke"
+msgstr "Brišem datoteke"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Files deleted:"
 msgstr "Obrisanih datoteka:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2420
+#: libnautilus-private/nautilus-file-operations.c:2455
 msgid "Deleting"
-msgstr "Briše"
+msgstr "Brišem"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2421
 msgid "Preparing to Delete files..."
 msgstr "Priprema za brisanje datoteka..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Emptying the Trash"
-msgstr "Izbacivanje smeća"
+msgstr "Izbacujem smeće"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2456
 msgid "Preparing to Empty the Trash..."
 msgstr "Priprema za izbacivanje smeća..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2519
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Sigurno želite da izbacite sve stavke iz smeća?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2533
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr "Ukoliko ispraznite smeće, stavke će biti trajno uklonjene."
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2545
 msgid "_Empty"
 msgstr "_Isprazni"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid "foo"
 msgstr "nešto"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2592
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (copy)"
 msgstr "nešto (umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid ".bashrc (copy)"
 msgstr ".bashrc (umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo.txt"
 msgstr ".nešto.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid ".foo (copy).txt"
 msgstr ".nešto (umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo"
 msgstr "nešto nešto"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo (copy)"
 msgstr "nešto nešto (umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo.txt"
 msgstr "nešto.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2596
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (copy).txt"
 msgstr "nešto (umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo foo.txt"
 msgstr "nešto nešto.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2597
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (copy).txt"
 msgstr "nešto nešto (umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo.txt txt"
 msgstr "nešto nešto.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo foo (copy).txt txt"
 msgstr "nešto nešto (umnožak).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo...txt"
 msgstr "nešto...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo.. (copy).txt"
 msgstr "nešto.. (umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo..."
 msgstr "nešto..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo... (copy)"
 msgstr "nešto... (umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (copy)"
 msgstr "nešto. (umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo. (another copy)"
 msgstr "nešto. (dodatni umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (another copy)"
 msgstr "nešto (dodatni umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (another copy).txt"
 msgstr "nešto (dodatni umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo (3rd copy)"
 msgstr "nešto (3. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (3rd copy).txt"
 msgstr "nešto (3. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (another copy).txt"
 msgstr "nešto nešto (dodatni umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo foo (3rd copy).txt"
 msgstr "nešto nešto (3. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (13th copy)"
 msgstr "nešto (13. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (14th copy)"
 msgstr "nešto (14. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (13th copy).txt"
 msgstr "nešto (13. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (14th copy).txt"
 msgstr "nešto (14. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (21st copy)"
 msgstr "nešto (21. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (22nd copy)"
 msgstr "nešto (22. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (21st copy).txt"
 msgstr "nešto (21. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (22nd copy).txt"
 msgstr "nešto (22. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (23rd copy)"
 msgstr "nešto (23. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (23rd copy).txt"
 msgstr "nešto (23. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (24th copy)"
 msgstr "nešto (24. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (24th copy).txt"
 msgstr "nešto (24. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo (25th copy)"
 msgstr "nešto (25. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo (25th copy).txt"
 msgstr "nešto (25. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (24th copy)"
 msgstr "nešto nešto (24. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (25th copy)"
 msgstr "nešto nešto (25. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (24th copy).txt"
 msgstr "nešto nešto (24. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo foo (25th copy).txt"
 msgstr "nešto nešto (25. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "nešto nešto (100000000000000. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (10th copy)"
 msgstr "nešto (10. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (11th copy)"
 msgstr "nešto (11. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (10th copy).txt"
 msgstr "nešto (10. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (11th copy).txt"
 msgstr "nešto (11. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2622
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (12th copy)"
 msgstr "nešto (12. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2623
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (12th copy).txt"
 msgstr "nešto (12. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (110th copy)"
 msgstr "nešto (110. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (111th copy)"
 msgstr "nešto (111. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (110th copy).txt"
 msgstr "nešto (110. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (111th copy).txt"
 msgstr "nešto (111. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (122nd copy)"
 msgstr "nešto (122. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (123rd copy)"
 msgstr "nešto (123. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (122nd copy).txt"
 msgstr "nešto (122. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (123rd copy).txt"
 msgstr "nešto (123. umnožak).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2630
 msgid "foo (124th copy)"
 msgstr "nešto (124. umnožak)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2631
 msgid "foo (124th copy).txt"
 msgstr "nešto (124. umnožak).txt"
 
@@ -2894,64 +2743,64 @@ msgstr "nešto (124. umnožak).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "danas u 14:33:24"
 
-#: libnautilus-private/nautilus-file.c:2768
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "danas u %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "danas u 14:33"
 
-#: libnautilus-private/nautilus-file.c:2771
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "danas u %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2773
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "danas, 14:33"
 
-#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "danas, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2776
-#: libnautilus-private/nautilus-file.c:2777
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "danas"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ju�e u 14:12:34"
 
-#: libnautilus-private/nautilus-file.c:2787
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ju�e u %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ju�e u 14:22"
 
-#: libnautilus-private/nautilus-file.c:2790
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ju�e u %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2792
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ju�e, 14:22"
 
-#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ju�e, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2795
-#: libnautilus-private/nautilus-file.c:2796
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ju�e"
 
@@ -2960,136 +2809,136 @@ msgstr "ju�e"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "sreda, 23. septembar 2003. u 14:34:27"
 
-#: libnautilus-private/nautilus-file.c:2808
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d. %B %Y. u %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "sre, 23. sep 2003. u 14:34:27"
 
-#: libnautilus-private/nautilus-file.c:2811
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d. %b %Y. u %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "sre, 23. sep 2003. u 14:34"
 
-#: libnautilus-private/nautilus-file.c:2814
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d. %b %Y. u %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "23. sep 2003. u 14:34"
 
-#: libnautilus-private/nautilus-file.c:2817
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d. %b %Y. u %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "23. sep 2003, 14:24"
 
-#: libnautilus-private/nautilus-file.c:2820
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d. %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2822
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2823
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.'%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2825
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2826
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%-d.%m.'%y."
 
-#: libnautilus-private/nautilus-file.c:4121
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 stavki"
 
-#: libnautilus-private/nautilus-file.c:4121
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 direktorijuma"
 
-#: libnautilus-private/nautilus-file.c:4122
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 datoteka"
 
-#: libnautilus-private/nautilus-file.c:4126
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 datoteka"
 
-#: libnautilus-private/nautilus-file.c:4126
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 direktorijum"
 
-#: libnautilus-private/nautilus-file.c:4127
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 datoteka"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4130
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u stavki"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4130
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u direktorijuma"
 
 # bug: plural-forms
-#: libnautilus-private/nautilus-file.c:4131
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u datoteka"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4443
-#: libnautilus-private/nautilus-file.c:4459
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? stavki"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4449
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bajtova"
 
-#: libnautilus-private/nautilus-file.c:4464
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "nepoznat tip"
 
-#: libnautilus-private/nautilus-file.c:4467
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "nepoznat MIME tip"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4473
-#: src/file-manager/fm-properties-window.c:1151
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "nepoznato"
 
-#: libnautilus-private/nautilus-file.c:4505
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4517
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3099,7 +2948,7 @@ msgstr ""
 "da je vaša datoteka gnome-vfs.keys na pogrešnom mesti, ili je ne može "
 "pronaći iz nekih drugih razloga."
 
-#: libnautilus-private/nautilus-file.c:4521
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3108,12 +2957,12 @@ msgstr ""
 "Nije našao opis za MIME tip „%s“ (datoteka je „%s“), obavestite dopisno "
 "društvo za gnome-vfs."
 
-#: libnautilus-private/nautilus-file.c:4535
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "veza"
 
 # Ne pokazuje na pravo mesto
-#: libnautilus-private/nautilus-file.c:4555
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "veza (neispravna)"
 
@@ -3234,11 +3083,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Nađi datoteke prema imenu i osobinama"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Pregled pomoću ikona"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Pregledaj kao spisak"
@@ -3382,147 +3233,146 @@ msgstr "Li�ni direktorijum (%s)"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1175
 msgid "Computer"
 msgstr "Ra�unar"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2344
-msgid "file icon"
-msgstr "ikona datoteke"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2727
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "izmenjiv tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2728
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "izmenjiva oznaka"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2735
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "dodatni tekst"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2736
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "još teksta"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2743
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "istaknuto radi izbora"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2744
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "da li istaknuti radi izbora"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2751
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "istaknuto u žiži tastature"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2752
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "da li istaknuti kada je u žiži tastature"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2760
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "istaknuto za puštanje"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2761
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "da li istaknuti za puštanje u okviru „prevla�enja i puštanja“"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Pravougaonik izbora"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Uokviri tekst"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Iscrtaj okvir oko neizabranog teksta"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Boja površi izbora"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Boja površi izbora"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Providnost površi izbora"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Providnost površi izbora"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Providnost isticanja"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Providnost isticanja izabranih ikona"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Svetla boja obaveštenja"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Boja koja se koristi za tekst obaveštenja na tamnoj pozadini"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Tamna boja obaveštenja"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Boja koja se koristi za tekst obaveštenja na svetloj pozadini"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
-"Ovaj direktorijum koristi samoraspoređivanje. Želite li da pređete na ru�no "
-"raspoređivanje i ostavite ovu stavku tu gde ste je pustili? Ovo će izmeniti "
-"već sa�uvan ru�ni raspored."
+"Želite li da pređete na ru�no raspoređivanje i ostavite ovu stavku tu gde ste "
+"je pustili? Ovo će izmeniti već sa�uvan ru�ni raspored."
+
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr "Ovaj direktorijum koristi samoraspoređivanje."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
-"Ovaj direktorijum koristi samoraspoređivanje. Želite li da pređete na ru�no "
-"raspoređivanje i ostavite ove stavke tu gde ste ih pustili? Ovo će izmeniti "
-"već sa�uvan ru�ni raspored."
+"Želite li da pređete na ru�no raspoređivanje i ostavite ove stavke tu gde ste "
+"ih pustili? Ovo će izmeniti već sa�uvan ru�ni raspored."
 
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"Ovaj direktorijum koristi samoraspoređivanje. Želite li da pređete na ru�no "
-"raspoređivanje i ostavite ovu stavku tu gde ste je pustili?"
+"Želite li da pređete na ru�no raspoređivanje i ostavite ovu stavku tu gde ste "
+"je pustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"Ovaj direktorijum koristi samoraspoređivanje. Želite li da pređete na ru�no "
-"raspoređivanje i ostavite ove stavke tu gde ste ih pustili?"
+"Želite li da pređete na ru�no raspoređivanje i ostavite ove stavke tu gde ste "
+"ih pustili?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Preći na ru�no raspoređivanje?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Pređi"
 
@@ -3541,13 +3391,13 @@ msgid ""
 "been created.  This may take a long time."
 msgstr ""
 "Ukoliko želite da omogućite brzu pretragu, možete urediti datoteku %s kao "
-"root. Postavljanje na „da“ će uklju�iti Meduza usluge. Da po�nete sa uslugama "
-"indeksiranja i pretrage odmah, takođe pokrenite i sledeće naredbe kao root:\n"
+"root. Postavljanje na „da“ će uklju�iti Meduza usluge. Da odmah po�nete sa "
+"uslugama popisa i pretrage, takođe pokrenite i sledeće naredbe kao root:\n"
 "\n"
 "medusa-indexd\n"
 "medusa-searchd\n"
 "\n"
-"Brze pretrage neće biti dostupne dok se po�etni indeks vaših datoteka ne "
+"Brze pretrage neće biti dostupne dok se po�etni popis vaših datoteka ne "
 "napravi. Ovo može potrajati."
 
 #: libnautilus-private/nautilus-medusa-support.c:138
@@ -3631,72 +3481,72 @@ msgstr "Podrazumevano je za „%s“ stavke."
 msgid "Is the default for all \"%s\" items."
 msgstr "Podrazumevano je za sve „%s“ stavke."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Izmeni „%s“"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Uklju�i u meni za „%s“ stavke"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Koristi kao podrazumevano za „%s“ stavke"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Uklju�i u meni samo za „%s“"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Koristi kao podrazumevano samo za „%s“"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Ne uklju�uj u meni za „%s“ stavke"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Ime"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Stanje"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "I_zaberi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Gotovo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "Iz_meni..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Vrste datoteka i programi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Idi tamo"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3704,48 +3554,48 @@ msgstr ""
 "Možete podesiti koji su programi ponuđeni za koje vrste datoteka u "
 "prozor�etu „Vrste datoteka i programi“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Otvori nekim drugim programom"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Izaberite program kojim da otvori „%s“:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Otvori pomoću drugog pregleda�a"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Izaberi pregled za „%s“:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Nema dostupnih pregleda�a za „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Nema dostupnih pregleda�a."
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Nijedan program nije namenjen za otvaranje „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nema namenjenih programa"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Nijedna akcija nije namenjena za „%s“."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nema namenjenih akcija"
 
@@ -3753,175 +3603,179 @@ msgstr "Nema namenjenih akcija"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
-"%s\n"
-"\n"
-"Možete podesiti da Gnom nameni programe za određene vrste datoteka. Želite "
+"Možete podesiti Gnoma da nameni programe za određene vrste datoteka. Želite "
 "li da sada namenite program ovoj vrsti datoteka?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr "Nameni program"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
+msgstr "_Nameni program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Pregleda� namenjen za otvaranje „%s“ je neispravan."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Namenjen je neispravan pregleda�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Program namenjen za otvaranje „%s“ je neispravan."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Namenjen je neispravan program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Akcija namenjena za otvaranje „%s“ je neispravna."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Namenjena je neispravna akcija"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
-"%s\n"
-"\n"
-"Možete podesiti da Gnom nameni drugi program ili pregleda� za ovu vrstu "
-"datoteka. Želite li da sada namenite program ili pregleda� ovoj vrsti "
+"Možete podesiti Gnoma da nameni drugi program ili pregleda� za ovu vrstu "
+"datoteka. Želite li sada da namenite program ili pregleda� ovoj vrsti "
 "datoteka?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
-msgstr "Nameni akciju"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr "_Nameni akciju"
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr "Neuspešno otvaranje, želite li da izaberete drugi program?"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "„%s“ ne može da otvori „%s“ zato što „%s“ ne može da pristupi datotekama na "
-"lokacijama „%s“. Želite li da izaberete drugi program?"
+"lokacijama „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr "Otvaranje neuspešno, želite li da izaberete neku drugu akciju?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Podrazumevana akcija ne može da otvori „%s“ zato što ne može da pristupi "
-"datotekama na lokacijama „%s“. Želite li da izaberete drugu akciju?"
+"datotekama na putanjama „%s“."
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Ne može da otvori putanju"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
 msgstr ""
 "„%s“ ne može da otvori „%s“ zato što „%s“ ne može da pristupi datotekama na "
-"lokacijama „%s“. Nema drugih programa koji mogu da pregledaju ovu datoteku. "
-"Ukoliko prebacite ovu datoteku na vaš ra�unar, možda ćete moći da ga "
-"otvorite."
+"putanjama „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
+msgstr ""
+"Nema drugih programa koji mogu da pregledaju ovu datoteku. Ukoliko prebacite "
+"ovu datoteku na vaš ra�unar, možda ćete moći da ga otvorite."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Podrazumevana akcija ne može da otvori „%s“ zato što ne može da pristupi "
-"datotekama na lokacijama „%s“. Nijedna druga akcija nije namenjena pregledanju "
-"ove datoteke. Ukoliko prekopirate ovu datoteku na vaš ra�unar, možda ćete "
-"moći da je otvorite."
+"datotekama na putanjama „%s“."
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
+msgstr ""
+"Nema drugih programa koji mogu da pregledaju ovu datoteku. Ukoliko prebacite "
+"ovu datoteku na vaš ra�unar, možda ćete moći da ga otvorite."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
-msgstr "Otvara %s"
+msgstr "Otvaram %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr ""
-"Nažalost, ne možete izvršavati naredbe sa udaljenog mesta radi veće "
-"bezbednosti."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "Nažalost, ne možete izvršavati naredbe sa udaljenog mesta."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "Ne može da izvrši udaljene veze"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr "Ovo je onemogućeno iz bezbednosnih razloga."
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
-msgstr ""
-"Došlo je do greške pri pokretanju programa.\n"
-"\n"
-"Detalji:"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr "Ne mogu da izvršim udaljene veze"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr "Detalji:"
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
+msgstr "Došlo je do greške pri pokretanju programa."
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr "Greška pri pokretanju programa"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr "Ovo odredište prevla�enja podržava samo lokalne datoteke."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
-"Ova meta za puštanje podržava samo lokalne datoteke.\n"
-"\n"
 "Da biste otvorili udaljene datoteke, prebacite ih u lokalni direktorijum, i "
 "prevucite ih ponovo."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
-msgstr "Meta prevla�enja podržava samo lokalne datoteke"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
+msgstr "Odredište prevla�enja podržava samo lokalne datoteke"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
-"Ova meta za puštanje podržava samo lokalne datoteke.\n"
-"\n"
 "Da biste otvorili udaljene datoteke, prebacite ih u lokalni direktorijum, i "
 "prevucite ih ponovo. Lokalne datoteke koje ste prevukli su već otvorene."
 
@@ -4168,14 +4022,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Stavke koje sadrže „medusa“ u imenu i koje su direktorijumi"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Pretražuje diskove"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus tražuje direktorijume sa smećem na vašim diskovima"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Uredi"
@@ -4380,100 +4226,112 @@ msgid "Empty Trash"
 msgstr "Isprazni Smeće"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Ovo će otvoriti %d odvojenih prozora. Sigurno želite to da u�inite?"
+msgid "Open %d Windows?"
+msgstr "Otvori %d prozora?"
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
+msgstr "Sigurno želite da otvorite sve datoteke?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:156
 #, c-format
-msgid "Open %d Windows?"
-msgstr "Otvori %d prozora?"
+msgid "This will open %d separate windows."
+msgstr "Ovo će otvoriti %d odvojenih prozora."
 
-#: src/file-manager/fm-directory-view.c:836
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Sigurno želite da trajno uklonite „%s“?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:840
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Sigurno želite da trajno uklonite %d izabranih stavki?"
 
-#: src/file-manager/fm-directory-view.c:846
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr "Ukoliko obrišete stavku, ona će biti trajno uklonjena."
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Ukloni?"
 
-#: src/file-manager/fm-directory-view.c:985
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr "Izaberite obrazac"
 
-#: src/file-manager/fm-directory-view.c:1001
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr "Ob_rasci:"
 
-#: src/file-manager/fm-directory-view.c:1598
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "„%s“ izabran"
 
-#: src/file-manager/fm-directory-view.c:1600
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 direktorijum izabran"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1603
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d direktorijuma izabrano"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (sadrži 0 stavki)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (sadrži 1 stavku)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1614
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (sadrži %d stavki)"
 
-#: src/file-manager/fm-directory-view.c:1621
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (sadrži ukupno 0 stavki)"
 
-#: src/file-manager/fm-directory-view.c:1623
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (sadrži ukupno 1 stavku)"
 
-#: src/file-manager/fm-directory-view.c:1625
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (sadrži ukupno %d stavki)"
 
-#: src/file-manager/fm-directory-view.c:1638
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "„%s“ izabran (%s)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1642
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d stavki izabrano (%s)"
 
-#: src/file-manager/fm-directory-view.c:1649
+# bug: plural-forms
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "Još jedna stavka izabrana (%s)"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:1652
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d drugih stavki izabrano (%s)"
@@ -4485,7 +4343,7 @@ msgstr "%d drugih stavki izabrano (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1681
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4494,119 +4352,125 @@ 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:1806
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
-"Direktorijum „%s“ sadrži više datoteka nego što Nautilus može da podnese. "
-"Neke datoteke neće biti prikazane."
+"Direktorijum „%s“ sadrži više datoteka nego što Nautilus može da podnese."
+
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr "Neke datoteke neće biti prikazane."
 
-#: src/file-manager/fm-directory-view.c:1813
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Previše datoteka"
 
-#: src/file-manager/fm-directory-view.c:3058
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
-msgstr "Ne može da prebaci „%s“ u Smeće. Želite li da ga odmah obrišete?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
+msgstr "Ne mogu da prebacim „%s“ u smeće, želite li da ga odmah obrišete?"
 
-# bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3063
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr ""
-"Ne može da prebaci %d izabranih stavki u Smeće. Želite li da ih odmah "
-"obrišete?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr "Ne može se prebaciti „%s“ u smeće."
 
-# bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3067
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "Ne mogu da prebacim stavke u smeće, želite li da ga ih odmah obrišete?"
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"Ne može da prebaci %d izabranih stavki u Smeće. Želite li odmah da obrišete "
-"tih %d stavki?"
+"Ne mogu da prebacim neke stavke u smeće, želite li da ga ih odmah obrišete?"
 
-#: src/file-manager/fm-directory-view.c:3075
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Obriši odmah?"
 
-#: src/file-manager/fm-directory-view.c:3107
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
-msgstr "Sigurno želite da trajno izbacite „%s“ iz Smeća?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
+msgstr "Sigurno želite da trajno izbacite „%s“ iz smeća?"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:3111
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
-msgstr "Sigurno želite da trajno izbacite %d izabranih stavki iz Smeća?"
+"trash?"
+msgstr "Sigurno želite da trajno izbacite %d izabranih stavki iz smeća?"
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr "Ukoliko obrišete stavku, ona će biti trajno uklonjena."
 
-#: src/file-manager/fm-directory-view.c:3117
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Izbaci iz Smeća?"
 
-#: src/file-manager/fm-directory-view.c:3396
-#: src/file-manager/fm-directory-view.c:3438
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Koristi „%s“ za otvaranje izabrane stavke"
 
-#: src/file-manager/fm-directory-view.c:3514
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Drugi _program..."
 
-#: src/file-manager/fm-directory-view.c:3514
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "_Program..."
 
-#: src/file-manager/fm-directory-view.c:3536
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Drugi pre_gleda�..."
 
-#: src/file-manager/fm-directory-view.c:3536
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Pre_gleda�..."
 
-#: src/file-manager/fm-directory-view.c:3629
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Ne može završiti navedeno delovanje: %s"
 
-#: src/file-manager/fm-directory-view.c:3653
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Ne može završiti navedeno delovanje."
 
-#: src/file-manager/fm-directory-view.c:4162
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Pokreni „%s“ na svakoj izabranoj stavci"
 
-#: src/file-manager/fm-directory-view.c:4379
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr "Napravi dokument prema šablonu „%s“"
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Sve izvršne datoteke u ovom direktorijumu će se pojaviti u meniju „Skripte“."
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
-"Sve izvršne datoteke u ovom direktorijumu će se pojaviti u meniju Skripte. "
-"Izborom skripte iz menija će se ona pokrenuti, a sve izabrane stavke će joj "
-"biti ulaz."
+"Izborom skripte iz menija se ona pokreće, a sve izabrane stavke će joj biti "
+"ulaz."
 
-#: src/file-manager/fm-directory-view.c:4382
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "O skriptama"
 
-#: src/file-manager/fm-directory-view.c:4383
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4647,18 +4511,18 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: mesto i veli�ina tekućeg prozora"
 
-#: src/file-manager/fm-directory-view.c:4513
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "„%s“ će biti premešten ukoliko izaberete naredbu Ubaci datoteke"
 
-#: src/file-manager/fm-directory-view.c:4517
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "„%s“ će biti umnožen ukoliko izaberete naredbu Ubaci datoteke"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:4524
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4667,167 +4531,165 @@ msgstr ""
 "datoteke"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:4528
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "%d izabranih stavki će biti umnoženo ukoliko izaberete naredbu Ubaci datoteke"
 
-#: src/file-manager/fm-directory-view.c:4607
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Nema ništa u spisku ise�aka za ubacivanje"
 
-#: src/file-manager/fm-directory-view.c:4708
-#: src/file-manager/fm-directory-view.c:5594
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Greška montiranja"
 
-#: src/file-manager/fm-directory-view.c:4769
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Greška demontiranja"
 
-#: src/file-manager/fm-directory-view.c:4771
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr "Greška pri izbacivanju"
 
-#: src/file-manager/fm-directory-view.c:4993
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "I_zbaci"
 
-#: src/file-manager/fm-directory-view.c:4993
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Demontiraj disk"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Otvori u novom prozoru"
 
 # bug: plural-forms
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr "Otvori u %d novih prozora"
 
-#: src/file-manager/fm-directory-view.c:5080
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
 msgstr "Razgledaj direktorijum"
 
-#: src/file-manager/fm-directory-view.c:5082
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
 msgstr "Razgledaj direktorijume"
 
-#: src/file-manager/fm-directory-view.c:5105
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Izbaci iz smeća"
 
-#: src/file-manager/fm-directory-view.c:5107
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Trajno obriši sve izabrane stavke"
 
-#: src/file-manager/fm-directory-view.c:5110
-#: src/file-manager/fm-directory-view.c:5398
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Pre_mesti u smeće"
 
-#: src/file-manager/fm-directory-view.c:5112
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Premesti svaku izabranu stavku u smeće"
 
-#: src/file-manager/fm-directory-view.c:5136
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: src/file-manager/fm-directory-view.c:5156
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Napravi veze"
 
-#: src/file-manager/fm-directory-view.c:5157
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Napravi vezu"
 
-#: src/file-manager/fm-directory-view.c:5170
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
-#: src/file-manager/fm-directory-view.c:5186
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "I_seci datoteku"
 
-#: src/file-manager/fm-directory-view.c:5187
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "I_seci datoteke"
 
-#: src/file-manager/fm-directory-view.c:5196
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Umnoži datoteku"
 
-#: src/file-manager/fm-directory-view.c:5197
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Umnoži datoteke"
 
-#: src/file-manager/fm-directory-view.c:5389
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
-msgstr ""
-"Ova veza se ne može koristiti, zato što nema metu. Želite li da premestite "
-"ovu vezu u smeće?"
+# bug: s/borken/broken/, though, one can always wonder :)
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Ova veza je zabrljana, želite li da je bacite u smeće?"
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr "Ova veza se ne može koristiti, zato što nema odredište."
 
-#: src/file-manager/fm-directory-view.c:5392
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
-msgstr ""
-"Ova veza se ne može koristiti, zato njena meta „%s“ ne postoji. Želite li da "
-"premestite ovu vezu u smeće?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
+msgstr "Ova veza se ne može koristiti, zato njeno odredište „%s“ ne postoji."
 
-#: src/file-manager/fm-directory-view.c:5398
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
-msgstr "Razbijena veza"
+msgstr "Prekinuta veza"
 
-#: src/file-manager/fm-directory-view.c:5455
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
-msgstr ""
-"„%s“ je izvršna tekstualna datoteka. Želite li da je pokrenete, ili "
-"prikažete njen sadržaj?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr "Želite li da pokrenete „%s“, ili prikažete njen sadržaj?"
 
-#: src/file-manager/fm-directory-view.c:5461
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "„%s“ je izvršna tekstualna datoteka."
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Pokreni ili prikaži?"
 
-#: src/file-manager/fm-directory-view.c:5462
-msgid "_Display"
-msgstr "_Prikaži"
-
-#: src/file-manager/fm-directory-view.c:5463
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Pokreni u _terminalu"
 
-#: src/file-manager/fm-directory-view.c:5466
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Prikaži"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Po_kreni"
 
-#: src/file-manager/fm-directory-view.c:5725
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
-msgstr "Otvara „%s“"
+msgid "Opening \"%s\"."
+msgstr "Otvaram „%s“."
 
-#: src/file-manager/fm-directory-view.c:5731
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
-msgstr "Odustani od otvaranja?"
+msgstr "Otkaži otvaranje?"
 
 #: src/file-manager/fm-error-reporting.c:57
 #, c-format
@@ -4846,17 +4708,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Nažalost, ne može da prikaže sav sadržaj „%s“."
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr "Ne može se prikazati sadržaj direktorijuma."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Greška pri prikazivanju direktorijuma"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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 ""
 "Već je u upotrebi ime „%s“ u ovom direktorijumu. Stavite neko drugo ime."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4864,12 +4730,12 @@ msgstr ""
 "Ne postoji „%s“ u ovom direktorijumu. Možda je upravo premešteno ili "
 "obrisano?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Niste ovlašćeni da preimenujete „%s“."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4877,81 +4743,97 @@ msgid ""
 msgstr ""
 "Ime „%s“ je neispravno zato što sadrži znak „/“. Koristite neko drugo ime."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Ime „%s“ je neispravno. Koristite neko drugo ime."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "Ne može da preimenuje „%s“ zato što je na disku samo za �itanje"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Nažalost, ne može da preimenuje „%s“ u „%s“."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr "Stavka se ne može preimenovati."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Greška pri preimenovanju"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Niste ovlašćeni da promenite grupu za „%s“."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "Ne može da promeni grupu za „%s“ zato što je na disku samo za �itanje"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Nažalost, ne može da promeni grupu za „%s“."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr "Grupa se ne može izmeniti."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Greška pri postavljanju grupe"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Ne može da promeni vlasnika „%s“ zato što je na disku samo za �itanje"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Nažalost, ne može da promeni vlasnika „%s“."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr "Vlasnik se ne može izmeniti."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Greška pri postavljanju vlasnika"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Ne može da promeni ovlašćenja za „%s“ zato što je na disku samo za �itanje"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Ne može da promeni ovlašćenja za „%s“."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr "Ovlašćenja se ne mogu promeniti."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Greška pri postavljanju ovlašćenja"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Preimenuje „%s“ u „%s“."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Odustani od preimenovanja?"
 
@@ -5009,129 +4891,131 @@ msgstr "Vrati izvorne veli�ine ikona"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Vrati izvornu veli�inu ikone"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pokazuje na „%s“"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
-msgstr "Prevla�enje i puštanje je podržano samo za lokalne diskove."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr "Prevla�enje i puštanje nije podržano."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Prevla�enje i puštanje je podržano samo za lokalne sisteme datoteka."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr "Greška prevla�enja i puštanja"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Upotrebljena je neispravna vrsta prevla�enja."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Veli�ina"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Datum izmene"
 
-#: src/file-manager/fm-properties-window.c:481
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
-msgstr ""
-"Ne možete izabrati više od jedne ikone! Povucite samo jednu sliku da biste "
-"postavili ikonu."
+#: src/file-manager/fm-properties-window.c:482
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "Ne možete dodeliti više od jedne posebne ikone!"
 
 #: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr "Prevucite samo jednu sliku da biste postavili ikonu."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Više od jedne slike"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Datoteka koju ste prevukli i pustili nije lokalna. Možete koristiti samo "
-"lokalne slike za ikone."
+msgid "The file that you dropped is not local."
+msgstr "Datoteka koju ste pustili nije lokalna."
 
 #: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr "Možete koristiti samo lokalne slike za ikone."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Samo lokalne slike"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr ""
-"Datoteka koju ste prevukli nije slika. Možete koristiti samo lokalne slike "
-"za ikone."
+msgid "The file that you dropped is not an image."
+msgstr "Datoteka koju ste pustili nije slika."
 
-#: src/file-manager/fm-properties-window.c:501
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Samo slike"
 
-#: src/file-manager/fm-properties-window.c:918
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Osobine"
 
-#: src/file-manager/fm-properties-window.c:921
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Osobine za %s"
 
-#: src/file-manager/fm-properties-window.c:1382
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Odustani od izmene grupe?"
 
-#: src/file-manager/fm-properties-window.c:1383
-msgid "Changing group"
-msgstr "Menja grupu"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
+msgstr "Menjam grupu."
 
-#: src/file-manager/fm-properties-window.c:1544
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Odustani od izmene vlasnika?"
 
-#: src/file-manager/fm-properties-window.c:1545
-msgid "Changing owner"
-msgstr "Menja vlasnika"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
+msgstr "Menjam vlasnika."
 
-#: src/file-manager/fm-properties-window.c:1751
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ništa"
 
-#: src/file-manager/fm-properties-window.c:1753
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "ne�itljiv"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 stavka, veli�ine %s"
 
 # bug: plural-forms
-#: src/file-manager/fm-properties-window.c:1767
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d stavki, ukupne veli�ine %s"
 
-#: src/file-manager/fm-properties-window.c:1775
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(deo sadržaja ne�itljiv)"
 
@@ -5141,196 +5025,187 @@ msgstr "(deo sadržaja ne�itljiv)"
 #. * 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:1792
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Sadržaj:"
 
-#: src/file-manager/fm-properties-window.c:2183
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/file-manager/fm-properties-window.c:2211
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Imena:"
 
-#: src/file-manager/fm-properties-window.c:2213
-#: src/nautilus-connect-server-dialog.c:185
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:190
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: src/file-manager/fm-properties-window.c:2262
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Vrsta:"
 
 # bug: is em-dash suitable in here?
-#: src/file-manager/fm-properties-window.c:2264
-#: src/file-manager/fm-properties-window.c:2274
-#: src/file-manager/fm-properties-window.c:2280
-#: src/file-manager/fm-properties-window.c:2287
-#: src/file-manager/fm-properties-window.c:2291
-#: src/file-manager/fm-properties-window.c:2299
-#: src/file-manager/fm-properties-window.c:2305
-#: src/file-manager/fm-properties-window.c:2314
-#: src/file-manager/fm-properties-window.c:2320
-#: src/file-manager/fm-properties-window.c:2893
-#: src/file-manager/fm-properties-window.c:2914
-#: src/file-manager/fm-properties-window.c:2996
-#: src/file-manager/fm-properties-window.c:3000
-#: src/file-manager/fm-properties-window.c:3004
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
+#: src/file-manager/fm-properties-window.c:2288
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "—"
 
-#: src/file-manager/fm-properties-window.c:2272
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Veli�ina:"
 
-#: src/file-manager/fm-properties-window.c:2278 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:60
 msgid "Location:"
 msgstr "Putanja:"
 
-#: src/file-manager/fm-properties-window.c:2285
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Disk:"
 
-#: src/file-manager/fm-properties-window.c:2289
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Slobodan prostor:"
 
-#: src/file-manager/fm-properties-window.c:2297
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Meta veze:"
 
-#: src/file-manager/fm-properties-window.c:2303
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME tip:"
 
-#: src/file-manager/fm-properties-window.c:2312
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Izmenjen:"
 
-#: src/file-manager/fm-properties-window.c:2318
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Poslednji pristup:"
 
-#: src/file-manager/fm-properties-window.c:2334
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Izaberi ikonu..."
 
-#: src/file-manager/fm-properties-window.c:2340
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Ukloni zasebnu ikonu"
 
-#: src/file-manager/fm-properties-window.c:2681
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_ÄŒitanje"
 
-#: src/file-manager/fm-properties-window.c:2683
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Pisanje"
 
-#: src/file-manager/fm-properties-window.c:2685
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Izvršavanje"
 
-#: src/file-manager/fm-properties-window.c:2762
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Postavi _ID korisnika (SUID)"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Naro�ite oznake:"
 
-#: src/file-manager/fm-properties-window.c:2770
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Postavi ID _grupe (SGID)"
 
-#: src/file-manager/fm-properties-window.c:2772
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Lepljiv"
 
-#: src/file-manager/fm-properties-window.c:2858
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Ovlašćenja"
 
-#: src/file-manager/fm-properties-window.c:2868
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Niste vlasnik, pa ne možete izmeniti ova ovlašćenja"
 
-#: src/file-manager/fm-properties-window.c:2882
+#: src/file-manager/fm-properties-window.c:2894
 msgid "File _owner:"
 msgstr "_Vlasnik datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2888
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Vlasnik datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2899
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Grupa datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2908
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Grupa datoteke:"
 
-#: src/file-manager/fm-properties-window.c:2920
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Vlasnik:"
 
-#: src/file-manager/fm-properties-window.c:2921
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupa:"
 
-#: src/file-manager/fm-properties-window.c:2922
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Ostali:"
 
-#: src/file-manager/fm-properties-window.c:2995
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Tekstualni pregled:"
 
-#: src/file-manager/fm-properties-window.c:2999
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Brojevni pregled:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Poslednja promena:"
 
-#: src/file-manager/fm-properties-window.c:3009
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Ne može utvrditi ovlašćenja za „%s“."
 
-#: src/file-manager/fm-properties-window.c:3012
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Ne može utvrditi ovlašćenja za izabranu datoteku."
 
-#: src/file-manager/fm-properties-window.c:3328
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Došlo je do greške pri prikazivanju pomoći: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
+msgstr "Došlo je do greške pri prikazivanju pomoći."
 
-#: src/file-manager/fm-properties-window.c:3330
-msgid "Couldn't show help"
-msgstr "Ne može da prikaže pomoć"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
+msgstr "Ne mogu da prikažem pomoć"
 
-#: src/file-manager/fm-properties-window.c:3667
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Odustani od prikazivanja prozora sa osobinama?"
 
-#: src/file-manager/fm-properties-window.c:3668
-msgid "Creating Properties window"
-msgstr "Obrazuje prozor sa osobinama"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
+msgstr "Obrazujem prozor sa osobinama."
 
-#: src/file-manager/fm-properties-window.c:3794
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Izaberite ikonu"
 
@@ -5341,101 +5216,118 @@ msgid ""
 "last indexed."
 msgstr ""
 "Rezultati pretrage možda neće sadržati stavke izmenjene nakon %s, kada je vaš "
-"disk poslednji put indeksiran."
+"disk poslednji put popisan."
 
 #: src/file-manager/fm-search-list-view.c:144
 msgid "Search Results"
 msgstr "Rezultati pretrage"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Nažalost, Meduza pretraga nije dostupna zato što nije instalirana."
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Nažalost, usluga pretrage Meduzom trenutno nije dostupna."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr "Meduza nije instalirana."
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Usluga pretrage nije dostupna"
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+"Pretraga koju ste izabrali je novija od popisa na vašem sistemu. Pretraga "
+"sada neće vratiti nikakve rezultate."
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
-"Pretraga koju ste izabrali je novija od indeksa na vašem sistemu. Pretraga "
-"sada neće vratiti nikakve rezultate. Možete napraviti novi indeks pokretanjem "
-"„%s“ naredbe kao root."
+"Možete napraviti novi popis pokretanjem naredbe „medusa-indexd“ kao "
+"administrator."
+
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr "Traženje stavki koje su suviše nove"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
-msgstr "Nađi stavke koje su suviše nove"
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Svaka popisana datoteka na vašem ra�unaru se poklapa sa merilom koje ste "
+"izabrali."
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
-"Svaka popisana datoteka na vašem ra�unaru se poklapa sa kriterijumom koji "
-"ste izabrali. Proverite da li ste ispravno uneli vaše izbore, ili dodajte "
-"još kriterijuma da suzite pretragu."
+"Proverite da li ste ispravno uneli vaše izbore, ili dodajte još ograni�enja "
+"da suzite pretragu."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr "Greška pri pretrazi"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
-"Pretraga ne može da otvori indeks diska. Vaš indeks možda nedostaje ili je "
-"neispravan. Napravite novi indeks izvršavanjem naredbe „%s“ kao root."
+"Pretraga ne može da otvori popis diska. Vaš popis možda nedostaje ili je "
+"neispravan."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
-msgstr "Greška pri �itanju indeksa datoteka"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
+msgstr "Greška pri �itanju popisa datoteka"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
-msgstr "Došlo je do greške pri u�itavanju sadržaja ove pretrage: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
+msgstr "Došlo je do greške pri u�itavanju sadržaja ove pretrage."
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
 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."
+"To do a fast search, Find requires an index of the files on your system."
 msgstr ""
-"Da biste izveli brzu pretragu, neophodan vam je indeks datoteka na vašem "
-"sistemu. Pretraga ne može trenutno da pristupi vašem indeksu, pa će "
-"koristiti sporu pretragu koja ne koristi indeks."
+"Da izvedete brzu pretragu, neophodan vam je popis datoteka na vašem sistemu."
 
-#: src/file-manager/fm-search-list-view.c:249
+#: src/file-manager/fm-search-list-view.c:242
 msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+"To do a content search, Find requires an index of the files on your system."
 msgstr ""
-"Da pretražite sadržaj, neophodan vam je indeks datoteka na vašem sistemu. "
-"Pretraga trenutno ne može da pristupi indeksu."
+"Da pretražite sadržaj, neophodan vam je popis datoteka na vašem sistemu."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
-msgstr "Brza pretraga nije moguća"
+#: src/file-manager/fm-search-list-view.c:245
+msgid ""
+"Find can't access your index right now so a slower search will be performed "
+"that doesn't use the index."
+msgstr ""
+"Pretraga ne može trenutno da pristupi vašem popisu, pa će koristiti sporu "
+"pretragu koja ne koristi popis."
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
-msgstr "Pretraga sadržaja nije moguća"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr "Pretraga ne može trenutno da pristupi vašem popisu."
+
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
+msgstr "Brza pretraga nije dostupna"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
+msgstr "Pretraga sadržaja nije dostupna"
+
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5443,76 +5335,95 @@ msgid ""
 "\n"
 "medusa-searchd"
 msgstr ""
-"Indeks je dostupan, ali Meduza Ä‘avao za pretragu, koji barata zahtevima u "
-"indeksu, nije pokrenut. Da pokrenete ovaj program, prijavite se kao root i "
+"Popis datoteka je dostupan, ali usluga Meduza, koji barata zahtevima u "
+"popisu, nije pokrenuta.  Da pokrenete ovaj program, prijavite se kao root i "
 "unesite ovu naredbu:\n"
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
-"Da izvedete brzu pretragu, neophodan vam je indeks datoteka na vašem "
-"sistemu. Vaš ra�unar trenutno obrazuje taj indeks. Kako nije moguće "
-"koristiti indeks, pretraga može potrajati nekoliko minuta."
+"Da izvedete brzu pretragu, neophodan vam je popis datoteka na vašem sistemu. "
+"Vaš ra�unar trenutno obrazuje taj popis."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+"Da sprovedete pretragu sadržaja, neophodan vam je popis sadržaja na vašem "
+"sistemu. Vaš ra�unar trenutno obrazuje takav popis."
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
-"Da sprovedete pretragu sadržaja, neophodan vam je indeks sadržaja na vašem "
-"sistemu. Vaš ra�unar trenutno obrazuje takav indeks. Pretraga sadržaja će "
-"biti moguća kada indeks bude gotov."
+"Kako nije moguće koristiti popis, pretraga može potrajati nekoliko minuta."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
-msgstr "Indeksirana pretraga nije moguća"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr "Pretraga sadržaja će biti moguća kada popis bude gotov."
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr "Pretraživanje popisa nije dostupno"
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
-"Da izvedete brzu pretragu, neophodan vam je indeks datoteka na vašem "
-"sistemu. Trenutno nema indeksa. Indeks možete obrazovati pokretanjem naredbe "
-"„medusa-indexd“ kao root. Dok se indeks ne napravi, pretrage će trajati po "
-"nekoliko minuta."
+"Da izvedete brzu pretragu, neophodan vam je popis datoteka na vašem sistemu. "
+"Trenutno nema popisa."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
-"Da izvedete pretragu sadržaja, neophodan vam je indeks sadržaja na vašem "
-"sistemu. Trenutno nema indeksa. Indeks možete obrazovati pokretanjem naredbe "
-"„medusa-indexd“ kao root. Dok se indeks ne napravi, pretrage sadržaja nisu "
-"moguće."
+"Da izvedete pretragu sadržaja, neophodan vam je popis sadržaja na vašem "
+"sistemu. Trenutno nema popisa."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+"Popis možete obrazovati pokretanjem naredbe „medusa-indexd“ kao root. Dok se "
+"popis ne napravi, pretrage će trajati po nekoliko minuta."
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+"Popis možete obrazovati pokretanjem naredbe „medusa-indexd“ kao root. Dok se "
+"popis ne napravi, pretrage sadržaja nisu moguće."
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr "Brze pretrage nisu uklju�ene na vašem ra�unaru."
+
+#: src/file-manager/fm-search-list-view.c:330
 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 ""
-"Da sprovedete brzu pretragu, neophodan vam je indeks datoteka na vašem "
+"Da sprovedete brzu pretragu, neophodan vam je popis datoteka na vašem "
 "sistemu. Administrator sistema je onemogućio brzu pretragu na ovom ra�unaru, "
-"pa indeks ne postoji."
+"pa popis ne postoji."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Brze pretrage su onemogućene na vašem ra�unaru"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
+msgstr "Brza pretraga nije uklju�ena"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Gde"
 
@@ -5521,7 +5432,7 @@ msgstr "Gde"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Razotkri u novom prozoru"
@@ -5533,7 +5444,7 @@ msgstr "_Razotkri u novom prozoru"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Razotkri u %d _novih prozora"
@@ -5542,15 +5453,15 @@ msgstr "Razotkri u %d _novih prozora"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
-msgstr ""
-"Nautilus je pronašao više rezultata nego što može da prikaže. Neki rezultati "
-"neće biti prikazani."
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus je pronašao više rezultata nego što može da prikaže."
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr "Neki rezultati neće biti prikazani."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Previše poklapanja"
 
@@ -5564,12 +5475,12 @@ msgid "Create L_auncher"
 msgstr "Novi _pokreta�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Napravite novi pokreta�"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Izbaci sve stavke iz smeća"
 
@@ -5590,7 +5501,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Koristi _podrazumevanu pozadinu"
@@ -5612,57 +5523,65 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Izaberi program kojim da pregleda izabranu stavku"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
-msgstr "Napravite _direktorijum"
+msgid "Create _Document"
+msgstr "Napravi _direktorijum"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
+msgid "Create _Folder"
+msgstr "Napravi _direktorijum"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
+msgstr "Obrazujte novu praznu datoteku unutar ovog direktorijuma"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Obrazujte prazan direktorijum unutar ovog direktorijuma"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Obrazujte simboli�ku vezu za svaku izabranu stavku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Udvostru�i"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Obriši izabranu stavku, bez premeštanja u smeće"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Udvostru�i svaku izabranu stavku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Uredi pokreta�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Uredi podatke pokreta�a"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatiraj izabrani disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Osobine _medija"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr "Montiraj izabrani disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Premesti ili umnoži datoteke prethodno izabrane pomoću naredbe Iseci "
 "datoteke ili Umnoži datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5670,123 +5589,131 @@ msgstr ""
 "Premesti ili umnoži datoteke prethodno izabrane pomoću naredbe Iseci "
 "datoteke ili Umnoži datoteke u izabrani direktorijum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr "Nema postavljenih Å¡ablona"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Otvori _pomoću"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr "Otvori svaku izabranu stavku u upravlja�kom prozoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr "Otvori u upravlja�kom prozoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Otvori izabranu stavku u ovom prozoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Pripremi izabrane datoteke za umnožavanje pomoću naredbe Ubaci datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Pripremi izabrane datoteke za premeštanje pomoću naredbe Ubaci datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Zaš_titi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Zaštiti izabrani disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Preimenuj izabranu stavku"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Postavi pregled na _podrazumevano"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Postavi poredak i uvećanje prema postavkama za ovaj pregled"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Pokreni ili upravljaj skriptama iz ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Izaberi _sve datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "Izaberite o_brazac"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Izaberi sve stavke u ovom prozoru"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr "Izaberite stavke u ovom prozoru koje odgovaraju datom obrascu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Prikaži osobine medija za izabrani disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Prikaži direktorijum koji sadrži skripte iz ovog menija"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Demontiraj izabrani disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Koristi podrazumevanu pozadinu za ovu lokaciju"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Pogledaj ili izmeni osobine svih izabranih stavki"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr "Pr_azna datoteka"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatiraj"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr "_Montiraj disk"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Otvori"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Otvori direktorijum sa skriptama"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "_Ubaci datoteke"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "U_baci datoteke u direktorijum"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Osobine"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skripte"
 
@@ -5869,53 +5796,63 @@ msgstr "_Ru�no"
 #: src/file-manager/nautilus-indexing-info.c:89
 #, c-format
 msgid "Indexing is %d%% complete."
-msgstr "Indeksiranje je %d%% gotovo."
+msgstr "Popis je %d%% gotov."
+
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Vaše datoteke su poslednji put popisane u %s"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
-"Jednom dnevno se vaše datoteke i tekstualni sadržaj indeksiraju kako bi "
+"Jednom dnevno se vaše datoteke i tekstualni sadržaj popisuju kako bi "
 "pretrage bile brze."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
-msgstr "Stanje indeksiranja"
+msgstr "Stanje popisa"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
-msgstr "Vaše datoteke su poslednji put indeksirane u %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
+msgstr "Vaše datoteke se upravo popisuju."
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
-"Jednom dnevno se vaše datoteke i tekstualni sadržaj indeksiraju kako bi "
-"pretrage bile brze. Indeksiranje je trenutno u toku."
+"Jednom dnevno se vaše datoteke i tekstualni sadržaj popisuju kako bi "
+"pretrage bile brze."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Trenutno ne postoji popis vaših datoteka."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
-"Kada je brza pretraga omogućena, obrazuje se indeks za ubrzanje pretraga. "
-"Brzo pretraživanje nije omogućeno na vašem ra�unaru, pa trenutno nemate "
-"indeks."
+"Kada je brza pretraga omogućena, obrazuje se popis za ubrzanje pretraga. Brzo "
+"pretraživanje nije omogućeno na vašem ra�unaru, pa trenutno nemate popis."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Trenutno ne postoji indeks vaših datoteka."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr "Nema popisa datoteka"
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Nažalost, usluga Meduza pretrage trenutno nije dostupna."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr "Proverite da li je Meduza ispravno postavljena."
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5929,69 +5866,70 @@ msgstr "Razotkri u novom prozoru"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:3
 msgid "Show Indexing Status"
-msgstr "Prikaži stanje indeksiranja"
+msgstr "Prikaži stanje popisa"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:4
 msgid "Show _Indexing Status"
-msgstr "Prikaži stanje _indeksiranja"
+msgstr "Prikaži stanje pop_isa"
 
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:5
 msgid "Show status of indexing used when searching"
-msgstr "Prikaži stanje upotrebljenog indeksiranja pri pretrazi"
+msgstr "Prikaži stanje upotrebljenog popisa pri pretrazi"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
-msgstr "Ne može da obrazuje traženi direktorijum"
+msgstr "Ne mogu da obrazujem obavezni direktorijum"
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Ne mogu da obrazujem obavezni direktorijum „%s“."
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
-"Nautilus ne može da obrazuje traženi direktorijum „%s“. Pre pokretanja "
-"Nautilusa, napravite ovaj direktorijum, ili postavite ovlašćenja tako da ga "
-"Nautilus može napraviti."
+"Pre pokretanja Nautilusa, napravite ovaj direktorijum, ili postavite "
+"ovlašćenja tako da ga Nautilus može napraviti."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Ne može da obrazuje obavezne direktorijume"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus ne može da napravi sledeće obavezne direktorijume: %s."
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
-"Nautilus ne može da obrazuje sledeće obavezne direktorijume:\n"
-"\n"
-"%s\n"
-"\n"
 "Pre pokretanja Nautilusa, napravite ove direktorijume, ili postavite "
 "ovlašćenja tako da ih Nautilus može napraviti."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Veza ka staroj radnoj površini"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+"Veza sa imenom „Veza ka staroj radnoj površini“ je napravljena na radnoj "
+"površi."
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
-"Lokacija direktorijuma za radnu površinu je izmenjena u Gnomu 2.4. Veza sa "
-"nazivom „Veza ka staroj radnoj površini“ je napravljena na radnoj površini. "
-"Možete otvoriti ovo da premestite datoteke koje želite, a zatim uklonite "
-"vezu."
+"Putanja direktorijuma za radnu površinu je izmenjena u Gnomu 2.4.  Možete "
+"otvoriti vezu da premestite datoteke koje želite, a zatim uklonite vezu."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr "Preseljena stara radna površina"
 
 #. Can't register myself due to trouble locating the
@@ -6004,7 +5942,7 @@ msgstr "Preseljena stara radna površina"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6015,7 +5953,7 @@ msgstr ""
 "instalirajte Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6061,12 +5999,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Trenutno se ne može koristiti Nautilus, usled nepredviđene greške."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6074,7 +6012,7 @@ msgstr ""
 "Trenutno se ne može koristiti Nautilus, usled nepredviđene greške Bonoba pri "
 "pokušaju prijave upravnika datoteka na server."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6084,7 +6022,7 @@ msgstr ""
 "pokušaju da pronađe fabriku. Gašenje bonobo-activation-server-a i ponovno "
 "pokretanje Nautilusa može možda otkloniti problem."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6094,6 +6032,17 @@ msgstr ""
 "pokušaju da pronađe objekat ljuske. Gašenje bonobo-activation-server-a i "
 "ponovno pokretanje Nautilusa može možda otkloniti problem."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Došlo je do greške pri prikazivanju pomoći: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nema obeleživa�a"
@@ -6127,35 +6076,43 @@ msgstr "Manje opcija"
 msgid "Find Them!"
 msgstr "Pronađi ih!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
-msgstr "Morate uneti ime za server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr "Morate uneti ime za server."
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
+msgstr "Unesite ime i pokušajte ponovo."
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
 msgstr "Ne mogu da se povežem sa serverom"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr ""
-"„%s“ ne predstavlja ispravnu adresu. Proverite da li ste dobro ukucali i "
-"pokušajte ponovo."
+msgid "\"%s\" is not a valid location."
+msgstr "„%s“ ne predstavlja ispravnu putanju."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
+msgstr "Proverite da li ste dobro ukucali i pokušajte ponovo."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
 msgstr "Poveži se sa serverom"
 
-#: src/nautilus-connect-server-dialog.c:203
+#: src/nautilus-connect-server-dialog.c:209 src/nautilus-location-dialog.c:147
 msgid "_Location:"
 msgstr "_Putanja:"
 
-#: src/nautilus-connect-server-dialog.c:228
-msgid "Connect"
-msgstr "Poveži se"
+#: src/nautilus-connect-server-dialog.c:235
+msgid "C_onnect"
+msgstr "Po_veži se"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -6354,74 +6311,77 @@ msgstr ""
 "\n"
 "Ukoliko želite da ponovo koristite �arobnjaka, obrišite ovu datoteku.\n"
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr "Ne možete dodeliti više od posebne jedne ikone."
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr "Možete koristiti samo slike za posebne ikone."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
-msgstr "Otvori pomoću %s"
+msgstr "Otvori pomoću: %s"
 
 #. Catch-all button after all the others.
 #: src/nautilus-information-panel.c:911
 msgid "Open with..."
 msgstr "Otvori pomoću..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
-msgstr ""
-"Ne može da pokrene program za snimanje CD-a:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:484
+msgid "Unable to launch the cd burner application."
+msgstr "Ne mogu da pokrenem program za snimanje CD-a."
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr "Ne može da pokrene CD reza�"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
+msgid "Can't Launch CD Burner"
+msgstr "Ne mogu da pokrenem CD reza�"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Upiši sadržaj na CD"
 
-#: src/nautilus-location-bar.c:62
+#: src/nautilus-location-bar.c:61
 msgid "Go To:"
 msgstr "Idi u:"
 
 # bug: plural-forms
 #: src/nautilus-location-bar.c:154
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
-msgstr "Želite li da vidite ovih %d lokacija u zasebnim prozorima?"
+msgid "Do you want to view %d locations?"
+msgstr "Želite li da vidite %d putanja?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:166
 msgid "View in Multiple Windows?"
 msgstr "Pregledaj u više prozora?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Otvori putanju"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Sprovedi skup brzih samoprovera."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Obrazuj po�etni prozor sa datim dimenzijama i pozicijom."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRIJA"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Obrazuj prozore samo za izri�ito navedene adrese."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6429,81 +6389,88 @@ msgstr ""
 "Ne upravljaj radnom površinom (zanemari sve postavke u prozor�etu sa "
 "postavkama)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr "otvorite prozor razgleda�a."
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Napusti Nautilusa."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Ponovo pokreni Nautilusa."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Upravnik datoteka"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:271
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:173
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check se ne može koristiti sa adresama.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check se ne može koristiti uz ostale opcije.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit se ne može koristiti sa adresama.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart se ne može koristiti sa adresama.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry se ne može koristiti sa više od jedne adrese.\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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
-msgstr ""
-"Sigurno želite da zaboravite istoriju? Ukoliko želite, osuđeni ste da je "
-"ponovite."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
+msgstr "Sigurno želite da zaboravite istoriju?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr "Ukoliko želite, osuđeni ste da je ponovite."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Sigurno želite da o�istite spisak posećenih lokacija?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "Ukoliko o�istite spisak putanja, one će biti trajno obrisane."
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "O�isti istorijat"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
-"Lokacija „%s“ ne postoji. Želite li da uklonite sve obeleživa�e ove lokacije "
-"iz vašeg spiska?"
+"Želite li da uklonite sve obeleživa�e sa nepostojeće putanje iz vašeg spiska?"
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Putanja „%s“ više ne postoji."
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Obeleživa� za nepostojeću putanju"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -6536,7 +6503,6 @@ msgid "Close _All Windows"
 msgstr "Zatvori _sve prozore"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr "Zatvori sve upravlja�ke prozore"
 
@@ -6558,150 +6524,160 @@ msgid "Forward"
 msgstr "Napred"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
+msgstr "Idi u direktorijum sa Å¡ablonima"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Idi na sledeće posećenu lokaciju"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Idi na prethodno posećenu lokaciju"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Idi u direktorijum sa smećem"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Po�etak"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Polje sa _putanjom"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Osveži"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Pronađi datoteke na ovom ra�unaru"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Linija sa s_tanjem"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Gore"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Piši na CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Dodaj obeleživa�"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Nazad"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Obeleživa�i"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_O�isti istorijat"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr "_Ra�unar"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Uredi obeleživa�e"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "Na_pred"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Idi"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Po�etak"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Putanja..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Površ postrance"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr "_Å abloni"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Smeće"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Gore"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "P_regled"
 
-#: src/nautilus-navigation-window.c:338
+#: src/nautilus-navigation-window.c:337
 msgid "Information"
 msgstr "Obaveštenje"
 
 #. Add "View as..." extra bonus choice.
-#: src/nautilus-navigation-window.c:702 src/nautilus-shell-ui.xml.h:27
+#: src/nautilus-navigation-window.c:701 src/nautilus-shell-ui.xml.h:27
 msgid "View as..."
 msgstr "Gledaj kao..."
 
-#: src/nautilus-navigation-window.c:734
+#: src/nautilus-navigation-window.c:733
 #, c-format
 msgid "File Browser: %s"
 msgstr "Pregleda� datoteka: %s"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
-msgstr ""
-"Jedna od površi postrance je naišla na grešku i ne može da nastavi. "
-"Nažalost, ne mogu da utvrdim koja."
+#: src/nautilus-navigation-window.c:1104
+msgid "One of the side panels encountered an error and can't continue."
+msgstr "Jedna od površi postrance je naišla na grešku i ne može da nastavi."
 
-#: src/nautilus-navigation-window.c:1103
-#, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr ""
-"Površ postrance %s je naišla na grešku i ne može da nastavi. Ukoliko se ovo "
-"nastavi, možete želeti da isklju�ite ovu površ."
+#: src/nautilus-navigation-window.c:1105
+msgid "Unfortunately I couldn't tell which one."
+msgstr "Nažalost, ne mogu da utvrdim koja."
 
 #: src/nautilus-navigation-window.c:1108
+#, c-format
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Površ postrance „%s“ je naišla na grešku i ne može da nastavi."
+
+#: src/nautilus-navigation-window.c:1109
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "Ukoliko se ovo nastavi, možete želeti da isklju�ite ovu površ."
+
+#: src/nautilus-navigation-window.c:1112
 msgid "Side Panel Failed"
 msgstr "Neuspešna površ postrance"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1243
 msgid "Side Pane"
 msgstr "Površ postrance"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1245
 msgid "Contains a side pane view"
 msgstr "Sadrži i površ postrance"
 
@@ -6735,147 +6711,175 @@ msgstr "_Dodaj novi..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Nažalost, ne može da obriše obrazac popunjavanja %s."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
-msgstr "Ne može da obriše obrazac popunjavanja"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr "Proverite da li imate ovlašćenja da obrišete ovaj obrazac."
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
+msgstr "Ne mogu da obrišem obrazac"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
-msgstr "Nažalost, ne može da obriše obeležje %s."
+msgstr "Nažalost, obeležje %s se ne može obrisati."
+
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr "Proverite da li imate ovlašćenja da obrišete ovo obeležje."
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr "Ne mogu da obrišem obeležje"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Napravi novo obeležje:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Klju�na re�:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Slika:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Izaberite sliku za novo obeležje:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Napravite novu boju:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_Ime boje:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Vrednost boje:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Nažalost, „%s“ ne predstavlja ispravno ime datoteke."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Nažalost, niste uneli ispravno ime datoteke."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
-msgstr "Ne može da postavi obrazac popunjavanja"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr "Pokušajte ponovo."
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr "Ne mogu da postavim obrazac"
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Nažalost, ne možete zameniti sliku za ponovno postavljanje"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr "Ponovno postavljanje je naro�ita slika koja se ne može obrisati."
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Nije slika"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Nažalost, ne može postaviti obrazac popunjavanja %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Izaberite sliku da je dodate kao obrazac popunjavanja"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr "Boja se ne može postaviti."
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Nažalost, morate unesti neprazno ime za novu boju."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
-msgstr "Ne može da postavi boju"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
+msgstr "Ne mogu da postavim boju"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Izaberite boju da dodate"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
-msgstr "Nažalost, „%s“ nije upotrebljiva slika"
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "Nažalost, „%s“ nije upotrebljiva slika."
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
+msgstr "Datoteka ne �ini sliku."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Izaberite kategoriju:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Odustani od _uklanjanja"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Dodaj novi obrazac..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Dodaj novu boju..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Dodaj novo obeležje"
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Kliknite na obrazac da ga uklonite"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Kliknite na boju da je uklonite"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Kliknite na obeležje da ga uklonite"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Obrasci:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Boje:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Obeležja:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Uklonite obrazac..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Uklonite boju..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Uklonite obeležje..."
 
@@ -7262,31 +7266,35 @@ msgid "CD _Creator"
 msgstr "Izrada _CD-a"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
-msgstr "Zatvori _sve naddirektorijume"
+msgid "Close P_arent Folders"
+msgstr "Zatvori _naddirektorijume"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
+msgstr "Zatvori naddirektorijume ovog direktorijuma"
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr "Idi u ra�unar"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "Idi u izradu CD-a"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "Otvori _putanju..."
 
 # bug: _Pa_rent???
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr "Otvori _naddirektorijum"
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr "Otvori naddirektorijum"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Mesta"
 
@@ -7316,112 +7324,128 @@ msgstr "Neuspešan pregled"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
-msgstr ""
-"Pregled %s je naišao na grešku i ne može da nastavi. Možete da izaberete "
-"neki drugi pregled ili da odete na drugu lokaciju."
+msgid "The %s view encountered an error and can't continue."
+msgstr "Pregled %s je naišao na grešku i ne može da nastavi."
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
+msgstr "Možete da izaberete neki drugi pregled ili da odete na drugu putanju."
 
 #: src/nautilus-window-manage-views.c:839
 #, c-format
 msgid "The %s view encountered an error while starting up."
 msgstr "Pregled %s je naišao na grešku pri pokretanju."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
+msgstr "Putanja se ne može prikazati ovim pregleda�em."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Pregled sadržaja"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Pregled tekuće datoteke ili direktorijuma"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Ne može da pronađe „%s“. Proverite da li ste dobro ukucali i pokušajte "
-"ponovo."
+msgid "Couldn't find \"%s\"."
+msgstr "Ne mogu da nađem „%s“."
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
-msgstr ""
-"Ne može da prikaži „%s“, zato što Nautilus ne može da odredi koje je vrste "
-"datoteka."
+msgid "Couldn't display \"%s\"."
+msgstr "Ne mogu da prikažem „%s“."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
-msgstr "Nautilus nema postavljen pregleda� za prikazivanje „%s“."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
+msgstr "Nautilus ne može da odredi koje je vrste datoteka."
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
-msgstr "Ne može da prikaže „%s“, zato što Nautilus ne podržava %s: lokacije."
+msgid "Nautilus has no installed viewer capable of displaying the file."
+msgstr "Nautilus nema postavljen pregleda� za prikazivanje ove datoteke."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
-msgstr "Ne može da prikaže „%s“, zato što je pokušaj prijave bio neuspešan."
+msgid "Nautilus cannot handle %s: locations."
+msgstr "Nautilus ne podržava putanje „%s:“."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
-msgstr "Ne može da prikaže „%s“, zato što je pristup odbijen."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr "Pokušaj prijave je neuspešan."
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr "Pristup odbijen."
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr "Ne mogu da prikažem „%s“, zato što nisam uspeo da nađem ra�unar „%s“."
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
-"Ne može da prikaže „%s“, zato što ne može pronaći domaćina „%s“. Proverite "
-"da li ste dobro ukucali i da li su postavke vašeg proksija ispravne. "
+"Proverite da li ste dobro ukucali i da li su postavke vašeg posrednika "
+"ispravne. "
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr ""
-"Ne može da prikaže „%s“. Proverite da li je vaš proksi ispravno postavljen."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
+msgstr "Proverite da li je vaš posrednik ispravno postavljen."
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
-"Ne može da prikaže „%s“, zato što Nautilus ne može da stupi u vezu sa "
-"glavnim SMB pretraživa�em.\n"
-"Proverite da li je SMB server pokrenut u lokalnoj mreži."
+"Ne mogu da prikažem „%s“, zato što Nautilus ne može da stupi u vezu sa "
+"glavnim razgleda�em SMB-a."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr "Proverite da li je SMB server pokrenut u lokalnoj mreži."
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
-"Pretraživanje je trenutno nedostupno, zato što ili nemate indeks, ili usluga "
-"pretraživanja nije pokrenuta. Proverite da li ste pokrenuli Meduza uslugu "
-"pretraživanjam, ili ako nemate indeks, da Meduza indeksiranje radi."
+"Pretraživanje je trenutno nedostupno, zato što ili nemate popis, ili usluga "
+"pretraživanja nije pokrenuta."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+"Proverite da li ste pokrenuli Meduza uslugu pretraživanja, ili ako nemate "
+"popis, da Meduza vrši popis."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Pretraživanje nedostupno"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus ne može da prikaže „%s“."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr "Izaberite neki drugi pregleda� i pokušajte ponovo."
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
-msgstr "Ne može da prikaže putanju"
+msgstr "Ne mogu da prikažem putanju"
 
 #: src/nautilus-window-menus.c:214
 msgid "Go to the location specified by this bookmark"
@@ -7431,24 +7455,27 @@ msgstr "Idi na lokaciju navedenu u ovom obeleživa�u"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
-msgstr "Copyright (C) 1999-2001 Eazel, Inc."
+msgstr "Copyright © 1999–2001 Eazel, Inc."
 
 #. Translators should localize the following string
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
-msgstr "Danilo Å egan <danilo@prevod.org>"
+msgstr ""
+"Danilo Å egan <danilo@prevod.org>\n"
+"\n"
+"Prevod.org — prevod na srpski jezik."
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
 msgstr ""
-"Nautilus je grafi�ka ljuska za Gnom koja olakšava upravljanje datotekama i "
+"Nautilus je grafi�ka ljuska za Gnoma koja olakšava upravljanje datotekama i "
 "ostatkom sistema."
 
 #: src/nautilus-window-toolbars.c:361
@@ -7459,36 +7486,40 @@ msgstr "Idi nazad za nekoliko stranica"
 msgid "Go forward a number of pages"
 msgstr "Idi napred za nekoliko stranica"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:906
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Prikaži ovu lokaciju pomoću „%s“"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1177
 msgid "Network"
 msgstr "Mreža"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1179
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1181
+msgid "Themes"
+msgstr "Teme"
+
+#: src/nautilus-window.c:1183
 msgid "CD Creator"
 msgstr "Izrada CD-a"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1623
 msgid "Application ID"
 msgstr "ID programa"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1624
 msgid "The application ID of the window."
 msgstr "ID programa ovog prozora"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1630
 msgid "Application"
 msgstr "Program"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1631
 msgid "The NautilusApplication associated with this window."
 msgstr "Nautilus Program vezan za ovaj prozor."
 
@@ -7524,6 +7555,256 @@ msgstr "Mrežni serveri"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Pregledajte vaše mrežne servere u Nautilusovom upravniku datoteka"
 
+#~ msgid "Search Google for Selected Text"
+#~ msgstr "Pronađi izabrani tekst pomoću Gugla"
+
+#~ msgid "Use Google to search the web for the selected text"
+#~ msgstr "Koristi Gugl za traženje izabranog teksta na vebu"
+
+#~ msgid "Look Up Selected Text in Dictionary"
+#~ msgstr "Potraži izabrani tekst u re�niku"
+
+#~ msgid "Look up the selected text in the Merriam-Webster dictionary"
+#~ msgstr "Potraži izabrani tekst u Merijam-Vebsterovom re�niku"
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrika za pregled hardvera"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Pregled hardvera"
+
+#~ msgid "Hardware view"
+#~ msgstr "Pregled hardvera"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Gledaj kao hardver"
+
+#~ msgid "hardware view"
+#~ msgstr "pregled hardvera"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "Ime ikone za pregled hardvera"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "Sažetak podataka o hardveru"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s procesor\n"
+#~ "%s MHz\n"
+#~ "%s KB keš memorije"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB memorije"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB memorije"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+# bug: plural-forms
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Uklju�en je %d dana, %d sati, %d minuta"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Opšti pregled hardvera"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Ovime se �uva mesto za list procesora."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Ovime se �uva mesto za list memorije."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Ovime se �uva mesto za list diskova."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Pretražuje diskove"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus tražuje direktorijume sa smećem na vašim diskovima"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Greška pri umnožavanju u „%s“.\n"
+#~ "\n"
+#~ "Nema dovoljno mesta u odredištu."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Greška pri pravljenju veze u „%s“.\n"
+#~ "\n"
+#~ "Nema dovoljno mesta u odredištu."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Greška pri premeštanju u „%s“.\n"
+#~ "\n"
+#~ "Niste ovlašćeni da pišete u ovaj direktorijum."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Greška pri premeštanju u „%s“.\n"
+#~ "\n"
+#~ "Sa odredišnog diska se može samo �itati."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Greška pri uspostavljanju veza u „%s“.\n"
+#~ "\n"
+#~ "Niste ovlašćeni da pišete u ovaj direktorijum."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Greška pri uspostavljanju veza u „%s“.\n"
+#~ "\n"
+#~ "Sa odredišnog diska se može samo �itati."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri umnožavanju „%s“.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri premeštanju „%s“.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri brisanju „%s“.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri umnožavanju.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri uspostavljanju veze.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Greška „%s“ pri brisanju.\n"
+#~ "\n"
+#~ "Želite li da nastavite?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Ne može da umnoži u Smeće"
+
+#~ 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 ""
+#~ "Podrazumevana akcija ne može da otvori „%s“ zato što ne može da pristupi "
+#~ "datotekama na lokacijama „%s“. Nijedna druga akcija nije namenjena "
+#~ "pregledanju ove datoteke. Ukoliko prekopirate ovu datoteku na vaš ra�unar, "
+#~ "možda ćete moći da je otvorite."
+
+# bug: plural-forms
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Ne može da prebaci %d izabranih stavki u Smeće. Želite li da ih odmah "
+#~ "obrišete?"
+
+# bug: plural-forms
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Ne može da prebaci %d izabranih stavki u Smeće. Želite li odmah da "
+#~ "obrišete tih %d stavki?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Datoteka koju ste prevukli nije slika. Možete koristiti samo lokalne "
+#~ "slike za ikone."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Nažalost, Meduza pretraga nije dostupna zato što nije instalirana."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Jednom dnevno se vaše datoteke i tekstualni sadržaj indeksiraju kako bi "
+#~ "pretrage bile brze. Indeksiranje je trenutno u toku."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "„%s“ ne predstavlja ispravnu adresu. Proverite da li ste dobro ukucali i "
+#~ "pokušajte ponovo."
+
+#~ 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 ""
+#~ "Ne može da prikaže „%s“, zato što Nautilus ne može da stupi u vezu sa "
+#~ "glavnim SMB pretraživa�em.\n"
+#~ "Proverite da li je SMB server pokrenut u lokalnoj mreži."
+
+#~ msgid "file icon"
+#~ msgstr "ikona datoteke"
+
 #~ msgid "Name:"
 #~ msgstr "Ime:"
 
@@ -7623,8 +7904,5 @@ msgstr "Pregledajte vaše mrežne servere u Nautilusovom upravniku datoteka"
 #~ msgid "_Toolbar"
 #~ msgstr "_Alatke"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Lokacija „%s“ više ne postoji."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Idi na nepostojeću putanju"
diff --git a/po/sv.po b/po/sv.po
index a38cd9906..9e7fad321 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-09-28 22:43+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -43,8 +43,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() misslyckades."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Emblem"
 
@@ -57,48 +57,60 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus emblemvy"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Kunde inte ta bort emblem"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Kunde inte ta bort emblemet med namnet \"%s\". Detta beror troligtvis på att "
 "emblemet är permanent och inte något du lade till själv."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Kunde inte ta bort emblem"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Kunde inte byta namn på emblem"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Kunde inte byta namn på emblemet med namnet \"%s\". Detta beror troligtvis "
 "på att emblemet är permanent och inte något du lade till själv."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Kunde inte byta namn på emblem"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Byt namn på emblem"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Ange ett nytt namn för det visade emblemet:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Byt namn"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Lägg till emblem..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -106,7 +118,7 @@ msgstr ""
 "Ange ett beskrivande namn bredvid varje emblem. Detta namn kommer att "
 "användas på andra ställen för att identifiera emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -114,139 +126,62 @@ msgstr ""
 "Ange ett beskrivande namn bredvid emblemet. Detta namn kommer att användas "
 "på andra ställen för att identifiera emblemet."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"En del av filerna kunde inte läggas till som emblem eftersom de inte verkar "
-"vara giltiga bilder."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Tyvärr, bilden i %s kunde inte installeras som ett emblem."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Filen \"%s\" verkar inte vara en giltig bild."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Kunde inte lägga till emblem"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Inga av filerna kunde läggas till som emblem eftersom de inte verkar vara "
 "giltiga bilder."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Den dragna texten var ingen giltig filplats."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Kunde inte lägga till emblem"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Filen \"%s\" verkar inte vara en giltig bild."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Den dragna filen verkar inte vara en giltig bild."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Ta bort"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Fabrik för hårdvaruvy"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "HÃ¥rdvara"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "HÃ¥rdvaruvisare"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "HÃ¥rdvaruvy"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Visa som hårdvara"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "hårdvaruvy"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "namn på ikon för hårdvaruvyn"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "sammanfattning av hårdvaruinformation"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"Processor: %s\n"
-"Klockfrekvens: %s MHz\n"
-"Cachestorlek: %s kB"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Drifttid är %d dagar, %d timmar, %d minuter"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Hårdvaruöversikt"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Detta är en platshållare för CPU-sidan."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Detta är en platshållare för RAM-sidan."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Detta är en platshållare för IDE-sidan."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Historik"
@@ -913,6 +848,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "HÃ¥rdvara"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Internationellt"
@@ -1198,31 +1137,19 @@ msgid "Desktop trash icon name"
 msgstr "Namn på papperskorgsskrivbordsikonen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Kataloger över denna storlek kommer att trunkeras till ungefärligen denna "
-"storlek. Avsikten med detta är att undvika att oavsiktligen spåra ur och "
-"använda för mycket minne och döda Nautilus med mycket stora kataloger. Ett "
-"negativt värde innebär att ingen gräns finns. Gränsen är ungefärlig på grund "
-"av den styckvisa inläsningen av kataloger."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Aktivera \"specialflaggor\" i filegenskapsfönstret"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "Filnamn för standardskrivbordsbakgrunden. Används endast om background_set "
 "är sant."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1230,6 +1157,20 @@ msgstr ""
 "Filnamn för standardsidopanelsbakgrunden. Används endast om "
 "side_pane_background_set är sant."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Kataloger över denna storlek kommer att trunkeras till ungefärligen denna "
+"storlek. Avsikten med detta är att undvika att oavsiktligen spåra ur och "
+"använda för mycket minne och döda Nautilus med mycket stora kataloger. Ett "
+"negativt värde innebär att ingen gräns finns. Gränsen är ungefärlig på grund "
+"av den styckvisa inläsningen av kataloger."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Dölj standardbokmärken i bokmärkesmenyn"
@@ -1239,9 +1180,10 @@ msgid "Home icon visible on desktop"
 msgstr "Hemikon synlig på skrivbordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "Om detta är sant kommer Nautilus endast att visa kataloger i "
 "trädsidopanelen. Annars kommer Nautilus att visa både kataloger och filer."
@@ -1273,9 +1215,10 @@ msgstr ""
 "exotiska filalternativen i dialogrutan filinställningar."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"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 kataloger innan filer i ikon- och listvyerna."
 
@@ -1318,8 +1261,9 @@ msgstr ""
 "bokmärkesmenyn."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "Om detta är sant kommer Nautilus att använda användarens hemkatalog som "
@@ -1336,9 +1280,10 @@ msgstr ""
 "tildetecken (~) som säkerhetskopior."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Om detta är sant kommer dolda filer att visas i filhanteraren. Dolda filer "
 "är antingen punktfiler eller är listade i katalogens .hidden-fil."
@@ -1362,8 +1307,9 @@ msgstr ""
 "på skrivbordet."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Om detta är sant kommer en ikon som länkar till hemkatalogen att placeras på "
@@ -1401,7 +1347,8 @@ msgstr ""
 "för efter minskande storlek."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+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."
@@ -1433,7 +1380,8 @@ msgid "List of possible captions on icons"
 msgstr "Lista med möjliga rubriker på ikoner"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Maximalt antal hanterade filer i katalog"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1453,11 +1401,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus hanterar ritandet av skrivbordet"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus använder användarens hemkatalog som skrivbord"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Visa endast kataloger i trädsidopanelen"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1477,8 +1427,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Omvänd sorteringsordning i nya fönster"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
-msgstr "Visa kataloger först i fönster"
+msgid "Show folders first in windows"
+msgstr "Visa mappar först i fönster"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 msgid "Show location bar in new windows"
@@ -1515,10 +1465,11 @@ msgstr ""
 "att spelas."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1530,12 +1481,13 @@ msgstr ""
 "aldrig att läsas in."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 "
@@ -1545,10 +1497,11 @@ msgstr ""
 "att användas."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "Hastighetskompromiss för när antalet objekt ska visas i en katalog. Om detta "
@@ -1560,17 +1513,18 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 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:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
-"Standardsorteringsordningen för objektet i listvyn. Möjliga värden är \"name"
+"Standardsorteringsordningen för objekt i listvyn. Möjliga värden är \"name"
 "\", \"size\", \"type\" och \"modification_date\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1614,7 +1568,8 @@ msgid "Use manual layout in new windows"
 msgstr "Använd manuell layout i nya fönster"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Använd kompaktare layout i nya fönster"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1643,7 +1598,8 @@ msgstr ""
 "för denna mapp. Möjliga värden är \"list_view\" och \"icon_view\"."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "När antalet antalet objekt i en katalog ska visas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1655,7 +1611,8 @@ 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:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Huruvida en standardkatalogbakgrund har ställts in."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1814,67 +1771,82 @@ msgstr "återställ"
 msgid "on the desktop"
 msgstr "på skrivbordet"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Kan inte ta bort volym"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Du kan inte ta bort en volymikon. 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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Kan inte ta bort volym"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Flytta hit"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Kopiera hit"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_Länka hit"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Ställ in som _bakgrund"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Ställ in som bakgrund för _alla mappar"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "Tyvärr, temat \"%s\" kunde inte installeras."
+
+#: 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:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Kunde inte installera emblem"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1884,20 +1856,26 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Tyvärr, det finns redan ett emblem med namnet \"%s\". Välj ett annat namn på "
 "det."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Kunde inte installera emblem"
+
+#: 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:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Tyvärr, kan inte spara anpassat emblemnamn."
 
@@ -1916,22 +1894,28 @@ msgstr "Från:"
 msgid "To:"
 msgstr "Till:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Fel vid flyttning."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Fel vid flyttning.\n"
 "\n"
 "\"%s\" kan inte flyttas eftersom den är på en skrivskyddad disk."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Fel vid borttagning."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1940,22 +1924,17 @@ 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:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Fel vid borttagning.\n"
 "\n"
 "\"%s\" kan inte tas bort eftersom den är på en skrivskyddad disk."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1964,24 +1943,25 @@ 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:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Fel vid flyttning."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Fel vid flyttning.\n"
 "\n"
 "\"%s\" kan inte flyttas eftersom den eller dess föräldermapp finns i målet."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Fel vid flyttning.\n"
@@ -1989,296 +1969,245 @@ msgstr ""
 "\"%s\" kan inte flyttas till papperskorgen eftersom du inte har de "
 "nödvändiga rättigheterna för att ändra den eller dess föräldermapp."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Fel vid kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Fel vid kopiering.\n"
 "\n"
 "\"%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:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fel vid kopiering till \"%s\".\n"
-"\n"
-"Det finns inte tillräckligt med utrymme på målet."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Fel vid kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Fel vid flyttning till \"%s\".\n"
 "\n"
 "Det finns inte tillräckligt med utrymme på målet."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Fel vid skapande av länk i \"%s\".\n"
-"\n"
-"Det finns inte tillräckligt med utrymme på målet."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Fel vid flyttning."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Fel vid länkning."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Fel vid kopiering till \"%s\".\n"
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Fel vid kopiering till \"%s\".\n"
 "\n"
 "Målet är skrivskyddat."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fel vid flyttning av objekt till \"%s\".\n"
-"\n"
-"Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fel vid flyttning av objekte till \"%s\".\n"
-"\n"
-"Måldisken är skrivskyddad."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Fel vid skapande av länkar i \"%s\".\n"
-"\n"
-"Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Fel vid flyttning."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Fel vid skapande av länkar i \"%s\".\n"
-"\n"
-"Måldisken är skrivskyddad."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid kopiering av \"%s\".\n"
-"\n"
-"Vill du fortsätta?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Fel vid länkning."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Fel vid kopiering."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Fel \"%s\" vid flyttning av \"%s\".\n"
+"Fel \"%s\" vid flyttning.\n"
 "\n"
 "Vill du fortsätta?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid skapande av en länk till \"%s\".\n"
-"\n"
-"Vill du fortsätta?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Fel vid flyttning."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Fel \"%s\" vid borttagning av \"%s\".\n"
+"Fel \"%s\" vid skapande av en länk till \"%s\".\n"
 "\n"
 "Vill du fortsätta?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid kopiering.\n"
-"\n"
-"Vill du fortsätta?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Fel vid borttagning."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid flyttning.\n"
-"\n"
-"Vill du fortsätta?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Fel vid kopiering."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid länkande.\n"
-"\n"
-"Vill du fortsätta?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Fel vid flyttning."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Fel \"%s\" vid borttagning.\n"
-"\n"
-"Vill du fortsätta?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Fel vid länkning."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Fel vid borttagning."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Fel vid kopiering."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Fel vid flyttning."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Fel vid länkning."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Fel vid borttagning."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Hoppa över"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Försök igen"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Kunde inte färdigställa angiven åtgärd."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kunde inte flyttas till den nya platsen eftersom namnet redan används "
 "för ett speciellt objekt som inte kan flyttas eller ersättas.\n"
 "\n"
 "Om du fortfarande vill flytta \"%s\" bör du döpa om det och försöka igen."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Kunde inte färdigställa angiven åtgärd."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" kunde inte kopieras till den nya platsen eftersom namnet redan "
 "används för ett speciellt objekt som inte kan flyttas eller ersättas.\n"
 "\n"
 "Om du fortfarande vill kopiera \"%s\" bör du döpa om det och försöka igen."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Kan inte ersätta fil."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Filen \"%s\" finns redan.\n"
 "\n"
 "Vill du ersätta den?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Konflikt vid kopiering"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Ersätt"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Ersätt alla"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "länk till %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "ytterligare en länk till %s"
@@ -2287,25 +2216,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:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, 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:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, 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:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, 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:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d:e länken till %s"
@@ -2315,561 +2244,600 @@ 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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopia)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (ytterligare en kopia)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ":e kopian)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ":a kopian)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ":e kopian)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopia)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ytterligare en kopia)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, 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:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, 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:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, 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:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Okänd GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Flyttar filer till papperskorgen"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Filer som kastats:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Flyttar"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Förbereder flyttning till papperskorgen..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Flyttar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Filer som flyttats:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Förbereder flyttning..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Slutför flyttning..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Skapar länkar till filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Filer som länkats:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Länkar"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Förbereder skapande av länkar..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Slutför skapande av länkar..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Kopierar filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Filer som kopierats:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopierar"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Förbereder kopiering..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Du kan inte kopiera objekt till papperskorgen."
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Kan inte kopiera till papperskorgen"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Du kan inte flytta denna papperskorgsmapp."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Du kan inte kopiera denna papperskorgsmapp."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Kan inte byta plats på papperskorgen"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Kan inte kopiera papperskorgen"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 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:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 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:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Skapa en ny tom mapp inuti denna mapp"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Kan inte flytta in i sig själv"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Kan inte kopiera in i sig själv"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 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:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Kan inte kopiera över sig själv"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Fel vid skapande av ny mapp.\n"
 "\n"
 "Du har inte de nödvändiga rättigheterna för att skriva till målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Fel vid skapande av ny mapp.\n"
 "\n"
 "Det finns inget utrymme på målet."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Fel \"%s\" vid skapande av ny mapp."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Fel vid skapande av ny mapp"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+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:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "namnlös mapp"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Fel \"%s\" vid skapande av ny mapp."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Fel vid skapande av ny mapp"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Fel vid skapande av ny mapp"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fil"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Tar bort filer"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 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:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Tar bort"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Förbereder borttagning av filer..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Tömmer papperskorgen"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Förbereder tömning av papperskorgen..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Är du säker att du vill ta bort alla objekt i papperskorgen permanent?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Töm"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "apa"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "apa (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".apa.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".apa (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "apa apa"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "apa apa (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "apa.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "apa (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "apa apa.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "apa apa (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "apa apa.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "apa apa (kopia).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "apa...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "apa.. (kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "apa..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "apa... (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "apa. (kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "apa. (ytterligare en kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "apa (ytterligare en kopia)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "apa (ytterligare en kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "apa (tredje kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "apa (tredje kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "apa apa (ytterligare en kopia).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "apa apa (tredje kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "apa (13:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "apa (14:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "apa (13:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "apa (14:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "apa (21:a kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "apa (22:a kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "apa (21:a kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "apa (22:a kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "apa (23:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "apa (23:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "apa (24:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "apa (24:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "apa (25:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "apa (25:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "apa apa (24:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "apa apa (25:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "apa apa (24:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "apa apa (25:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "apa apa (100000000000000:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "apa (10:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "apa (11:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "apa (10:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "apa (11:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "apa (12:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "apa (12:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "apa (110:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "apa (111:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "apa (110:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "apa (111:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "apa (122:a kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "apa (123:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "apa (122:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "apa (123:e kopian).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "apa (124:e kopian)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "apa (124:e kopian).txt"
 
@@ -2888,64 +2856,64 @@ msgstr "apa (124:e kopian).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "idag klockan 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "idag klockan %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "idag klockan 00.00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "idag klockan %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "idag, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "idag, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "idag"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "igår klockan 00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "igår klockan %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "igår klockan 00.00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "igår klockan %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "igår, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "igår, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "igår"
 
@@ -2954,133 +2922,133 @@ msgstr "igår"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 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:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d %B %Y kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 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:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d %b %Y kl. %H.%M.%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "MÃ¥n 00 okt 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d %b %Y kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 okt 0000 kl. 00.00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y kl. %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 okt 0000, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "0000-00-00, 00.00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%Y-%m-%d, %H.%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "0000-00-00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 objekt"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 mappar"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 filer"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 objekt"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fil"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u objekt"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u mappar"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u filer"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? objekt"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? byte"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "okänd typ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "okänd"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3090,7 +3058,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:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3099,11 +3067,11 @@ 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:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "länk"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "länk (trasig)"
 
@@ -3224,11 +3192,13 @@ 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:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Ikonvy"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Listvy"
@@ -3372,147 +3342,152 @@ msgstr "%.0sHem"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr "Dator"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "filikon"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "redigerbar text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "den redigerbara etiketten"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "ytterligare text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "mer text"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "färgmarkerad för markering"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 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:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "färgmarkerad som tangentbordsfokus"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 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:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "färgmarkerad för släpp"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 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:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Markeringsrektangeln"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Rama in text"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Rita en ram runt omarkerad text"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Färg på markeringsruta"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Färg på markeringsrutan"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa för markeringsruta"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Opacitet för markeringsrutan"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Färgmarkeringsalfa"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Opacitet för färgmarkeringen för markerade ikoner"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Ljus informationsfärg"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 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:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Mörk informationsfärg"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 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:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Denna mapp använder automatisk layout. 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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Denna mapp använder automatisk layout. 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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Denna mapp använder automatisk layout. Vill du byta till manuell layout och "
 "lämna detta objekt där du släppte det?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Denna mapp använder automatisk layout. Vill du byta till manuell layout och "
 "lämna dessa objekt där du släppte dem?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Byt till manuell layout?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Byt"
 
@@ -3621,72 +3596,72 @@ msgstr "Är standard för \"%s\"-objekt."
 msgid "Is the default for all \"%s\" items."
 msgstr "Är standard för alla \"%s\"-objekt."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Ändra \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Inkludera i menyn för \"%s\"-objekt"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Använd som standard för \"%s\"-objekt"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Inkludera endast i menyn för \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Använd som standard endast för \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Inkludera inte i menyn för \"%s\"-objekt"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Namn"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Status"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Välj"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Klar"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Ändra..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Filtyper och program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_GÃ¥ dit"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3694,48 +3669,48 @@ msgstr ""
 "Du kan konfigurera vilka program som erbjuds för vilka filtyper i dialogen "
 "Filtyper och program."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Öppna med annat program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Välj ett program att öppna \"%s\" med:"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Öppna med annan visare"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Välj en vy för \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Inga visare är tillgängliga för \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Inga visare är tillgängliga"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Det finns inget program som är associerat med \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Inget program är associerat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Det finns ingen åtgärd som är associerad med \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Ingen åtgärd är associerad"
 
@@ -3743,11 +3718,9 @@ msgstr "Ingen åtgärd är associerad"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3756,42 +3729,41 @@ msgstr ""
 "Du kan konfigurera GNOME att associera program med filtyper. Vill du "
 "associera ett program med denna filtyp nu?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Associera program"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Visaren som är associerad med \"%s\" är ogiltig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Ogiltig visare associerad"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Programmet som är associerat med \"%s\" är ogiltigt."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Ogiltigt program associerat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Åtgärden som är associerad med \"%s\" är ogiltig."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Ogiltig åtgärd associerad"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3802,93 +3774,134 @@ msgstr ""
 "denna filtyp. Vill du associera ett program eller en visare med denna filtyp "
 "nu?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Associera åtgärd"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
+"\"-platser. Vill du välja ett annat program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
 "\"-platser. Vill du välja ett annat program?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer "
 "på \"%s\"-platser. Vill du välja en annan åtgärd?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Kan inte öppna plats"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
+"\"-platser. Vill du välja ett annat program?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
 "\"-platser. 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:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt filer "
-"på \"%s\"-platser. Det finns inga andra tillgängliga åtgärder som kan visa "
-"denna fil. Om du kopierar denna fil till din dator kan du kanske öppna den."
+"på \"%s\"-platser. Vill du välja en annan åtgärd?"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" kan inte öppna \"%s\" eftersom \"%s\" inte kan komma åt filer på \"%s"
+"\"-platser. 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:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+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 på grund av "
 "säkerhetsskäl."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Kunde inte köra fjärrlänkar"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Det inträffade ett fel vid start av programmet.\n"
 "\n"
 "Detaljer: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Fel vid start av program"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Släppmål stöder endast lokala filer"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Detta släppmål stöder endast lokala filer.\n"
@@ -3896,15 +3909,15 @@ 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:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Släppmål stöder endast lokala filer"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4160,14 +4173,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Objekt som har \"medusa\" i sina namn och som är mappar"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Söker på diskar"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus söker efter papperskorgsmappar på dina hårddiskar."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Redigera"
@@ -4367,98 +4372,108 @@ msgstr "Bakgrund"
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "Öppna %d fönster?"
+
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Är du säker att du vill ta bort \"%s\" permanent?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
 msgstr ""
 "Detta kommer att öppna %d separata fönster. Är du säker på att du vill göra "
 "detta?"
 
-#: src/file-manager/fm-directory-view.c:499
-#, c-format
-msgid "Open %d Windows?"
-msgstr "Öppna %d fönster?"
-
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, 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:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Är du säker att du vill ta bort de %d markerade objekten permanent?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Ta bort alla markerade objekt permanent"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Ta bort?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Välj en kategori:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Mönster:"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" markerad"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 mapp markerad"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d mappar markerade"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (innehåller 0 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (innehåller 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (innehåller %d objekt)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (innehåller totalt 0 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (innehåller totalt 1 objekt)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (innehåller totalt %d objekt)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" markerad (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d objekt markerade (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 annat objekt markerat (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d andra objekt markerade (%s)"
@@ -4470,7 +4485,7 @@ msgstr "%d andra objekt markerade (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4479,107 +4494,125 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Mappen \"%s\" innehåller fler filer än Nautilus kan visa. En del filer "
 "kommer inte att visas."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "För många filer"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" kan inte flyttas till papperskorgen. Vill du ta bort det omedelbart?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"De %d markerade objekten kan inte flyttas till papperskorgen. Vill du ta "
-"bort dem omedelbart?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" kan inte flyttas till papperskorgen. Vill du ta bort det omedelbart?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d av de markerade objekten kan inte flyttas till papperskorgen. Vill du ta "
-"bort dessa %d objekt omedelbart?"
+"\"%s\" kan inte flyttas till papperskorgen. Vill du ta bort det omedelbart?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Ta bort omedelbart?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, 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:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Är du säker att du vill ta bort de %d markerade objekten i papperskorgen "
 "permanent?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Ta bort från papperskorgen?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, 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:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "_Annat program..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Ett _program..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Annan _visare..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "En _visare..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Kunde inte färdigställa angiven åtgärd: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Kunde inte färdigställa angiven åtgärd."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Kör \"%s\" på alla markerade objekt"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+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. 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:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4587,11 +4620,11 @@ msgstr ""
 "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:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Om skript"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4630,17 +4663,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: det aktuella fönstrets position och storlek"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 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:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 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:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4648,7 +4681,7 @@ msgstr ""
 "De %d markerade objekten kommer att flyttas om du väljer kommandot Klistra "
 "in filer"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4656,161 +4689,168 @@ msgstr ""
 "De %d markerade objekten kommer att kopieras om du väljer kommandot Klistra "
 "in filer"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 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:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Monteringsfel"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Avmonteringsfel"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Monteringsfel"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "_Mata ut"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Avmontera volym"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Öppna _i nytt fönster"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Öppna _i %d nya fönster"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Hemmapp"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Hemmapp"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Ta bort från papperskorgen"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Ta bort alla markerade objekt permanent"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Flytta till papperskorgen"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Flytta varje markerat objekt till papperskorgen"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Sk_apa länkar"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Sk_apa länk"
 
 # T, Ö, M, P, A är alla redan upptagna snabbtangenter här
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Töm pappers_korgen"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Klipp _ut fil"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Klipp _ut filer"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Kopiera fil"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Kopiera filer"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Denna länk kan inte användas eftersom den inte har något mål. Vill du flytta "
 "denna länk till papperskorgen?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+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. Vill du flytta "
+"denna länk till papperskorgen?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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. Vill du "
 "flytta denna länk till papperskorgen?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Trasig länk"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" är en körbar textfil. Vill du köra den eller visa dess innehåll?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Körbara textfiler"
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Kör eller visa?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Visa"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Kör i _terminal"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Visa"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Kör"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Öppnar \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Avbryt öppning?"
 
@@ -4832,28 +4872,33 @@ 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
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Rättigheterna för \"%s\" kunde inte fastställas."
+
+#: 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:102
+#: 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:107
+#: 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:112
+#: 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:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4862,84 +4907,104 @@ 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:121
+#: 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:127
+#: 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:136
+#: 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:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Tyvärr, det temat kunde inte tas bort!"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Namnbytesfel"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ändra grupp på \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Tyvärr, kunde inte ändra grupp på \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Rättigheterna för \"%s\" kunde inte fastställas."
+
+#: 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:201
+#: 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:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Tyvärr, kunde inte ändra ägaren av \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Rättigheterna för \"%s\" kunde inte fastställas."
+
+#: 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:233
+#: 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:240
+#: 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:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Rättigheterna för \"%s\" kunde inte fastställas."
+
+#: 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:309
+#: 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:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Avbryt namnbyte?"
 
@@ -4997,128 +5062,150 @@ msgstr "_Återställ ikonernas originalstorlekar"
 msgid "Restore Icon's Original Si_ze"
 msgstr "_Återställ ikonens originalstorlek"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pekar på \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Dra och släpp stöds endast på lokala filsystem."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+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-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Fel med dra och släpp"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "En ogiltig dragtyp användes."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Storlek"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Typ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Modifieringsdatum"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+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! Dra endast en bild "
+"för att ställa in en anpassad ikon."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Du kan inte tilldela mer än en anpassad ikon åt gången! Dra endast en bild "
 "för att ställa in en anpassad ikon."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Fler än en bild"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr ""
 "Filen som du släppte är inte lokal. Du kan endast använda lokala bilder som "
 "anpassade ikoner."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr ""
+"Filen som du släppte är inte lokal. Du kan endast använda lokala bilder som "
+"anpassade ikoner."
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Endast lokala bilder"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Filen som du släppte är inte en bild. Du kan endast använda lokala bilder "
+"Filen som du släppte är inte lokal. Du kan endast använda lokala bilder som "
 "anpassade ikoner."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Endast bilder"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper för %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Avbryt ändring av grupp?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Ändrar grupp"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Avbryt ändring av ägare?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Ändrar ägare"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ingenting"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "oläsbar"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 objekt, med storleken %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d objekt, totalt %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(en del innehåll är oläsbart)"
 
@@ -5128,191 +5215,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Innehåll:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Namn:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Plats:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Volym:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Ledigt utrymme:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Länkmål:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Ändrad:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Ã…tkommen:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Välj anpassad ikon..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Ta bort anpassad ikon"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Läs"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Skriv"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Kör"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Ställ in _användar-ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Specialflaggor:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Ställ in gr_upp-ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Fast"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 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:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Filägare:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Filägare:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Filgrupp:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Filgrupp:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grupp:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Andra:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Textvy:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Talvy:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Senast ändrad:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, 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:3006
+#: src/file-manager/fm-properties-window.c:3033
 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:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Det inträffade ett fel vid visande av hjälp: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Det inträffade ett fel vid visande av hjälp: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Kunde inte visa hjälp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Avbryt visandet av egenskapsfönstret?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Skapar fönstret Egenskaper"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Välj en ikon"
 
@@ -5330,71 +5417,110 @@ msgid "Search Results"
 msgstr "Sökresultat"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Tyvärr, söktjänsten Medusa är inte tillgänglig eftersom den inte är "
-"installerad."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Tyvärr, söktjänsten medusa är inte tillgänglig."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Söktjänsten är inte tillgänglig"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Sökningen som du har markerat är nyare än indexet på ditt system. Sökningen "
 "kommer inte att ge några resultat just nu. Du kan skapa ett nytt index genom "
 "att köra \"medusa-indexd\" som root på kommandoraden."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Sök kan inte öppna ditt filsystemsindex. Ditt index kan vara korrupt eller "
+"saknas. Du kan skapa ett nytt index genom att köra \"medusa-indexd\" som "
+"root på kommandoraden."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Sök efter filer som är för nya"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Varje indexerad fil på din dator stämmer överens med de sökkriterier som du "
+"valde. Du kan kontrollera din stavning av dina val eller lägga till fler "
+"sökkriterier för att begränsa dina sökresultat."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Varje indexerad fil på din dator stämmer överens med de sökkriterier som du "
 "valde. Du kan kontrollera din stavning av dina val eller lägga till fler "
 "sökkriterier för att begränsa dina sökresultat."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Fel under sökning"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Sök kan inte öppna ditt filsystemsindex. Ditt index kan vara korrupt eller "
 "saknas. Du kan skapa ett nytt index genom att köra \"medusa-indexd\" som "
 "root på kommandoraden."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Fel vid läsning av filindex"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Ett fel inträffade vid inläsning av innehållet i denna sökning: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"För att göra en innehållssökning måste Sök ha tillgång till ett index med "
+"filerna på ditt system. Sök kan inte komma åt ditt index just nu. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"För att göra en innehållssökning måste Sök ha tillgång till ett index med "
+"filerna på ditt system. Sök kan inte komma åt ditt index just nu. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5402,25 +5528,23 @@ msgstr ""
 "filerna på ditt system. Sök kan inte komma åt ditt index just nu så en "
 "långsammare sökning, som inte använder index, kommer att genomföras."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"För att göra en innehållssökning måste Sök ha tillgång till ett index med "
-"filerna på ditt system. Sök kan inte komma åt ditt index just nu. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Snabbsökningar är inte tillgängliga"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Innehållssökningar är inte tillgängliga"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5434,56 +5558,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "För att göra en snabbsökning måste Sök ha tillgång till ett index med "
 "filerna på ditt system. Din dator skapar detta index just nu. Eftersom Sök "
 "inte kan använda ett index kommer denna sökning kanske att ta flera minuter. "
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "För att göra en innehållssökning måste Sök ha tillgång till ett index med "
 "innehållet på ditt system. Din dator skapar detta index just nu. "
 "Innehållssökning kommer att vara tillgängligt när indexet är färdigt."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Indexerade sökningar är inte tillgängliga"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"För att göra en innehållssökning måste Sök ha tillgång till ett index med "
+"filerna på ditt system. Sök kan inte komma åt ditt index just nu. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"För att göra en innehållssökning måste Sök ha tillgång till ett index med "
+"filerna på ditt system. Sök kan inte komma åt ditt index just nu. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "För att göra en snabbsökning måste Sök ha tillgång till ett index med "
 "filerna på ditt system. Inget index är tillgängligt just nu. Du kan skapa "
 "ett index genom att köra \"medusa-indexd\" som root på kommandoraden. Innan "
 "ett fullständigt index har skapats kommer sökningar att ta flera minuter."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "För att göra en innehållssökning måste Sök ha tillgång till ett index med "
 "innehållet på ditt system. Inget index är tillgängligt just nu. Du kan skapa "
 "ett index genom att köra \"medusa-indexd\" som root på kommandoraden. Innan "
 "ett fullständigt index har skapats kan inga innehållssökningar göras."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Snabbsökningar är inte påslagna på din dator"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5493,11 +5649,12 @@ msgstr ""
 "filerna på ditt system. Din systemadministratör har stängt av snabbsökning, "
 "så inget index är tillgängligt."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Snabbsökningar är inte påslagna på din dator"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Snabbsökningar är inte tillgängliga"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Plats"
 
@@ -5506,7 +5663,7 @@ msgstr "Plats"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Visa _objekt i nytt fönster"
@@ -5517,7 +5674,7 @@ msgstr "Visa _objekt i nytt fönster"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Visa _objekt i %d nya fönster"
@@ -5526,15 +5683,21 @@ msgstr "Visa _objekt i %d nya fönster"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus hittade fler sökresultat än det kan visa. En del träffar kommer "
 "inte att visas."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus hittade fler sökresultat än det kan visa. En del träffar kommer "
+"inte att visas."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "För många träffar"
 
@@ -5548,12 +5711,12 @@ msgid "Create L_auncher"
 msgstr "Skapa st_artare"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Skapa en ny startare"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Ta bort alla objekt i papperskorgen"
 
@@ -5574,7 +5737,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Använd standard_bakgrund"
@@ -5596,58 +5759,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Välj en annan visare att öppna det markerade objektet med"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Skapa _mapp"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Skapa _mapp"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Skapa en ny tom mapp inuti denna mapp"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Skapa en ny tom mapp inuti denna mapp"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Skapa en symbolisk länk för varje markerat objekt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "_Duplicera"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Ta bort varje markerat objekt, utan att flytta till papperskorgen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Duplicera varje markerat objekt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Redigera startare"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Redigera startarinformationen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Formatera den valda volymen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Medi_aegenskaper"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Avmontera den valda volymen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 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 filer "
 "eller Kopiera filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5655,132 +5828,141 @@ msgstr ""
 "Flytta eller kopiera filer som tidigare valts med kommandot Klipp ut filer "
 "eller Kopiera filer till den markerade mappen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Ö_ppna med"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Öppna varje markerat objekt i ett nytt fönster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Öppna _i nytt fönster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Öppna det markerade objektet i detta fönster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 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 filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 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"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Sk_ydda"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Skydda den valda volymen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Byt namn på markerat objekt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "_Återställ vy till standardalternativ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 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"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Kör eller hantera skript från ~/Nautilus/skript"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Markera alla filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Markera _inget"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Markera alla objekt i detta fönster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Markera alla objekt i detta fönster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Visa mediaegenskaper för den valda volymen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 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"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Avmontera den valda volymen"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Använd standardbakgrunden för denna plats"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Visa eller ändra egenskaperna på varje markerat objekt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Kopiera fil"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Formatera"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Avmontera volym"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Öppna"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Öppna skriptmapp"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Klistra _in filer"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Klistra _in filer i mapp"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Skript"
 
@@ -5867,7 +6049,12 @@ msgstr "_Manuellt"
 msgid "Indexing is %d%% complete."
 msgstr "Indexering är %d%% klar."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Dina filer indexerades senast %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5875,25 +6062,29 @@ msgstr ""
 "En gång om dagen indexeras dina filer och innehållet i dem så att det ska gå "
 "snabbt att söka."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Indexeringsstatus"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Dina filer indexerades senast %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "En gång om dagen indexeras dina filer och innehållet i dem så att det ska gå "
-"snabbt att söka. Dina filer indexeras nu."
+"snabbt att söka."
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Det finns inget index över dina filer just nu."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5903,15 +6094,19 @@ msgstr ""
 "sökningar. Snabbsökning är inte påslaget på din dator, så du har inget index "
 "just nu."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Det finns inget index över dina filer just nu."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Tyvärr, söktjänsten medusa är inte tillgänglig."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%x %H.%M"
 
@@ -5935,32 +6130,37 @@ msgstr "Visa _indexeringsstatus"
 msgid "Show status of indexing used when searching"
 msgstr "Visa statusen för indexeringen som används av sökning"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Kan inte skapa mapp som krävs"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Nautilus kunde inte skapa katalogen %s."
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus kunde inte skapa den nödvändiga mappen \"%s\". 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:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Kan inte skapa mappar som krävs"
 
-#: src/nautilus-application.c:262
-#, c-format
+#: src/nautilus-application.c:263
+#, fuzzy, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr "Nautilus kunde inte skapa katalogen %s."
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5971,22 +6171,27 @@ 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:333
 msgid "Link To Old Desktop"
 msgstr "Länk till gammalt skrivbord"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Platsen för skrivbordskatalogen har ändrats i GNOME 2.4. En länk med namnet "
 "\"Länk till gammalt skrivbord\" har skapats på skrivbordet. Du kan öppna "
 "denna för att flytta över de filer du vill ha och sedan ta bort länken."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Migrerat gammalt skrivbord"
 
 #. Can't register myself due to trouble locating the
@@ -5999,7 +6204,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:522
+#: src/nautilus-application.c:521
 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 "
@@ -6010,7 +6215,7 @@ msgstr ""
 "eller installera om Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6056,12 +6261,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 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:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6069,7 +6274,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:577
+#: src/nautilus-application.c:576
 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 "
@@ -6079,7 +6284,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:584
+#: src/nautilus-application.c:583
 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 "
@@ -6089,6 +6294,17 @@ 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:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Det inträffade ett fel vid visande av hjälp: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Inga bokmärken angivna"
@@ -6122,34 +6338,44 @@ msgstr "Färre alternativ"
 msgid "Find Them!"
 msgstr "Hitta dem!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Kan inte flytta in i sig själv"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "är inte en giltig blockenhet"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" är ingen giltig plats. Kontrollera stavningen och försök igen."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "Kunde inte hitta \"%s\". Kontrollera stavningen och försök igen."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Nätverksservrar"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "_Namn:"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Plats:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6349,6 +6575,20 @@ msgstr ""
 "\n"
 "Du kan manuellt ta bort denna fil för att visa guiden igen.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+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! Dra endast en bild "
+"för att ställa in en anpassad ikon."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Filen som du släppte är inte lokal. Du kan endast använda lokala bilder som "
+"anpassade ikoner."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6359,26 +6599,25 @@ msgstr "Öppna med %s"
 msgid "Open with..."
 msgstr "Öppna med..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Kan inte starta cd-brännarprogrammet:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+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:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Töm _papperskorgen"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Skriv innehåll till cd"
 
@@ -6386,37 +6625,37 @@ msgstr "_Skriv innehåll till cd"
 msgid "Go To:"
 msgstr "GÃ¥ till:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Vill du se dessa %d platser i separata fönster?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Visa i flera fönster?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Kan inte öppna plats"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Utför ett antal snabba självtester."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Skapa det första fönstret med den angivna geometrin."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Skapa endast fönster för explicit angivna URI:er."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -6424,82 +6663,95 @@ msgstr ""
 "Hantera inte skrivbordet (ignorera inställningen som är angiven i "
 "dialogfönstret inställningar)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Avsluta Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Starta om Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Filhanterare"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 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:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart kan inte användas med URI:er.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 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"
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Är du säker att du vill ta bort \"%s\" permanent?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Är du säker på att du vill glömma historien? I så fall kommer du att vara "
 "dömd att återupprepa den."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 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:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Töm historik"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Platsen \"%s\" finns inte. Vill du ta bort alla bokmärken med denna plats "
 "från din lista?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Platsen \"%s\" finns inte längre."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bokmärke för icke-existerande plats"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -6532,7 +6784,6 @@ msgid "Close _All Windows"
 msgstr "Stäng _alla fönster"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Stäng alla Nautilus-fönster"
@@ -6555,107 +6806,119 @@ msgid "Forward"
 msgstr "Framåt"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "GÃ¥ till papperskorgsmappen"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Gå till nästa besökta plats"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Gå till föregående besökta plats"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "GÃ¥ till papperskorgsmappen"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Hem"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Adressrad"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Läs om"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Sök efter filer på denna dator"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Status_rad"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Upp"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Skriv till cd"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Lägg till bokmärke"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Bakåt"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Bokmärken"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Töm historik"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Dator"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Redigera bokmärken"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Framåt"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_GÃ¥"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Hem"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Plats..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Sido_panel"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Pappers_korg"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Upp"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Visa"
 
@@ -6673,34 +6936,39 @@ msgstr "Visa som..."
 msgid "File Browser: %s"
 msgstr "Filägare:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "En av sidopanelerna råkade ut för ett fel och kan inte fortsätta. Tyvärr kan "
 "jag inte avgöra vilken."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s-vyn råkade ut för ett fel vid uppstarten."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Sidopanelen %s råkade ut för ett fel och kan inte fortsätta. Om detta "
 "fortsätter att hända kanske du vill stänga av denna panel."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Sidopanel misslyckades"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Sidopanel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Innehåller en sidopanelsvy"
 
@@ -6734,97 +7002,130 @@ msgstr "_Lägg till ny..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Tyvärr, mönstret %s kunde inte tas bort."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Kunde inte ta bort mönster"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, 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:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Kunde inte ta bort emblem"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Skapa ett nytt emblem:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Nyckelord:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Bild:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Välj en bildfil för det nya emblemet:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Skapa en ny färg:"
 
 # SUN CHANGED MESSAGE
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Färg_namn:"
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Färg_värde:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, 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:1103
+#: src/nautilus-property-browser.c:1107
 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:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Kunde inte installera mönster"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 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:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Inte en bild"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, 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:1167
+#: src/nautilus-property-browser.c:1174
 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:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 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:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Kunde inte installera färg"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Välj en färg att lägga till"
 
-#: 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:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, 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:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Filen \"%s\" verkar inte vara en giltig bild."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Välj en kategori:"
 
@@ -6834,61 +7135,61 @@ msgstr "Välj en kategori:"
 # Jag vill ha "A_vbryt borttagning"
 # men jag går med på ändringen.
 #
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "A_vbryt ta bort"
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Lägg till ett nytt mönster..."
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Lägg till en ny färg..."
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Lägg till ett nytt emblem..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 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:2088
+#: src/nautilus-property-browser.c:2097
 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:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Klicka på ett emblem för att ta bort det"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mönster:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Färger:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Emblem:"
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Ta bort ett mönster..."
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Ta bort en färg..."
 
 # SUN CHANGED MESSAGE
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Ta bort ett emblem..."
 
@@ -7278,34 +7579,39 @@ msgstr "_Cd-skapare"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Stäng _alla fönster"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Stäng sidopanelen"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Dator"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "GÃ¥ till papperskorgsmappen"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Plats..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Objekt som är ]mappar"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Mönster"
@@ -7335,10 +7641,13 @@ msgid "View Failed"
 msgstr "Vy misslyckades"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s-vyn råkade ut för ett fel vid uppstarten."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s-vyn råkade ut för ett fel och kan inte fortsätta. Du kan välja en annan "
 "vy eller gå till en annan plats."
@@ -7348,100 +7657,131 @@ msgstr ""
 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:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Den NautilusApplication som är associerad med detta fönster."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Innehållsvy"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Vy med aktuell fil eller mapp"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "Kunde inte hitta \"%s\". Kontrollera stavningen och försök igen."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Kunde inte läsa in %s"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Kunde inte läsa in %s"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Kunde inte visa \"%s\", eftersom Nautilus inte kan bestämma vilken typ av "
 "fil det är."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus har ingen installerad visare som kan visa \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Kunde inte visa \"%s\", eftersom Nautilus inte kan hantera %s:-platser."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "Kunde inte visa \"%s\", eftersom inloggningsförsöket misslyckades."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Kunde inte visa \"%s\", eftersom åtkomst nekades."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Kunde inte visa \"%s\", eftersom värden \"%s\" inte kunde hittas.  "
 "Kontrollera att du stavat namnet rätt och att dina proxyserverinställningar "
 "stämmer."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Kunde inte visa \"%s\". Kontrollera att dina proxyserverinställningar "
 "stämmer."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"Kunde inte visa \"%s\", eftersom Nautilus inte kan kontakta SMB-"
-"huvudbläddraren.\n"
-"Kontrollera att det finns en SMB-server körande på det lokala nätverket."
+"Kunde inte visa \"%s\", eftersom Nautilus inte kan hantera %s:-platser."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Sökning är inte tillgänglig just nu, antingen beroende på att du inte har "
 "något index, eller att söktjänsten inte kör. Försäkra dig om att du har "
 "startat Medusa-söktjänsten och att Medusa-indexeraren kör om du inte har ett "
 "index."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Sökning är inte tillgänglig just nu, antingen beroende på att du inte har "
+"något index, eller att söktjänsten inte kör. Försäkra dig om att du har "
+"startat Medusa-söktjänsten och att Medusa-indexeraren kör om du inte har ett "
+"index."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Sökning är inte tillgänglig"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus kan inte visa \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Kan inte visa plats"
 
@@ -7453,7 +7793,7 @@ msgstr "Gå till platsen som detta bokmärke anger"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7461,7 +7801,7 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Christian Rose\n"
@@ -7469,7 +7809,7 @@ msgstr ""
 "Richard Hult\n"
 "Skicka synpunkter på översättningen till sv@li.org"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7485,38 +7825,42 @@ msgstr "Gå bakåt några sidor"
 msgid "Go forward a number of pages"
 msgstr "Gå framåt ett antal sidor"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Visa denna plats med \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Teman"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_Cd-skapare"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Program-id"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Program-id för fönstret."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Program"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Den NautilusApplication som är associerad med detta fönster."
 
@@ -7552,6 +7896,273 @@ msgstr "Nätverksservrar"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "En del av filerna kunde inte läggas till som emblem eftersom de inte "
+#~ "verkar vara giltiga bilder."
+
+#~ msgid "Factory for hardware view"
+#~ msgstr "Fabrik för hårdvaruvy"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "HÃ¥rdvaruvisare"
+
+#~ msgid "Hardware view"
+#~ msgstr "HÃ¥rdvaruvy"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Visa som hårdvara"
+
+#~ msgid "hardware view"
+#~ msgstr "hårdvaruvy"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "namn på ikon för hårdvaruvyn"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "sammanfattning av hårdvaruinformation"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "Processor: %s\n"
+#~ "Klockfrekvens: %s MHz\n"
+#~ "Cachestorlek: %s kB"
+
+#~ 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 "Drifttid är %d dagar, %d timmar, %d minuter"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Hårdvaruöversikt"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Detta är en platshållare för CPU-sidan."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Detta är en platshållare för RAM-sidan."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Detta är en platshållare för IDE-sidan."
+
+#~ msgid "Show directories first in windows"
+#~ msgstr "Visa kataloger först i fönster"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fel vid kopiering till \"%s\".\n"
+#~ "\n"
+#~ "Det finns inte tillräckligt med utrymme på målet."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Fel vid skapande av länk i \"%s\".\n"
+#~ "\n"
+#~ "Det finns inte tillräckligt med utrymme på målet."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fel vid flyttning av objekt till \"%s\".\n"
+#~ "\n"
+#~ "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fel vid flyttning av objekte till \"%s\".\n"
+#~ "\n"
+#~ "Måldisken är skrivskyddad."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Fel vid skapande av länkar i \"%s\".\n"
+#~ "\n"
+#~ "Du har inte de nödvändiga rättigheterna för att skriva i denna mapp."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Fel vid skapande av länkar i \"%s\".\n"
+#~ "\n"
+#~ "Måldisken är skrivskyddad."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid kopiering av \"%s\".\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid flyttning av \"%s\".\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid borttagning av \"%s\".\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid kopiering.\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid länkande.\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Fel \"%s\" vid borttagning.\n"
+#~ "\n"
+#~ "Vill du fortsätta?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Kan inte kopiera till papperskorgen"
+
+#~ 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 ""
+#~ "Standardåtgärden kan inte öppna \"%s\" eftersom den inte kan komma åt "
+#~ "filer på \"%s\"-platser. Det finns inga andra tillgängliga åtgärder som "
+#~ "kan visa denna fil. Om du kopierar denna fil till din dator kan du kanske "
+#~ "öppna den."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Söker på diskar"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus söker efter papperskorgsmappar på dina hårddiskar."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "De %d markerade objekten kan inte flyttas till papperskorgen. Vill du ta "
+#~ "bort dem omedelbart?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d av de markerade objekten kan inte flyttas till papperskorgen. Vill du "
+#~ "ta bort dessa %d objekt omedelbart?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Filen som du släppte är inte en bild. Du kan endast använda lokala bilder "
+#~ "anpassade ikoner."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Tyvärr, söktjänsten Medusa är inte tillgänglig eftersom den inte är "
+#~ "installerad."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "En gång om dagen indexeras dina filer och innehållet i dem så att det ska "
+#~ "gå snabbt att söka. Dina filer indexeras nu."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" är ingen giltig plats. Kontrollera stavningen och försök igen."
+
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "Tyvärr, \"%s\" är inte en användbar bildfil!"
+
+#~ 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 ""
+#~ "Kunde inte visa \"%s\", eftersom Nautilus inte kan kontakta SMB-"
+#~ "huvudbläddraren.\n"
+#~ "Kontrollera att det finns en SMB-server körande på det lokala nätverket."
+
+#~ msgid ""
+#~ "The default sort-order for items in the icon view. Possible values are "
+#~ "\"name\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+#~ msgstr ""
+#~ "Standardsorteringsordningen för objekt i ikonvyn. Möjliga värden är \"name"
+#~ "\", \"size\", \"type\", \"modification_date\" och \"emblems\"."
+
+#~ msgid ""
+#~ "The default sort-order for the item in the list view. Possible values are "
+#~ "name, size, type, and modification_date."
+#~ msgstr ""
+#~ "Standardsorteringsordningen för objektet i listvyn. Möjliga värden är "
+#~ "\"name\", \"size\", \"type\" och \"modification_date\"."
+
+#~ msgid "file icon"
+#~ msgstr "filikon"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_Namn:"
+
 #~ msgid "Unknown"
 #~ msgstr "Okänd"
 
@@ -7625,9 +8236,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "_Open activated item in a new window"
 #~ msgstr "_Öppna aktiverat objekt i ett nytt fönster"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Platsen \"%s\" finns inte längre."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "GÃ¥ till ickeexisterande plats"
 
@@ -7659,20 +8267,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ "Om detta är sant kommer Nautilus endast att visa kataloger i "
 #~ "trädsidopanelen. Annars kommer Nautilus att visa både kataloger och filer."
 
-#~ msgid ""
-#~ "The default sort-order for items in the icon view. Possible values are "
-#~ "\"name\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
-#~ msgstr ""
-#~ "Standardsorteringsordningen för objekt i ikonvyn. Möjliga värden är \"name"
-#~ "\", \"size\", \"type\", \"modification_date\" och \"emblems\"."
-
-#~ msgid ""
-#~ "The default sort-order for items in the list view. Possible values are "
-#~ "\"name\", \"size\", \"type\", and \"modification_date\"."
-#~ msgstr ""
-#~ "Standardsorteringsordningen för objekt i listvyn. Möjliga värden är \"name"
-#~ "\", \"size\", \"type\" och \"modification_date\"."
-
 #~ msgid "Criteria for search bar searching."
 #~ msgstr "Kriterium för sökradssökning."
 
@@ -7759,9 +8353,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "New _Window"
 #~ msgstr "Nytt _fönster"
 
-#~ msgid "Show folders first in windows"
-#~ msgstr "Visa mappar först i fönster"
-
 #~ msgid ""
 #~ "The default sort-order for the items in the list view. Possible values "
 #~ "are name, size, type, and modification_date."
@@ -7814,9 +8405,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Authentication Required"
 #~ msgstr "Autentisering krävs"
 
-#~ msgid "_Location:"
-#~ msgstr "_Plats:"
-
 #~ msgid "Current Nautilus theme"
 #~ msgstr "Aktuellt Nautilus-tema"
 
@@ -7883,9 +8471,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #~ msgid "Nodes side pane for Nautilus"
 #~ msgstr "Anteckningssidopanel för Nautilus"
 
@@ -8474,9 +9059,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Set Cover Image"
 #~ msgstr "Ställ in framsidesbild"
 
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "Tyvärr, \"%s\" är inte en användbar bildfil."
-
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Välj en bildfil för skivomslaget:"
 
@@ -8599,9 +9181,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "_Local Files Only"
 #~ msgstr "_Endast lokala filer"
 
-#~ msgid "Themes"
-#~ msgstr "Teman"
-
 #~ msgid "New Window Behavior"
 #~ msgstr "Nytt fönsterbeteende"
 
@@ -8632,9 +9211,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Click Behavior"
 #~ msgstr "Klickbeteende"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Körbara textfiler"
-
 #~ msgid "Show Options"
 #~ msgstr "Visa alternativ"
 
@@ -8783,9 +9359,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Kunde inte lägga till tema"
 
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "Tyvärr, temat \"%s\" kunde inte installeras."
-
 #~ msgid "Couldn't install theme"
 #~ msgstr "Kunde inte installera tema"
 
@@ -8802,9 +9375,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ "Tyvärr, du kan inte ta bort det aktuella temat. Byt till ett annat tema "
 #~ "innan du tar bort detta."
 
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Tyvärr, det temat kunde inte tas bort!"
-
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Kunde inte ta bort tema"
 
@@ -8820,9 +9390,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "No description available for the \"%s\" theme"
 #~ msgstr "Ingen beskrivning är tillgänglig för temat \"%s\""
 
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Tyvärr, bilden i %s kunde inte installeras som ett emblem."
-
 #~ msgid "Delete"
 #~ msgstr "Ta bort"
 
@@ -8904,9 +9471,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "%I:%M %p"
 #~ msgstr "%H.%M"
 
-#~ msgid "Couldn't load %s"
-#~ msgstr "Kunde inte läsa in %s"
-
 #~ msgid "Loading %s"
 #~ msgstr "Läser in %s"
 
@@ -10201,9 +10765,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "is write-protected, mounting read-only"
 #~ msgstr "är skrivskyddad, monterar som endast läsbar"
 
-#~ msgid "is not a valid block device"
-#~ msgstr "är inte en giltig blockenhet"
-
 #~ msgid "No medium found"
 #~ msgstr "Inget medium hittades"
 
@@ -10216,9 +10777,6 @@ msgstr "Visa dina nätverksservrar i filhanteraren Nautilus"
 #~ msgid "scripts"
 #~ msgstr "skript"
 
-#~ msgid "Nautilus was unable to create the directory %s."
-#~ msgstr "Nautilus kunde inte skapa katalogen %s."
-
 #~ msgid "No Scripts Folder"
 #~ msgstr "Ingen skript-mapp"
 
diff --git a/po/th.po b/po/th.po
index 4ea62db6b..d3e3bf2ab 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
-"PO-Revision-Date: 2003-02-20 21:12-0700\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
+"PO-Revision-Date: 2003-12-15 22:42-0600\n"
 "Last-Translator: Paisa Seeluangsawat <paisa@colorado.edu>\n"
 "Language-Team: Thai <L10n@opentle.org>\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() failed."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "ตรา"
 
@@ -51,184 +51,121 @@ msgid "Nautilus Emblem view"
 msgstr "มุมมองตรา ของ Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "เอาตราออ�ไม่ได้"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr "เอาตรา '%s' ออ�ไม่ได้ นี่อาจเป็นเพราะว่านี่ไม่ใช้ตราที่คุณติดไว้�ต่เป็นตราถาวร"
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "เอาตราออ�ไม่ได้"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "เปลี่ยนชื่อตราไม่ได้"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr "เปลี่ยนชื่อตรา '%s' ไม่ได้ นี่อาจเป็นเพราะว่านี่ไม่ใช้ตราที่คุณติดไว้�ต่เป็นตราถาวร"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "เปลี่ยนชื่อตราไม่ได้"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "เปลี่ยนชื่อตรา"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "ใส่ชื่อใหม่สำหรับตราที่�สดง:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "เพิ่มตรา..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "ใส่ชื่อไว้ข้างๆตรา"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "ใส่ชื่อไว้ข้างๆตรา"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr "บาง�ฟ้มไม่ใช่รูปจึงใช้เป็นตราไม่ได้"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "�ฟ้ม '%s' ดูเหมือนจะไม่ใช่รูป"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "เพิ่มตราไม่สำเร็จ"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "ไม่มี�ฟ้มที่เป็นรูปซึ่งใช้เป็นตราได้"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "ข้อความที่ลา�มาไม่ใช้ตำ�หน่งของ�ฟ้มที่ถู�ต้อง"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "เพิ่มตราไม่สำเร็จ"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "�ฟ้ม '%s' ดูเหมือนจะไม่ใช่รูป"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "�ฟ้มที่ลา�มาดูเหมือนจะไม่ใช่รูป"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "ลบ"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "ฮาร์ด�วร์"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "ตัว�สดงฮาร์ด�วร์"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "มุมมองฮาร์ด�วร์"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "มองเป็นฮาร์ด�วร์"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "มุมมองฮาร์ด�วร์"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "ชื่อของสั�ลั�ษณ์สำหรับมุมมองฮาร์ด�วร์"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "สรุปข้อมูลฮาร์ด�วร์"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "เปิดเครื่องมา %d วัน, %d ชั่วโมง, %d นาที"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "ข้อมูลฮาร์ด�วร์โดยรวม"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "นี่เป็นที่สำหรับหน้า CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "นี่เป็นที่สำหรับหน้า RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "นี่เป็นที่สำหรับหน้า IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "ประวัติ"
@@ -254,56 +191,53 @@ msgid "Nautilus Image Properties view"
 msgstr "มุมมองคุณสมบัติภาพ จา� Nautilus"
 
 #: components/image_properties/nautilus-image-properties-view.c:192
-#, fuzzy
 msgid "Camera Brand"
-msgstr "�ล้อง"
+msgstr "ยี่ห้อ�ล้อง"
 
 #: components/image_properties/nautilus-image-properties-view.c:193
-#, fuzzy
 msgid "Camera Model"
-msgstr "�ล้อง"
+msgstr "รุ่น�ล้อง"
 
 #: components/image_properties/nautilus-image-properties-view.c:194
 msgid "Date Taken"
-msgstr ""
+msgstr "วันที่ถ่าย"
 
 #: components/image_properties/nautilus-image-properties-view.c:195
 msgid "Exposure Time"
-msgstr ""
+msgstr "ความเร็วชัตเตอร์"
 
 #: components/image_properties/nautilus-image-properties-view.c:196
-#, fuzzy
 msgid "Exposure Program"
-msgstr "โปร��รม"
+msgstr ""
 
 #: components/image_properties/nautilus-image-properties-view.c:197
 msgid "Aperture Value"
-msgstr ""
+msgstr "พื้นที่หน้า�ล้อง"
 
 #: components/image_properties/nautilus-image-properties-view.c:198
 msgid "Metering Mode"
-msgstr ""
+msgstr "วิธีวัด�สง"
 
 #: components/image_properties/nautilus-image-properties-view.c:199
 msgid "Flash Fired"
-msgstr ""
+msgstr "ใช้�ฟลช"
 
 #: components/image_properties/nautilus-image-properties-view.c:200
 msgid "Focal Lenght"
-msgstr ""
+msgstr "ระยะโฟ�ัส"
 
 #: components/image_properties/nautilus-image-properties-view.c:201
 msgid "Shutter Speed"
-msgstr ""
+msgstr "ความเร็วชัตเตอร์"
 
 #: components/image_properties/nautilus-image-properties-view.c:202
 msgid "ISO Speed Rating"
-msgstr ""
+msgstr "ความไว�สง (ISO)"
 
 #: components/image_properties/nautilus-image-properties-view.c:203
 #: data/static_bookmarks.xml.h:36
 msgid "Software"
-msgstr "Software"
+msgstr "โปร��รม"
 
 #: components/image_properties/nautilus-image-properties-view.c:222
 #, c-format
@@ -435,11 +369,11 @@ msgstr "โฟลเดอร์บ้าน"
 
 #: components/tree/nautilus-tree-view.c:531
 msgid "Filesystem"
-msgstr ""
+msgstr "ระบบ�ฟ้ม"
 
 #: components/tree/nautilus-tree-view.c:533
 msgid "Network Neighbourhood"
-msgstr ""
+msgstr "เครือข่าย�ถวนี้"
 
 #: data/applications.desktop.in.h:1
 msgid "Applications"
@@ -455,7 +389,7 @@ msgstr "Apparition"
 
 #: data/browser.xml.h:2
 msgid "Art"
-msgstr "Art"
+msgstr "ศิลป์"
 
 #: data/browser.xml.h:3
 msgid "Azul"
@@ -463,7 +397,7 @@ msgstr "Azul"
 
 #: data/browser.xml.h:4
 msgid "Black"
-msgstr "Black"
+msgstr "ดำ"
 
 #: data/browser.xml.h:5
 msgid "Blue Ridge"
@@ -503,7 +437,7 @@ msgstr "Camouflage"
 
 #: data/browser.xml.h:14
 msgid "Certified"
-msgstr "ได้รับ�ารรับรอง"
+msgstr "ผ่าน�ารรับรอง"
 
 #: data/browser.xml.h:15
 msgid "Chalk"
@@ -575,11 +509,11 @@ msgstr "ลา�ลวดลายไปที่วัตถุ�ล้วม
 
 #: data/browser.xml.h:32
 msgid "Drag an emblem to an object to add it to the object"
-msgstr "ลา�ตราไปที่วัตถุ�ล้วตราจะติดอยู่"
+msgstr "ลา�ตราไปติดที่�ฟ้มหรือโฟลเดอร์ได้"
 
 #: data/browser.xml.h:33
 msgid "Eclipse"
-msgstr "Eclipse"
+msgstr "อุปราคา"
 
 #: data/browser.xml.h:34
 msgid "Envy"
@@ -591,11 +525,11 @@ msgstr "ของโปรด"
 
 #: data/browser.xml.h:37
 msgid "Fibers"
-msgstr "Fibers"
+msgstr "เส้นใย"
 
 #: data/browser.xml.h:38
 msgid "Fire Engine"
-msgstr "Fire Engine"
+msgstr "รถดับเพลิง"
 
 #: data/browser.xml.h:39
 msgid "Fleur De Lis"
@@ -615,7 +549,7 @@ msgstr "GNOME"
 
 #: data/browser.xml.h:43
 msgid "Granite"
-msgstr "Granite"
+msgstr "หินอัคนี"
 
 #: data/browser.xml.h:44
 msgid "Grapefruit"
@@ -627,7 +561,7 @@ msgstr "Green Weave"
 
 #: data/browser.xml.h:46
 msgid "Ice"
-msgstr "นำ้�ข็ง"
+msgstr "น้ำ�ข็ง"
 
 #: data/browser.xml.h:47
 msgid "Important"
@@ -691,7 +625,7 @@ msgstr "Oh No"
 
 #: data/browser.xml.h:62
 msgid "Onyx"
-msgstr "Onyx"
+msgstr "หินโมรา"
 
 #: data/browser.xml.h:63
 msgid "Orange"
@@ -703,7 +637,7 @@ msgstr "�พ็�เ�จ"
 
 #: data/browser.xml.h:65
 msgid "Pale Blue"
-msgstr "นำ้เงินอ่อน"
+msgstr "ฟ้าอ่อน"
 
 #: data/browser.xml.h:66
 msgid "Personal"
@@ -735,7 +669,7 @@ msgstr "ฟองคลื่นทะเล"
 
 #: data/browser.xml.h:73
 msgid "Shale"
-msgstr "Shale"
+msgstr "หินดินเหนียว"
 
 #: data/browser.xml.h:74
 msgid "Silver"
@@ -894,6 +828,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "ฮาร์ด�วร์"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "นานาชาติ"
@@ -1086,11 +1024,11 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:3
 msgid "Bring up a new window for every opened file"
-msgstr ""
+msgstr "เปิดหน้าต่างใหม่สำหรับ�ต่ละ�ฟ้มที่เปิด"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
 msgid "Computer icon visible on desktop"
-msgstr ""
+msgstr "�สดงสั�ลั�ษณ์คอมพิวเตอร์บนพื้นโต๊ะ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:5
 msgid "Criteria for search bar searching"
@@ -1153,9 +1091,8 @@ msgid "Default list zoom level"
 msgstr "ขนาดย่อขยายปริยาย (_Z):"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
-#, fuzzy
 msgid "Default sort order"
-msgstr "เป็นโปร��รมหลั�สำหรับ�ฟ้มนี้"
+msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 #, fuzzy
@@ -1181,27 +1118,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1214,8 +1151,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1242,10 +1179,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "ถังขยะห้ามออ�ไปจา�พื้นโต๊ะ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1278,10 +1216,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "ถังขยะห้ามออ�ไปจา�พื้นโต๊ะ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1293,7 +1232,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1310,7 +1249,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1336,7 +1275,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1360,7 +1299,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1379,11 +1318,12 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "มุมมองสั�ลั�ษณ์บนพื้นโต๊ะ ของ Nautilus"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "มุมมองสั�ลั�ษณ์บนพื้นโต๊ะ ของ Nautilus"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1403,7 +1343,7 @@ msgstr "เปิดในหน้าต่างใหม่"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "พยายามเปลี่ยนขนาดให้พอดี�ับหน้าต่าง"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1440,7 +1380,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1448,30 +1388,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1510,13 +1450,12 @@ msgid "Type of click used to launch/open files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:83
-#, fuzzy
 msgid "Use manual layout in new windows"
-msgstr "จัดผังด้วยมือ (_M)"
+msgstr "ใช้�ารจัดวางสั�ลั�ษณ์ด้วยมือในหน้าต่างใหม่"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "เปิดราย�ารที่เรีย�ในหน้าต่างใหม่ (_O)"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1540,7 +1479,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1554,7 +1493,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "ใช้พื้นหลังปริยายสำหรับพื้นโต๊ะ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1582,9 +1521,8 @@ msgid "Whether to show hidden files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:98
-#, fuzzy
 msgid "Width of the side pane"
-msgstr "ปิด�ถบข้าง"
+msgstr ""
 
 #: libnautilus-private/filesystem-attributes.xml.h:1
 msgid "AFFS Volume"
@@ -1596,15 +1534,15 @@ msgstr "AFS Network Volume"
 
 #: libnautilus-private/filesystem-attributes.xml.h:3
 msgid "Auto-detected Volume"
-msgstr "Auto-detected Volume"
+msgstr ""
 
 #: libnautilus-private/filesystem-attributes.xml.h:4
 msgid "CD Digital Audio"
-msgstr "CD Digital Audio"
+msgstr ""
 
 #: libnautilus-private/filesystem-attributes.xml.h:5
 msgid "CD-ROM Drive"
-msgstr "เครื่องอ่าน CD-ROM"
+msgstr "เครื่องอ่านซีดี"
 
 #: libnautilus-private/filesystem-attributes.xml.h:6
 msgid "CDROM Volume"
@@ -1672,7 +1610,7 @@ msgstr "SuperMount Volume"
 
 #: libnautilus-private/filesystem-attributes.xml.h:22
 msgid "System Volume"
-msgstr "ระดับเสียงระบบ"
+msgstr "System Volume"
 
 #: libnautilus-private/filesystem-attributes.xml.h:23
 msgid "Udfs Solaris Volume"
@@ -1712,66 +1650,79 @@ msgstr "เริ่มใหม่"
 msgid "on the desktop"
 msgstr "บนพื้นโต๊ะ"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "ลบไดรฟ์ข้อมูลไม่ได้"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
-msgstr ""
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
-msgstr "ฟอร์�มตไดรฟ์ข้อมูลที่เลือ�"
+msgid "Can't Delete Volume"
+msgstr "ลบไดรฟ์ข้อมูลไม่ได้"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "ถังขยะ"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "ย้ายมาที่นี่ (_M)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "คัดลอ�มาที่นี่ (_C)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "เชื่อมโยงมาที่นี่ (_L)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "ตั้งเป็นพื้นหลัง (_B)"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "ย�เลิ�"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "ตั้งเป็นพื้นหลังสำหรับทุ�โฟลเดอร์ (_A)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "ตั้งเป็นพื้นหลังสำหรับโฟลเดอร์นี้ (_T)"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "คุณต้องตั้งคำหลั�สำหรับตรา"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "ติดตั้งตราไม่สำเร็จ"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "คำหลั�ใช้ได้�ค่ตัวอั�ษร ช่องว่าง �ละตัวเลข"
@@ -1780,18 +1731,24 @@ msgstr "คำหลัà¸�ใช้ได้à¹�ค่ตัวอัà¸�ษร à¸
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "มีคำหลั�ชื่อ \"%s\" �ล้ว โปรดใช้ชื่ออื่น"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "ติดตั้งตราไม่สำเร็จ"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "บันทึ�ตราที่�ำหนดไม่สำเร็จ"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "บันทึ�ชื่อตราที่�ำหนดไม่สำเร็จ"
 
@@ -1810,22 +1767,28 @@ msgstr "จา�:"
 msgid "To:"
 msgstr "ถึง:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "ย้ายไม่สำเร็จ\n"
 "\n"
 "\"%s\" ถู�ย้ายไม่ได้เพราะมันอยู่บนดิส�์ที่อ่านได้เท่านั้น"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "เ�ิดข้อผิดพลาดขณะลบ"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1833,22 +1796,17 @@ msgstr ""
 "\n"
 "ลบ \"%s\" ไม่ได้เพราะคุณไม่มีสิทธิ์ที่จะ��้ไขโฟลเดอร์ที่มันอยู่"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "ลบไม่สำเร็จ\n"
 "\n"
 "ลบ \"%s\" ไม่ได้เพราะมันอยู่บนดิส�์ที่อ่านได้เท่านั้น"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1856,24 +1814,25 @@ msgstr ""
 "\n"
 "ย้าย \"%s\" ไม่ได้เพราะคุณไม่มีสิทธิ์ที่จะ��้ไข�ฟ้มนี้หรือโฟลเดอร์ที่มันอยู่"
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "เ�ิดข้อผิดพลาดขณะย้าย\n"
 "\n"
-"ไม่สามารถย้าย \"%s\" ได้เพราะ parent folder อยู่ในข้างในจุดหมาย"
+"ไม่สามารถย้าย \"%s\" ได้เพราะโฟลเดอร์ parent อยู่ในข้างในจุดหมาย"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "ย้ายไม่สำเร็จ\n"
@@ -1881,292 +1840,241 @@ msgstr ""
 "ย้าย \"%s\" ไปถังขยะไม่ได้เพราะคุณไม่มีสิทธิ์จะเปลี่ยน �ฟ้มล์/โฟลเดอร์ นี้หรือ its parent "
 "folder"
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "เ�ิดข้อผิดพลาดขณะคัดลอ�"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "คัดลอ�ไม่สำเร็จ\n"
 "\n"
 "คัดลอ� \"%s\" ไม่ได้เพราะคุณไม่มีสิทธิ์อ่านมัน"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"คัดลอ�ไป \"%s\" ไม่สำเร็จ\n"
-"\n"
-"จุดหมายมีที่ไม่พอ"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะคัดลอ�"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "ย้ายไป \"%s\" ไม่สำเร็จ\n"
 "\n"
 "จุดหมายมีที่ไม่พอ"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"สร้างจุดเชื่อม \"%s\" ไม่สำเร็จ\n"
-"\n"
-"จุดหมายมีที่ไม่พอ"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างจุดเชื่อม"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "คัดลอ�ไป \"%s\" ไม่สำเร็จ\n"
 "\n"
 "คุณไม่มีสิทธิ์เขียน�ฟ้มนี้"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "คัดลอ�ไป \"%s\" ไม่สำเร็จ\n"
 "\n"
 "ดิส�์จุดหมายเขียนได้เท่านั้น"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"ย้ายไป \"%s\" ไม่สำเร็จ\n"
-"\n"
-"คุณไม่มีสิทธิ์เขียน�ฟ้มนี้"
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"ย้ายไป \"%s\" ไม่สำเร็จ\n"
-"\n"
-"ดิส�์จุดหมายเขียนได้เท่านั้น"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"สร้างจุดเชื่อมใน \"%s\" ไม่สำเร็จ\n"
-"\n"
-"คุณไม่มีสิทธิ์เขียน�ฟ้มนี้"
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"สร้างจุดเชื่อมใน \"%s\" ไม่สำเร็จ\n"
-"\n"
-"ดิส�์จุดหมายเขียนได้เท่านั้น"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะคัดลอ� \"%s\"\n"
-"\n"
-"จะลอ�ต่อไหม?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างจุดเชื่อม"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะคัดลอ�"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะย้าย \"%s\"\n"
+"เ�ิดข้อผิดพลาด \"%s\" ขณะย้าย\n"
 "\n"
 "จะย้ายต่อไหม?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
+
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 "เ�ิดข้อผิดพลาด \"%s\" ขณะสร้างจุดเชื่อม \"%s\"\n"
 "\n"
 "จะสร้างต่อไหม?"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะลบ \"%s\"\n"
-"\n"
-"จะลบต่อไหม?"
-
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะคัดลอ�\n"
-"\n"
-"จะคัดลอ�ต่อไหม?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "เ�ิดข้อผิดพลาดขณะลบ"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะย้าย\n"
-"\n"
-"จะย้ายต่อไหม?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "เ�ิดข้อผิดพลาดขณะคัดลอ�"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะสร้างจุดเชื่อม\n"
-"\n"
-"จะสร้างต่อไหม?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"เ�ิดข้อผิดพลาด \"%s\" ขณะลบ\n"
-"\n"
-"จะลบต่อไหม?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างจุดเชื่อม"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "เ�ิดข้อผิดพลาดขณะลบ"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "เ�ิดข้อผิดพลาดขณะคัดลอ�"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "เ�ิดข้อผิดพลาดขณะย้าย"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "เ�ิดข้อผิดพลาดขณะสร้างจุดเชื่อม"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "เ�ิดข้อผิดพลาดขณะลบ"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "ข้าม"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "ลองใหม่"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "ทำคำสั่งที่ให้ไม่สำเร็จ"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "ย้าย \"%s\" ไปจุดหมายไม่ได้เพราะจุดหมายมี�ฟ้มหรือโฟลเดอร์ชื่อนี้ที่ไม่สามารถถู�เขียนทับได้\n"
 "\n"
 "ถ้าคุณยังอยา�ย้าย \"%s\" โปรดเปลี่ยนชื่อมัน�ล้วลองใหม่ "
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "ทำคำสั่งที่ให้ไม่สำเร็จ"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "คัดลอ� \"%s\" ไปจุดหมายไม่ได้เพราะจุดหมายมี�ฟ้มหรือโฟลเดอร์ชื่อนี้ที่ไม่สามารถถู�เขียนทับได้\n"
 "\n"
 "ถ้าคุณยังอยา�คัดลอ� \"%s\" โปรดเปลี่ยนชื่อมัน�ล้วลองใหม่ "
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "ไม่สามารถเขียนทับ�ฟ้มได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "มี�ฟ้มชื่อ %s อยู่�ล้ว\n"
 "คุณต้อง�าร�ทนที่มันหรือไม่ ?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "เ�ิดข้อขัด�ย้งขณะคัดลอ�"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "�ทนที่"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "�ทนที่ทั้งหมด"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "ตัวเชื่อมไป %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "ตัวเชื่อมอี�อันไป %s"
@@ -2175,25 +2083,25 @@ msgstr "ตัวเชื่อมอี�อันไป %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "ตัวเชื่อมที่ %d ไป %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "ตัวเชื่อมที่ %d ไป %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "ตัวเชื่อมที่ %d ไป %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "ตัวเชื่อมที่ %d ไป %s"
@@ -2203,564 +2111,600 @@ msgstr "ตัวเชื่อมที่ %d ไป %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (สำเนา)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (สำเนาอี�อัน)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " (สำเนาอี�อัน)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st copy)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd copy)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd copy)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (สำเนา)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (สำเนาอี�อัน)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth copy)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst copy)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd copy)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd copy)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Unknown GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "ทิ้งลงถังขยะ"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "�ฟ้มที่ทิ้งไป:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "�ำลังย้าย"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "�ำลังเตรียมตัวย้ายไปลงถังขยะ"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "�ำลังย้าย�ฟ้ม..."
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "�ฟ้มที่ย้ายไป�ล้ว:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "�ำลังเตรียม�ารย้าย..."
 
 # Can't think of a better word :oP.
-#: libnautilus-private/nautilus-file-operations.c:1871
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
-msgstr "เ�็บข้าวของ..."
+msgstr "ย้ายจะเสร็จ�ล้ว..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "สร้างตัวเชื่อมไป�ฟ้ม"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "จำนวน�ฟ้มที่เชื่อมไป�ล้ว:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "�ำลังเชื่อม"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "เตรียมสร้างตัวเชื่อม..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
-msgstr "เ�็บข้าวของ..."
+msgstr "สร้างจุดเชื่อมจะเสร็จ�ล้ว..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "�ำลังคัดลอ��ฟ้มล์..."
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "จำนวน�ฟ้มที่คัดลอ�ไป�ล้ว:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "�ำลังคัดลอ�"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "เตรียม�ารคัดลอ�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "�ฟ้มจะถู�คัดลอ�ไปถังขยะไม่ได้ (จะทำอย่างนั้นไปทำไม)"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "คัดลอ�ไปถังขยะไม่ได้"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "ถังขยะจะถู�ย้ายไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "ถังขยะจะถู�คัดลอ�ไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "เปลี่ยนตำ�หน่งถังขยะไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "ถังขยะจะถู�คัดลอ�ไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "ย้าย�ฟ้มไปไว้ในตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "คัดลอ��ฟ้มไปไว้ในตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "สร้างโฟลเดอร์เปล่าข้างในโฟลเดอร์นี้"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "ย้ายไปไว้ในตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "คัดลอ�ไปไว้ในตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "คัดลอ��ฟ้มไปเป็นตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "คัดลอ�ไปเป็นตัวเองไม่ได้"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "สร้างโฟลเดอร์ใหม่ไม่สำเร็จ\n"
 "\n"
 "คุณไม่มีสิทธิ์จะเขียนบนจุดหมาย"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "สร้างโฟลเดอร์ใหม่ไม่สำเร็จ\n"
 "\n"
 "จุดหมายไม่มีที่เหลือพอ"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "เ�ิดข้อผิดพลาด \"%s\" ขณะสร้างโฟลเดอร์ใหม่"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างโฟลเดอร์ใหม่"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "เ�ิดข้อผิดพลาดขณะสร้างโฟลเดอร์ใหม่"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "โฟลเดอร์ไม่มีชื่อ"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "เ�ิดข้อผิดพลาด \"%s\" ขณะสร้างโฟลเดอร์ใหม่"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างโฟลเดอร์ใหม่"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "เ�ิดข้อผิดพลาดขณะสร้างโฟลเดอร์ใหม่"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 �ฟ้ม"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "�ำลังลบ�ฟ้ม"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "จำนวน�ฟ้มที่ลบไป�ล้ว"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "�ำลังลบ"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "เตรียม�ารลบ�ฟ้ม..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "�ำลังเอาถังขยะไปเท"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "เตรียมเทถังขยะ..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
-#, fuzzy
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "คุณ�น่ใจนะว่าต้อง�ารลบทุ�อย่างในถังขยะอย่างถาวร ?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
-msgstr ""
+msgstr "เทถังขยะ�ล้วข้อมูลจะถู�ลบทิ้งโดยถาวร"
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "เทขยะ (_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th copy).txt"
 
@@ -2779,64 +2723,64 @@ msgstr "foo (124th copy).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
-msgstr "วันนี้ตอน 00:00:00"
+msgstr "วันนี้ 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
-msgstr "วันนี้ตอน %-H:%M:%S"
+msgstr "วันนี้ %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
-msgstr "วันนี้ตอน 00:00"
+msgstr "วันนี้ 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
-msgstr "วันนี้ตอน %-H:%M"
+msgstr "วันนี้ %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
-msgstr "วันนี้ 00:00"
+msgstr "วันนี้, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
-msgstr "วันนี้ %-H:%M"
+msgstr "วันนี้, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "วันนี้"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
-msgstr "เมื่อวานตอน 00:00:00"
+msgstr "เมื่อวาน 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
-msgstr "เมื่อวานตอน %-H:%M:%S"
+msgstr "เมื่อวาน %H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
-msgstr "เมื่อวานตอน 00:00"
+msgstr "เมื่อวาน 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
-msgstr "เมื่อวานตอน %-H:%M"
+msgstr "เมื่อวาน %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "เมื่อวาน, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
-msgstr "เมื่อวาน, %-H:%M"
+msgstr "เมื่อวาน, %H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "เมื่อวาน"
 
@@ -2847,133 +2791,133 @@ msgstr "เมื่อวาน"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
-msgstr ""
+msgstr "วันพฤหัสบดี ที่ 00 พฤศจิ�ายน พ.ศ. 0000 ตอน 00:00:00 น."
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
-msgstr ""
+msgstr "วัน%A ที่ %-d %B %EY ตอน %-H:%M:%S น."
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
-msgstr ""
+msgstr "อา. 13 มิ.ย. 2542, 22:48:32"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
-msgstr ""
+msgstr "%a %-d %b %Ey, %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
-msgstr ""
+msgstr "อา. 13 มิ.ย. 2542, 22:48"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
-msgstr ""
+msgstr "%a %-d %b %Ey, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
-msgstr ""
+msgstr "13 มิ.ย. 2542, 22:48"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
-msgstr ""
+msgstr "%-d %b %Ey, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
-msgstr ""
+msgstr "13 มิ.ย. 2542, 22:48"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
-msgstr ""
+msgstr "%-d %b %Ey, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
-msgstr ""
+msgstr "00/00/0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
-msgstr ""
+msgstr "%-d/%m/%Ey, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
-msgstr ""
+msgstr "00/00/0000"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
-msgstr ""
+msgstr "%d/%m/%Ey"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 ราย�าร"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 โฟลเดอร์"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 �ฟ้ม"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 ราย�าร"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 �ฟ้ม"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u ราย�าร"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u โฟลเดอร์"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u �ฟ้ม"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? ราย�าร"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? ไบต์"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "ชนิดที่ไม่รู้จั�"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "ไม่รู้จั�"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "โปร��รม"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -2983,7 +2927,7 @@ msgstr ""
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -2992,11 +2936,11 @@ msgstr ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "ตัวเชื่อม"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "ตัวเชื่อม (ขาด)"
 
@@ -3010,7 +2954,7 @@ msgstr "�ฟ้มท้องถิ่นเท่านั้น (_L)"
 
 #: libnautilus-private/nautilus-global-preferences.c:104
 msgid "_Never"
-msgstr "ไม่เลย (_N)"
+msgstr "ไม่ต้อง (_N)"
 
 #: libnautilus-private/nautilus-global-preferences.c:110
 #: src/nautilus-file-management-properties.glade.h:14
@@ -3117,11 +3061,13 @@ msgid "Search for files by file name and file properties"
 msgstr "หา�ฟ้มตามชื่อ�ฟ้ม�ละคุณลั�ษณะ"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "มุมมองสั�ลั�ษณ์"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "มุมมองรายชื่อ"
@@ -3265,151 +3211,155 @@ msgstr "บ้านของ %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
-#, fuzzy
+#: src/nautilus-window.c:1176
 msgid "Computer"
-msgstr "Countertop"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "สั�ลั�ษณ์�ฟ้ม"
+msgstr "คอมพิวเตอร์"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "ข้อความที่��้ไขได้"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "ฉลา�ที่��้ไขได้"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "ข้อความเพิ่มเติม"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ข้อความเพิ่มเติม"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "เน้นตัวที่ถู�เลือ�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "ว่าจะเน้นตัวที่ถู�เลือ�หรือไม่"
 
 # Don't know what this is for
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 #, fuzzy
 msgid "highlighted as keyboard focus"
 msgstr "เน้นเมื่อได้รับโฟ�ัส�ป้นพิมพ์"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 #, fuzzy
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "ว่าจะเน้นเมื่อได้รับโฟ�ัส�ป้นพิมพ์หรือไม่"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "สี่เหลี่ยมเลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Frame Text"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "วาด�รอบรอบข้อความที่ไม่ถู�เลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "สี�รอบเลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "สีของ�รอบเลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "ความทึบ�รอบเลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "ความทึบ�สงของ�รอบเลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "ความทึบของสีเน้น"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "ความทึบ�สงของสีเน้นสำหรับสั�ลั�ษณ์ที่ถู�เลือ�"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "สีอ่อนสำหรับข้อความ"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "สีของข้อความบนพื้นสีเข้ม"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "สีเข้มสำหรับข้อความ"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "สีของข้อความบนพื้นสีอ่อน"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
-"โฟลเดอร์นี้ใช้�ารวางผังสั�ลั�ษณ์โดยอัตโนมัติ "
-"คุณต้อง�ารเปลี่ยนไปใช้�ารวางผังด้วยมือ�ละจัดวางสั�ลั�ษณ์นี้ไว้ตรงที่ที่คุณทิ้งมันไว้หรือไม่? ถ้าเปลี่ยน "
-"ผังอันเ�่าจะถู�ลบทิ้ง"
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
-"โฟลเดอร์นี้ใช้�ารวางผังสั�ลั�ษณ์โดยอัตโนมัติ "
-"คุณต้อง�ารเปลี่ยนไปใช้�ารวางผังด้วยมือ�ละจัดวางสั�ลั�ษณ์นี้ไว้ตรงที่ที่คุณทิ้งมันไว้หรือไม่?"
+"โฟลเดอร์นี้ใช้�ารจัดวางสั�ลั�ษณ์โดยอัตโนมัติ "
+"คุณต้อง�ารเปลี่ยนไปใช้�ารจัดวางสั�ลั�ณณ์ด้วยมือ�ละวางสั�ลั�ษณ์นี้ไว้ตรงที่ที่คุณทิ้งมันไว้หรือไม่ ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
-"โฟลเดอร์นี้ใช้�ารวางผังสั�ลั�ษณ์โดยอัตโนมัติ "
-"คุณต้อง�ารเปลี่ยนไปใช้�ารวางผังด้วยมือ�ละจัดวางสั�ลั�ษณ์เหล่านี้ไว้ตรงที่ที่คุณทิ้งมันไว้หรือไม่?"
+"โฟลเดอร์นี้ใช้�ารจัดวางสั�ลั�ษณ์โดยอัตโนมัติ "
+"คุณต้อง�ารเปลี่ยนไปใช้�ารจัดวางสั�ลั�ณณ์ด้วยมือ�ละวางสั�ลั�ษณ์นี้ไว้ตรงที่ที่คุณทิ้งมันไว้หรือไม่ ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
-msgstr "เปลี่ยนไปใช้�ารวางผังสั�ลั�ษณ์ด้วยมือไหม?"
+msgstr "เปลี่ยนไปใช้�ารจัดวางสั�ลั�ษณ์ด้วยมือไหม ?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "เปลี่ยน"
 
@@ -3473,13 +3423,13 @@ msgstr "อยู่ในเมนูสำหรับ \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:345
 msgid "default for this file"
-msgstr "เป็นโปร��รมหลั�สำหรับ�ฟ้มนี้"
+msgstr "เป็นโปร��รมปริยายสำหรับ�ฟ้มนี้"
 
 #: libnautilus-private/nautilus-program-chooser.c:348
 #: libnautilus-private/nautilus-program-chooser.c:351
 #, c-format
 msgid "default for \"%s\""
-msgstr "เป็นโปร��รมหลั�สำหรับ \"%s\""
+msgstr "เป็นโปร��รมปริยายสำหรับ \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:396
 #, c-format
@@ -3504,302 +3454,334 @@ msgstr "อยู่ในเมนูสำหรับ�ฟ้มชนิด
 #: libnautilus-private/nautilus-program-chooser.c:408
 #, c-format
 msgid "Is the default for \"%s\"."
-msgstr "เป็นโปร��รมหลั�สำหรับ \"%s\""
+msgstr "เป็นโปร��รมปริยายสำหรับ \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:411
 #, c-format
 msgid "Is the default for \"%s\" items."
-msgstr "เป็นโปร��รมหลั�สำหรับ�ฟ้มชนิด \"%s\""
+msgstr "เป็นโปร��รมปริยายสำหรับ�ฟ้มชนิด \"%s\""
 
 #: libnautilus-private/nautilus-program-chooser.c:414
 #, c-format
 msgid "Is the default for all \"%s\" items."
-msgstr "เป็นโปร��รมหลั�สำหรับ�ฟ้มชนิด \"%s\" ทั้งหมด"
+msgstr "เป็นโปร��รมปริยายสำหรับ�ฟ้มชนิด \"%s\" ทั้งหมด"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "��้ไข \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "ใส่ไว้ในเมนูสำหรับ�ฟ้มชนิด \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
-msgstr "ใช้เป็นโปร��รมหลั�สำหรับ�ฟ้มชนิด \"%s\""
+msgstr "ใช้เป็นโปร��รมปริยายสำหรับ�ฟ้มชนิด \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "รวมไว้ในเมนูสำหรับ \"%s\" เท่านั้น"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
-msgstr "ใช้เป็นโปร��รมหลั�สำหรับ \"%s\" เท่านั้น"
+msgstr "ใช้เป็นโปร��รมปริยายสำหรับ \"%s\" เท่านั้น"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "อย่ารวมไว้ในเมนูสำหรับ�ฟ้มชนิด \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "ชื่อ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "สถานะ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "เลือ� (_H)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "เสร็จเรียบร้อย"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
-msgstr "��้ไข... (_M)"
+msgstr "��้ไข (_M) ..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "ชนิด�ฟ้ม �ละ โปร��รมที่ใช้เปิด"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "ไปที่นั่น (_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
-"คุณสามารถเลิ�ว่าโปร��รมไหนถู�เสนอให้เลือ�สำหรับ�ฟ้ม�ต่ละชนิดได้ที่�ล่อง \"ชนิด�ฟ้ม �ละ "
+"คุณสามารถเลิ�ว่าโปร��รมไหนถู�เสนอให้เลือ�ใช้สำหรับ�ฟ้ม�ต่ละชนิดได้ที่หน้าต่าง \"ชนิด�ฟ้ม �ละ "
 "โปร��รมที่ใช้เปิด\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "เปิดด้วยโปร��รมอื่น"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "เลือ�โปร��รมสำหรับใช้เปิด \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "เปิดด้วยตัวอ่านอื่น"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "เลือ�ตัวอ่านสำหรับ \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "ไม่มีตัวอ่านสำหรับ \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "ไม่มีตัวอ่าน"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "ไม่มีโปร��รมที่ตั้งไว้ใช้เปิด \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "ไม่มีโปร��รมที่ตั้งไว้"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1597
+#, c-format
 msgid "There is no action associated with \"%s\"."
-msgstr "ไม่มีโปร��รมที่ตั้งไว้ใช้เปิด \"%s\""
+msgstr "ไม่มีคำสั่งตั้งไว้สำหรับ \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
-msgstr "ไม่มีโปร��รมที่ตั้งไว้"
+msgstr "ไม่มีคำสั่งตั้งไว้"
 
 #. Note: This might be misleading in the components case, since the
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 "%s\n"
 "\n"
-"GNOME อนุ�าตุให้คุณตั้งโปร��รมที่จะใช้เปิด�ฟ้ม�ต่ละชนิด  "
-"คุณต้อง�ารตั้งโปร��รมที่จะใช้เปิด�ฟ้มชนิดนี้หรือไม่?"
+"คุณสามารถตั้งโปร��รมที่จะใช้เปิด�ฟ้ม�ต่ละชนิด  คุณต้อง�ารตั้งโปร��รมที่จะใช้เปิด�ฟ้มชนิดนี้หรือไม่ ?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "โปร��รมที่ใช้เปิด"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1639
+#, c-format
 msgid "The viewer associated with \"%s\" is invalid."
-msgstr "ไม่มีโปร��รมที่ตั้งไว้ใช้เปิด \"%s\""
+msgstr "ไม่สามารถใช้ตัว�สดงที่ตั้งไว้สำหรับ \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
-msgstr ""
+msgstr "เลือ�ตัว�สดงใว้ไม่ดี"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1642
+#, c-format
 msgid "The application associated with \"%s\" is invalid."
-msgstr "ไม่มีโปร��รมที่ตั้งไว้ใช้เปิด \"%s\""
+msgstr "ไม่สามารถใช้โปร��รมที่ตั้งไว้เปิด \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
-msgstr "ไม่มีโปร��รมที่ตั้งไว้"
+msgstr "เลือ�โปร��รมไว้ไม่ดี"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1645
+#, c-format
 msgid "The action associated with \"%s\" is invalid."
-msgstr "ไม่มีโปร��รมที่ตั้งไว้ใช้เปิด \"%s\""
+msgstr "คำสั่งที่ตั้งไว้สำหรับ \"%s\" ใช้ไม่ได้"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
-#, fuzzy
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
-msgstr "ไม่มีโปร��รมที่ตั้งไว้"
+msgstr "เลือ�คำสั่งไว้ไม่ดี"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 "%s\n"
 "\n"
-"GNOME อนุ�าตุให้คุณตั้งโปร��รมที่จะใช้เปิด�ฟ้ม�ต่ละชนิด  "
-"คุณต้อง�ารตั้งโปร��รมที่จะใช้เปิด�ฟ้มชนิดนี้หรือไม่?"
+"คุณสามารถตั้งโปร��รมไว้สำหรับ�ฟ้มชนิดต่างๆ  คุณต้อง�ารตั้งโปร��รมสำหรับ�ฟ้มชนิดนี้หรือไม่?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
-msgstr "โปร��รมที่ใช้เปิด"
+msgid "_Associate Action"
+msgstr "ตั้งคำสั่ง"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
+"คุณจะเลือ�ใช้โปร��รมอื่นหรือไม่?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
 "คุณจะเลือ�ใช้โปร��รมอื่นหรือไม่?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
-"\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
-"คุณจะเลือ�ใช้โปร��รมอื่นหรือไม่?"
+"คำสั่งที่ตั้งไว้เปิด \"%s\" ไม่สำเร็จเพราะมันไม่สามารถอ่าน�ฟ้มที่ \"%s\"  "
+"คุณต้อง�ารเลือ�คำสั่งอื่นหรือไม่ ?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "เปิดที่อยู่ที่ให้ไม่สำเร็จ"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
+"คุณจะเลือ�ใช้โปร��รมอื่นหรือไม่?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
 "โปร��รมอื่นในเครื่องไม่สามารถอ่าน�ฟ้มนี้ได้ ถ้าคุณคัดลอง�ฟ้มนี้มาไว้บนเครื่องของคุณ "
 "คุณอาจจะเปิดมันได้"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"คำสั่งที่ตั้งไว้เปิด \"%s\" ไม่สำเร็จเพราะมันไม่สามารถอ่าน�ฟ้มที่ \"%s\"  "
+"คุณต้อง�ารเลือ�คำสั่งอื่นหรือไม่ ?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" ไม่สามารถเปิด \"%s\" เพราะ \"%s\" ไม่สามารถเปิด�ฟ้มที่อยู่ใน \"%s\"  "
 "โปร��รมอื่นในเครื่องไม่สามารถอ่าน�ฟ้มนี้ได้ ถ้าคุณคัดลอง�ฟ้มนี้มาไว้บนเครื่องของคุณ "
 "คุณอาจจะเปิดมันได้"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
+#, c-format
 msgid "Opening %s"
-msgstr "�ำลังเปิด \"%s\""
+msgstr "�ำลังเปิด %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
-msgstr "เพื่อความปลอดภัย จะเรีย�ใช้คำสั่งบนเครื่องอื่นไม่ได้"
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr "เพื่อความปลอดภัย ไม่อนุ�าตุให้เรีย�ใช้โปร��รมที่มาจา�เครื่องอื่น"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
-msgstr "เรีย�ใช้โปร��รมจา�เครื่องอื่นไม่ได้"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
+msgstr "ห้ามเรีย�ใช้โปร��รมจา�เครื่องอื่น"
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "เ�ิดข้อผิดพลาดขณะเรีย�ใช้โปร��รม\n"
 "\n"
 "รายละเอียด: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "เ�ิดข้อผิดพลาดขณะเรีย�ใช้โปร��รม"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "จุดทิ้งใช้ได้�ต่�ับ�ฟ้มบนเครื่องนี้"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "จุดทิ้งนี้ใช้ได้�ต่�ับ�ฟ้มบนเครื่องนี้\n"
 "\n"
 "ถ้าต้อง�ารเปิด�ฟ้มบนเครื่องอื่น โปรดคัดลอ�มันมาไว้บนเครื่องนี้�ล้วลองใหม่"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "จุดทิ้งใช้ได้�ต่�ับ�ฟ้มบนเครื่องนี้"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4051,14 +4033,6 @@ msgstr "รายà¸�ารที่มีคำว่า \"stuff\" อยู่à
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "ราย�ารที่มีคำว่า \"medusa\" อยู่ในชื่อ �ละ เป็นโฟลเดอร์"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "�ำลังค้นหา..."
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus �ำลังค้นจานบันทึ�เพื่อหาโฟลเดอร์ถังขยะ"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "��้"
@@ -4069,7 +4043,7 @@ msgstr "เรีย�คืน"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:176
 msgid "Undo the edit"
-msgstr ""
+msgstr "ย�เลิ��าร��้ไข"
 
 #: libnautilus-private/nautilus-undo-signal-handlers.c:177
 msgid "Redo Edit"
@@ -4127,7 +4101,7 @@ msgstr "�ปะข้อความ (_P)"
 
 #: nautilus-computer.desktop.in.h:2
 msgid "View your computer storage"
-msgstr ""
+msgstr "ดู�หล่งเ�็บข้อมูลบนเครื่อง"
 
 #: nautilus-file-management-properties.desktop.in.h:1
 msgid "Change how files are managed"
@@ -4142,9 +4116,8 @@ msgid "View your home folder in the Nautilus file manager"
 msgstr "เปิดโฟลเดอร์บ้านใน Nautilus file manager"
 
 #: nautilus.desktop.in.h:1
-#, fuzzy
 msgid "Browse Filesystem"
-msgstr "โฟลเดอร์บ้าน"
+msgstr "เรีย�ดูระบบ�ฟ้ม"
 
 #: nautilus.desktop.in.h:2
 msgid "Browse the filesystem with the file manager"
@@ -4160,7 +4133,7 @@ msgstr "สั�ลั�ษณ์"
 
 #: src/Nautilus_shell.server.in.h:3
 msgid "Icons Viewer"
-msgstr "ตัว�สดงมุมมองสั�ลั�ษณ์"
+msgstr "ตัว�สดงสั�ลั�ษณ์"
 
 #: src/Nautilus_shell.server.in.h:4
 msgid "List"
@@ -4182,15 +4155,15 @@ msgstr "Component ของ Nautilus ที่à¹�สดงมุมมองรà
 msgid ""
 "Nautilus file manager component that shows a scrollable list for search "
 "results"
-msgstr "Component ของ Nautilus ที่�สดงมุมมองรายชื่อสำหรับผล�ารค้นหา"
+msgstr "คอมโพเนนต์ของ Nautilus ที่�สดงมุมมองรายชื่อผล�ารค้นหา"
 
 #: src/Nautilus_shell.server.in.h:9
 msgid "Nautilus file manager component that shows a two-dimensional icon space"
-msgstr "Component ของ Nautilus ที่�สดงพื้นที่สองมิติสำหรับสั�ลั�ษณ์ (มุมมองสั�ลั�ษณ์)"
+msgstr "คอมโพเนนต์ของ Nautilus ที่�สดงพื้นที่สองมิติสำหรับสั�ลั�ษณ์ (มุมมองสั�ลั�ษณ์)"
 
 #: src/Nautilus_shell.server.in.h:10
 msgid "Nautilus file manager component that shows icons on the desktop"
-msgstr "Component ของ Nautilus ที่�สดงสั�ลั�ษณ์บนพื้นโต๊ะ"
+msgstr "คอมโพเนนต์ของ Nautilus ที่�สดงสั�ลั�ษณ์บนพื้นโต๊ะ"
 
 #: src/Nautilus_shell.server.in.h:11
 msgid "Nautilus file manager desktop icon view"
@@ -4255,96 +4228,106 @@ msgstr "พื้นหลัง"
 msgid "Empty Trash"
 msgstr "เทขยะ"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "นี่จะเปิดหน้าต่าง %d บาน คุณต้อง�ารจะทำอย่างนั้นจริงๆหรือ ?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "เปิดหน้าต่าง %d บาน ?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "�น่ใจนะว่าจะลบ \"%s\" อย่างถาวร ?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "นี่จะเปิดหน้าต่าง %d บาน คุณต้อง�ารจะทำอย่างนั้นจริงๆหรือ ?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "�น่ใจนะว่าจะลบ \"%s\" อย่างถาวร ?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "�น่ใจนะว่าจะลบ�ฟ้มหรือโฟลเดอร์ทั้ง %d อันอย่างถาวร ?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "เทถังขยะ�ล้วข้อมูลจะถู�ลบทิ้งโดยถาวร"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "ลบ ?"
 
-#: src/file-manager/fm-directory-view.c:972
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
-msgstr "เลือ�สั�ลั�ษณ์:"
+msgstr "เลือ�รูป�บบ"
 
-#: src/file-manager/fm-directory-view.c:988
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
-msgstr "ลวดลาย (_P)"
+msgstr ""
+"รูป�บบ (_P):\n"
+"เช่น *.mp3"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" ถู�เลือ�"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 �ฟ้มถู�เลือ�"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d �ฟ้มถู�เลือ�"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (บรรจุ 0 ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (บรรจุ 1 ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (บรรจุ %d ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (บรรจุทั้งหมด 0 ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (บรรจุทั้งหมด 1 ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (บรรจุทั้งหมด %d ราย�าร)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" ถู�เลือ� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d ราย�าร ถู�เลือ� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ราย�าร ถู�เลือ� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ราย�ารอื่นๆ ถู�เลือ� (%s)"
@@ -4356,7 +4339,7 @@ msgstr "%d ราย�ารอื่นๆ ถู�เลือ� (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4365,110 +4348,129 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr "โฟลเดอร์ \"%s\" มี�ฟ้มมา�เ�ิน�ว่าที่ Nautilus จะรับได้ บาง�ฟ้มอาจจะไม่ถู��สดง"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "�ฟ้มมา�เ�ินไป"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "ย้าย \"%s\" ไปถังขยะไม่ได้  จะลบทิ้งถาวรเลยไหม ?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr "ย้าย %d ราย�ารที่เลือ�ไปถังขยะไม่ได้  จะลบทิ้งถาวรเลยไหม ?"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "ย้าย \"%s\" ไปถังขยะไม่ได้  จะลบทิ้งถาวรเลยไหม ?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"ย้ายบางราย�ารที่เลือ� (%d ราย�าร) ไปถังขยะไม่ได้  จะลบ %d ราย�ารนี้ทิ้งถาวรเลยไหม ?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "ย้าย \"%s\" ไปถังขยะไม่ได้  จะลบทิ้งถาวรเลยไหม ?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "ลบทิ้งถาวร ?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "�น่ใจนะว่าจะเท \"%s\" ทิ้งจา�ถังขยะอย่างถาวร ?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "�น่ใจนะว่าจะเท %d ราย�ารที่เลือ�ทิ้งจา�ถังขยะอย่างถาวร ?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+#, fuzzy
+msgid "If you delete an item, it will be permanently lost."
+msgstr "เทถังขยะ�ล้วข้อมูลจะถู�ลบทิ้งโดยถาวร"
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "เททิ้งจา�ถังขยะ ?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "ใช้ \"%s\" เปิดราย�ารที่เลือ�"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "โปร��รมอื่น... (_A)"
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
-msgstr ""
+msgstr "โปร��รม... (_A)"
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "ตัวอ่านอื่น... (_V)"
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "ทำคำสั่งที่ให้ไม่สำเร็จ:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "ทำคำสั่งที่ให้ไม่สำเร็จ"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "เรีย�ใช้ \"%s\" บน�ต่ละราย�ารที่เลือ�"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"ทุ��ฟ้มในโฟลเดอร์นี้ที่เป็นโปร��รมจะโผล่ขึ้นมาในเมนูสคริปต์ "
+"ถ้าคุณเลือ�สคริปต์จา�เมนูนี้สคริปต์นั้นจะถู�เรีย�ใช้โดยมีราย�ารที่เลือ�ไว้เป็นค่านำเข้า (input)"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "ทุ��ฟ้มในโฟลเดอร์นี้ที่เป็นโปร��รมจะโผล่ขึ้นมาในเมนูสคริปต์ "
 "ถ้าคุณเลือ�สคริปต์จา�เมนูนี้สคริปต์นั้นจะถู�เรีย�ใช้โดยมีราย�ารที่เลือ�ไว้เป็นค่านำเข้า (input)"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "เ�ี่ยว�ับสคริปต์"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4490,177 +4492,179 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" จะถู�ย้ายถ้าคุณเลือ�คำสั่ง \"�ปะ�ฟ้ม\""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" จะถู�คัดลอ�ถ้าคุณเลือ�คำสั่ง \"�ปะ�ฟ้ม\""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "%d ราย�ารที่เลือ�จะถู�ย้ายถ้าคุณเลือ�คำสั่ง \"�ปะ�ฟ้ม\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d ราย�ารที่เลือ�จะถู�คัดลอ�ถ้าคุณเลือ�คำสั่ง \"�ปะ�ฟ้ม\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "ไม่มีอะไรในคลิปบอร์ดจะ�ปะ"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Mount Error"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Unmount Error"
 
-#: src/file-manager/fm-directory-view.c:4739
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
-msgstr "Mount Error"
+msgstr "Eject Error"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "เอา�ผ่นออ� (_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Unmount Volume"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "เปิดในหน้าต่างใหม่ (_I)"
 
-#: src/file-manager/fm-directory-view.c:5043
-#, fuzzy, c-format
+#: src/file-manager/fm-directory-view.c:5531
+#, c-format
 msgid "Open in %d New Windows"
-msgstr "เปิดใน %d หน้าต่างใหม่ (_I)"
+msgstr "เปิดใน %d หน้าต่างใหม่"
 
-#: src/file-manager/fm-directory-view.c:5048
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5536
 msgid "Browse Folder"
-msgstr "โฟลเดอร์บ้าน"
+msgstr "เรีย�ดูโฟลเดอร์"
 
-#: src/file-manager/fm-directory-view.c:5050
-#, fuzzy
+#: src/file-manager/fm-directory-view.c:5538
 msgid "Browse Folders"
-msgstr "โฟลเดอร์บ้าน"
+msgstr "เรีย�ดูโฟลเดอร์"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "เททิ้งจา�ถังขยะ (_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "ลบราย�ารที่เลือ�ทั้งหมดอย่างถาวร"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "ทิ้งลงถังขยะ (_V)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "ย้ายราย�ารที่เลือ�ไปไว้ในถังขยะ"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "ลบ (_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "สร้างจุดเชื่อม (_K)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "สร้างจุดเชื่อม (_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "เทขยะทิ้ง (_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "ตัด�ฟ้ม (_T)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "ตัด�ฟ้ม (_T)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "คัดลอ��ฟ้ม (_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "คัดลอ��ฟ้ม (_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr "จุดเชื่อมนี้ใช้ไม่ได้เพราะมันไม่มีจุดหมาย  จะทิ้งจุดเชื่อมนี้ลงถังขยะไหม ?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr "จุดเชื่อมนี้ใช้ไม่ได้เพราะมันไม่มีจุดหมาย  จะทิ้งจุดเชื่อมนี้ลงถังขยะไหม ?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "จุดเชื่อมขาด"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "\"%s\" เป็น text file ที่เรีย�ใช้ได้ คุณต้อง�ารจะเรีย�ใช้มันหรืออ่านมัน ?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "เรีย�ใช้ หรือ อ่าน"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "อ่าน (_D)"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "เรีย�ใช้ใน Terminal (_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "อ่าน (_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "เรีย�ใช้ (_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "�ำลังเปิด \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "ย�เลิ��ารเปิด ?"
 
@@ -4681,107 +4685,132 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "ไม่สามารถ�สดงข้อมูลทั้งหมดของ \"%s\""
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "เ�ิดข้อผิดพลาดขณะ�สดงโฟลเดอร์"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "มีราย�ารชื่อ \"%s\" อยู่ในโฟลเดอร์นี้�ล้ว  โปรดใช้ชื่ออื่น"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "ไม่มีราย�ารชื่อ \"%s\" ในโฟลเดอร์นี้  มันอาจจะพึ่งถู�ลบไป"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "คุณไม่ได้รับสิทธิใน�ารเปลี่ยนชื่อ \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "ใช้ชื่อ \"%s\" ไม่ได้เพราะมันมีตัวอั�ษร \"/\".  โปรดใช้ชื่ออื่น"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "ชื่อ \"%s\" ใช้ไม่ได้.  โปรดใช้ชื่ออื่น"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "เปลี่ยนชื่อ \"%s\" ไม่ได้เพราะมันอยู่บนจานที่อ่านได้เท่านั้น"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "เปลี่ยนชื่อ \"%s\" ไปเป็น \"%s\" ไม่ได้"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยนชื่อ"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "คุณไม่ได้รับสิทธิใน�ารเปลี่ยน�ลุ่มของ \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "เปลี่ยน�ลุ่มของ \"%s\" ไม่ได้เพราะมันอยู่บนจานที่เขียนได้เท่านั้น"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "เปลี่ยน�ลุ่มของ \"%s\" ไม่ได้"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยน�ลุ่ม"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "เปลี่ยนเจ้าของ ของ \"%s\" ไม่ได้เพราะมันอยู่บนจานที่เขียนได้เท่านั้น"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "เปลี่ยนเจ้าของ ของ \"%s\" ไม่ได้"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยนเจ้าของ"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "เปลี่ยนสิทธิ์ของ \"%s\" ไม่ได้เพราะมันอยู่บนจานที่เขียนได้เท่านั้น"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "เปลี่ยนสิทธิ์ของ \"%s\" ไม่ได้"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "เ�ิดข้อผิดพลาดขณะเปลี่ยนสิทธิ์"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "�ำลังเปลี่ยนชื่อ \"%s\" ไปเป็น \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "ย�เลิ��ารเปลี่ยนชื่อ ?"
 
@@ -4839,123 +4868,140 @@ msgstr "เปลี่ยน�ลับไปใช้ขนาดปร�ต
 msgid "Restore Icon's Original Si_ze"
 msgstr "เปลี่ยน�ลับไปใช้ขนาดปร�ติของสั�ลั�ษณ์ (_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "�ำลังชี้ไปที่ \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "�ารลา��ล้วปล่อยนั้นใช้ได้�ต่�ับ�ฟ้มบนเครื่องนี้"
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "�ารลา��ล้วปล่อยนั้นใช้ได้�ต่�ับ�ฟ้มบนเครื่องนี้"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "เ�ิดข้อผิดพลาดขณะลา��ล้วปล่อย"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "ชื่อ�ฟ้ม"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "ขนาด"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "ประเภท"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "วันที่ถู���้ไข"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr "ถ้าจะเปลี่ยนสั�ลั�ษณ์ โปรดลา�ภาพมา�ค่ที่ละหนี่งภาพ"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr "ถ้าจะเปลี่ยนสั�ลั�ษณ์ โปรดลา�ภาพมา�ค่ที่ละหนี่งภาพ"
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "มีมา��ว่าหนี่งภาพ"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr "�ฟ้มที่ลา�มาไม่ได้อยู่บนเครื่องนี้  ภาพสำหรับสั�ลั�ษณ์ต้องอยู่บนเครื่องนี้"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr "�ฟ้มที่ลา�มาไม่ได้อยู่บนเครื่องนี้  ภาพสำหรับสั�ลั�ษณ์ต้องอยู่บนเครื่องนี้"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "ภาพจา�เครื่องนี้เท่านั้น"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr "�ฟ้มที่ลา�มาไม่ใช่ภาพ"
+#, fuzzy
+msgid "The file that you dropped is not an image."
+msgstr "�ฟ้มที่ลา�มาไม่ได้อยู่บนเครื่องนี้  ภาพสำหรับสั�ลั�ษณ์ต้องอยู่บนเครื่องนี้"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "ภายเท่านั้น"
 
-#: src/file-manager/fm-properties-window.c:916
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "คุณสมบัติ (_P)"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "คุณสมบัติของ %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "ย�เลิ��ารเปลี่ยน�ลุ่ม ?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "�ำลังเปลี่ยน�ลุ่ม"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "ย�เลิ��ารเปลี่ยนเจ้าของ ?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "�ำลังเปลี่ยนเจ้าของ"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "ไม่มีอะไร"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "อ่านไม่ได้"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 ราย�าร, ขนาด %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d ราย�าร, ขนาดทั้งหมด %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(อ่านข้อมูลบางส่วนไม่ได้)"
 
@@ -4965,197 +5011,192 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "เนื้อหา:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "พื้น�าน"
 
-#: src/file-manager/fm-properties-window.c:2208
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "ชื่อ (_N):"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "ชื่อ (_N):"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "ประเภท:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "ขนาด:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "ตำ�หน่ง:"
 
-#: src/file-manager/fm-properties-window.c:2282
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
-msgstr "ระดับเสียง DVD"
+msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
-msgstr ""
+msgstr "เนื้อที่ว่าง:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "เป้าหมายจุดเชื่อม:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "ประเภท MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
-msgstr "ถู���้ไข:"
+msgstr "��้ไขเมื่อ:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "เปิดอ่าน:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "เลือ�สั�ลั�ษณ์ (_S)..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "ใช้สั�ลั�ษณ์ปริยาย (_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "อ่าน (_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "เขียน (_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
-msgstr "เรีย�ใช้ (_X)"
+msgstr "เป็นโปร��รม (_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "ตั้งหมายเลขผู้ใช้(UID) (_U)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "ป้ายบอ�สถานะพิเศษ:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "ตั้งหมายเลข�ลุ่ม(GID) (_U)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "สิทธิ์ที่อนุ�าต"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "คุณไม่ใช่เจ้าของ�ฟ้ม/โฟลเดอร์ คุณจึงเปลี่ยนสิทธิ์เหล่านี้ไม่ได้"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr "เจ้าของ�ฟ้ม (_O):"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "เจ้าของ�ฟ้ม:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "�ลุ่มของ�ฟ้ม (_F):"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "�ลุ่มของ�ฟ้ม:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "เจ้าของ:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "�ลุ่ม:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "อื่นๆ:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "ดูเป็นข้อความ:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "ดูเป็นตัวเลข:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "��้ไขเมื่อ:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
 
-#: src/file-manager/fm-properties-window.c:3006
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
-msgstr "ไม่รู้สิทธิ์สำหรับ \"%s\""
+msgstr "ไม่รู้สิทธิ์สำหรับ�ฟ้มที่เลือ�"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"เ�ิดข้อผิดพลาดขณะ�สดงวิธีใช้: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "เ�ิดข้อผิดพลาดขณะ�สดงวิธีใช้: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�สดงวิธีใช้ไม่ได้"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "ย�เลิ��าร�สดงหน้าต่างคุณสมบัติ ?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "�ำลังสร้างหน้าต่างคุณสมบัติ"
 
-#: src/file-manager/fm-properties-window.c:3788
-#, fuzzy
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
-msgstr "เลือ�สั�ลั�ษณ์:"
+msgstr "เลือ�สั�ลั�ษณ์"
 
 #: src/file-manager/fm-search-list-view.c:124
 #, c-format
@@ -5169,89 +5210,124 @@ msgid "Search Results"
 msgstr "ผล�ารค้นหา"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "บริ�ารค้นหาของ Medusa ยังไม่ได้ถู�ติดตั้ง"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "บริ�ารค้นหา (Medusa) ไม่มีให้ใช้"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "บริ�ารค้นหายังไม่ได้ถู�ติดตั้ง"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "สิ่งที่คุณเลือ�หานั้นใหม่�ว่าดัชนีบนเครื่อง คุณจะหา�ฟ้มที่เลือ�ไม่เจอ  ถ้าต้อง�ารจะสร้างดัชนีใหม่ "
 "โปรดใช้คำสั่ง \"medusa-indexd\" ขณะเป็นผู้ใช้ root"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"ตัวค้นหาไม่สามารถเปิดดัชนี�ฟ้มได้  ดัชนีของคุณอาจจะหายหรือเสียไป  "
+"คุณสามารถสร้างดัชนีใหม่ได้โดยใช้คำสั่ง \"medusa-indexd\" ขณะเป็นผู้ใช้ root"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "สิ่งที่หานั้นใหม่เ�ินไป"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"�ฟ้มทุ��ฟ้มบนเครื่องคุณในดัชนีตรง�ับข้อ�ำหนดที่คุณตั้ง  "
+"คุณอาจจะอยา�สำรวจข้อ�ำหนด�ารค้นหาของคุณดูอี�ครั้ง"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "�ฟ้มทุ��ฟ้มบนเครื่องคุณในดัชนีตรง�ับข้อ�ำหนดที่คุณตั้ง  "
 "คุณอาจจะอยา�สำรวจข้อ�ำหนด�ารค้นหาของคุณดูอี�ครั้ง"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "เ�ิดข้อผิดพลาดขณะค้นหา"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "ตัวค้นหาไม่สามารถเปิดดัชนี�ฟ้มได้  ดัชนีของคุณอาจจะหายหรือเสียไป  "
 "คุณสามารถสร้างดัชนีใหม่ได้โดยใช้คำสั่ง \"medusa-indexd\" ขณะเป็นผู้ใช้ root"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "เ�ิดข้อผิดพลาดขณะอ่านดัชนี�ฟ้ม"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "เ�ิดข้อผิดพลาดขณะอ่านข้อมูลของ�ารค้นหา: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr "คุณต้องมีดัชนี�ฟ้มถึงจะค้นหาจา�เนื้อหาได้  ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จ"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr "คุณต้องมีดัชนี�ฟ้มถึงจะค้นหาจา�เนื้อหาได้  ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จ"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 "คุณต้องมีดัชนี�ฟ้มถึงจะใ่ช้�ารค้นหา�บบเร็วได้  "
 "ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จจึงจะใช้�ารค้นหา�บบช้า�ทน"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
-msgstr "คุณต้องมีดัชนี�ฟ้มถึงจะค้นหาจา�เนื้อหาได้  ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จ"
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
+msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "ค้นหา�บบเร็วไม่ได้"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "ค้นหาจา�เนื้อหาไม่ได้"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5264,51 +5340,79 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "เพื่อที่จะค้นหา�บบเร็ว ทางโปร��รมต้องใช้ดัชนี�ฟ้มซึ่งขณะนี้เครื่องของคุณ�ำลังสร้างอยู่ "
 "ตอนนี้ยังใช้ดัชนีไม่ได้จึงจะใช้�ารค้นหา�บบช้าไป�่อน นี่อาจจะใช้เวลาหลายนาที"
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "ใน�ารค้นหาจา�เนื้อหา ทางโปร��รมต้องใช้ดัชนี�ฟ้มซึ่งขณะนี้เครื่องของคุณ�ำลังสร้างอยู่ "
 "คุณต้องรอให้ดัชนีถู�สร้างเสร็จ�่อนที่จะค้นหาจา�เนื้อหาได้"
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "ไม่มี�ารค้นหาจา�ดัชนีให้ใช้"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr "คุณต้องมีดัชนี�ฟ้มถึงจะค้นหาจา�เนื้อหาได้  ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จ"
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr "คุณต้องมีดัชนี�ฟ้มถึงจะค้นหาจา�เนื้อหาได้  ขณะนี้โปร��รมเรีย�ใช้ดัชนีไม่สำเร็จ"
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "เพื่อที่จะค้นหา�บบเร็ว ทางโปร��รมต้องใช้ดัชนี�ฟ้ม ซึ่งขณะนี้เครื่องของคุณไม่มี "
 "คุณสามารถสร้างดัชนีได้โดยใช้คำสั่ง \"medusa-indexd\" ขณะเป็นผู้ใช้ root  "
 "ในตอนนี้จะใช้�ารค้นหา�บบช้าไป�่อน นี่อาจจะใช้เวลาหลายนาที"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "ใน�ารค้นหาจา�เนื้อหา ทางโปร��รมต้องใช้ดัชนี�ฟ้ม ซึ่งขณะนี้เครื่องของคุณไม่มี "
 "คุณสามารถสร้างดัชนีได้โดยใช้คำสั่ง \"medusa-indexd\" ขณะเป็นผู้ใช้ root"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "ไม่มี�ารค้นหา�บบเร็วให้ใช้บนเครื่องคุณ"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5317,11 +5421,12 @@ msgstr ""
 "เพื่อที่จะค้นหา�บบเร็ว ทางโปร��รมต้องใช้ดัชนี�ฟ้ม "
 "ผู้ดู�ลระบบของคุณปิด�ารค้นหา�บบเร็วไว้จึงไม่มีดัชนีให้ใช้"
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "ไม่มี�ารค้นหา�บบเร็วให้ใช้บนเครื่องคุณ"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "ค้นหา�บบเร็วไม่ได้"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "ที่ใหน"
 
@@ -5330,7 +5435,7 @@ msgstr "ที่ใหน"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "เปิดหน้าต่างใหม่�ล้วเลือ� (_R)"
@@ -5341,7 +5446,7 @@ msgstr "เปิดหน้าต่างใหม่�ล้วเลือ
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "เปิด %d หน้าต่างใหม่�ล้วเลือ� (_N)"
@@ -5350,13 +5455,17 @@ msgstr "เปิด %d หน้าต่างใหม่à¹�ล้วเลà¸
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr "Nautilus เจอ�ฟ้มที่ตรงข้อค้นหามา��ว่าที่จะ�สดงผลได้ จะ�สดง�ฟ้มที่เจอไม่หมดทุ��ฟ้ม"
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr "Nautilus เจอ�ฟ้มที่ตรงข้อค้นหามา��ว่าที่จะ�สดงผลได้ จะ�สดง�ฟ้มที่เจอไม่หมดทุ��ฟ้ม"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "เจอ�ฟ้มมา�เ�ินไป"
 
@@ -5366,24 +5475,22 @@ msgstr "เปลี่ยนพื้นหลังของพื้นโต
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 #: src/file-manager/nautilus-directory-view-ui.xml.h:4
-#, fuzzy
 msgid "Create L_auncher"
 msgstr "ตัวเรีย�โปร��รมใหม่ (_A)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "สร้างตัวเรีย�โปร��รมใหม่"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "ลบราย�ารทั้งหมดในถังขยะ"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
-#, fuzzy
 msgid "Open T_erminal"
-msgstr "เทอร์มินอลใหม่"
+msgstr "เทอร์มินอลใหม่ (_E)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:7
 msgid "Open a new GNOME terminal window"
@@ -5396,7 +5503,7 @@ msgstr "เปิดหน้าต่างเลือ�สีหรือล
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "ใช้พื้นหลังปริยาย (_D)"
@@ -5419,185 +5526,197 @@ msgstr "เลือ�ใช้โปร��รมอื่นเปิดร
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
-msgstr "โฟลเดอร์บ้าน"
+msgid "Create _Document"
+msgstr "สร้างโฟลเดอร์ใหม่ (_F)"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "สร้างโฟลเดอร์ใหม่ (_F)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "สร้างโฟลเดอร์เปล่าข้างในโฟลเดอร์นี้"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "สร้างโฟลเดอร์เปล่าข้างในโฟลเดอร์นี้"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "สร้างตัวเชื่อมสำหรับ�ต่ละราย�ารที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "ทำสำเนา (_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "ลบราย�ารที่เลือ�โดยไม่ส่งไปถังขยะ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "สร้างสำเนาของ�ต่ละราย�ารที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "��้ไขตัวเรีย�โปร��รม"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "��้ไขตัวเรีย�โปร��รม"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "ฟอร์�มตไดรฟ์ข้อมูลที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "คุณสมบัติของสื่อ (_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
-msgstr "ฟอร์�มตไดรฟ์ข้อมูลที่เลือ�"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "ย้ายหรือคัดลอ��ฟ้มที่ถู� \"ตัด\" หรือ \"คัดลอ�\" ไว้ มาที่นี่"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
-msgstr "ย้ายหรือคัดลอ��ฟ้มที่ถู� \"ตัด\" หรือ \"คัดลอ�\" ไว้ มาที่นี่"
+msgstr "ย้ายหรือคัดลอ��ฟ้มที่ถู� \"ตัด\" หรือ \"คัดลอ�\" ไว้ มาที่โฟลเดอร์ที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "เปิดด้วย (_H)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "เปิดราย�ารที่เลือ�ในหน้าต่างใหม่"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "เปิดในหน้าต่างใหม่ (_I)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "เปิดราย�ารที่เลือ�ในหน้าต่างนี้"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "เตรียมราย�ารที่เลือ�ไว้สำหรับคัดลอ�ด้วยคำสั่ง \"�ปะ\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "เตรียมราย�ารที่เลือ�ไว้สำหรับย้ายด้วยคำสั่ง \"�ปะ\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "ป้อง�ัน (_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "ป้อง�ันไดรฟ์ข้อมูลที่เลือ� (_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "เปลี่ยนชื่อราย�ารที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "ใช้ค่าปริยายของมุมมอง (_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "ใช้�ารเรียง�ฟ้ม�ละขนาดขยายจา�ค่าปริยายของมุมมองนี้"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "เรีย�หรือจัดสคริปต์จา� ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "เลือ�ทุ��ฟ้ม (_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
-msgstr "ลวดลาย (_P)"
+msgstr "เลือ�รูป�บบ (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "เลือ�ราย�ารทุ�ราย�ารในหน้าต่างนี้"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
-msgstr "เลือ�ราย�ารทุ�ราย�ารในหน้าต่างนี้"
+msgstr "เลือ�ราย�ารในหน้าต่างนี้ที่ตรง�ับรูป�บบที่�ำหนด"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "�สดงคุณสมบัติสื่อของไดฟ์ข้อมูลที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "เปิดโฟลเดอร์ที่บรรจุสคริปต์ที่�สดงในเมนูนี้"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "ใช้พื้นหลังปริยายสำหรับตำ�หน่งนี้"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "ดูหรือ��้ไขคุณสมบัติของ�ต่ละราย�ารที่เลือ�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "คัดลอ��ฟ้ม (_C)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "ฟอร์�มต (_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
-msgstr "_Unmount Volume"
+msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "เปิด (_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "เปิดหน้าต่างสคริปต์ (_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "�ปะ�ฟ้ม (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
-#, fuzzy
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
-msgstr "�ปะ�ฟ้ม (_P)"
+msgstr "�ปะ�ฟ้มลงในโฟลเดอร์ (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "คุณสมบัติ (_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "เปลี่ยนชื่อ (_R)..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "สคริปต์ (_S)"
 
@@ -5631,16 +5750,15 @@ msgstr "เรียงให้เรียบร้อยตามชื่อ
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:8
 msgid "Compact _Layout"
-msgstr "ใช้ผัง�บบ�ระชับ (_L)"
+msgstr "จัดวางสั�ลั�ษณ์อย่าง�ระชับ (_L)"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:9
 msgid "Display icons in the opposite order"
 msgstr "เรียงสั�ลั�ษณ์ย้อน�ับปร�ติ"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:10
-#, fuzzy
 msgid "Keep icons lined up on a grid"
-msgstr "คอยเรียงสั�ลั�ษณ์เป็น�ถวตามชื่อ"
+msgstr "คอยเรียงสั�ลั�ษณ์ให้ตรง�นว"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:16
 msgid "Leave icons wherever they are dropped"
@@ -5664,15 +5782,15 @@ msgstr "�ลับไปใช้ขนาดปร�ติของสั�
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:22
 msgid "Str_etch Icon"
-msgstr "ยืดสั�ลั�ษณ์ (_E)"
+msgstr "ปรับขนาดสั�ลั�ษณ์ (_E)"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:23
 msgid "Toggle using a tighter layout scheme"
-msgstr "เปลี่ยนไปใช้�ารจัดผังสั�ลั�ษณ์�บบ�ระชับ"
+msgstr "จัดวางสั�ลั�ษณ์ให้�ระชับใ�ล้�ัน"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:24
 msgid "_Keep Aligned"
-msgstr ""
+msgstr "คอยจัดให้ตรง�นว (_K)"
 
 #: src/file-manager/nautilus-icon-view-ui.xml.h:25
 msgid "_Manually"
@@ -5683,31 +5801,38 @@ msgstr "ด้วยมือ (_M)"
 msgid "Indexing is %d%% complete."
 msgstr "สร้างดัชนีไปได้ %d%%"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "ดัชนีสำหรับ�ฟ้มของคุณถู�สร้างครั้งสุดท้ายเมื่อ %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "เครื่องสร้างดัชนีสำหรับ�ฟ้ม�ละเนื้อหา text ทุ�ๆวันเพื่อคุณค้นหา�ฟ้มได้เร็วขึ้น"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "ผล�ารสร้างดัชนี"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "ดัชนีสำหรับ�ฟ้มของคุณถู�สร้างครั้งสุดท้ายเมื่อ %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
-msgstr ""
-"เครื่องสร้างดัชนีสำหรับ�ฟ้ม�ละเนื้อหา text ทุ�ๆวันเพื่อคุณค้นหา�ฟ้มได้เร็วขึ้น "
-"ขณะนี้เครื่อง�ำลังสร้างดัชนี"
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr "เครื่องสร้างดัชนีสำหรับ�ฟ้ม�ละเนื้อหา text ทุ�ๆวันเพื่อคุณค้นหา�ฟ้มได้เร็วขึ้น"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "คุณจึงยังไม่มีดัชนี�ฟ้ม"
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5716,15 +5841,19 @@ msgstr ""
 "ถ้าคุณเปิด�ารค้นหา�บบเร็ว เครื่องจะสร้างดัชนี�ฟ้มเพื่อใช้ทำให้�ารค้นหาเร็วขึ้น "
 "�ารค้นหา�บบเร็วถู�ปิดอยู่ คุณจึงยังไม่มีดัชนี�ฟ้ม"
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "คุณจึงยังไม่มีดัชนี�ฟ้ม"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "บริ�ารค้นหา (Medusa) ไม่มีให้ใช้"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -5748,31 +5877,36 @@ msgstr "�สดงผล�ารสร้างดัชนี (_I)"
 msgid "Show status of indexing used when searching"
 msgstr "�สดงผล�ารสร้างดัชนีขณะค้นหา"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "สร้างโฟลเดอร์ที่จำเป็นไม่สำเร็จ"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "สร้างโฟลเดอร์ที่จำเป็นไม่สำเร็จ"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus สร้างโฟลเดอร์ที่จำเป็นซึ่งชื่อ \"%s\" ไม่สำเร็จ �่อนจะใช้ Nautilus "
 "โปรดสร้างโฟลเดอร์นี้ หรือตั้งสิทธิ์ที่อนุ�าตอย่างที่ยอม Nautilus สร้างโฟลเดอร์นี้ได้"
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "สร้างโฟลเดอร์ที่จำเป็นไม่สำเร็จ"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5783,21 +5917,28 @@ msgstr ""
 "�่อนจะใช้ Nautilus โปรดสร้างเหล่านี้โฟลเดอร์นี้ หรือตั้งสิทธิ์ที่อนุ�าตอย่างที่ยอม Nautilus "
 "สร้างเหล่านี้โฟลเดอร์นี้ได้"
 
-#: src/nautilus-application.c:334
-#, fuzzy
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
-msgstr "บนพื้นโต๊ะ"
+msgstr "จุดเชื่อมไปพื้นโต๊ะเ�่า"
+
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
 
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
+"GNOME 2.4 ใช้ตำ�หน่งโฟลเดอร์พื้นโต๊ะที่ต่างจา� GNOME รุ่น�่อนๆ  คุณจะเจอ "
+"\"จุดเชื่อมไปพื้นโต๊ะเ�่า\" อยู่บนพื้นโต๊ะใหม่  ถ้าต้อง�าร คุณสามารถเปิดจุดเชื่อมนี้ "
+"ย้าย�ฟ้มเ�่าๆมาที่พื้นโต๊ะใหม่ �ละลบจุดเชื่อมนี้"
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "ย้ายไปพื้นโต๊ะใหม่"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5809,7 +5950,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5819,7 +5960,7 @@ msgstr ""
 "ถ้าปั�หาไม่หายไปลองรีบูตเครื่องหรือติดตั้ง Nautilus ใหม่"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5848,48 +5989,57 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"เ�ิดข้อผิดพลาดขณะ�สดงวิธีใช้: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "ยังไม่มีที่คั่นหน้า"
 
 #: src/nautilus-bookmarks-window.glade.h:1
-#, fuzzy
 msgid "<b>_Bookmarks</b>"
-msgstr "ที่คั่นหน้า (_B)"
+msgstr "<b>ที่คั่นหน้า (_B)</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:2
-#, fuzzy
 msgid "<b>_Location</b>"
-msgstr "ตำ�หน่ง (_L):"
+msgstr "<b>ตำ�หน่ง (_L)</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:3
 msgid "<b>_Name</b>"
-msgstr ""
+msgstr "<b>ชื่อ (_N)</b>"
 
 #: src/nautilus-bookmarks-window.glade.h:4
 msgid "Edit Bookmarks"
@@ -5908,37 +6058,46 @@ msgstr "ขอตัวเลือ�น้อยลง"
 msgid "Find Them!"
 msgstr "ค้นหา"
 
+#: src/nautilus-connect-server-dialog.c:86
+#, fuzzy
+msgid "You must enter a name for the server."
+msgstr "คุณต้องบอ�ชื่อเซิร์ฟเวอร์"
+
 #: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
-msgstr "ย้ายไปไว้ในตัวเองไม่ได้"
+msgid "Can't Connect to Server"
+msgstr "เชื่อมต่อไปเซิร์ฟเวอร์ไม่สำเร็จ"
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" ไม่ใช่ตำ�หน่งที่ใช้ได้ โปรดตรวจดูว่าพิมพ์อะไรผิดหรือเปล่า"
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "ใช้ชื่อ \"%s\" ไม่ได้"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
 #, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "หา \"%s\" ไม่เจอ โปรดตรวจดูว่าพิมพ์อะไรผิดหรือเปล่า"
+
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
-msgstr "เครือข่าย"
+msgstr "เชื่อมต่อไปเซิร์ฟเวอร์"
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "ชื่อ (_N):"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "ตำ�หน่ง (_L):"
 
-#: src/nautilus-connect-server-dialog.c:226
-#, fuzzy
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
-msgstr "Conectiva"
+msgstr "เชื่อมต่อ"
 
 #: src/nautilus-desktop-window.c:356
 msgid "Desktop"
@@ -5949,9 +6108,8 @@ msgid "    "
 msgstr "    "
 
 #: src/nautilus-file-management-properties.glade.h:2
-#, fuzzy
 msgid "1 GB"
-msgstr "1 MB"
+msgstr "1 GB"
 
 #: src/nautilus-file-management-properties.glade.h:5
 msgid "100 KB"
@@ -5975,7 +6133,7 @@ msgstr "<span weight=\"bold\">à¹�ฟ้ม text ที่เรียà¸�ใชà¹
 
 #: src/nautilus-file-management-properties.glade.h:27
 msgid "<span weight=\"bold\">Folders</span>"
-msgstr "<span weight=\"bold\">�ฟ้ม</span>"
+msgstr "<span weight=\"bold\">โฟลเดอร์</span>"
 
 #: src/nautilus-file-management-properties.glade.h:28
 msgid "<span weight=\"bold\">Icon Captions</span>"
@@ -5990,9 +6148,8 @@ msgid "<span weight=\"bold\">List View Defaults</span>"
 msgstr "<span weight=\"bold\">ค่าปริยายของมุมมองรายชื่อ</span>"
 
 #: src/nautilus-file-management-properties.glade.h:31
-#, fuzzy
 msgid "<span weight=\"bold\">Other Previewable Files</span>"
-msgstr "<span weight=\"bold\">�ฟ้มภาพ</span>"
+msgstr "<span weight=\"bold\">�ฟ้มอื่นๆ ที่�สดงตัวอย่างได้</span>"
 
 #: src/nautilus-file-management-properties.glade.h:32
 msgid "<span weight=\"bold\">Sound Files</span>"
@@ -6008,7 +6165,7 @@ msgstr "<span weight=\"bold\">ถังขยะ</span>"
 
 #: src/nautilus-file-management-properties.glade.h:35
 msgid "<span weight=\"bold\">Tree View Defaults</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ค่าปริยายของมุมมองต้นไม้</span>"
 
 #: src/nautilus-file-management-properties.glade.h:36
 msgid "Always"
@@ -6016,7 +6173,7 @@ msgstr "เสมอ"
 
 #: src/nautilus-file-management-properties.glade.h:37
 msgid "Ask before _emptying the Trash or deleting files"
-msgstr "ถาม�่อนที่จะเทขยะถังขยะหรือลบ�ฟ้ม (_E)"
+msgstr "ถาม�่อนที่จะเทถังขยะหรือลบ�ฟ้ม (_E)"
 
 #: src/nautilus-file-management-properties.glade.h:38
 msgid "Behavior"
@@ -6026,7 +6183,7 @@ msgstr "พฤติ�รรม"
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
-msgstr "เลือ�ลำดับของข้อมูลที่�สดงใต้สั�ลั�ษณ์ จะเห็นข้อมูลมา�ขึ้นเมื่อขยายให�่ขึ้น"
+msgstr "เลือ�ลำดับข้อมูลที่�สดงใต้สั�ลั�ษณ์ ข้อมูลจะ�สดงมา�ขึ้นเมื่อซูมเข้าไปดูใ�ล้สั�ลั�ษณ์ขึ้น"
 
 #: src/nautilus-file-management-properties.glade.h:45
 msgid "Count _number of items:"
@@ -6042,7 +6199,7 @@ msgstr "ปรับ�ต่ง�ารจัด�าร�ฟ้ม"
 
 #: src/nautilus-file-management-properties.glade.h:48
 msgid "I_nclude a Delete command that bypasses Trash"
-msgstr "รวมคำสั่งลบถาวร(ไม่ผ่านถังขยะ)ให้เลือ� (_N)"
+msgstr "�สดงคำสั่งลบถาวร (ลบโดยไม่ผ่านถังขยะ) ในเมนู (_N)"
 
 #: src/nautilus-file-management-properties.glade.h:49
 msgid "Icon Captions"
@@ -6058,7 +6215,7 @@ msgstr "ไม่เลย"
 
 #: src/nautilus-file-management-properties.glade.h:56
 msgid "Preview _sound files:"
-msgstr "เปิดตัวอย่างสำหรับ�ฟ้มเสียง (_S)"
+msgstr "เล่นตัวอย่างจา��ฟ้มเสียง (_S)"
 
 #: src/nautilus-file-management-properties.glade.h:57
 msgid "Show _only folders"
@@ -6078,7 +6235,7 @@ msgstr "�สดงข้อความในสั�ลั�ษณ์ (_X)"
 
 #: src/nautilus-file-management-properties.glade.h:61
 msgid "Sort _folders before files"
-msgstr "เรียงโฟลเดอร์มา�่อน�ฟ้ม (_F)"
+msgstr "เรียงโฟลเดอร์�่อน�ฟ้ม (_F)"
 
 #: src/nautilus-file-management-properties.glade.h:62
 msgid "View _new folders using:"
@@ -6114,11 +6271,11 @@ msgstr "เปิด/ใช้ รายà¸�ารด้วยคลิà¸�เดà
 
 #: src/nautilus-file-management-properties.glade.h:71
 msgid "_Text beside icons"
-msgstr ""
+msgstr "�สดงข้อความที่ข้างขวาของสั�ลั�ษณ์ (_T)"
 
 #: src/nautilus-file-management-properties.glade.h:72
 msgid "_Use compact layout"
-msgstr "ใช้ผัง�บบ�ระชับ (_U)"
+msgstr "ใช้�ารจัดวาง�บบ�ระชับ (_U)"
 
 #: src/nautilus-file-management-properties.glade.h:73
 msgid "_View executable text files when they are clicked"
@@ -6137,6 +6294,16 @@ msgstr ""
 "\n"
 "You can manually erase this file to present the druid again.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr "ถ้าจะเปลี่ยนสั�ลั�ษณ์ โปรดลา�ภาพมา�ค่ที่ละหนี่งภาพ"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr "�ฟ้มที่ลา�มาไม่ได้อยู่บนเครื่องนี้  ภาพสำหรับสั�ลั�ษณ์ต้องอยู่บนเครื่องนี้"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6147,24 +6314,22 @@ msgstr "เปิดด้วย %s"
 msgid "Open with..."
 msgstr "เปิดด้วย..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "ตัวเรีย�โปร��รมใหม่ (_A)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "เทถังขยะ (_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6172,114 +6337,125 @@ msgstr ""
 msgid "Go To:"
 msgstr "ไปที่:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "คุณต้อง�ารดู %d ตำ�หน่งเหล่านี้�ย��ันในหน้าต่างเดี่ยวๆหรือไม่ ?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "ดูในหลายๆหน้าต่าง�ย��ัน ?"
 
-#: src/nautilus-location-dialog.c:138
-#, fuzzy
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
-msgstr "เปิดที่อยู่ที่ให้ไม่สำเร็จ"
+msgstr "เปิดตำ�หน่ง"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "ลองสำรวจตัวเองอย่างคร่าวๆ"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "สร้างหน้าต่างเริ่มต้นที่ตำ�หน่ง�ละด้วยขนาดที่�ำหนด"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ตำ�หน่ง�ละขนาด"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "ออ�จา� Nautilus"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "เริ่มต้น Nautilus ใหม่"
 
-#: src/nautilus-main.c:233
-#, fuzzy
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "�ารจัด�าร�ฟ้ม"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "�น่ใจนะว่าจะลบ \"%s\" อย่างถาวร ?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
-msgstr "�น่ใจนะว่าจะล้างรายชื่อของตำ�หน่งที่คุณไปเยี่ยมมา ?"
+msgstr "�น่ใจนะว่าจะล้างประวัติตำ�หน่งที่คุณไปเยี่ยมมา ?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+#, fuzzy
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr "เทถังขยะ�ล้วข้อมูลจะถู�ลบทิ้งโดยถาวร"
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "ล้างประวัติ"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "ตำ�หน่ง \"%s\" ไม่มีตัวตน คุณต้อง�ารลบที่คั่นหน้าทั้งหมดของคุณที่อ้างอิงถึงตำ�หน่งนี้หรือไม่ ?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "ตำ�หน่ง \"%s\" ไม่มีตัวตนอี�ต่อไป"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "ที่คั่นหน้าสำหรับตำ�หน่งที่ไม่มีตัวตน"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "ลบ"
 
@@ -6289,7 +6465,7 @@ msgstr "เพิ่มที่คั่นหน้าสำหรับที
 
 #: src/nautilus-navigation-window-ui.xml.h:2
 msgid "Back"
-msgstr "�่อนหน้า"
+msgstr "ถอย�ลับ"
 
 #: src/nautilus-navigation-window-ui.xml.h:3
 msgid "Change the visibility of this window's location bar"
@@ -6305,22 +6481,20 @@ msgstr "เปลี่ยนทัศนวิสัยของที่�ถ
 
 #: src/nautilus-navigation-window-ui.xml.h:6
 msgid "Clear contents of Go menu and Back/Forward lists"
-msgstr "ล้างเนื้อหาของเมนู ไป, �่อนหน้า, ถัดไป"
+msgstr "ล้างเนื้อหาของเมนู \"ไป\" \"ถอย�ลับ\" �ละ \"ถัดไป\""
 
 #: src/nautilus-navigation-window-ui.xml.h:7
 msgid "Close _All Windows"
 msgstr "ปิดทุ�หน้าต่าง (_A)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
-#, fuzzy
 msgid "Close all Navigation windows"
 msgstr "ปิดหน้าต่าง Nautilus ทุ�บาน"
 
 #: src/nautilus-navigation-window-ui.xml.h:10
 #: src/nautilus-spatial-window-ui.xml.h:4
 msgid "Connect to _Server..."
-msgstr ""
+msgstr "เชื่อมต่อไปเซิร์ฟเวอร์ (_S)..."
 
 #: src/nautilus-navigation-window-ui.xml.h:11
 msgid "Display a window that allows editing the bookmarks in this menu"
@@ -6335,107 +6509,118 @@ msgid "Forward"
 msgstr "ถัดไป"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "ไปโฟลเดอร์ถังขยะ"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "ไปตำ�หน่งที่ไปเยี่ยมมาถัดจา�นี้"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "ไปตำ�หน่งที่ไปเยี่ยมมา�่อนจา�นี้"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "ไปโฟลเดอร์ถังขยะ"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "บ้าน"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "�ถบตำ�หน่ง (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "เรีย�ใหม่"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "ค้นหา�ฟ้มในเครื่องนี้"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "�ถบสถานะ (_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "หยุด"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "ขึ้น"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "เพิ่มที่คั่นหน้า (_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
-msgstr "�่อนหน้า (_B)"
+msgstr "ถอย�ลับ (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "ที่คั่นหน้า (_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "ล้างประวัติ (_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
-#, fuzzy
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
-msgstr "_Courier"
+msgstr "คอมพิวเตอร์ (_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "��้ไขที่คั่นหน้า (_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "ถัดไป (_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "ไป (_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "บ้าน (_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "ตำ�หน่ง (_L)..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "�ถบข้าง (_S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "ถังขยะ (_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "ขึ้น (_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "มุมมอง (_V)"
 
@@ -6449,34 +6634,38 @@ msgid "View as..."
 msgstr "ดูเป็น..."
 
 #: src/nautilus-navigation-window.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "File Browser: %s"
-msgstr "เจ้าของ�ฟ้ม:"
+msgstr "ตัวเรีย�ดู�ฟ้ม: %s"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr "�ถบข้างอันใดสั�อันเ�ิดข้อผิดพลาดขึ้น �ต่ไม่รู้ว่าอันไหน"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
-msgstr "เ�ิดข้อผิดพลาดใน�ถบข้าง %s ถ้านี่เ�ิดขึ้นบ่อยๆ เลิ�ใช้�ถบข้างนี้ไปเลย�็ดี"
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "เ�ิดข้อผิดพลาดขณะเตรียมตัวมุมมอง %s "
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1110
 #, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
+msgstr "เ�ิดข้อผิดพลาดใน�ถบข้าง %s ถ้านี่เ�ิดขึ้นบ่อยๆ เลิ�ใช้�ถบข้างนี้ไปเลย�็ดี"
+
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "เ�ิดข้อผิดพลาดใน�ถบข้าง"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "�ถบข้าง"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6510,148 +6699,180 @@ msgstr "เพิ่มใหม่ (_A)..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "ลบลวดลาย %s ไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "ลบลวดลายไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "ลบตรา %s ไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "เอาตราออ�ไม่ได้"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "สร้างตราใหม่"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "คำหลั� (_K):"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "ภาพ (_I):"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "เลือ�ภาพสำหรับตราใหม่นี้:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "สร้างสีใหม่:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "ชื่อสี (_N):"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "ค่าสี (_V):"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "ใช้ชื่อ \"%s\" ไม่ได้"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "ชื่อที่คุณให้ใช้ไม่ได้"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "ติดตั้งลวดลายไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "เปลี่ยนภาพสำหรับปุ่ม \"เริ่มใหม่\" ไม่ได้"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "ไม่ใช่ภาพ"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "ติดตั้งลวดลาย %s ไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "เลือ��ฟ้มภาพที่รวมไว้ใช้สำหรับลวดลาย"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "คุณต้องตั้งชื่อสำหรับสีใหม่"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "ติดตั้งสีไม่สำเร็จ"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "เลือ�สีที่จะเพิ่ม"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "\"%s\" ไม่ใช่�ฟ้มรูปที่ใช้ได้"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
 #, fuzzy
-msgid "Select a Category:"
-msgstr "เลือ�สั�ลั�ษณ์:"
+msgid "The file is not an image."
+msgstr "�ฟ้ม '%s' ดูเหมือนจะไม่ใช่รูป"
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr "เลือ�หัวข้อ:"
+
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "ย�เลิ��ารลบ (_A)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "เพิ่มลวดลายใหม่ (_A)..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "เพิ่มสีใหม่ (_A)..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "เพิ่มตราใหม่ (_A)..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "คลิ�บนลวดลายที่จะลบ"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "คลิ�บนสีที่จะลบ"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "คลิ�บนตราที่จะลบ"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "ลวดลาย:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "สี:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "ตรา:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "ลบลวดลาย (_R)..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "ลบสี (_R)..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "ลบตรา (_R)..."
 
@@ -6819,14 +7040,14 @@ msgstr ""
 "ของคุณ�ละถู�ติดตั้งอย่างเรียบร้อย"
 
 #: src/nautilus-server-connect.c:395
-#, fuzzy, c-format
+#, c-format
 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 ""
 "ไม่สามารถติดต่อไปที่ URI %s\n"
-"โปรดตรวจดูว่าที่นี้อยู่ถู�ต้อง ถ้าไม่ดีขึ้นโปรดลองพิมพ์ที่อยู่นี้ลงใน file manager โดยตรง"
+"โปรดตรวจดูว่าสะ�ดที่อยู่ถู�ต้อง ถ้าไม่ดีขึ้นโปรดลองพิมพ์ที่อยู่นี้โดยตรงลงในตัวจัด�าร�ฟ้ม"
 
 #: src/nautilus-server-connect.c:460
 msgid ""
@@ -6849,9 +7070,8 @@ msgid "*"
 msgstr "*"
 
 #: src/nautilus-server-connect.glade.h:3
-#, fuzzy
 msgid "_Connect"
-msgstr "Conectiva"
+msgstr "เชื่อมต่อ (_C)"
 
 #: src/nautilus-shell-ui.xml.h:2
 msgid "Choose a view for the current location, or modify the set of views"
@@ -6884,9 +7104,8 @@ msgid "Edit Nautilus preferences"
 msgstr "��้ไขลั�ษณะที่ปรา��ของ Nautilus"
 
 #: src/nautilus-shell-ui.xml.h:11
-#, fuzzy
 msgid "Go to Empty CD folder"
-msgstr "ไปโฟลเดอร์ถังขยะ"
+msgstr "ไปโฟลเดอร์ ซีดีเปล่า"
 
 #: src/nautilus-shell-ui.xml.h:12
 msgid "Go to the home location"
@@ -6962,7 +7181,7 @@ msgstr "พื้นหลัง�ละตรา (_B)"
 
 #: src/nautilus-shell-ui.xml.h:33
 msgid "_CD Creator"
-msgstr ""
+msgstr "ตัวเขียนซีดี (_C)"
 
 #: src/nautilus-shell-ui.xml.h:34
 msgid "_Close Window"
@@ -7021,9 +7240,8 @@ msgid "_View as..."
 msgstr "ดูเป็น (_V)..."
 
 #: src/nautilus-shell-ui.xml.h:51
-#, fuzzy
 msgid "_Write to CD"
-msgstr "เขียน (_W)"
+msgstr "เขียนลงซีดี (_W)"
 
 #: src/nautilus-side-pane.c:395
 msgid "Close the side pane"
@@ -7036,41 +7254,41 @@ msgstr "�สดง %s"
 
 #: src/nautilus-spatial-window-ui.xml.h:1
 msgid "CD _Creator"
-msgstr ""
+msgstr "ตัวเขียนซีดี (_C)"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
-msgstr "ปิดทุ�หน้าต่าง (_A)"
+msgid "Close P_arent Folders"
+msgstr "เรีย�ดูโฟลเดอร์"
 
-#: src/nautilus-spatial-window-ui.xml.h:5
+#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
+msgid "Close this folder's parents"
+msgstr "ปิด�ถบข้าง"
+
+#: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
-msgstr "ไปโฟลเดอร์ถังขยะ"
+msgstr "ไปโฟลเดอร์คอมพิวเตอร์"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
-msgstr "ไปโฟลเดอร์ถังขยะ"
+msgstr "ไปที่ตัวเขียนซีดี"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
-msgstr "ตำ�หน่ง (_L)..."
+msgstr "เปิดตำ�หน่ง (_L)..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
-msgstr "[Items that are ]โฟลเดอร์"
+msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:13
-#, fuzzy
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
-msgstr "ลวดลาย (_P)"
+msgstr "ที่หลั�ๆ (_P)"
 
 #: src/nautilus-switchable-search-bar.c:129
 msgid "Find:"
@@ -7097,10 +7315,13 @@ msgid "View Failed"
 msgstr "ใช้มุมมองไม่สำเร็จ"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "เ�ิดข้อผิดพลาดขณะเตรียมตัวมุมมอง %s "
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr "เ�ิดข้อผิดพลาดในมุมมอง %s โปรดเลือ�มุมมองอื่นหรือไปที่ตำ�หน่งอื่น"
 
 #: src/nautilus-window-manage-views.c:839
@@ -7108,89 +7329,119 @@ msgstr "เà¸�ิดข้อผิดพลาดในมุมมอง %s à¹
 msgid "The %s view encountered an error while starting up."
 msgstr "เ�ิดข้อผิดพลาดขณะเตรียมตัวมุมมอง %s "
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "ไม่สามารถใช้โปร��รมที่ตั้งไว้เปิด \"%s\""
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "หา \"%s\" ไม่เจอ โปรดตรวจดูว่าพิมพ์อะไรผิดหรือเปล่า"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "เพิ่มตราไม่สำเร็จ"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus �สดง \"%s\" ไม่สำเร็จ"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "�สดง \"%s\" ไม่สำเร็จเพราะ Nautilus ไม่รู้ว่านี่เป็น�ฟ้มประเภทไหน"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus ไม่มีตัวอ่านสำหรับ \"%s\" ติดตั้งอยู่"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "�สดง \"%s\" ไม่สำเร็จเพราะ Nautilus จัด�ารตำ�หน่ง %s: ไม่เป็น"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "�สดง \"%s\" ไม่สำเร็จเพราะล็อ�อินไม่สำเร็จ"
 
-#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
 #, fuzzy, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�สดง \"%s\" ไม่สำเร็จเพราะ access was denied"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
+"�สดง \"%s\" ไม่สำเร็จเพราะไม่พบโฮสต์ \"%s\"  โปรดตรวจว่าตัวสะ�ดชื่อโฮสต์�ละค่าตั้งพร็อ�ซี"
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
-msgstr "�สดง \"%s\" ไม่สำเร็จเพราะล็อ�อินไม่สำเร็จ"
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
+msgstr "�สดง \"%s\" ไม่สำเร็จ โปรดเช็�ว่าตั้งค่าพร็อ�ซีไว้ถู�ต้อง"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "�สดง \"%s\" ไม่สำเร็จเพราะ Nautilus จัด�ารตำ�หน่ง %s: ไม่เป็น"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"�สดง \"%s\" ไม่สำเร็จเพราะ Nautilus ไม่สามารถติดต่อ SMB master browser\n"
-"ตรวจสอบดูให้�น่ว่ามี SMB server เปิดใช้งานอยู่ในระบบเครือข่ายท้องถิ่น"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"ใช้�ารค้นหาไม่ได้เพราะคุณไม่มีดัชนี�ฟ้ม หรือไม่มีบริ�ารค้นหาเปิดอยู่  ตรวจสอบดูให้�น่ว่าบริ�ารค้นหา "
+"(Medusa) เปิดอยู่ �ละถ้าคุณไม่มีดัชนี ตรวจดูว่า Medusa indexer เปิดอยู่"
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "ใช้�ารค้นหาไม่ได้เพราะคุณไม่มีดัชนี�ฟ้ม หรือไม่มีบริ�ารค้นหาเปิดอยู่  ตรวจสอบดูให้�น่ว่าบริ�ารค้นหา "
 "(Medusa) เปิดอยู่ �ละถ้าคุณไม่มีดัชนี ตรวจดูว่า Medusa indexer เปิดอยู่"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "�ารค้นหาไม่มีให้ใช้"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus �สดง \"%s\" ไม่สำเร็จ"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�สดงตำ�หน่งไม่สำเร็จ"
 
@@ -7202,7 +7453,7 @@ msgstr "ไปที่ตำ�หน่งที่ตั้งไว้ใน
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "สงวนลิขสิทธิ์ (C) 1999-2001 Eazel, Inc."
 
@@ -7210,15 +7461,17 @@ msgstr "สงวนลิขสิทธิ์ (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
-msgstr "�ปลโดย http://gnome-th.sourceforge.net"
+msgstr ""
+"ไพศาข์ สีเหลืองสวัสดิ์\n"
+"http://gnome-th.sourceforge.net"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
-msgstr "Nautilus เป็นโปร��รมของ GNOME ที่ช่วยคุณจัด�าร�ฟ้มบนเครื่องของคุณ"
+msgstr "Nautilus เป็นโปร��รมของ GNOME ที่ช่วยคุณจัด�าร�ฟ้มบนเครื่อง"
 
 #: src/nautilus-window-toolbars.c:361
 msgid "Go back a few pages"
@@ -7228,39 +7481,41 @@ msgstr "ถอย�ลับไปหน้า�่อนๆ"
 msgid "Go forward a number of pages"
 msgstr "เดินหน้าไปหน้าถัดๆไป"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "�สดงตำ�หน่งนี้ด้วย \"%s\""
 
-#: src/nautilus-window.c:1172
-#, fuzzy
+#: src/nautilus-window.c:1178
 msgid "Network"
-msgstr "Red Hat Network"
+msgstr "เครือข่าย"
 
-#: src/nautilus-window.c:1175
-#, fuzzy
+#: src/nautilus-window.c:1180
 msgid "Fonts"
-msgstr "ตัวอั�ษรณ์ (_O)"
+msgstr "ตัวอั�ษรณ์"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
 #, fuzzy
+msgid "Themes"
+msgstr "_Times"
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
-msgstr "ไปโฟลเดอร์ถังขยะ"
+msgstr "ตัวเขียนซีดี"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr ""
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr ""
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7289,14 +7544,239 @@ msgid "Set the zoom level of the current view"
 msgstr "ตั้งขนาดย่อขยายสำหรับมุมมองปัจจุบัน"
 
 #: src/network-scheme.desktop.in.h:1
-#, fuzzy
 msgid "Network Servers"
-msgstr "เครือข่าย"
+msgstr "เซิร์ฟเวอรเครือข่าย"
 
 #: src/network-scheme.desktop.in.h:2
 msgid "View your network servers in the Nautilus file manager"
 msgstr "ดูเซิร์ฟเวอร์เครือข่ายใน Nautilus"
 
+#~ msgid "Hardware Viewer"
+#~ msgstr "ตัว�สดงฮาร์ด�วร์"
+
+#~ msgid "Hardware view"
+#~ msgstr "มุมมองฮาร์ด�วร์"
+
+#~ msgid "View as Hardware"
+#~ msgstr "มองเป็นฮาร์ด�วร์"
+
+#~ msgid "hardware view"
+#~ msgstr "มุมมองฮาร์ด�วร์"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "ชื่อของสั�ลั�ษณ์สำหรับมุมมองฮาร์ด�วร์"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "สรุปข้อมูลฮาร์ด�วร์"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K L2 �คช"
+
+#~ 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 "เปิดเครื่องมา %d วัน, %d ชั่วโมง, %d นาที"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "ข้อมูลฮาร์ด�วร์โดยรวม"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "นี่เป็นที่สำหรับหน้า CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "นี่เป็นที่สำหรับหน้า RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "นี่เป็นที่สำหรับหน้า IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "คัดลอ�ไป \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "จุดหมายมีที่ไม่พอ"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "สร้างจุดเชื่อม \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "จุดหมายมีที่ไม่พอ"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "ย้ายไป \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "คุณไม่มีสิทธิ์เขียน�ฟ้มนี้"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "ย้ายไป \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "ดิส�์จุดหมายเขียนได้เท่านั้น"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "สร้างจุดเชื่อมใน \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "คุณไม่มีสิทธิ์เขียน�ฟ้มนี้"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "สร้างจุดเชื่อมใน \"%s\" ไม่สำเร็จ\n"
+#~ "\n"
+#~ "ดิส�์จุดหมายเขียนได้เท่านั้น"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะคัดลอ� \"%s\"\n"
+#~ "\n"
+#~ "จะลอ�ต่อไหม?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะย้าย \"%s\"\n"
+#~ "\n"
+#~ "จะย้ายต่อไหม?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะลบ \"%s\"\n"
+#~ "\n"
+#~ "จะลบต่อไหม?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะคัดลอ�\n"
+#~ "\n"
+#~ "จะคัดลอ�ต่อไหม?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะสร้างจุดเชื่อม\n"
+#~ "\n"
+#~ "จะสร้างต่อไหม?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "เ�ิดข้อผิดพลาด \"%s\" ขณะลบ\n"
+#~ "\n"
+#~ "จะลบต่อไหม?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "คัดลอ�ไปถังขยะไม่ได้"
+
+#~ 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 ""
+#~ "คำสั่งที่ตั้งไว้เปิด \"%s\" ไม่สำเร็จเพราะมันไม่สามารถอ่าน�ฟ้มที่ \"%s\"  "
+#~ "ไม่มีคำสั่งอื่นที่ใช้ได้สำหรับ�ฟ้มนี้  ถ้าคุณคัดลอ��ฟ้มนี้มาไว้ที่เครื่องคุณ คุณอาจจะเปิดมันได้"
+
+#~ msgid "Searching Disks"
+#~ msgstr "�ำลังค้นหา..."
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus �ำลังค้นจานบันทึ�เพื่อหาโฟลเดอร์ถังขยะ"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr "ย้าย %d ราย�ารที่เลือ�ไปถังขยะไม่ได้  จะลบทิ้งถาวรเลยไหม ?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "ย้ายบางราย�ารที่เลือ� (%d ราย�าร) ไปถังขยะไม่ได้  จะลบ %d ราย�ารนี้ทิ้งถาวรเลยไหม ?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr "�ฟ้มที่ลา�มาไม่ใช่ภาพ"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "บริ�ารค้นหาของ Medusa ยังไม่ได้ถู�ติดตั้ง"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "เครื่องสร้างดัชนีสำหรับ�ฟ้ม�ละเนื้อหา text ทุ�ๆวันเพื่อคุณค้นหา�ฟ้มได้เร็วขึ้น "
+#~ "ขณะนี้เครื่อง�ำลังสร้างดัชนี"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "\"%s\" ไม่ใช่ตำ�หน่งที่ใช้ได้ โปรดตรวจดูว่าพิมพ์อะไรผิดหรือเปล่า"
+
+#~ 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 ""
+#~ "�สดง \"%s\" ไม่สำเร็จเพราะ Nautilus ไม่สามารถติดต่อ SMB master browser\n"
+#~ "ตรวจสอบดูให้�น่ว่ามี SMB server เปิดใช้งานอยู่ในระบบเครือข่ายท้องถิ่น"
+
+#~ msgid "file icon"
+#~ msgstr "สั�ลั�ษณ์�ฟ้ม"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "ชื่อ (_N):"
+
 #~ msgid "Unknown"
 #~ msgstr "ไม่รู้จั�"
 
@@ -7353,9 +7833,6 @@ msgstr "ดูเซิร์ฟเวอร์เครือข่ายใน
 #~ msgid "Sort in _reverse"
 #~ msgstr "เรียงย้อน�ลับ (_R)"
 
-#~ msgid "Use _manual layout"
-#~ msgstr "จัดผังด้วยมือ (_M)"
-
 #~ msgid "_Open activated item in a new window"
 #~ msgstr "เปิดราย�ารที่เรีย�ในหน้าต่างใหม่ (_O)"
 
@@ -7380,9 +7857,6 @@ msgstr "ดูเซิร์ฟเวอร์เครือข่ายใน
 #~ msgid "_Toolbar"
 #~ msgstr "�ถบเครื่องมือ (_T)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "ตำ�หน่ง \"%s\" ไม่มีตัวตนอี�ต่อไป"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "ไปที่ตำ�หน่งที่ไม่มีตัวตน"
 
@@ -7445,6 +7919,3 @@ msgstr "ดูเซิร์ฟเวอร์เครือข่ายใน
 
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
-
-#~ msgid "_Times"
-#~ msgstr "_Times"
diff --git a/po/tr.po b/po/tr.po
index 67b295ef0..862a29fff 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-11-03 05:58+0000\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -47,8 +47,8 @@ msgstr "bonobo_ui_init() hatası."
 
 # data/browser.xml.h:34 src/file-manager/fm-properties-window.c:1376
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Logolar"
 
@@ -62,57 +62,72 @@ msgstr "Nautilus Amblem kenarı paneli"
 msgid "Nautilus Emblem view"
 msgstr "Nautilus Amblem görünümü"
 
+# src/nautilus-theme-selector.c:616
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Amblem silinemedi"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Amblem '%s' adıyla kaldırılamıyor. Bunun nedeni bu amblemi sizin eklememiş "
 "olmanız veya geçici olması olabilir."
 
 # src/nautilus-theme-selector.c:616
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Amblem silinemedi"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+# src/nautilus-property-browser.c:1421 src/nautilus-property-browser.c:1424
+# src/nautilus-property-browser.c:1428 src/nautilus-property-browser.c:1457
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Amblem yeniden adlandırılamadı"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Amblem  adı '%s' yapılamadı. Bunun nedeni bu amblemi sizin eklememiş olmanız "
 "veya geçici olması olabilir."
 
 # src/nautilus-property-browser.c:1421 src/nautilus-property-browser.c:1424
 # src/nautilus-property-browser.c:1428 src/nautilus-property-browser.c:1457
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Amblem yeniden adlandırılamadı"
 
 # src/nautilus-property-browser.c:2255
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Amblemi Yeniden Adlandır"
 
 # src/nautilus-property-browser.c:1033
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Gösterilen amblem için yeni bir ad giriniz:"
 
 # libnautilus-private/nautilus-icon-text-item.c:1546
 # src/file-manager/nautilus-icon-view-ui.xml.h:14
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
 # src/nautilus-property-browser.c:2187
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Yeni Amblem ekle..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -120,7 +135,7 @@ msgstr ""
 "Her amblemin yanına bir açıklama giriniz.  Bu isim başka yerlerde bu amblemi "
 "tanımak için kullanılacaktır."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -128,158 +143,66 @@ msgstr ""
 "Amblemin yanına bir açıklama giriniz.  Bu isim başka yerlerde bu amblemi "
 "tanımak için kullanılacaktır."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-"Bazı dosyalar düzgün bir resim olarak görüntülenemediğinden amblem olarak "
-"eklenemiyor."
+# src/nautilus-property-browser.c:1456
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
+msgstr "Üzgünüm, ancak %s resmi bir logo olarak kurulamadı."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "'%s' dosyası düzgün bir resim gibi görünmüyor."
 
 # src/nautilus-theme-selector.c:397
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Amblem eklenemedi"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Hiçbir dosya düzgün bir resim olarak görüntülenemediğinden amblem olarak "
 "eklenemiyor."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Sürüklenen metin doğru bir dosya konumu değil."
 
 # src/nautilus-theme-selector.c:397
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Amblem eklenemiyor"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "'%s' dosyası düzgün bir resim gibi görünmüyor."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Sürüklenen dosya düzgün bir resim gibi görünmüyor."
 
 # data/browser.xml.h:36
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Sil"
 
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Donanım görünümü için mimari"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:2
-# data/static_bookmarks.xml.h:12
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Donanım"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:3
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Donanım Görüntüleyici"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:3
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Donanım görünümü"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:2
-# data/static_bookmarks.xml.h:12
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Donanım olarak Görüntüle"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:4
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "donanım görünümü"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "Donanım görünümü için simge adı"
-
-# components/hardware/Nautilus_View_hardware.oaf.in.h:1
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "Donanım görünümü için özet"
-
-# components/hardware/nautilus-hardware-view.c:230
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s MÄ°B\n"
-"%s Mhz\n"
-"%s K önbellek"
-
-# components/hardware/nautilus-hardware-view.c:264
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-# components/hardware/nautilus-hardware-view.c:266
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-# components/hardware/nautilus-hardware-view.c:324
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-# components/hardware/nautilus-hardware-view.c:326
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Başlatılma zamanı %d gün, %d saat, %d dakika"
-
-# components/hardware/nautilus-hardware-view.c:407
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Donanım Bilgileri"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "CPU sayfasına giden yol"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "RAM sayfasına giden yol"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "IDE sayfasına giden yol"
-
 # components/history/Nautilus_View_history.oaf.in.h:2
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
@@ -1080,6 +1003,12 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+# components/hardware/Nautilus_View_hardware.oaf.in.h:2
+# data/static_bookmarks.xml.h:12
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Donanım"
+
 # components/help/Nautilus_View_help.oaf.in.h:8
 #: data/static_bookmarks.xml.h:16
 msgid "International"
@@ -1385,31 +1314,31 @@ msgstr "Masaüstü ev simgesi adı"
 msgid "Desktop trash icon name"
 msgstr "Masaüstü çöp simgesi adı"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
 # libnautilus-private/nautilus-global-preferences.c:180
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Tercihler penceresinde özel işaretleri göster"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr ""
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 # libnautilus-private/nautilus-global-preferences.c:190
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 #, fuzzy
@@ -1422,8 +1351,8 @@ msgstr "Ev simgesi masaüstünde görünür"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1456,8 +1385,8 @@ msgstr "Eğer doğru ise, Nautilus bir dosyayı çöpe gönderirken size soracak
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 #, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr "Eğer doğru ise, Nautilus bir dosyayı çöpe gönderirken size soracaktır."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1499,10 +1428,13 @@ msgstr ""
 "görüntüleyecektir. "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+"Eğer doğru ise, Nautilus kullanıcının yer imini \"yer imleri menüsünde\" "
+"görüntüleyecektir. "
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1514,7 +1446,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1531,7 +1463,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1557,8 +1489,10 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
+"Eğer doğru ise, yen pencereler öntanımlı olarak elle konumlandırılacaktır."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid ""
@@ -1582,7 +1516,8 @@ msgid "List of possible captions on icons"
 msgstr "Simgelerin üzerindeki olası logolar"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Bir dizinde olabilecek azami dosya sayısı"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1604,11 +1539,13 @@ msgstr "Masaüstünü düzenlemek için Nautilus kullan"
 
 # libnautilus-private/nautilus-global-preferences.c:148
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Masaüstünü düzenlemek için Nautilus kullan"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Yan ağaç çubuğunda sadece dizinleri görüntüle"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1628,7 +1565,8 @@ msgstr "Yeni pencerelerde ters sıralama düzeni"
 
 # libnautilus-private/nautilus-global-preferences.c:136
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Pencere içinde önce dizinleri göster"
 
 # libnautilus-private/nautilus-global-preferences.c:145
@@ -1669,7 +1607,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1677,17 +1615,17 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
@@ -1695,13 +1633,14 @@ msgstr ""
 #, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr "Simge görünümdeki öğelerin sıralama düzeni."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr "Liste görünümdeki öğelerin sıralama düzeni."
 
 # libnautilus-private/nautilus-global-preferences.c:145
@@ -1757,7 +1696,8 @@ msgstr "Yeni pencereleri elle yerleÅŸtir"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Yeni pencerelerde sıkışık yerleşim kullan"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1780,7 +1720,8 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Bir dizindeki öğe sayısının gösterilmesi"
 
 # libnautilus-private/nautilus-global-preferences.c:602
@@ -1796,7 +1737,7 @@ msgstr ""
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Öntanımlı arkaplanı kullan"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1982,82 +1923,99 @@ msgstr "sıfırla"
 msgid "on the desktop"
 msgstr "masaüstünde"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+# src/nautilus-theme-selector.c:594
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Bu dosya sistemi silinemedi"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr "Bir dosya sistemi simgesini silemezsiniz."
 
 # src/nautilus-theme-selector.c:594
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Bu dosya sistemi silinemedi"
 
 # data/linksets/desktop.xml.h:2 libnautilus-private/nautilus-file.c:4642
 # libnautilus-private/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:66
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Çöp"
 
 # libnautilus-private/nautilus-program-chooser.c:1317
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Buraya taşı"
 
 # libnautilus-private/nautilus-program-chooser.c:1317
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Oraya kopyala"
 
 # src/nautilus-link-set-window.c:191
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Buraya _bağlantı koy"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:30
 # src/nautilus-sidebar.c:482
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "_Arkaplan Olarak Tanımla"
 
 # components/music/mpg123.c:29
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Ä°ptal"
 
 # src/nautilus-shell-ui.xml.h:41
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "_Tüm dizinler için arkaplan resmi olarak tanımla"
 
 # src/nautilus-shell-ui.xml.h:41
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "_Bu dizin için arkaplan resmi olarak tanımla"
 
-# src/nautilus-property-browser.c:1420
+# src/nautilus-theme-selector.c:425
 #: 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
+#, fuzzy
+msgid "The emblem cannot be installed."
+msgstr "\"%s\" teması yüklenemedi."
+
+# src/nautilus-property-browser.c:1420
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 "Üzgünüm, ancak yeni logo için boş olmayan bir anahtar kelime girmelisiniz."
 
 # src/nautilus-property-browser.c:1421 src/nautilus-property-browser.c:1424
 # src/nautilus-property-browser.c:1428 src/nautilus-property-browser.c:1457
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Logolar kurulamadı"
 
 # src/nautilus-property-browser.c:1423
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -2069,19 +2027,27 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "\"%s\" isimli bir logo daha önce kullanılmış. Lütfen farklı bir isim seçin."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+# src/nautilus-property-browser.c:1421 src/nautilus-property-browser.c:1424
+# src/nautilus-property-browser.c:1428 src/nautilus-property-browser.c:1457
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Logolar kurulamadı"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Özel logo kaydedilemedi."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Özel logo ismi kaydedilemedi."
 
@@ -2103,24 +2069,32 @@ msgstr "Kaynak:"
 msgid "To:"
 msgstr "Hedef:"
 
+# libnautilus-private/nautilus-file-operations.c:877
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Taşınırken hata oluştu."
+
 # libnautilus-private/nautilus-file-operations.c:538
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Taşıma sırasında hata\n"
 "\n"
 "\"%s\" dosyası, salt-oku bir disk üzerinde bulunduğu için taşınamadı."
 
+# libnautilus-private/nautilus-file-operations.c:885
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Silinirken hata oluÅŸtu."
+
 # libnautilus-private/nautilus-file-operations.c:549
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -2129,23 +2103,18 @@ msgstr ""
 "\"%s\" silinemedi. Üst dizine yazma hakkınız bulunmuyor."
 
 # libnautilus-private/nautilus-file-operations.c:555
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Silme sırasında hata oluştu.\n"
 "\n"
 "\"%s\" silinemedi. Bu dosya salt okunur bir disk üzerinde bulunuyor."
 
 # libnautilus-private/nautilus-file-operations.c:586
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -2154,13 +2123,17 @@ msgstr ""
 "\"%s\" taşınamadı. Dosyayı değiştirmek ya da silmek için yeterli hakkınız "
 "bulunmuyor."
 
+# libnautilus-private/nautilus-file-operations.c:877
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Taşınırken hata oluştu."
+
 # libnautilus-private/nautilus-file-operations.c:538
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Taşıma sırasında hata\n"
@@ -2168,12 +2141,10 @@ msgstr ""
 "\"%s\" dosyasının ana dizini hedefta bulunduğu için taşınamadı."
 
 # libnautilus-private/nautilus-file-operations.c:593
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Taşıma sırasında bir hata oluştu.\n"
@@ -2181,266 +2152,207 @@ msgstr ""
 "\"%s\" çöpe gönderilemedi. Dosya ya da üst dizinini değiştirmek ya da silmek "
 "için yeterli hakkınız bulunmuyor."
 
+# libnautilus-private/nautilus-file-operations.c:874
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Kopyalarken hata oluÅŸtu."
+
 # libnautilus-private/nautilus-file-operations.c:617
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Kopyalama sırasında hata.\n"
 "\n"
 "\"%s\" dosyasını okumak için yeterli haklarınız bulunmuyor."
 
-# libnautilus-private/nautilus-file-operations.c:639
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" dizinine kopyalama sırasında hata.\n"
-"\n"
-"Hedef bölgede yeterli disk alanı bulunmuyor."
+# libnautilus-private/nautilus-file-operations.c:874
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Kopyalarken hata oluÅŸtu."
 
 # libnautilus-private/nautilus-file-operations.c:644
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "\"%s\" hedefine taşıma sırasında hata.\n"
 "\n"
 "Hedef bölgede yeterli disk alanı bulunmuyor."
 
-# libnautilus-private/nautilus-file-operations.c:648
+# libnautilus-private/nautilus-file-operations.c:877
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"\"%s\" bağlantısı oluşturulurken hata oluştu.\n"
-"\n"
-"Hedef dizinde yeterli disk alanı bulunmuyor."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Taşınırken hata oluştu."
+
+# libnautilus-private/nautilus-file-operations.c:880
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Bağlantı yapılırken hata oluştu"
 
 # libnautilus-private/nautilus-file-operations.c:660
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "\"%s\"e kopyalanırken hata.\n"
 "\n"
 "Bu dizine yazma hakkınız bulunmuyor."
 
 # libnautilus-private/nautilus-file-operations.c:664
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 " \"%s\"e kopyalanırken hata oluştu.\n"
 "\n"
 "Hedef disk alanı salt-oku durumda."
 
-# libnautilus-private/nautilus-file-operations.c:671
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\" dizinine taşıma sırasında hata.\n"
-"\n"
-"Bu dizine yazma hakkınız bulunmuyor."
-
-# libnautilus-private/nautilus-file-operations.c:675
+# libnautilus-private/nautilus-file-operations.c:877
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" dizinine taşıma sırasında hata.\n"
-"\n"
-"Hedef bölge salt-okunur."
-
-# libnautilus-private/nautilus-file-operations.c:682
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"\"%s\" için bağlantı oluşturulması sırasında hata.\n"
-"\n"
-"Bu dizine yazmak için yeterli haklarınız bulunmuyor."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Taşınırken hata oluştu."
 
-# libnautilus-private/nautilus-file-operations.c:686
+# libnautilus-private/nautilus-file-operations.c:880
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"\"%s\" için bağlantı oluşturulması sırasında hata.\n"
-"\n"
-"Hedef disk salt-okunur."
-
-# libnautilus-private/nautilus-file-operations.c:715
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" kopyalanması sırasında \"%s\" hatası oluştu.\n"
-"\n"
-"Devam etmek ister misiniz?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Bağlantı yapılırken hata oluştu"
 
-# libnautilus-private/nautilus-file-operations.c:719
+# libnautilus-private/nautilus-file-operations.c:874
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Kopyalarken hata oluÅŸtu."
+
+# libnautilus-private/nautilus-file-operations.c:748
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"\"%s\" hatası. Taşınamıyor: \"%s\".\n"
+"Taşıma sırasında bir hata oluştu: \"%s\"\n"
 "\n"
 "Devam etmek istiyor musunuz?"
 
-# libnautilus-private/nautilus-file-operations.c:723
+# libnautilus-private/nautilus-file-operations.c:877
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"\"%s\" hatası. Bağlantı yapılamıyor: \"%s\".\n"
-"\n"
-"Devam etmek istiyor musunuz?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Taşınırken hata oluştu."
 
-# libnautilus-private/nautilus-file-operations.c:729
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+# libnautilus-private/nautilus-file-operations.c:723
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"\"%s\" hatası oluştu (dosya adı: \"%s\")\n"
+"\"%s\" hatası. Bağlantı yapılamıyor: \"%s\".\n"
 "\n"
 "Devam etmek istiyor musunuz?"
 
-# libnautilus-private/nautilus-file-operations.c:744
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Kopyalama sırasında hata oluştu: \"%s\"\n"
-"\n"
-"Devam etmek istiyor musunuz?"
+# libnautilus-private/nautilus-file-operations.c:885
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Silinirken hata oluÅŸtu."
 
-# libnautilus-private/nautilus-file-operations.c:748
+# libnautilus-private/nautilus-file-operations.c:874
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Taşıma sırasında bir hata oluştu: \"%s\"\n"
-"\n"
-"Devam etmek istiyor musunuz?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Kopyalarken hata oluÅŸtu."
 
-# libnautilus-private/nautilus-file-operations.c:752
+# libnautilus-private/nautilus-file-operations.c:877
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Bağlama sırasında hata oluştu: \"%s\".\n"
-"\n"
-"Devam etmek istiyor musunuz?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Taşınırken hata oluştu."
 
-# libnautilus-private/nautilus-file-operations.c:758
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Silerken bir hata oluÅŸtu: \"%s\"\n"
-"\n"
-"Devam etmek istiyor musunuz?"
+# libnautilus-private/nautilus-file-operations.c:880
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Bağlantı yapılırken hata oluştu"
+
+# libnautilus-private/nautilus-file-operations.c:885
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Silinirken hata oluÅŸtu."
 
 # libnautilus-private/nautilus-file-operations.c:874
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Kopyalarken hata oluÅŸtu."
 
 # libnautilus-private/nautilus-file-operations.c:877
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Taşınırken hata oluştu."
 
 # libnautilus-private/nautilus-file-operations.c:880
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Bağlantı yapılırken hata oluştu"
 
 # libnautilus-private/nautilus-file-operations.c:885
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Silinirken hata oluÅŸtu."
 
 # libnautilus-private/nautilus-file-operations.c:910
 # libnautilus-private/nautilus-file-operations.c:929
 # libnautilus-private/nautilus-file-operations.c:1043
 # libnautilus-private/nautilus-file-operations.c:1057
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Atla"
 
 # libnautilus-private/nautilus-file-operations.c:929
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Yeniden dene"
 
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Belirtilen işlem tamamlanamadı."
+
 # libnautilus-private/nautilus-file-operations.c:1007
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" yeni konumuna taşınamadı, çünkü bu isim özel bir nesne için "
 "kullanılmaktadır.\n"
@@ -2448,14 +2360,17 @@ msgstr ""
 "Eğer yine de \"%s\" dosyasını taşımak istiyorsanız, önce adını değiştirin, "
 "daha sonra yeniden deneyin."
 
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Belirtilen işlem tamamlanamadı."
+
 # libnautilus-private/nautilus-file-operations.c:1013
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" yeni konumuna kopyalanamadı, çünkü bu isim özel bir nesne için "
 "kullanılmaktadır.\n"
@@ -2464,53 +2379,59 @@ msgstr ""
 "deÄŸiÅŸtirin, daha sonra yeniden deneyin."
 
 # libnautilus-private/nautilus-file-operations.c:1021
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Dosyanın üzerine yazılamıyor."
 
 # libnautilus-private/nautilus-file-operations.c:1031
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "%s dosyası zaten mevcut.\n"
 "\n"
 "Üzerine yazılsın mı?"
 
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1042
 # libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Kopyalama sırasında çakışma hatası"
 
 # libnautilus-private/nautilus-file-operations.c:1043
 # libnautilus-private/nautilus-file-operations.c:1057
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Üstüne yaz"
 
 # libnautilus-private/nautilus-file-operations.c:1057
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Hepsinin üstüne yaz"
 
 # libnautilus-private/nautilus-file-operations.c:1106
 # libnautilus-private/nautilus-file.c:3699
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s öğesine bağlantı"
 
 # libnautilus-private/nautilus-file-operations.c:1110
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "%s'e diğer bağlantı"
@@ -2520,28 +2441,28 @@ msgstr "%s'e diğer bağlantı"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d. %s'e bağlantı"
 
 # libnautilus-private/nautilus-file-operations.c:1130
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%2$s dosyasına %1$d. bağlantı"
 
 # libnautilus-private/nautilus-file-operations.c:1134
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%2$s dosyasına %1$d. bağlantı"
 
 # libnautilus-private/nautilus-file-operations.c:1138
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%2$s dosyasına %1$d. bağlantı"
@@ -2553,702 +2474,746 @@ msgstr "%2$s dosyasına %1$d. bağlantı"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1160
 # libnautilus-private/nautilus-file-operations.c:2259
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (diÄŸer kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1168
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ". kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1162
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ". kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1164
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ". kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1166
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ". kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:1178
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1180
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (diÄŸer kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1188
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1182
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1184
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1186
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d. kopya)%s"
 
 # libnautilus-private/nautilus-file-operations.c:1272
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 # libnautilus-private/nautilus-file-operations.c:1280
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
 # libnautilus-private/nautilus-file-operations.c:1437
 # libnautilus-private/nautilus-file-operations.c:1969
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "Bilinmeyen GnomeVFSXferProgressStatus %d"
 
 # libnautilus-private/nautilus-file-operations.c:2099
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Dosyalar çöp kutusuna taşınıyor"
 
 # libnautilus-private/nautilus-file-operations.c:2101
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Silinen dosyalar:"
 
 # libnautilus-private/nautilus-file-operations.c:1757
 # libnautilus-private/nautilus-file-operations.c:2103
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Taşınıyor"
 
 # libnautilus-private/nautilus-file-operations.c:2104
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Çöp Kutusuna Taşımaya Hazırlık Yapılıyor..."
 
 # libnautilus-private/nautilus-file-operations.c:1753
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Dosyalar taşınıyor"
 
 # libnautilus-private/nautilus-file-operations.c:1755
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Taşınan dosyalar:"
 
 # libnautilus-private/nautilus-file-operations.c:1758
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Taşımaya Hazırlanıyor..."
 
 # libnautilus-private/nautilus-file-operations.c:1759
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Taşıma Bitiriliyor..."
 
 # libnautilus-private/nautilus-file-operations.c:1769
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Dosyalara bağlantı kuruluyor"
 
 # libnautilus-private/nautilus-file-operations.c:1771
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Bağlantı kurulan dosyalar: "
 
 # libnautilus-private/nautilus-file-operations.c:1773
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Bağlanıyor"
 
 # libnautilus-private/nautilus-file-operations.c:1774
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Bağlantıları oluşturmaya Hazırlanıyorum..."
 
 # libnautilus-private/nautilus-file-operations.c:1775
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Bağlantı Oluşturma Tamamlanıyor..."
 
 # libnautilus-private/nautilus-file-operations.c:1782
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Dosyalar kopyalanıyor"
 
 # libnautilus-private/nautilus-file-operations.c:1784
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Kopyalanan dosyalar:"
 
 # libnautilus-private/nautilus-file-operations.c:1786
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Kopyalanıyor"
 
 # libnautilus-private/nautilus-file-operations.c:1787
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Kopyalamaya Hazırlıyorum..."
 
 # libnautilus-private/nautilus-file-operations.c:1805
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Dosyaları çöp kutusuna kopyalayamazsınız."
 
-# libnautilus-private/nautilus-file-operations.c:1806
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Çöpe Kopyalanamıyor."
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:1830
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Çöp kutusu taşınamaz."
 
 # libnautilus-private/nautilus-file-operations.c:1833
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Bu çöp kutusunu kopyalayamazsınız."
 
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1835
 # libnautilus-private/nautilus-file-operations.c:2060
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Çöpün Yeri Değiştirilemiyor"
 
 # libnautilus-private/nautilus-file-operations.c:1836
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Çöp Kutusuna Kopyalanamıyor"
 
 # libnautilus-private/nautilus-file-operations.c:1854
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Bir dizini kendi üzerine taşıyamazsınız."
 
 # libnautilus-private/nautilus-file-operations.c:1855
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Bir dizini kendi üzerine kopyalayamazsınız."
 
+# src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Bu dizin içinde boş bir dizin Oluştur"
+
 # libnautilus-private/nautilus-file-operations.c:1856
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Üzerine Taşınamaz"
 
 # libnautilus-private/nautilus-file-operations.c:1856
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Ãœzerine Kopyalanamaz"
 
 # libnautilus-private/nautilus-file-operations.c:1855
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Bir dosyayı kendi üzerine kopyalayamazsınız."
 
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
 # libnautilus-private/nautilus-file-operations.c:1856
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Ãœzerine Kopyalanamaz"
 
 # libnautilus-private/nautilus-file-operations.c:1907
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Yeni dizin açılırken hata.\n"
 "\n"
 "Hedef bölgeye yazma hakkınız yok"
 
 # libnautilus-private/nautilus-file-operations.c:1910
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Yeni dizin oluÅŸturulurken hata oluÅŸtu.\n"
 "\n"
 "Hedef bölgede yeterli disk alanı yok."
 
 # libnautilus-private/nautilus-file-operations.c:1913
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Yeni dizin oluÅŸturulurken hata: \"%s\""
 
 # libnautilus-private/nautilus-file-operations.c:1917
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Yeni dizin oluÅŸturulurken hata"
+
+# libnautilus-private/nautilus-file-operations.c:1917
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Yeni dizin oluÅŸturulurken hata"
 
 # libnautilus-private/nautilus-file-operations.c:1994
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "isimsiz dizin"
 
+# libnautilus-private/nautilus-file-operations.c:1913
+#: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Yeni dizin oluÅŸturulurken hata: \"%s\""
+
+# libnautilus-private/nautilus-file-operations.c:1917
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Yeni dizin oluÅŸturulurken hata"
+
+# libnautilus-private/nautilus-file-operations.c:1917
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Yeni dizin oluÅŸturulurken hata"
+
+# libnautilus-private/nautilus-file.c:3300
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 dosya"
+
 # libnautilus-private/nautilus-file-operations.c:2146
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2191
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Dosyaları siliyorum"
 
 # libnautilus-private/nautilus-file-operations.c:2148
 # libnautilus-private/nautilus-file-operations.c:2185
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Silinen dosyalar:"
 
 # libnautilus-private/nautilus-file-operations.c:2150
 # libnautilus-private/nautilus-file-operations.c:2187
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Siliniyor"
 
 # libnautilus-private/nautilus-file-operations.c:2151
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Dosyalar Silinmek Üzere Hazırlanıyor..."
 
 # libnautilus-private/nautilus-file-operations.c:2183
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Çöp kutusu boşaltılıyor"
 
 # libnautilus-private/nautilus-file-operations.c:2188
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Çöp kutusunu boşaltmaya hazırlanıyorum..."
 
 # libnautilus-private/nautilus-file-operations.c:2219
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Gerçekten çöp kutusundaki herşeyi tümüyle silmek istiyor musunuz?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:2222
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_BoÅŸalt"
 
 # libnautilus-private/nautilus-file-operations.c:2260
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "dosya"
 
 # libnautilus-private/nautilus-file-operations.c:2260
 # libnautilus-private/nautilus-file-operations.c:2270
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "dosya (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2261
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
 # libnautilus-private/nautilus-file-operations.c:2261
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2262
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".dosya.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2262
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".dosya (kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2263
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "dosya2"
 
 # libnautilus-private/nautilus-file-operations.c:2263
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "dosya2 (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2264
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "dosya.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2264
 # libnautilus-private/nautilus-file-operations.c:2271
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "dosya (kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2265
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "dosya2.txt"
 
 # libnautilus-private/nautilus-file-operations.c:2265
 # libnautilus-private/nautilus-file-operations.c:2285
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "dosya2 (kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2266
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "dosya2.txt txt"
 
 # libnautilus-private/nautilus-file-operations.c:2266
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "dosya2 (kopya).txt txt"
 
 # libnautilus-private/nautilus-file-operations.c:2267
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "dosya...txt"
 
 # libnautilus-private/nautilus-file-operations.c:2267
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "dosya... (kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2268
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "dosya..."
 
 # libnautilus-private/nautilus-file-operations.c:2268
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "dosya... (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2269
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "dosya. (kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2269
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "dosya. (diÄŸer kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2270
 # libnautilus-private/nautilus-file-operations.c:2272
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "dosya (diÄŸer kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2271
 # libnautilus-private/nautilus-file-operations.c:2273
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "dosya (diÄŸer kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2272
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "dosya (3. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2273
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "dosya (3. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2274
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "dosya2 (diÄŸer kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2274
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "dosya2 (3. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "dosya (13. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2279
 # libnautilus-private/nautilus-file-operations.c:2281
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "dosya (14. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "dosya (13. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2280
 # libnautilus-private/nautilus-file-operations.c:2282
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "dosya (14. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "dosya (21. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2275
 # libnautilus-private/nautilus-file-operations.c:2277
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "dosya (22. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "dosya (21. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2276
 # libnautilus-private/nautilus-file-operations.c:2278
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "dosya (22. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2277
 # libnautilus-private/nautilus-file-operations.c:2279
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "dosya (23. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2278
 # libnautilus-private/nautilus-file-operations.c:2280
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "dosya (23. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2279
 # libnautilus-private/nautilus-file-operations.c:2281
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "dosya (24. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2280
 # libnautilus-private/nautilus-file-operations.c:2282
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "dosya (24. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2281
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "dosya (25. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2282
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "dosya (25. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2283
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "dosya2 (24. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2283
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "dosya (25. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2284
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "dosya (24. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2284
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "dosya (25. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2285
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "dosya (100000000000000. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "dosya (10. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "dosya (11. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "dosya (10. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "dosya (11. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2279
 # libnautilus-private/nautilus-file-operations.c:2281
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "dosya (12. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2282
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "dosya (12. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "dosya (110. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2275
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "dosya (111. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "dosya (110. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2276
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "dosya (111. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2275
 # libnautilus-private/nautilus-file-operations.c:2277
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "dosya (122. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2277
 # libnautilus-private/nautilus-file-operations.c:2279
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "dosya (123. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2276
 # libnautilus-private/nautilus-file-operations.c:2278
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "dosya (122. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2273
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "dosya (123. kopya).txt"
 
 # libnautilus-private/nautilus-file-operations.c:2279
 # libnautilus-private/nautilus-file-operations.c:2281
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "dosya (124. kopya)"
 
 # libnautilus-private/nautilus-file-operations.c:2282
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "dosya (124. kopya).txt"
 
@@ -3267,36 +3232,36 @@ msgstr "dosya (124. kopya).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "bugün, 00:00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2242
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "bugün, %-I:%M %S %p"
 
 # libnautilus-private/nautilus-file.c:2242
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "bugün, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2242
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "bugün, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "bugün, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2242
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "bugün, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "bugün"
 
@@ -3304,37 +3269,37 @@ msgstr "bugün"
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "dün, 00:00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2247
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "dün, %-I:%M:%S %p"
 
 # libnautilus-private/nautilus-file.c:2247
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "dün, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2247
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "dün saat %-H:%M'de %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "dün, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2247
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "dün, %-I:%M %p"
 
 # components/services/install/command-line/eazel-alt-install-corba.c:118
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "dün"
 
@@ -3343,112 +3308,112 @@ msgstr "dün"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Çarşamba, Eylül 00 0000  00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:2252
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%-d %B %Y %A, saat %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Pazartesi, Ekim 00 0000 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:2252
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%-d %b %Y %a, saat %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Pazartesi, Ekim 00 0000 00:00:00 PM"
 
 # libnautilus-private/nautilus-file.c:2252
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y %a, saat %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Eki 00 0000 saat 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2257
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %m %Y saat %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Eki 00 0000, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2257
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 ÖS"
 
 # libnautilus-private/nautilus-file.c:2257
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
 # libnautilus-private/nautilus-file.c:3294
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 öğe"
 
 # libnautilus-private/nautilus-file.c:3294
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 dosya"
 
 # libnautilus-private/nautilus-file.c:3295
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 dosya"
 
 # libnautilus-private/nautilus-file.c:3299
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 öğe"
 
 # libnautilus-private/nautilus-file.c:3299
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 dizin"
 
 # libnautilus-private/nautilus-file.c:3300
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 dosya"
 
 # libnautilus-private/nautilus-file.c:3303
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "Toplam %u"
 
 # libnautilus-private/nautilus-file.c:3303
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u dizin"
 
 # libnautilus-private/nautilus-file.c:3304
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u dosya"
@@ -3456,25 +3421,25 @@ msgstr "%u dosya"
 # libnautilus-private/nautilus-file.c:3604
 # libnautilus-private/nautilus-file.c:3618
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? öğe"
 
 # libnautilus-private/nautilus-file.c:3604
 # libnautilus-private/nautilus-file.c:3618
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bayt"
 
 # libnautilus-private/nautilus-file.c:3622
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "bilinmeyen tip"
 
 # libnautilus-private/nautilus-file.c:3624
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "bilinmeyen MIME türü"
 
@@ -3482,17 +3447,17 @@ msgstr "bilinmeyen MIME türü"
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "bilinmiyor"
 
 # libnautilus-private/nautilus-file.c:3664
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "program"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3501,7 +3466,7 @@ msgstr ""
 "\"x-directory/normal\" için bir açıklama bulunamadı. Bunun anlamı, gnome-vfs."
 "keys dosyasının bulunamaması ya da hatalı bir yerde bulunmasıdır."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3511,12 +3476,12 @@ msgstr ""
 "gnome-vfs posta listesine iletin."
 
 # libnautilus-private/nautilus-file.c:3693
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "bağlantı"
 
 # libnautilus-private/nautilus-file.c:3713
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "link (kırık)"
 
@@ -3648,12 +3613,14 @@ msgstr "Dosyaları isme ve dosya özelliklerine göre ara"
 
 # src/file-manager/fm-directory-view.c:2961
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Simge Görünümü"
 
 # src/file-manager/fm-directory-view.c:2961
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Liste Görünümü"
@@ -3816,160 +3783,165 @@ msgstr "%.0s Başlangıç"
 # components/music/mpg123.c:29
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Countertop"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "dosya simgesi"
-
 # components/music/mpg123.c:40
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "Düzenlenebilir Metin"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "düzenlenebilir etiket"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "ek metin"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "daha fazla metin"
 
 # components/help/converters/gnome-db2html2/sect-elements.c:1029
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "seçim için gösterildi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "seçim için gösterilelim"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "klavye odaklaması için gösterildi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "klavye odaklaması sunumu için gösterilelim"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "düşme için gösterildi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "bir D&D için gösterilelim"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:12
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Seçim dörgeni"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Ek Pencere Metni"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Seçili olmayan metnin etrafına çerçeve çiz"
 
 # src/nautilus-property-browser.c:1319
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Seçim Kutusu Rengi"
 
 # src/nautilus-shell-ui.xml.h:29
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Seçim kutusunun rengi"
 
 # src/nautilus-shell-ui.xml.h:92
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Seçim Kutusu Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Seçim kutusunun şeffaflığı"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Transparan Göster"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Seçili simgelerin şeffaflığı"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Açık Bilgi Rengi"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Koyu arkaplanda bilgi metni için kullanılacak renk"
 
 # data/browser.xml.h:25
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Koyu Bilgi Rengi"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Açık arkaplanda gösterilecek bilgi yazısı için renk"
 
 # libnautilus-private/nautilus-icon-dnd.c:720
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Bu dizin otomatik düzenleme yapıyor. Elle düzenlemeye geçip, bu öğenin "
 "bıraktığınız yerde durmasını istiyor musunuz?"
 
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
 # libnautilus-private/nautilus-icon-dnd.c:724
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Bu dizin otomatik düzenleme yapıyor. Elle düzenlemeye geçip, bu öğelerin "
 "bıraktığınız yerde durmasını istiyor musunuz?"
 
 # libnautilus-private/nautilus-icon-dnd.c:730
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Bu dizin otomatik düzenleme yapıyor. Elle düzenlemeye geçip, bu öğenin "
 "bıraktığınız yerde durmasını istiyor musunuz?"
 
 # libnautilus-private/nautilus-icon-dnd.c:733
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Bu dizin otomatik düzenleme yapıyor. Elle düzenlemeye geçip, bu öğelerin "
 "bıraktığınız yerde durmasını istiyor musunuz?"
 
 # libnautilus-private/nautilus-icon-dnd.c:738
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Elle Düzenlemeye Geçeyim Mi?"
 
 # libnautilus-private/nautilus-icon-dnd.c:739
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Geç"
 
@@ -4095,42 +4067,42 @@ msgid "Is the default for all \"%s\" items."
 msgstr "Tüm \"%s\" için öntanımlı olsun."
 
 # libnautilus-private/nautilus-program-chooser.c:949
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "\"%s\"yi DeÄŸiÅŸtir"
 
 # libnautilus-private/nautilus-program-chooser.c:974
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "\"%s\" öğeleri için menüye ekle"
 
 # libnautilus-private/nautilus-program-chooser.c:981
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Tüm \"%s\" için öntanımlı olsun"
 
 # libnautilus-private/nautilus-program-chooser.c:974
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Sadece \"%s\" için menüde bulundur"
 
 # libnautilus-private/nautilus-program-chooser.c:981
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Tüm \"%s\" için öntanımlı olsun"
 
 # libnautilus-private/nautilus-program-chooser.c:1001
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Tüm \"%s\" için menülerde bulunmasın"
@@ -4139,45 +4111,45 @@ msgstr "Tüm \"%s\" için menülerde bulunmasın"
 # src/file-manager/fm-list-view.c:1918
 # src/file-manager/fm-search-list-view.c:334
 # src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Ä°sim"
 
 # libnautilus-private/nautilus-program-chooser.c:1168
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Durum"
 
 # libnautilus-private/nautilus-program-chooser.c:1229
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Seç"
 
 # libnautilus-private/nautilus-program-chooser.c:1231
 # src/nautilus-property-browser.c:365
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Bitti"
 
 # libnautilus-private/nautilus-program-chooser.c:1294
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Düzenle..."
 
 # libnautilus-private/nautilus-program-chooser.c:1305
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Dosya Tipleri ve Programlar"
 
 # libnautilus-private/nautilus-program-chooser.c:1317
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "Oraya _Git"
 
 # libnautilus-private/nautilus-program-chooser.c:1326
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -4186,58 +4158,58 @@ msgstr ""
 "ve Programlar penceresinden yapılandırabilirsiniz."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:22
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Başka Uygulama ile Aç"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "\"%s\" programını açacak bir uygulamayı seçin."
 
 # libnautilus-private/nautilus-program-chooser.c:1216
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Başka Bir İzleyici ile Aç"
 
 # libnautilus-private/nautilus-program-chooser.c:1222
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "\"%s\" için bir görüntüleyici belirleyin."
 
 # src/nautilus-theme-selector.c:720
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "\"%s\" için görüntüleyici bulunamadı."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Görüntüleyici Yok"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "\"%s\" dosyasını açacak bir uygulama bulunamadı."
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Buna Uygun bir Uygulama Tanımlanmamış"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "\"%s\" için tanımlanmış bir eylem yok."
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Tanımlanmış Bir Eylem Yok"
 
@@ -4245,11 +4217,9 @@ msgstr "Tanımlanmış Bir Eylem Yok"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -4258,49 +4228,48 @@ msgstr ""
 "Dosya türleri ile bu dosyaları açacak olan uygulamaları buradan "
 "tanımlayabilirsiniz. Şimdi bu ilişkilendirmeyi yapmak istiyor musunuz?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Uygulamayı Tanımla"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "\"%s\" dosyasını görüntüleyecek uygulama geçersiz."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Geçersiz Görüntüleyici"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "\"%s\" ile tanımlanmış olan uygulama geçersiz."
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Geçersiz Uygulama"
 
 # libnautilus-private/nautilus-program-chooser.c:1217
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "\"%s\" ile tanımlanmış olan eylem geçersiz."
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Geçersiz Eylem"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -4310,93 +4279,139 @@ msgstr ""
 "Dosya türleri ile bu dosyaları açacak olan uygulamaları buradan "
 "tanımlayabilirsiniz. Şimdi bu ilişkilendirmeyi yapmak istiyor musunuz?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Bir Eylem Tanımla"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
+"erişemiyor. Başka bir uygulama seçmek ister misiniz?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
 "erişemiyor. Başka bir uygulama seçmek ister misiniz?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
+"\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
+"erişemiyor. Başka bir uygulama seçmek ister misiniz?"
 
 # src/nautilus-window-manage-views.c:1397
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "Adres Gösterilemiyor"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
+"erişemiyor. Başka bir uygulama seçmek ister misiniz?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
 "erişemiyor. Bu dosyayı görüntülemek için başka bir uygulama bulunmuyor.  "
 "Eğer bu dosyayı kendi bilgisayarınıza kopyalarsanız, açabilirsiniz."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
+"erişemiyor. Başka bir uygulama seçmek ister misiniz?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
+"\"%s\", \"%s\"i açamıyor çünkü \"%s\", \"%s\" konumundaki dosyalara "
+"erişemiyor. Bu dosyayı görüntülemek için başka bir uygulama bulunmuyor.  "
+"Eğer bu dosyayı kendi bilgisayarınıza kopyalarsanız, açabilirsiniz."
 
 # src/file-manager/fm-directory-view.c:3577
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılıyor"
 
 # src/file-manager/fm-directory-view.c:3456
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Üzgünüm, güvenlik nedeniyle uzaktaki bir makine üzerinde yeralan dosyayı "
 "çalıştıramazsınız."
 
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:3457
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Uzaktaki bağlantılar çalıştırılamaz"
 
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
 # components/music/nautilus-music-view.c:1709
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Uygulama çalıştırılırken bir hata oluştu.\n"
 "\n"
 "Ayrıntılar: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Uygulamayı çalıştırırken hata"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Sürükle-bırak işlemi sadece yerel dosyaları destekler"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Bu işlem sadece yerel dosyaları destekler.\n"
@@ -4404,15 +4419,15 @@ msgstr ""
 "Yerel olmayan dosyaları açmak için bunları önce yerel bir dizine aktarmanız "
 "gerekmektedir."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Sürükle-bırak işlemi sadece yerel dosyaları destekler"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4704,16 +4719,6 @@ msgstr "İçinde \"elma\" geçen ve 2000 bayttan küçük olan normal dosyalar"
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "İçinde \"medusa\" geçen dizinler"
 
-# libnautilus-private/nautilus-trash-directory.c:73
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Diskler Taranıyor"
-
-# libnautilus-private/nautilus-trash-directory.c:74
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus diskinizdeki çöp kutularını araştırıyor"
-
 # libnautilus-private/nautilus-undo-signal-handlers.c:175
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
@@ -4962,117 +4967,129 @@ msgstr "Arkaplan"
 msgid "Empty Trash"
 msgstr "Çöpü Boşalt"
 
-# src/file-manager/fm-directory-view.c:455
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Bu işlem %d pencere açacaktır. Gerçekten yapmak istiyor musunuz?"
-
 # src/file-manager/fm-directory-view.c:457
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "%d Yeni Pencere Açılsın mı?"
 
 # src/file-manager/fm-directory-view.c:2639
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "\"%s\" dosyasını tamamen silmek istediğinize emin misiniz?"
+
+# src/file-manager/fm-directory-view.c:455
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Bu işlem %d pencere açacaktır. Gerçekten yapmak istiyor musunuz?"
+
+# src/file-manager/fm-directory-view.c:2639
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "\"%s\" dosyasını tamamen silmek istediğinize emin misiniz?"
 
 # src/file-manager/fm-directory-view.c:2643
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Seçili %d dosyayı tamamen silmek istediğınize emin misiniz?"
 
+# src/file-manager/fm-directory-view.c:3176
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Seçili öğeleri tamamen sil"
+
 # src/file-manager/fm-directory-view.c:2609
 # src/file-manager/fm-directory-view.c:2650
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Sil?"
 
 # src/nautilus-property-browser.c:2169
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Bir Sınıf Seçin:"
 
 # data/browser.xml.h:65
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Desenler"
 
 # src/file-manager/fm-directory-view.c:1211
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" seçili"
 
 # src/file-manager/fm-directory-view.c:1213
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 dizin seçildi"
 
 # src/file-manager/fm-directory-view.c:1216
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d dizin seçildi"
 
 # src/file-manager/fm-directory-view.c:1222
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (0 öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1224
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (1 öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1226
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (%d öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1222
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (0 öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1224
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (toplam 1 öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1226
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (toplam %d öğe içeriyor)"
 
 # src/file-manager/fm-directory-view.c:1237
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1241
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d öğe seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1248
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 başka öğe seçili (%s)"
 
 # src/file-manager/fm-directory-view.c:1251
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d başka öğe seçili (%s)"
@@ -5085,7 +5102,7 @@ msgstr "%d başka öğe seçili (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -5095,120 +5112,137 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "\"%s\" dizini Nautilus'un gösterebileceğinden daha fazla dosya içeriyor. "
 "Bazı dosyalar gösterilmeyecektir."
 
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:1410
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Çok Fazla Dosya"
 
 # src/file-manager/fm-directory-view.c:2591
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" çöpe gönderilemiyor. Bunu hemen silmek istiyor musunuz?"
 
-# src/file-manager/fm-directory-view.c:2596
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Seçili %d dosya çöpe gönderilemiyor. Bunları hemen silmek ister misiniz?"
 
-# src/file-manager/fm-directory-view.c:2600
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+# src/file-manager/fm-directory-view.c:2591
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" çöpe gönderilemiyor. Bunu hemen silmek istiyor musunuz?"
+
+# src/file-manager/fm-directory-view.c:2591
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"Seçili dosyaların %d tanesi çöpe gönderilemiyor. Bu %d dosyayı hemen silmek "
-"ister misiniz?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" çöpe gönderilemiyor. Bunu hemen silmek istiyor musunuz?"
 
 # src/file-manager/fm-directory-view.c:2608
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Hemen Sil?"
 
 # src/file-manager/fm-directory-view.c:2639
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 "\"%s\" dosyasını çöp kutusundan tamamen silmek istediğinize emin misiniz?"
 
 # src/file-manager/fm-directory-view.c:2643
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "Seçili %d dosyayı çöp kutusundan tamamen silmek istiyor musunuz?"
 
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
 # src/file-manager/fm-directory-view.c:2649
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Çöpten Silinsin mi?"
 
 # src/file-manager/fm-directory-view.c:2922
 # src/file-manager/fm-directory-view.c:2963
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Seçili dosyayı açmak için \"%s\" kullan"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "BaÅŸka _Uygulama..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:24
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Bir _Uygulama..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "BaÅŸka Ä°_zleyici..."
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:25
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Bir Ä°_zleyici..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Belirtilen işlem tamamlanamadı: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Belirtilen işlem tamamlanamadı."
 
 # src/file-manager/fm-directory-view.c:2922
 # src/file-manager/fm-directory-view.c:2963
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Herhangi bir seçili öğe üzerinde \"%s\" çalıştır"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Bu dizindeki tüm çalıştırılabilir dosyalar Betikler menüsünde yeralacaktır. "
+"Menüden seçılen herhangi bir program, girdi olarak seçilen öğelerle "
+"çalıştırılacaktır."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -5216,11 +5250,11 @@ msgstr ""
 "Menüden seçılen herhangi bir program, girdi olarak seçilen öğelerle "
 "çalıştırılacaktır."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Betikler Hakkında"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -5261,130 +5295,130 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: geçerli pencerenin konumu ve boyutu"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "Dosyaları Yapıştır komutu verirseniz \"%s\" taşınacaktır"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "Dosyaları Yapıştır komutu verirseniz \"%s\" kopyalanacaktır."
 
 # src/file-manager/fm-directory-view.c:2596
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "Dosyaları Yapıştır komutu verirseniz \"%d\" seçili öğe taşınacaktır"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 "Dosyaları Yapıştır komutu verirseniz \"%d\" seçili öğe kopyalanacaktır."
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Panoda yapıştırılacak hiç bir şey yok."
 
 # libnautilus-private/nautilus-volume-monitor.c:1121
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Bağlama Hatası"
 
 # libnautilus-private/nautilus-volume-monitor.c:1123
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Ayırma Hatası"
 
 # libnautilus-private/nautilus-volume-monitor.c:1121
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Bağlama Hatası"
 
 # src/file-manager/fm-properties-window.c:1733
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Çı_kart"
 
 # src/file-manager/fm-desktop-icon-view.c:1113
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Diski Ayır"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr "Yeni Pencerede Aç"
 
 # src/file-manager/fm-directory-view.c:3150
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "%d Yeni _Pencerede Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Başlangıç Dizini"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:15
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Başlangıç Dizini"
 
 # src/file-manager/fm-directory-view.c:3182
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Çöp Kutusundan _Sil"
 
 # src/file-manager/fm-directory-view.c:3176
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Seçili öğeleri tamamen sil"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:13
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Çöpe _Taşı"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Tüm seçilenleri çöp kutusuna taşı"
 
 # src/file-manager/fm-directory-view.c:2609
 # src/file-manager/fm-directory-view.c:2650
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Sil"
 
 # src/file-manager/fm-directory-view.c:3219
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Bağlantıları Oluştur"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:4
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "B_ağlantı Oluştur"
 
 # src/file-manager/fm-directory-view.c:3239
 # src/file-manager/nautilus-directory-view-ui.xml.h:39
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Çöp _Kutusunu Boşalt"
 
@@ -5393,87 +5427,95 @@ msgstr "Çöp _Kutusunu Boşalt"
 # components/mozilla/nautilus-mozilla-ui.xml.h:4
 # components/sample/nautilus-sample-content-view-ui.xml.h:4
 # src/nautilus-shell-ui.xml.h:78
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "_Dosyayı Kes"
 
 # libnautilus-private/nautilus-file.c:3304
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "_Dosyaları Kes"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:74
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Dosyayı K_opyala"
 
 # libnautilus-private/nautilus-file-operations.c:1782
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Dosyaları K_opyala"
 
 # src/file-manager/fm-directory-view.c:3390
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr ""
+"Bu bağlantı kullanılamaz, çünkü hedefi bulunmuyor. Bağlantıyı çöpe göndermek "
+"ister misiniz?"
+
+# src/file-manager/fm-directory-view.c:3390
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
 msgstr ""
 "Bu bağlantı kullanılamaz, çünkü hedefi bulunmuyor. Bağlantıyı çöpe göndermek "
 "ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:3393
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Bu bağlantı kullanılamaz, çünkü hedefi (%s) bulunamıyor. Bağlantıyı çöpe "
 "göndermek ister misiniz?"
 
 # src/file-manager/fm-directory-view.c:3399
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Kırık Bağlantı"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" çalıştırılabilir bir metin dosyasıdır. Bunu çalıştırmak mı, yoksa "
 "içindekileri görmek mi istiyorsunuz?"
 
+#: src/file-manager/fm-directory-view.c:5917
+#, fuzzy, c-format
+msgid "\"%s\" is an executable text file."
+msgstr "Çalıştırılabilir Metin Dosyaları"
+
 # libnautilus-private/nautilus-global-preferences.c:488
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Çalıştır / Göster?"
 
-# libnautilus-private/nautilus-global-preferences.c:488
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Göster"
-
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:6
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "_Terminalde Çalıştır"
 
-#: src/file-manager/fm-directory-view.c:5434
+# libnautilus-private/nautilus-global-preferences.c:488
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Göster"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Ç_alıştır"
 
 # src/file-manager/fm-directory-view.c:3577
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "\"%s\" açılıyor"
 
 # src/file-manager/fm-directory-view.c:3583
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Açma İşlemi İptal Edilsin mi?"
 
@@ -5496,20 +5538,26 @@ msgstr "\"%s\" bulunamadı. Silinmiş olabilir."
 msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "\"%s\" dosyasının içeriği gösterilemiyor."
 
-# libnautilus-private/nautilus-file-operations.c:1917
+# src/file-manager/fm-properties-window.c:1796
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "\"%s\"nin erişim hakları belirlenemedi."
+
+# libnautilus-private/nautilus-file-operations.c:1917
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Dizin Gösterilmesinde Hata"
 
 # src/file-manager/fm-error-reporting.c:55
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "\"%s\" adı bu dizinde kullanılıyor. Lütfen başka bir isim giriniz."
 
 # src/file-manager/fm-error-reporting.c:60
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -5517,7 +5565,7 @@ msgstr ""
 "Bu dizinde \"%s\" bulunamadı. Silinmiş, ya da yerdeğiştirilmiş olabilir mi?"
 
 # src/file-manager/fm-error-reporting.c:65
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
@@ -5525,7 +5573,7 @@ msgstr ""
 "deÄŸilsiniz."
 
 # src/file-manager/fm-error-reporting.c:70
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -5535,30 +5583,36 @@ msgstr ""
 "ismini kullanın."
 
 # src/file-manager/fm-error-reporting.c:74
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "\"%s\" geçerli bir ad değil. Lütfen başka bir dosya ismini kullanın."
 
 # src/file-manager/fm-error-reporting.c:80
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "\"%s\" değiştirilemez, çünkü bu öğe salt-oku bir disk üzerindedir."
 
 # src/file-manager/fm-error-reporting.c:87
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "\"%s\" ismi \"%s\"e deÄŸiÅŸtirilemedi."
 
+# src/nautilus-theme-selector.c:615
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Üzgünüm, ancak bu tema silinemedi!"
+
 # src/file-manager/fm-error-reporting.c:93
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Yeniden Adlandırma Hatası"
 
 # src/file-manager/fm-error-reporting.c:112
-#: src/file-manager/fm-error-reporting.c:163
+#: src/file-manager/fm-error-reporting.c:165
 #, c-format
 msgid ""
 "You do not have the permissions necessary to change the group of \"%s\"."
@@ -5567,26 +5621,32 @@ msgstr ""
 "deÄŸilsiniz."
 
 # src/file-manager/fm-error-reporting.c:116
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "\"%s\" öğesinin grubu değiştirilemez, çünkü salt-oku disk üzerinde."
 
 # src/file-manager/fm-error-reporting.c:123
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 "\"%s\"'nin grubu değiştirilemedi. Bu dosya salt okunur disk üzerinde "
 "yeralıyor."
 
+# src/file-manager/fm-properties-window.c:1796
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "\"%s\"nin erişim hakları belirlenemedi."
+
 # src/file-manager/fm-error-reporting.c:127
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Grup Bilgisi DeÄŸiÅŸtirilirken Hata"
 
 # src/file-manager/fm-error-reporting.c:148
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
@@ -5594,18 +5654,24 @@ msgstr ""
 "yeralıyor."
 
 # src/file-manager/fm-error-reporting.c:154
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "\"%s\" dosyasının sahibi değiştirilemedi."
 
+# src/file-manager/fm-properties-window.c:1796
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "\"%s\"nin erişim hakları belirlenemedi."
+
 # src/file-manager/fm-error-reporting.c:157
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Sahibi DeÄŸiÅŸtirilirken Hata"
 
 # src/file-manager/fm-error-reporting.c:178
-#: src/file-manager/fm-error-reporting.c:233
+#: 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"
@@ -5614,24 +5680,30 @@ msgstr ""
 "üzerinde yeralıyor."
 
 # src/file-manager/fm-error-reporting.c:184
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "\"%s\"nin erişim hakları değiştirilemedi."
 
+# src/file-manager/fm-properties-window.c:1796
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "\"%s\"nin erişim hakları belirlenemedi."
+
 # src/file-manager/fm-error-reporting.c:187
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Erişim Hakları Düzenlenirken Hata"
 
 # src/file-manager/fm-error-reporting.c:253
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "%s'nin adı %s'ye değiştiriliyor."
 
 # src/file-manager/fm-error-reporting.c:258
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Yeniden adlandırmayı iptal edeyim mi ?"
 
@@ -5712,154 +5784,178 @@ msgid "Restore Icon's Original Si_ze"
 msgstr "S_imgeyi Asıl Boyutlarına Getir"
 
 # src/file-manager/fm-icon-view.c:1457
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "\"%s\" gösteriliyor"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "Sürükle ve bırak sadece yerel dosya sistemlerinde destekleniyor."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "Sürükle ve bırak sadece yerel dosya sistemlerinde destekleniyor."
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Sürükle ve bırak hatası"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Geçersiz bir sürükleme türü kullanıldı."
 
 # src/file-manager/fm-properties-window.c:1677
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Dosya adı"
 
 # src/file-manager/fm-list-view.c:1924
 # src/file-manager/fm-search-list-view.c:346
 # src/nautilus-search-bar-criterion.c:73
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Boyut"
 
 # src/file-manager/fm-list-view.c:1930
 # src/file-manager/fm-search-list-view.c:352
 # src/nautilus-search-bar-criterion.c:71
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Tip"
 
 # src/file-manager/fm-list-view.c:1936
 # src/file-manager/fm-search-list-view.c:358
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "DeÄŸiÅŸim tarihi"
 
 # src/nautilus-sidebar.c:655
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Aynı anda birden fazla özel simge tanımlanamaz. Lütfen özel simge belirlemek "
+"için tek bir resmi sürükleyiniz."
+
+# src/nautilus-sidebar.c:655
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Aynı anda birden fazla özel simge tanımlanamaz. Lütfen özel simge belirlemek "
 "için tek bir resmi sürükleyiniz."
 
 # src/nautilus-sidebar.c:657
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Birden Fazla Resim"
 
 # src/nautilus-sidebar.c:676
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Kullandığınız dosya yerel değil. Özel simgelerde sadece yerel dosyalar "
+"kullanılabilir."
+
+# src/nautilus-sidebar.c:676
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Kullandığınız dosya yerel değil. Özel simgelerde sadece yerel dosyalar "
 "kullanılabilir."
 
 # src/nautilus-sidebar.c:678
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Sadece Yerel Resimler"
 
-# src/nautilus-sidebar.c:683
-#: src/file-manager/fm-properties-window.c:497
+# src/nautilus-sidebar.c:676
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Bıraktığınız dosya bir resim değil. Özel simgeler için sadece yerel diskten "
-"alınan resimler kullanılabilir."
+"Kullandığınız dosya yerel değil. Özel simgelerde sadece yerel dosyalar "
+"kullanılabilir."
 
 # src/nautilus-sidebar.c:685
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Sadece Resimler"
 
 # src/file-manager/fm-properties-window.c:487
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Özellikler"
 
 # src/file-manager/fm-properties-window.c:487
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s Özellikleri"
 
 # src/file-manager/fm-properties-window.c:614
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Grup DeÄŸiÅŸimi Ä°ptal Edilsin Mi?"
 
 # src/file-manager/fm-properties-window.c:615
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Grup deÄŸiÅŸtiriliyor"
 
 # src/file-manager/fm-properties-window.c:774
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Sahip DeÄŸiÅŸimi Ä°ptal Edilsin Mi?"
 
 # src/file-manager/fm-properties-window.c:775
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Sahibi DeÄŸiÅŸtiriliyor"
 
 # src/file-manager/fm-properties-window.c:950
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "hiçbiri"
 
 # src/file-manager/fm-properties-window.c:952
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "okunamıyor"
 
 # src/file-manager/fm-properties-window.c:961
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 dosya, boyutu %s"
 
 # src/file-manager/fm-properties-window.c:963
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d dosya, toplam boyut %s"
 
 # src/file-manager/fm-properties-window.c:969
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(bazı içerikler okunamadı)"
 
@@ -5870,12 +5966,12 @@ msgstr "(bazı içerikler okunamadı)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "İçerik:"
 
 # src/file-manager/fm-properties-window.c:1200
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Temel"
 
@@ -5883,7 +5979,7 @@ msgstr "Temel"
 # src/file-manager/fm-list-view.c:1918
 # src/file-manager/fm-search-list-view.c:334
 # src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "Ä°_sim:"
 
@@ -5891,215 +5987,216 @@ msgstr "Ä°_sim:"
 # src/file-manager/fm-list-view.c:1918
 # src/file-manager/fm-search-list-view.c:334
 # src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "Ä°_sim:"
 
 # src/file-manager/fm-properties-window.c:1273
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
 # src/file-manager/fm-properties-window.c:1278
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Büyüklük:"
 
 # src/nautilus-location-bar.c:60
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Adres:"
 
 # libnautilus-private/nautilus-volume-monitor.c:1300
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Bölüm:"
 
 # components/music/mpg123.c:62
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "BoÅŸ alan:"
 
 # src/nautilus-link-set-window.c:191
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Bağlantı hedefi:"
 
 # src/file-manager/fm-icon-text-window.c:86
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME türü:"
 
 # src/file-manager/fm-properties-window.c:1288
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "DeÄŸiÅŸim:"
 
 # src/file-manager/fm-properties-window.c:1289
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "EriÅŸim:"
 
 # src/file-manager/fm-properties-window.c:1297
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Ö_zel Simge Seç..."
 
 # src/file-manager/fm-properties-window.c:1303
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Öz_el Simgeyi Sil"
 
 # src/file-manager/fm-properties-window.c:1725
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Okuma"
 
 # src/file-manager/fm-properties-window.c:1729
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Yazma"
 
 # src/file-manager/fm-properties-window.c:1733
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Ç_alıştırma"
 
 # src/file-manager/fm-properties-window.c:1636
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "SUID"
 
 # src/file-manager/fm-properties-window.c:1637
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Özel bayraklar:"
 
 # src/file-manager/fm-properties-window.c:1639
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "SGID"
 
 # src/file-manager/fm-properties-window.c:1640
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Yapışık"
 
 # src/file-manager/fm-properties-window.c:1658
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Erişim hakları"
 
 # src/file-manager/fm-properties-window.c:1664
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Dosyanın sahibi olmadığınız için bu ayarları değiştiremezsiniz."
 
 # src/file-manager/fm-properties-window.c:1677
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Dosya sahibi:"
+
+# src/file-manager/fm-properties-window.c:1677
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Dosya sahibi:"
 
 # src/file-manager/fm-properties-window.c:1686
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Dosya grubu:"
 
 # src/file-manager/fm-properties-window.c:1686
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Dosya grubu:"
 
 # src/file-manager/fm-properties-window.c:1704
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Sahibi:"
 
 # src/file-manager/fm-properties-window.c:1705
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Grubu:"
 
 # src/file-manager/fm-properties-window.c:1706
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "DiÄŸerleri:"
 
 # components/text/Nautilus_View_text.oaf.in.h:3
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Metin görünüm:"
 
 # src/file-manager/fm-properties-window.c:1791
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Sayısal görünüm:"
 
 # src/file-manager/fm-properties-window.c:1792
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Son deÄŸiÅŸtirme:"
 
 # src/file-manager/fm-properties-window.c:1796
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "\"%s\"nin erişim hakları belirlenemedi."
 
 # src/file-manager/fm-properties-window.c:1796
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Seçilen dosyanın izinleri bulunamadı."
 
 # components/music/nautilus-music-view.c:1709
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Yardım görüntülenirken bir hata oluştu: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Yardım metni görüntülenirken bir hata oluştu: %s"
 
 # src/nautilus-theme-selector.c:397
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Yardım görüntülenemiyor"
 
 # src/file-manager/fm-properties-window.c:2043
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Özellikler Penceresi Kapatılsın Mı?"
 
 # src/file-manager/fm-properties-window.c:2044
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Özellikler Penceresi Oluşturuluyor"
 
 # src/nautilus-property-browser.c:1319
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Bir simge seçin"
 
@@ -6120,38 +6217,62 @@ msgstr "Arama Sonuçları"
 
 # src/file-manager/nautilus-indexing-info.c:254
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Üzgünüm, ancak medusa arama servisi kurulmadığı için arama yapılamaz."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Üzgünüm, ancak medusa arama servisi kullanılamaz."
 
-# src/file-manager/nautilus-indexing-info.c:255
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+# src/file-manager/nautilus-indexing-info.c:255
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Arama Servisi Kullanılamaz"
 
 # src/file-manager/fm-search-list-view.c:137
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Seçtiğiniz arama sistemdeki indeksten daha yeni. Arama hiç bir sonuç "
 "döndürmeyecektir. Yeni bir indeks oluşturmak için \"medusa-indexd\" komutunu "
 "root haklarıyla çalıştırmanız gereklidir."
 
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find komutu sistem dosya indeksinizi bulamadı. Bu indeks bozuk, ya da henüz "
+"hiç oluşturulmamış olabilir. İndeksi yeniden oluşturmak için komut satırında "
+"root kullanıcısı haklarıyla \"medusa-indexd\" komutunu girin."
+
 # src/file-manager/fm-search-list-view.c:142
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Çok yeni olan öğeler için arama yap"
 
 # src/file-manager/fm-search-list-view.c:153
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Bilgisayarda her indekslenen dosya seçtiğiniz kriterlere eşleşir. Yapılan "
+"Seçimlerde kontrol yapabilir, ya da sonuçları daraltmak için daha fazla "
+"kriter ekleyebilirsiniz."
+
+# src/file-manager/fm-search-list-view.c:153
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Bilgisayarda her indekslenen dosya seçtiğiniz kriterlere eşleşir. Yapılan "
@@ -6160,37 +6281,55 @@ msgstr ""
 
 # src/file-manager/fm-search-list-view.c:158
 # src/file-manager/fm-search-list-view.c:168
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Tarama sırasında bir hata oluştu"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find komutu sistem dosya indeksinizi bulamadı. Bu indeks bozuk, ya da henüz "
 "hiç oluşturulmamış olabilir. İndeksi yeniden oluşturmak için komut satırında "
 "root kullanıcısı haklarıyla \"medusa-indexd\" komutunu girin."
 
 # libnautilus-private/nautilus-file-operations.c:1917
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Dosya indeksi okunurken hata"
 
 # src/file-manager/fm-search-list-view.c:163
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Arama içeriğini yüklerken bir hata oluştu: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"İçerik araması yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
+"gereklidir. Ancak bu indeks bulunamadı."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"İçerik araması yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
+"gereklidir. Ancak bu indeks bulunamadı."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -6198,27 +6337,25 @@ msgstr ""
 "gereklidir. Ancak bu indeks bulunamadığı için indeksi kullanmayan daha yavaş "
 "bir arama yöntemi kullanılacaktır."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"İçerik araması yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
-"gereklidir. Ancak bu indeks bulunamadı."
 
 # src/file-manager/nautilus-indexing-info.c:255
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Hızlı arama servisi kullanılamaz"
 
 # src/file-manager/nautilus-indexing-info.c:255
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "İçerik arama servisi kullanılamaz"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -6231,56 +6368,89 @@ msgstr ""
 "kullanıcısı olarak sisteme girin aşağıdaki komutu yazın:\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Hızlı arama yapmak için, sistemdeki dosyaların indeksinin oluşturulması "
 "gerekmektedir. Bilgisayarınız bu indeksi hazırlıyor. Ancak oluşturulan "
 "indeks şu anda kullanılamadığı için arama işlemi bir kaç dakika sürebilir."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "İçerik araması yapmak için, sistemdeki dosyaların indeksinin oluşturulması "
 "gerekmektedir. Bilgisayarınız bu indeksi hazırlıyor. İndeksleme işlemi "
 "bitince içerik araması da yapılabilecektir."
 
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
 # src/file-manager/nautilus-indexing-info.c:255
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "İndeksli aramalar kullanılamaz"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"İçerik araması yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
+"gereklidir. Ancak bu indeks bulunamadı."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"İçerik araması yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
+"gereklidir. Ancak bu indeks bulunamadı."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Hızlı arama yapmak için, sistemdeki dosyaların indeksinin oluşturulması "
 "gerekmektedir. Bilgisayarınızda bu indeksi bulunmuyor. İndeks hazırlamak "
 "için \"medusa-indexd\" komutunu çalıştırmanız gerekmektedir. Bu işlem bir "
 "kaç dakika sürebilir."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Hızlı arama yapmak için bilgisayardaki dosyaların indeksinin çıkartılması "
 "gereklidir. Ancak bu indeks bulunamadı. Bir indeks çıkartmak için root "
 "kullanıcısı haklarıyla \"medusa-indexd\" komutunu girmeniz gerekmektedir."
 
-#: src/file-manager/fm-search-list-view.c:323
+# src/file-manager/nautilus-indexing-info.c:255
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Hızlı arama servisi bu bilgisayarda etkinleştirilmemiş"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -6291,12 +6461,13 @@ msgstr ""
 "etkisiz hale getirdiği için bu indekse ulaşılamıyor."
 
 # src/file-manager/nautilus-indexing-info.c:255
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Hızlı arama servisi bu bilgisayarda etkinleştirilmemiş"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Hızlı arama servisi kullanılamaz"
 
 # src/file-manager/fm-search-list-view.c:340
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Konum"
 
@@ -6307,7 +6478,7 @@ msgstr "Konum"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "_Yeni Pencerede Aç"
@@ -6319,7 +6490,7 @@ msgstr "_Yeni Pencerede Aç"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "%d Yeni _Pencerede Aç"
@@ -6329,16 +6500,23 @@ msgstr "%d Yeni _Pencerede Aç"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Nautilus gösterebileceğinden daha fazlasını buldu. Bulunan bazı maddeler "
+"ekranda yeralmayacaktır. "
+
+# src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "Nautilus gösterebileceğinden daha fazlasını buldu. Bulunan bazı maddeler "
 "ekranda yeralmayacaktır. "
 
 # src/file-manager/fm-search-list-view.c:514
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Çok Fazla Eşleşme"
 
@@ -6355,14 +6533,14 @@ msgstr "_Yeni Başlatıcı"
 
 # src/nautilus-property-browser.c:1061
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Yeni bir başlatıcı oluştur"
 
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:2
 # src/file-manager/nautilus-directory-view-ui.xml.h:8
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Çöp kutusundaki tüm öğeleri sil"
 
@@ -6385,7 +6563,7 @@ msgstr "Masaüstü arkaplanı rengi ya da desenini ayarlayacak pencere aç"
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Ö_ntanımlı Arkaplanı Kullan"
@@ -6412,66 +6590,78 @@ msgstr "Seçili dosyayı gösterecek başka bir izleyici seç"
 
 # components/music/nautilus-music-view.c:1710
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
+#, fuzzy
+msgid "Create _Document"
+msgstr "_Dizin OluÅŸtur"
+
+# components/music/nautilus-music-view.c:1710
+#: src/file-manager/nautilus-directory-view-ui.xml.h:6
 msgid "Create _Folder"
 msgstr "_Dizin OluÅŸtur"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:6
-#: src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
+msgstr "Bu dizin içinde boş bir dizin Oluştur"
+
+# src/file-manager/nautilus-directory-view-ui.xml.h:6
+#: src/file-manager/nautilus-directory-view-ui.xml.h:8
 msgid "Create a new empty folder inside this folder"
 msgstr "Bu dizin içinde boş bir dizin Oluştur"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:7
-#: src/file-manager/nautilus-directory-view-ui.xml.h:8
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Seçilen her dosya için sembolik bağlantı oluştur"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Ä°_kizle"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:12
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Tüm seçilen öğeleri Çöpe göndermeden sil"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:10
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Her seçili öğeyi ikizle"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Başlatıcıyı Düzenle"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Başlatıcı bilgisini düzenle"
 
 # libnautilus-private/nautilus-volume-monitor.c:1177
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Seçilen diski biçimlendir"
 
 # src/file-manager/fm-properties-window.c:487
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "A_ygıt Özellikleri"
 
 # libnautilus-private/nautilus-volume-monitor.c:1177
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Seçilen aygıtı ayır"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Daha önce Dosyaları Kes ya da Dosyaları Kopyala komutu yardımıyla seçilen "
 "dosyaları taşı ya da kopyala"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -6480,152 +6670,162 @@ msgstr ""
 "Daha önce Dosyaları Kes ya da Dosyaları Kopyala komutu yardımıyla seçilen "
 "dosyaları taşı ya da kopyala"
 
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
 # src/file-manager/nautilus-directory-view-ui.xml.h:18
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "_Birlikte Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:19
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Seçili her dosyayı yeni pencerede aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:20
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Yeni Pencerede Aç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:21
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Seçili dosyayı bu pencerede aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Seçili dosyaları 'Dosyaları Yapıştır' komutuyla kopyalamaya hazırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Seçili dosyaları 'Dosyaları Yapıştır' komutuyla taşımaya hazırla"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "_Koru"
 
 # libnautilus-private/nautilus-volume-monitor.c:1177
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "_Seçili aygıtı koru"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:15
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Seçili öğeyi yeniden adlandır"
 
 # src/file-manager/fm-directory-view.c:2961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "_Görünümleri Öntanımlı Hale Getir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Bu görünüm için tercihlerle uyuşmak için sıralamayı ve odaklama oranını "
 "deÄŸiÅŸtir"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "~/Nautilus/scripts'ten bir betik çalıştır/yönet"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:31
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "_Tüm Dosyaları Seç"
 
 # data/browser.xml.h:65
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr "_Desen Seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Bu penceredeki tüm öğeleri seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:32
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Bu penceredeki tüm öğeleri seç"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Seçilen disk için özellikleri göster"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Bu menüde görüntülenen betikleri içeren dizini göster"
 
 # libnautilus-private/nautilus-volume-monitor.c:1177
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Seçilen aygıtı ayır"
 
 # src/nautilus-shell-ui.xml.h:41
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Bu konum için öntanımlı arkaplanı kullan"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:37
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Seçili her öğenin özelliklerini göster ya da değiştir"
 
+# libnautilus/nautilus-clipboard-ui.xml.h:6 src/nautilus-shell-ui.xml.h:74
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Dosyayı K_opyala"
+
 # src/nautilus-window-menus.c:315
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Biçimlendir"
 
 # src/file-manager/fm-desktop-icon-view.c:1113
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Diski Ayır"
 
 # src/file-manager/nautilus-directory-view-ui.xml.h:40
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Betikler Dizinini Göster"
 
 # libnautilus/nautilus-clipboard-ui.xml.h:8 src/nautilus-shell-ui.xml.h:87
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Dosyaları _Yapıştır"
 
 # libnautilus-private/nautilus-file-operations.c:1994
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "isimsiz dizin"
 
 # src/file-manager/fm-properties-window.c:487
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "Ö_zellikler"
 
 # src/file-manager/nautilus-icon-view-ui.xml.h:26
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Ye_niden adlandır..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Betikler"
 
@@ -6734,8 +6934,14 @@ msgstr "_Elle"
 msgid "Indexing is %d%% complete."
 msgstr "İndeksleme %%%d tamamlandı"
 
+# src/file-manager/nautilus-indexing-info.c:122
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Dosyalarınız en son %s tarihinde indekslendi"
+
 # src/file-manager/nautilus-indexing-info.c:230
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -6744,28 +6950,31 @@ msgstr ""
 "bir şekilde yapılabilir. "
 
 # src/file-manager/nautilus-search-list-view-ui.xml.h:3
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Ä°ndeksleme Durumu"
 
 # src/file-manager/nautilus-indexing-info.c:122
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Dosyalarınız en son %s tarihinde indekslendi"
 
 # src/file-manager/nautilus-indexing-info.c:230
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Her gün dosyalarınız indekslenmektedir. Bu yolla arama işlemleri çok hızlı "
-"bir şekilde yapılabilir. Eğer indeksi şimdi güncellemek istiyorsanız, "
-"\"Şimdi Güncelle\" düğmesine tıklayın."
+"bir şekilde yapılabilir. "
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Şu anda dosyalarınızın indeksi bulunmuyor."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -6775,17 +6984,21 @@ msgstr ""
 "için bir indeks oluşturulur. Hızlı arama bilgisayarınızda henüz etkin "
 "olmadığı için henüz bir indekse de sahip değilsiniz."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Şu anda dosyalarınızın indeksi bulunmuyor."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
 # src/file-manager/nautilus-indexing-info.c:254
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Üzgünüm, ancak medusa arama servisi kullanılamaz."
 
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
 # src/file-manager/nautilus-indexing-info.c:274
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -6815,32 +7028,38 @@ msgid "Show status of indexing used when searching"
 msgstr "Arama sırasında indeksleme durumunu göster"
 
 # src/nautilus-application.c:275
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Gereken Dizin oluşturulamadı"
 
-#: src/nautilus-application.c:256
-#, c-format
+# src/nautilus-application.c:280
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Gereken Dizinler oluşturulamadı"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus gerekli \"%s\" dizinini oluşturulanıyor. Nautilus'u çalıştırmadan "
 "önce bu dizini kendiniz oluşturun, ya da haklarını düzeltin."
 
 # src/nautilus-application.c:280
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Gereken Dizinler oluşturulamadı"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -6851,19 +7070,23 @@ msgstr ""
 "Nautilus'u çalıştırmadan önce lütfen bu dizinleri oluşturun, ya da "
 "Nautilus'un bunları oluşturabileceği şekilde izinlerini değiştirin."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Eski Masaüstüne Bağ"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "Eski masaüstü aktarıldı"
 
 #. Can't register myself due to trouble locating the
@@ -6876,7 +7099,7 @@ msgstr "Eski masaüstü aktarıldı"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -6888,7 +7111,7 @@ msgstr ""
 
 # src/nautilus-application.c:400
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6934,13 +7157,13 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus beklenmedik bir hatadan dolayı kullanılamıyor."
 
 # src/nautilus-application.c:426
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6949,7 +7172,7 @@ msgstr ""
 "Bonobo hatası yüzünden, Nautilus şuanda kullanılamıyor."
 
 # src/nautilus-application.c:444
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6960,7 +7183,7 @@ msgstr ""
 "Nautilius'un yeniden başlatılması problemin çözümüne yardımcı olabilir."
 
 # src/nautilus-application.c:444
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6970,6 +7193,18 @@ msgstr ""
 "yüzünden Nautilus şuanda kullanılamıyor. Bonobo-activation-server'ı kapatmak "
 "ve Nautilus'u yeninden başlatmak problemin çözümüne yardımcı olabilir."
 
+# components/music/nautilus-music-view.c:1709
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Yardım görüntülenirken bir hata oluştu: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Yer imi tanımlanmamış"
@@ -7009,41 +7244,49 @@ msgstr "Daha Az Seçenek"
 msgid "Find Them!"
 msgstr "Hepsini Bul!"
 
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
+msgstr ""
+
 #: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+msgid "Please enter a name and try again."
 msgstr ""
 
 # libnautilus-private/nautilus-file-operations.c:1856
-#: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Üzerine Taşınamaz"
 
-# src/nautilus-window-manage-views.c:1308
-#: src/nautilus-connect-server-dialog.c:100
+# src/nautilus-theme-selector.c:396
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Üzgünüm, fakat \"%s\" geçerli bir dosya adı değil."
+
+# src/nautilus-window-manage-views.c:1302
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "\"%s\" geçerli bir konum değil. Yazdıklarınızı yeniden gözden geçirin."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "\"%s\" bulunamadı. Lütfen yazdığınızı yeniden gözden geçirin."
 
 # libnautilus-private/nautilus-global-preferences.c:894
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Ağ Sunucuları"
 
-# libnautilus-private/nautilus-program-chooser.c:1165
-# src/file-manager/fm-list-view.c:1918
-# src/file-manager/fm-search-list-view.c:334
-# src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "Ä°_sim:"
+# src/nautilus-location-bar.c:60
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr "_Adres:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_BaÄŸlan"
@@ -7261,6 +7504,22 @@ msgstr ""
 "\n"
 "Bu dosyayı elle silerek aracın yeniden sunulmasını sağlayabilirsiniz.\n"
 
+# src/nautilus-sidebar.c:655
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Aynı anda birden fazla özel simge tanımlanamaz. Lütfen özel simge belirlemek "
+"için tek bir resmi sürükleyiniz."
+
+# src/nautilus-sidebar.c:676
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Kullandığınız dosya yerel değil. Özel simgelerde sadece yerel dosyalar "
+"kullanılabilir."
+
 # src/nautilus-sidebar.c:1237
 #: src/nautilus-information-panel.c:882
 #, c-format
@@ -7273,29 +7532,28 @@ msgstr "%s ile aç"
 msgid "Open with..."
 msgstr "Birlikte aç..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "CD yazıcı uygulaması çalıştırılamadı:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "CD yazıcı başlatılamadı"
 
 # src/file-manager/fm-desktop-icon-view.c:1093
 # src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
 # src/file-manager/nautilus-directory-view-ui.xml.h:11
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "Çöpü _Boşalt"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Dosyaları CD'ye yaz"
 
@@ -7305,138 +7563,153 @@ msgid "Go To:"
 msgstr "Git:"
 
 # src/nautilus-location-bar.c:139
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "%d konumu farklı pencerelerde görmek istiyor musunuz?"
 
 # src/nautilus-location-bar.c:146
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Farklı pencerelerde görüntülensin mi?"
 
 # src/nautilus-window-manage-views.c:1397
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr "Adresi Aç"
 
 # src/nautilus-main.c:143
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Nautilus'un hızlı iç testini gerçekleştir."
 
 # src/nautilus-main.c:146
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Verilen boyutlarda pencere oluÅŸtur."
 
 # src/nautilus-main.c:146
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
 # src/nautilus-main.c:148
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Sadece açık olarak belirtilen URL'ler için pencere oluştur."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "Masaüstünü yönetme (Tercihler penceresindeki özellikleri gözardı et)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
 # src/nautilus-main.c:150
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Nautilus'tan çık."
 
 # src/nautilus-main.c:152
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Nautilus'u yeniden baÅŸlat"
 
 # src/file-manager/fm-properties-window.c:1677
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Dosya Yöneticisi"
 
 # data/static_bookmarks.xml.h:25 src/nautilus-window-manage-views.c:235
 # src/nautilus-window-menus.c:552
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
 # src/nautilus-main.c:205
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check URI'lerle beraber kullanılamaz.\n"
 
 # src/nautilus-main.c:209
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check diğer seçeneklerle beraber kullanılamaz.\n"
 
 # src/nautilus-main.c:213
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit URI'lerle beraber kullanılamaz.\n"
 
 # src/nautilus-main.c:217
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart URI'lerle beraber kullanılamaz.\n"
 
 # src/nautilus-main.c:221
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: --geometry bir URI'den fazla beraber kullanılamaz.\n"
 
-# src/nautilus-window-menus.c:306
+# src/file-manager/fm-directory-view.c:2639
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "\"%s\" dosyasını tamamen silmek istediğinize emin misiniz?"
+
+# src/nautilus-window-menus.c:306
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Geçmişi silmek istediğinize emin misiniz? Yeniden hatırlamak güç "
 "olabilir! :-)"
 
 # src/nautilus-window-menus.c:309
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Daha önce ziyaret edilen konumları silmek istediğinize emin misiniz?"
 
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
 # src/nautilus-window-menus.c:314
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Geçmişi Sil"
 
 # src/nautilus-window-menus.c:716
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "\"%s\" konumu bulunmuyor. Bu konumla ilgili tüm yer imlerini listeden "
 "sileyim mi?"
 
+# src/nautilus-window-menus.c:734
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "\"%s\" için yer bilgisi bulunamadı."
+
 # src/nautilus-window-menus.c:720
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bulunmayan Adres İçin Yer İmi"
 
 # src/nautilus-bookmarks-window.c:190 src/nautilus-window-menus.c:721
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Sil"
 
@@ -7477,7 +7750,6 @@ msgstr "_Tüm Pencereleri Kapat"
 
 # src/nautilus-shell-ui.xml.h:13
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Tüm Nautilus pencerelerini kapat"
@@ -7502,45 +7774,52 @@ msgstr "Bul"
 msgid "Forward"
 msgstr "Ä°leri"
 
-# src/nautilus-shell-ui.xml.h:31
+# libnautilus-private/nautilus-search-uri.c:249
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Çöp dizinine git"
+
+# src/nautilus-shell-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Sonraki ziyaret edilen konuma git"
 
 # src/nautilus-shell-ui.xml.h:32
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Önceki yere gidin"
 
 # libnautilus-private/nautilus-search-uri.c:249
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Çöp dizinine git"
 
 # components/help/converters/gnome-db2html2/gdb3html.c:717
 # src/nautilus-shell-ui.xml.h:37
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Başlangıç"
 
 # src/nautilus-shell-ui.xml.h:33 src/nautilus-window-menus.c:433
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "_Konum Çubuğu"
 
 # src/file-manager/fm-properties-window.c:1725
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Tekrar Yükle"
 
 # src/nautilus-shell-ui.xml.h:49
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Dosyaları bu bilgisayarda ara"
 
 # src/nautilus-shell-ui.xml.h:35 src/nautilus-window-menus.c:415
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "_Durum Çubuğu"
 
@@ -7549,92 +7828,99 @@ msgstr "_Durum Çubuğu"
 # libnautilus-private/nautilus-file-operations.c:910
 # libnautilus-private/nautilus-file-operations.c:929
 # src/nautilus-shell-ui.xml.h:55
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Dur"
 
 # src/nautilus-shell-ui.xml.h:59
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "CD'ye yaz"
 
 # src/nautilus-shell-ui.xml.h:69
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Yer imi ekle"
 
 # src/nautilus-shell-ui.xml.h:70
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_Geri"
 
 # src/nautilus-shell-ui.xml.h:72
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Yer imleri"
 
 # src/nautilus-shell-ui.xml.h:27
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Geçmişi Temizle"
 
 # components/text/nautilus-text-view-ui.xml.h:6
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Courier"
 
 # src/nautilus-shell-ui.xml.h:76
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "Yer İmlerini _Düzenle"
 
 # src/nautilus-shell-ui.xml.h:80
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Ä°leri"
 
 # src/nautilus-shell-ui.xml.h:81
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "G_it"
 
 # src/nautilus-shell-ui.xml.h:83
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Başlangıç"
 
 # src/nautilus-bookmarks-window.c:177
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Adres..."
 
 # libnautilus-private/nautilus-global-preferences.c:514
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Yan Panel"
 
+# components/text/nautilus-text-view-ui.xml.h:9
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+#, fuzzy
+msgid "_Templates"
+msgstr "_Times"
+
 # data/linksets/desktop.xml.h:2 libnautilus-private/nautilus-file.c:4642
 # libnautilus-private/nautilus-trash-directory.c:301
 # src/file-manager/fm-desktop-icon-view.c:66
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "Çö_p"
 
 # src/nautilus-shell-ui.xml.h:59
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "_Yukarı"
 
 # src/nautilus-shell-ui.xml.h:97
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Görüntüle"
 
@@ -7656,34 +7942,40 @@ msgid "File Browser: %s"
 msgstr "Dosya Tarayıcı: %s"
 
 # src/nautilus-window-manage-views.c:899
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr "Yan çubuk panellerinden birisinde hata oluştu ve devam edilemiyor. "
 
-# src/nautilus-window-manage-views.c:903
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+# src/nautilus-window-manage-views.c:799
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Başlatılırken %s görünümü bir hata saptadı."
+
+# src/nautilus-window-manage-views.c:903
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s yan çubuk panelinde bir hata oluştu ve devam edilemiyor. Eğer bu durum "
 "yinelenirse paneli tamamen kapatmanızda fayda var."
 
 # src/nautilus-window-manage-views.c:908
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr "Kenar Çubuğu Hatası"
 
 # libnautilus-private/nautilus-global-preferences.c:514
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Yan Panel"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Bir kenar paneli görünümü içerir"
 
@@ -7724,186 +8016,219 @@ msgstr "_Yeni ekle..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Üzgünüm, ancak %s deseni silinemedi."
 
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
 # src/nautilus-property-browser.c:887 src/nautilus-property-browser.c:916
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Desen silinemedi"
 
 # src/nautilus-property-browser.c:915
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Üzgünüm, ancak %s logosu silinemez."
 
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+# src/nautilus-property-browser.c:1421 src/nautilus-property-browser.c:1424
+# src/nautilus-property-browser.c:1428 src/nautilus-property-browser.c:1457
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Amblem yeniden adlandırılamadı"
+
 # src/nautilus-property-browser.c:1011
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Yeni Bir Logo OluÅŸtur:"
 
 # src/nautilus-property-browser.c:1016
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Anahtar sözcük:"
 
 # components/image-viewer/Nautilus_View_image.oaf.in.h:3
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Resim:"
 
 # src/nautilus-property-browser.c:1033
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Yeni logo için bir resim dosyası belirleyin:"
 
 # src/nautilus-property-browser.c:1061
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Yeni Bir Renk OluÅŸtur:"
 
 # src/nautilus-property-browser.c:1066
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Renk _adı:"
 
 # src/nautilus-property-browser.c:1077
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Renk _deÄŸeri:"
 
 # src/nautilus-theme-selector.c:396
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Üzgünüm, fakat \"%s\" geçerli bir dosya adı değil."
 
 # src/nautilus-theme-selector.c:396
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Üzgünüm, ancak geçerli bir dosya adı vermediniz."
 
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
 # src/nautilus-property-browser.c:1164
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Desen kurulamadı"
 
 # src/nautilus-property-browser.c:1122
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Sıfırlama resminin üzerine alamazsınız."
 
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
 # components/music/nautilus-music-view.c:686
 # src/file-manager/fm-properties-window.c:2140
 # src/nautilus-property-browser.c:986 src/nautilus-property-browser.c:1122
 # src/nautilus-property-browser.c:1135 src/nautilus-property-browser.c:1403
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Resim Dosyası Değil"
 
 # src/nautilus-property-browser.c:1163
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Üzgünüm, ancak %s deseni kurulamadı."
 
 # src/nautilus-property-browser.c:1189
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Desen olarak eklenecek bir resim dosyası seçin:"
 
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
 # src/nautilus-property-browser.c:1261
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Yeni rengin adı boş olamaz."
 
 # src/nautilus-property-browser.c:1262
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Renkler kurulamadı"
 
 # src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Eklenecek rengi seçin"
 
-# src/file-manager/fm-properties-window.c:2139
-# src/nautilus-property-browser.c:984 src/nautilus-property-browser.c:1134
-# src/nautilus-property-browser.c:1402
-#: 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' bir resim dosyası değil!"
+# components/music/nautilus-music-view.c:684
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
+msgstr "`%s' kullanılabilir bir resim dosyası değil."
+
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "'%s' dosyası düzgün bir resim gibi görünmüyor."
 
 # src/nautilus-property-browser.c:2169
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Bir Sınıf Seçin:"
 
 # src/nautilus-property-browser.c:2177 src/nautilus-theme-selector.c:503
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Silmeyi Ä°ptal Et"
 
 # src/nautilus-property-browser.c:2181
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Yeni Bir _Desen Ekle..."
 
 # src/nautilus-property-browser.c:2184
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Yeni _Bir Renk Ekle..."
 
 # src/nautilus-property-browser.c:2187
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Yeni Bir Logo Ekle..."
 
 # src/nautilus-property-browser.c:2210
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Silmek için bir desenin üzerine tıklayın"
 
 # src/nautilus-property-browser.c:2213
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Silmek için bir rengin üzerine tıklayın"
 
 # src/nautilus-property-browser.c:2216
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Silmek için bir logonun üzerine tıklayın"
 
 # src/nautilus-property-browser.c:2225
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Desenler:"
 
 # src/nautilus-property-browser.c:2228
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Renkler:"
 
 # src/nautilus-property-browser.c:2231
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Logolar:"
 
 # src/nautilus-property-browser.c:2249
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Bir Deseni Sil..."
 
 # src/nautilus-property-browser.c:2252
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "B_ir Rengi Sil..."
 
 # src/nautilus-property-browser.c:2255
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "Bir _Logoyu Sil..."
 
@@ -8348,9 +8673,15 @@ msgstr "_CD Yazıcı"
 # src/nautilus-shell-ui.xml.h:12
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "_Tüm Pencereleri Kapat"
 
+# components/notes/Nautilus_View_notes.oaf.in.h:3
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Yan paneli kapat"
+
 # libnautilus-private/nautilus-search-uri.c:249
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
@@ -8358,27 +8689,27 @@ msgid "Go to Computer"
 msgstr "BoÅŸ CD dizinine git"
 
 # libnautilus-private/nautilus-search-uri.c:249
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr "CD Yazıcıya Git"
 
 # src/nautilus-bookmarks-window.c:177
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr "_Adres Aç..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
 # libnautilus-private/nautilus-search-uri.c:249
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "dizin"
 
 # data/browser.xml.h:65
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr "_Yerler"
 
@@ -8410,12 +8741,16 @@ msgstr ""
 msgid "View Failed"
 msgstr "İzleme Başarısız"
 
-# src/nautilus-window-manage-views.c:788
+# src/nautilus-window-manage-views.c:799
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Başlatılırken %s görünümü bir hata saptadı."
+
+# src/nautilus-window-manage-views.c:788
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s görünümünde bir hata oluştu ve devam edilemiyor. Farklı bir görünüm türü "
 "seçebilir, ya da başka bir konuma gidebilirsiniz."
@@ -8426,110 +8761,142 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Başlatılırken %s görünümü bir hata saptadı."
 
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Bu pencereyle eşleşmiş Nautilus Uygulaması"
+
 # src/file-manager/fm-properties-window.c:983
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "İçerik Görünümü"
 
 # libnautilus-private/nautilus-search-uri.c:249
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Güncel dosya ya da dizin görünümü"
 
-# src/nautilus-window-manage-views.c:1302
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "\"%s\" bulunamadı. Lütfen yazdığınızı yeniden gözden geçirin."
+# src/nautilus-theme-selector.c:397
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "%s yüklenemiyor"
+
+# src/nautilus-theme-selector.c:397
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "%s yüklenemiyor"
 
 # src/nautilus-window-manage-views.c:1322
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "\"%s\" gösterilemedi, Nautilus bunun ne tür bir dosya olduğunu bulamadı."
 
 # src/nautilus-window-manage-views.c:1330
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "\"%s\" Nautilus tarafından gösterilemiyor."
 
 # src/nautilus-window-manage-views.c:1342
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "\"%s\" gösterilemiyor, çünkü Nautilus %s: konumunu tanıyamıyor."
 
 # src/nautilus-window-manage-views.c:1348
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "\"%s\" gösterilemiyor, çünkü giriş işleminde hata var."
 
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
 # src/nautilus-window-manage-views.c:1353
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "\"%s\" gösterilemedi, çünkü erişim engellendi"
 
 # src/nautilus-window-manage-views.c:1358
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "\"%s\" gösterilemedi, çünkü \"%s\" makine adı bulunamadı. Ağ ayarlarınızın "
 "doğru yapıldığına emin misiniz?"
 
 # src/nautilus-window-manage-views.c:1364
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "\"%s\" gösterilemedi, çünkü makina adı verilmemiş. Ağ ayarlarınızın doğru "
 "yapıldığına emin misiniz?"
 
-# src/nautilus-window-manage-views.c:1322
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+# src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "\"%s\" gösterilemiyor, çünkü Nautilus %s: konumunu tanıyamıyor."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"\"%s\" gösterilemiyor, çünkü Nautilus SMB ana tarayıcısına bağlanmıyor.\n"
-"Bir SMB sunucusunun yerel ağda çalıştığından emin olun."
 
 # src/nautilus-window-manage-views.c:1376
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Arama yapılamaz, çünkü henüz bir indeks oluşturmadınız, ya da arama servisi "
+"şu an çalışmıyor. Medusa arama servisinin çalıştığına emin olun ve indeksi "
+"oluşturmadıysanız şimdi Medusa Indexer'ı çalıştırın."
+
+# src/nautilus-window-manage-views.c:1376
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Arama yapılamaz, çünkü henüz bir indeks oluşturmadınız, ya da arama servisi "
 "şu an çalışmıyor. Medusa arama servisinin çalıştığına emin olun ve indeksi "
 "oluşturmadıysanız şimdi Medusa Indexer'ı çalıştırın."
 
 # src/nautilus-window-manage-views.c:1380
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Arama Yapılamaz"
 
 # src/nautilus-window-manage-views.c:1384
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "\"%s\" Nautilus tarafından gösterilemiyor."
 
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
 # src/nautilus-window-manage-views.c:1397
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Adres Gösterilemiyor"
 
@@ -8543,7 +8910,7 @@ msgstr "Bu yer imi tarafından belirtilen konuma git"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -8552,12 +8919,12 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Görkem Çetin"
 
 # src/nautilus-window-menus.c:562
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -8574,44 +8941,49 @@ msgid "Go forward a number of pages"
 msgstr "Bir kaç sayfa ileri git"
 
 # libnautilus-private/nautilus-global-preferences.c:139
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Bu konumu \"%s\" ile göster"
 
 # libnautilus-private/nautilus-undo-signal-handlers.c:178
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
 # libnautilus-private/nautilus-global-preferences.c:564
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 msgid "Fonts"
 msgstr "Yazıtipleri"
 
-#: src/nautilus-window.c:1178
+# components/text/nautilus-text-view-ui.xml.h:9
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr "Temalar"
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD Yazıcı"
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Uygulama No"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Pencerenin uygulama numarası"
 
 # components/help/hyperbola-filefmt.c:470
 # components/help/hyperbola-filefmt.c:758 data/linksets/apps.xml.h:1
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Uygulama"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Bu pencereyle eşleşmiş Nautilus Uygulaması"
 
@@ -8654,6 +9026,287 @@ msgstr "Ağ Sunucuları"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 
+#~ msgid ""
+#~ "Some of the files could not be added as emblems because they did not "
+#~ "appear to be valid images."
+#~ msgstr ""
+#~ "Bazı dosyalar düzgün bir resim olarak görüntülenemediğinden amblem olarak "
+#~ "eklenemiyor."
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "Factory for hardware view"
+#~ msgstr "Donanım görünümü için mimari"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:3
+#~ msgid "Hardware Viewer"
+#~ msgstr "Donanım Görüntüleyici"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:3
+#~ msgid "Hardware view"
+#~ msgstr "Donanım görünümü"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:2
+# data/static_bookmarks.xml.h:12
+#~ msgid "View as Hardware"
+#~ msgstr "Donanım olarak Görüntüle"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:4
+#~ msgid "hardware view"
+#~ msgstr "donanım görünümü"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "Donanım görünümü için simge adı"
+
+# components/hardware/Nautilus_View_hardware.oaf.in.h:1
+#~ msgid "summary of hardware info"
+#~ msgstr "Donanım görünümü için özet"
+
+# components/hardware/nautilus-hardware-view.c:230
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s MÄ°B\n"
+#~ "%s Mhz\n"
+#~ "%s K önbellek"
+
+# components/hardware/nautilus-hardware-view.c:264
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB RAM"
+
+# components/hardware/nautilus-hardware-view.c:266
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB RAM"
+
+# components/hardware/nautilus-hardware-view.c:324
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+# components/hardware/nautilus-hardware-view.c:326
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "Başlatılma zamanı %d gün, %d saat, %d dakika"
+
+# components/hardware/nautilus-hardware-view.c:407
+#~ msgid "Hardware Overview"
+#~ msgstr "Donanım Bilgileri"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "CPU sayfasına giden yol"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "RAM sayfasına giden yol"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "IDE sayfasına giden yol"
+
+# libnautilus-private/nautilus-file-operations.c:639
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" dizinine kopyalama sırasında hata.\n"
+#~ "\n"
+#~ "Hedef bölgede yeterli disk alanı bulunmuyor."
+
+# libnautilus-private/nautilus-file-operations.c:648
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "\"%s\" bağlantısı oluşturulurken hata oluştu.\n"
+#~ "\n"
+#~ "Hedef dizinde yeterli disk alanı bulunmuyor."
+
+# libnautilus-private/nautilus-file-operations.c:671
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\" dizinine taşıma sırasında hata.\n"
+#~ "\n"
+#~ "Bu dizine yazma hakkınız bulunmuyor."
+
+# libnautilus-private/nautilus-file-operations.c:675
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\" dizinine taşıma sırasında hata.\n"
+#~ "\n"
+#~ "Hedef bölge salt-okunur."
+
+# libnautilus-private/nautilus-file-operations.c:682
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "\"%s\" için bağlantı oluşturulması sırasında hata.\n"
+#~ "\n"
+#~ "Bu dizine yazmak için yeterli haklarınız bulunmuyor."
+
+# libnautilus-private/nautilus-file-operations.c:686
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "\"%s\" için bağlantı oluşturulması sırasında hata.\n"
+#~ "\n"
+#~ "Hedef disk salt-okunur."
+
+# libnautilus-private/nautilus-file-operations.c:715
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" kopyalanması sırasında \"%s\" hatası oluştu.\n"
+#~ "\n"
+#~ "Devam etmek ister misiniz?"
+
+# libnautilus-private/nautilus-file-operations.c:719
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" hatası. Taşınamıyor: \"%s\".\n"
+#~ "\n"
+#~ "Devam etmek istiyor musunuz?"
+
+# libnautilus-private/nautilus-file-operations.c:729
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "\"%s\" hatası oluştu (dosya adı: \"%s\")\n"
+#~ "\n"
+#~ "Devam etmek istiyor musunuz?"
+
+# libnautilus-private/nautilus-file-operations.c:744
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Kopyalama sırasında hata oluştu: \"%s\"\n"
+#~ "\n"
+#~ "Devam etmek istiyor musunuz?"
+
+# libnautilus-private/nautilus-file-operations.c:752
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Bağlama sırasında hata oluştu: \"%s\".\n"
+#~ "\n"
+#~ "Devam etmek istiyor musunuz?"
+
+# libnautilus-private/nautilus-file-operations.c:758
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Silerken bir hata oluÅŸtu: \"%s\"\n"
+#~ "\n"
+#~ "Devam etmek istiyor musunuz?"
+
+# libnautilus-private/nautilus-file-operations.c:1806
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Çöpe Kopyalanamıyor."
+
+# libnautilus-private/nautilus-trash-directory.c:73
+#~ msgid "Searching Disks"
+#~ msgstr "Diskler Taranıyor"
+
+# libnautilus-private/nautilus-trash-directory.c:74
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus diskinizdeki çöp kutularını araştırıyor"
+
+# src/file-manager/fm-directory-view.c:2596
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Seçili %d dosya çöpe gönderilemiyor. Bunları hemen silmek ister misiniz?"
+
+# src/file-manager/fm-directory-view.c:2600
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "Seçili dosyaların %d tanesi çöpe gönderilemiyor. Bu %d dosyayı hemen "
+#~ "silmek ister misiniz?"
+
+# src/nautilus-sidebar.c:683
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Bıraktığınız dosya bir resim değil. Özel simgeler için sadece yerel "
+#~ "diskten alınan resimler kullanılabilir."
+
+# src/file-manager/nautilus-indexing-info.c:254
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Üzgünüm, ancak medusa arama servisi kurulmadığı için arama yapılamaz."
+
+# src/file-manager/nautilus-indexing-info.c:230
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Her gün dosyalarınız indekslenmektedir. Bu yolla arama işlemleri çok "
+#~ "hızlı bir şekilde yapılabilir. Eğer indeksi şimdi güncellemek "
+#~ "istiyorsanız, \"Şimdi Güncelle\" düğmesine tıklayın."
+
+# src/nautilus-window-manage-views.c:1308
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" geçerli bir konum değil. Yazdıklarınızı yeniden gözden geçirin."
+
+# src/file-manager/fm-properties-window.c:2139
+# src/nautilus-property-browser.c:984 src/nautilus-property-browser.c:1134
+# src/nautilus-property-browser.c:1402
+#~ msgid "Sorry, but '%s' is not a usable image file!"
+#~ msgstr "`%s' bir resim dosyası değil!"
+
+# src/nautilus-window-manage-views.c:1322
+#~ 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 ""
+#~ "\"%s\" gösterilemiyor, çünkü Nautilus SMB ana tarayıcısına bağlanmıyor.\n"
+#~ "Bir SMB sunucusunun yerel ağda çalıştığından emin olun."
+
+#~ msgid "file icon"
+#~ msgstr "dosya simgesi"
+
+# libnautilus-private/nautilus-program-chooser.c:1165
+# src/file-manager/fm-list-view.c:1918
+# src/file-manager/fm-search-list-view.c:334
+# src/nautilus-bookmarks-window.c:164 src/nautilus-search-bar-criterion.c:67
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Ä°_sim:"
+
 # libnautilus-private/nautilus-file.c:3629
 #~ msgid "Unknown"
 #~ msgstr "Bilinmiyor"
@@ -8780,10 +9433,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "_Toolbar"
 #~ msgstr "_Araç Çubuğu"
 
-# src/nautilus-window-menus.c:734
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "\"%s\" için yer bilgisi bulunamadı."
-
 # src/nautilus-window-menus.c:735
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Bulunmayan Adrese Git"
@@ -8818,10 +9467,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "Authentication Required"
 #~ msgstr "Kimlik Sınama Gerekli"
 
-# src/nautilus-location-bar.c:60
-#~ msgid "_Location:"
-#~ msgstr "_Adres:"
-
 # libnautilus-private/nautilus-file-operations.c:1829
 # libnautilus-private/nautilus-file-operations.c:2059
 #~ msgid "The Trash must remain on the desktop."
@@ -8882,10 +9527,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "_Helvetica"
 #~ msgstr "_Helvetica"
 
-# components/text/nautilus-text-view-ui.xml.h:9
-#~ msgid "_Times"
-#~ msgstr "_Times"
-
 #, fuzzy
 #~ msgid "E_xecute scripts when they are clicked"
 #~ msgstr "_Tıklandığında dosyaları çalıştır"
@@ -9083,10 +9724,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "No description available for the \"%s\" theme"
 #~ msgstr "\"%s\" teması için bir açıklama bulunamadı"
 
-# components/text/nautilus-text-view-ui.xml.h:9
-#~ msgid "Themes"
-#~ msgstr "Temalar"
-
 # src/nautilus-shell-ui.xml.h:39
 #~ msgid "New Window Behavior"
 #~ msgstr "Yeni Pencere Davranışı"
@@ -9123,9 +9760,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "Click Behavior"
 #~ msgstr "Tıklama Yöntemi"
 
-#~ msgid "Executable Text Files"
-#~ msgstr "Çalıştırılabilir Metin Dosyaları"
-
 # src/nautilus-complex-search-bar.c:233
 #~ msgid "Show Options"
 #~ msgstr "Seçenekleri Göster"
@@ -9314,10 +9948,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "Couldn't add theme"
 #~ msgstr "Tema eklenemiyor"
 
-# src/nautilus-theme-selector.c:425
-#~ msgid "Sorry, but the \"%s\" theme couldn't be installed."
-#~ msgstr "\"%s\" teması yüklenemedi."
-
 # src/nautilus-theme-selector.c:426
 #~ msgid "Couldn't install theme"
 #~ msgstr "Tema yüklenemedi"
@@ -9339,10 +9969,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ "Geçerli temayı silemezsiniz. Bunu silmeden önce başka bir temaya geçiş "
 #~ "yapın."
 
-# src/nautilus-theme-selector.c:615
-#~ msgid "Sorry, but that theme could not be removed!"
-#~ msgstr "Üzgünüm, ancak bu tema silinemedi!"
-
 # src/nautilus-theme-selector.c:616
 #~ msgid "Couldn't remove theme"
 #~ msgstr "Tema silinemedi"
@@ -9994,10 +10620,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "Set Cover Image"
 #~ msgstr "Kapak Resmini Tanımla"
 
-# components/music/nautilus-music-view.c:684
-#~ msgid "Sorry, but '%s' is not a usable image file."
-#~ msgstr "`%s' kullanılabilir bir resim dosyası değil."
-
 # components/music/nautilus-music-view.c:734
 #~ msgid "Select an image file for the album cover:"
 #~ msgstr "Albüm kapağı için bir resim dosyası seçin:"
@@ -10069,10 +10691,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "<span size=\"xx-large\">%s - %s</span>"
 #~ msgstr "<span size=\"xx-large\">%s - %s</span>"
 
-# src/nautilus-property-browser.c:1456
-#~ msgid "Sorry, but the image at %s couldn't be installed as an emblem."
-#~ msgstr "Üzgünüm, ancak %s resmi bir logo olarak kurulamadı."
-
 # src/file-manager/fm-directory-view.c:2609
 # src/file-manager/fm-directory-view.c:2650
 #~ msgid "Delete"
@@ -10110,10 +10728,6 @@ msgstr "Nautilus dosya yöneticisinde ağ sunucularını görüntüle"
 #~ msgid "%I:%M %p"
 #~ msgstr "%I:%M %p"
 
-# src/nautilus-theme-selector.c:397
-#~ msgid "Couldn't load %s"
-#~ msgstr "%s yüklenemiyor"
-
 #~ msgid "Loading %s"
 #~ msgstr "%s yükleniyor"
 
diff --git a/po/uk.po b/po/uk.po
index e4b7e2c27..2ea024803 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-03-26 03:33--500\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -37,8 +37,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Збій bonobo_ui_init()."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Емблеми"
 
@@ -51,48 +51,60 @@ msgid "Nautilus Emblem view"
 msgstr "Відображенн� емблем дл� \"�аутілу�а\""
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "�е вдало�� видалити емблему"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "�е вдало�� видалити емблему з назвою \"%s\". Це може означати, що емблема є "
 "влашнованою, а не доданою."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "�е вдало�� видалити емблему"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "�е вдало�� перейменувати емблему"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "�е вдало�� перейменувати емблему з назвою \"%s\". Це може означати, що "
 "емблема є влашнованою, а не доданою."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "�е вдало�� перейменувати емблему"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "Перейменувати емблему"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Введіть нову назву дл� показаної емблеми:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Додати емблеми..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -100,7 +112,7 @@ msgstr ""
 "Введіть опи�ову назву кожної емблеми. Ці назви буде викори�тано дл� "
 "ідентифікації емблеми."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -108,139 +120,64 @@ msgstr ""
 "Введіть опи�ову назву емблеми. Цю назву буде викори�тано дл� ідентифікації "
 "емблеми."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Де�кі з файлів не вдало�� додати �к емблеми, о�кільки їх не вдало�� "
 "розпізнати �к зображенн�."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Файл \"%s\" не вдало�� розпізнати �к зображенн�."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "�е вдало�� додати емблеми"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Жоден з файлів не може бути доданим �к емблема, о�кільки їх не вдало�� "
 "розпізнати �к зображенн�."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Перене�ений тек�т не був правильним розміщенн�м файла."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "�е вдало�� додати емблему"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Файл \"%s\" не вдало�� розпізнати �к зображенн�."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Перене�ені файли не вдало�� розпізнати �к зображенн�."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Очи�тити"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Фабрика програми перегл�ду апаратного забезпеченн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "�паратне забезпеченн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Програма перегл�ду апаратного забезпеченн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Перегл�д апаратного забезпеченн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Показати �к апаратне забезпеченн�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "перегл�д апаратного забезпеченн�"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "назва піктограми дл� відображенн� апаратного забезпеченн�"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "зведена інформаці� про апаратне забезпеченн�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"ЦП %s\n"
-"%s МГц\n"
-"Об��г кеша %s К"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "ОЗП %lu Гб"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "ОЗП %lu Мб"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Гб"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Мб"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "В роботі %d д, %d г, %d хв"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Огл�д апаратного забезпеченн�"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "Мі�це дл� �торінки ЦП."
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "Мі�це дл� �торінки ОЗП."
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "Мі�це дл� �торінки IDE."
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "І�торі�"
@@ -906,6 +843,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "�паратне забезпеченн�"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Міжнародне"
@@ -1193,27 +1134,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1226,8 +1167,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1254,10 +1195,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
-msgstr ""
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
+msgstr "Смітник має лишати�� на �тільниці."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid ""
@@ -1290,10 +1232,11 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
+msgstr "Смітник має лишати�� на �тільниці."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
@@ -1305,7 +1248,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1322,7 +1265,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1348,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1372,7 +1315,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1391,11 +1334,12 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Перегл�д піктограм �тільниці менеджера файлів \"�аутілу�\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
-msgstr ""
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
+msgstr "Перегл�д піктограм �тільниці менеджера файлів \"�аутілу�\""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1415,7 +1359,7 @@ msgstr "Відкрити у новому вікні"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 #, fuzzy
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr "�амагати�ь заповнювати вікно"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1453,7 +1397,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1461,30 +1405,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1529,7 +1473,7 @@ msgstr "_Ручне розміщенн�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
 #, fuzzy
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr "Відкривати _активований елемент у новому вікні"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1553,7 +1497,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1567,7 +1511,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
 #, fuzzy
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr "Викори�товувати типове тло �тільниці"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1725,66 +1669,78 @@ msgstr "�кинути"
 msgid "on the desktop"
 msgstr "на �тільниці"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Форматувати вибраний том."
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
 #, fuzzy
-msgid "Can't delete volume"
+msgid "Can't Delete Volume"
 msgstr "Форматувати вибраний том."
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Смітник"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Пере_не�ти �юди"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "С_копіювати �юди"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "_По�лати�ь �юди"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "В�тановити �к _тло"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Ска�увати"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Викори�тати �к толо дл� _в�іх тек"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 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:274
+msgid "The emblem cannot be installed."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Вам необхідно вказати непорожнє ключове �лово дл� нової емблеми."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "�е вдало�� в�тановити емблему"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "Емблема може мі�тити лише літери, пропу�ки та цифри."
@@ -1793,20 +1749,26 @@ msgstr "Емблема може мі�тити лише літери, пропу
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 "Вибачте, але вже і�нує елемент з назвою \"%s\".  Будь ла�ка, оберіть іншу "
 "назву дл� цього."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "�е вдало�� в�тановити емблему"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Вибачте, не вдало�� зберегти нетипову емблему."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Вибачте, не вдало�� зберегти назву нетипової емблеми."
 
@@ -1825,23 +1787,29 @@ msgstr "Від:"
 msgid "To:"
 msgstr "До:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Помилка під ча� перено�у."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Стала�� помилка під ча� перене�енн�.\n"
 "\n"
 "�еможливо перене�ти \"%s\" тому, що він знаходить�� на ди�ку лише дл� "
 "зчитуванн�."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Помилка під ча� �тиранн�."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1850,22 +1818,17 @@ msgstr ""
 "\"%s\" не може бути �терто тому, що ви не маєте прав на модифікацію "
 "батьків�ької теки."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Стала�� помилка під ча� �тиранн�.\n"
 "\n"
 "\"%s\", що знаходить�� на ди�ку лише дл� зчитуванн�, не може бути �терто."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1874,12 +1837,15 @@ msgstr ""
 "\"%s\" не може бути перене�ено тому, що ви не маєте прав на модифікацію "
 "батьків�ької теки."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Помилка під ча� перено�у."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Стала�� помилка під ча� перене�енн�.\n"
@@ -1887,12 +1853,10 @@ msgstr ""
 "�еможливо перене�ти елемент \"%s\" тому, що він чи його батьків�ька тека "
 "знаходить�� в мі�ці призначенн�."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Стала�� помилка під ча� перене�енн�.\n"
@@ -1900,238 +1864,178 @@ msgstr ""
 "\"%s\" не може бути перене�ено в �мітник тому, що ви не маєте прав на "
 "модифікацію файла чи батьків�ької теки."
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Помилка під ча� копіюванн�."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Стала�� помилка під ча� копіюванн�.\n"
 "\n"
 "\"%s\" не може бути �копійовано тому, що ви не маєте прав на зчитуванн�."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Стала�� помилка під ча� копіюванн� в \"%s\".\n"
-"\n"
-"�е ви�тачає мі�ц� за мі�цем призначенн�."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Помилка під ча� копіюванн�."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Стала�� помилка під ча� перене�енн� в \"%s\".\n"
 "\n"
 "�е ви�тачає мі�ц� за мі�цем призначенн�."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Стала�� помилка під ча� �творенн� по�иланн� в \"%s\".\n"
-"\n"
-"�е ви�тачає мі�ц� за мі�цем призначенн�."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Помилка під ча� перено�у."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Помилка під ча� �творенн� по�иланн�."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Стала�� помилка під ча� копіюванн� в \"%s\".\n"
 "\n"
 "Ви не маєте прав на запи� у цю теку."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Стала�� помилка під ча� копіюванн� у \"%s\".\n"
 "\n"
 "Ди�к призначенн� лише дл� зчитуванн�."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Стала�� помилка під ча� перене�енн� елементів у \"%s\".\n"
-"\n"
-"Ви не маєте прав на запи� у цю теку."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Стала�� помилка під ча� перене�енн� елементів у \"%s\".\n"
-"\n"
-"Ди�к призначенн� лише дл� зчитуванн�."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Стала�� помилка під ча� �творенн� по�илань у \"%s\".\n"
-"\n"
-"Ви не маєте прав на запи� у цю теку."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Помилка під ча� перено�у."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Стала�� помилка під ча� �творенн� по�илань у \"%s\".\n"
-"\n"
-"Ди�к призначенн� лише дл� зчитуванн�."
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� копіюванн� \"%s\".\n"
-"\n"
-"Бажаєте продовжити?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Помилка під ча� �творенн� по�иланн�."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Помилка під ча� копіюванн�."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Стала�� помилка \"%s\" під ча� перене�енн� \"%s\".\n"
+"Стала�� помилка \"%s\" під ча� перене�енн�.\n"
 "\n"
 "Бажаєте продовжити?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� �творенн� по�иланн� в \"%s\".\n"
-"\n"
-"Бажаєте продовжити?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Помилка під ча� перено�у."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Стала�� помилка \"%s\" під ча� �тиранн� \"%s\".\n"
+"Стала�� помилка \"%s\" під ча� �творенн� по�иланн� в \"%s\".\n"
 "\n"
 "Бажаєте продовжити?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� копіюванн�.\n"
-"\n"
-"Бажаєте продовжити?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Помилка під ча� �тиранн�."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� перене�енн�.\n"
-"\n"
-"Бажаєте продовжити?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Помилка під ча� копіюванн�."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� �творенн� по�иланн�.\n"
-"\n"
-"Бажаєте продовжити?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Помилка під ча� перено�у."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Стала�� помилка \"%s\" під ча� �тиранн�.\n"
-"\n"
-"Бажаєте продовжити?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Помилка під ча� �творенн� по�иланн�."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Помилка під ча� �тиранн�."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Помилка під ча� копіюванн�."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Помилка під ча� перено�у."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Помилка під ча� �творенн� по�иланн�."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Помилка під ча� �тиранн�."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Пропу�тити"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Повторити"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "�е вдало�� завершити вказану дію."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" не може бути перене�ено у нове мі�це тому, що ц� назва вже "
 "викори�товуєть�� дл� о�обливого елементу, �кого не можна перене�ти чи "
@@ -2139,13 +2043,16 @@ msgstr ""
 "\n"
 "Якщо ви в�е ж таки хочете перене�ти \"%s\", перейменуйте та �пробуйте знову."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "�е вдало�� завершити вказану дію."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" не може бути �копійовано у нове мі�це тому, що ц� назва вже "
 "викори�товуєть�� дл� о�обливого елементу, �кого не можна перене�ти чи "
@@ -2153,44 +2060,50 @@ msgstr ""
 "\n"
 "Якщо ви в�е ж таки хочете �копіювати \"%s\", перейменуйте та �пробуйте знову."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "�еможливо замінити файл."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "Файл \"%s\" вже і�нує.\n"
 "\n"
 "Бажаєте замінити його?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Конфлікт під ча� копіюванн�"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Замінити"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Замінити в�е"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "по�иланн� на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "інше по�иланн� на %s"
@@ -2199,25 +2112,25 @@ msgstr "інше по�иланн� на %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%d по�иланн� на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%d по�иланн� на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%d по�иланн� на %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%d по�иланн� на %s"
@@ -2227,561 +2140,600 @@ msgstr "%d по�иланн� на %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (копі�)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (інша копі�)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " копі�)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr " копі�)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr " копі�)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr " копі�)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (копі�)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (інша копі�)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d копі�)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d копі�)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d копі�)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�евідоме значенн� GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Перене�енн� файлів у �мітник"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Файлів викинуто:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Перене�енн�"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Підготовка до перене�енн� у �мітник..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Перене�енн� файлів"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Перене�ено файли:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Підготовка до перене�енн�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Завершенн� перене�енн�..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "Створенн� по�илань на файли"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Створено по�иланн� на файли:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "Створенн� по�илань"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Підготовка до �творенн� по�илань..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "Завершенн� �творенн� по�илань..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Копіюванн� файлів"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Скопійовано файли:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Копіюванн�"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Підготовка до копіюванн�..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Ви не можете копіювати у �мітник"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�еможливо копіювати у �мітник"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Ви не можете перено�ити цей �мітник."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Ви не можете копіювати цю теку �мітника."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�еможливо змінювати розміщенн� �мітника"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�еможливо копіювати в �мітник"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "�еможливо перено�ити теку в �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "�еможливо копіювати теку в �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Створити нову порожню теку в цій"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�еможливо перено�ити в �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�еможливо копіювати в �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "�еможливо копіювати файл в �ебе."
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�еможливо копіювати в �ебе"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Помилка �творенн� теки.\n"
 "\n"
 "Ви не маєте прав дл� запи�у за призначенн�м."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Помилка �творенн� нової теки.\n"
 "\n"
 "�е ви�тачає мі�ц� за призначенн�м."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Помилка �творенн� нової теки \"%s\"."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Помилка �творенн� нової теки"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Помилка �творенн� нової теки"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "неназвана тека"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Помилка �творенн� нової теки \"%s\"."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Помилка �творенн� нової теки"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Помилка �творенн� нової теки"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 файл"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Стиранн� файлів"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Стерто файли:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Стиранн�"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Підготовка до �тиранн� файлів..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Спорожненн� �мітника"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Підготовка до �порожненн� �мітника..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Ви переконані в тому, що хочете безповоротно �терти в�е з �мітника?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Спорожнити"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (копі�).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (інша копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (інша копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (інша копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (інша копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123 копі�).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124 копі�)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124 копі�).txt"
 
@@ -2800,64 +2752,64 @@ msgstr "foo (124 копі�).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "�ьогодні в 00:00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "�ьогодні в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "�ьогодні в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "�ьогодні в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "�ьогодні, 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "�ьогодні, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "�ьогодні"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "вчора в 00:00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "вчора в %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "вчора в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "вчора в %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "вчора, 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "вчора, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "вчора"
 
@@ -2866,133 +2818,133 @@ msgstr "вчора"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Середа, Вере�ень 00 0000 в 00:00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %B %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Пнд, Жов 00 0000 в 00:00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %b %-d %Y at %-I:%M:%S %p"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Пнд, Жов 00 0000 в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "Пнд, Жов 00 0000 в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "Жов 00 0000 в 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%b %-d %Y at %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "Жов 00 0000, 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%b %-d %Y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00 ПП"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%m/%-d/%y, %-I:%M %p"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%m/%d/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 елементів"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 тек"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 файлів"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 елемент"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 тека"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 файл"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "елементів: %u"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "тек: %u"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "файлів: %u"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? елементів"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? байтів"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "невідомий тип"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "невідомо"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "програма"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3002,7 +2954,7 @@ msgstr ""
 "що файл gnome-vfs.keys знаходить�� у неправильному мі�ці, або його не можна "
 "знайти з інших причин."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3011,11 +2963,11 @@ msgstr ""
 "�е знайдено опи�у дл� типу MIME \"%s\" (файл \"%s\"), повідомте про це на "
 "поштовий �пи�ок gnome-vfs"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "по�иланн�"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "по�иланн� (зламане)"
 
@@ -3136,11 +3088,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Пошук файлів за назвою та вла�тиво�т�ми"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Піктограми"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Спи�ок"
@@ -3284,148 +3238,153 @@ msgstr "Домівка кори�тувача %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "Стійка"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "піктограма файла"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "тек�т, що можна редагувати"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "етикетка, �ку можна редагувати"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "додатковий тек�т"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "ще трохи тек�ту"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "виділене дл� вибору"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "чи виділ�ти дл� вибору"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "виділенн� фоку�у клавіатури"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "чи виділ�ти фоку� клавіатури"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "виділенн� дл� в�тавленн�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "чи виділ�ти файли при пере�уванні-в�тавленні"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Пр�мокутник вибору"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Рамка дл� тек�ту"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Малювати рамку навколо не вибраного тек�ту"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Колір обла�ті виділенн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Колір обла�ті виділенн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Прозорі�ть обла�ті виділенн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "Прозорі�ть обла�ті виділенн�"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Прозорі�ть під�вітки"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "Прозорі�ть під�вітки виділених піктограм"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Світлий інформаційний колір"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Колір інформаційного тек�ту на темному тлі"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Темний інформаційний колір"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Колір інформаційного тек�ту на �вітлому тлі"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Цей каталог викори�товує автоматичне розміщенн�. Хочете перемикнути�ь на "
 "ручне розміщенн� і лишити цей елемент там, де ви його помі�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Цей каталог викори�товує автоматичне розміщенн�. Хочете перемикнути�ь на "
 "ручне розміщенн� і лишити ці елементи там, де ви їх помі�тили?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Перемикнути�ь на ручне розміщенн�?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Перемикнути"
 
@@ -3534,72 +3493,72 @@ msgstr "Є типовим дл� елементів \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Є Типовим дл� в�іх елементів \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Змінити \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Включити в меню дл� елементів \"%s\"."
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Зробити типовим дл� елементів \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Включити в меню лише дл� \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Зробити типовим лише дл� \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�е включати в меню дл� елементів \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "�азва"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Стан"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Ви_брати"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Зроблено"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "З_мінити..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Типи файлів і програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "Перейти �юди"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3607,48 +3566,48 @@ msgstr ""
 "Ви можете налаштувати відповідні�ть між програмами і типами файлів у вікні "
 "\"Типи файлів та програм\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Відкрити у іншій програмі"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Виберіть програму �ка відкриватиме \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Відкрити у іншому перегл�дачеві"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Виберіть відображенн� дл� \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "�емає відображень дл� \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "�емає відображень"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "�емає програми пов'�заної з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "�емає пов'�заної програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, fuzzy, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "�емає програми пов'�заної з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 #, fuzzy
 msgid "No Action Associated"
 msgstr "�емає пов'�заної програми"
@@ -3657,11 +3616,9 @@ msgstr "�емає пов'�заної програми"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3670,44 +3627,43 @@ msgstr ""
 "Ви можете можете пов'�зати програми GNOME з типами файлів.  Чи ви бажаєте "
 "пов'�зати програми з типами файлів зараз?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Пов'�зуванн� програм"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, fuzzy, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "�емає програми пов'�заної з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, fuzzy, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "�емає програми пов'�заної з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 #, fuzzy
 msgid "Invalid Application Associated"
 msgstr "�емає пов'�заної програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, fuzzy, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "�емає програми пов'�заної з \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 #, fuzzy
 msgid "Invalid Action Associated"
 msgstr "�емає пов'�заної програми"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, fuzzy, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3717,94 +3673,134 @@ msgstr ""
 "Ви можете можете пов'�зати програми GNOME з типами файлів.  Чи ви бажаєте "
 "пов'�зати програми з типами файлів зараз?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
+#: libnautilus-private/nautilus-program-chooser.c:1654
 #, fuzzy
-msgid "Associate Action"
+msgid "_Associate Action"
 msgstr "Пов'�зуванн� програм"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
+"\"%s\".  Хочете вибрати іншу програму?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
 "\"%s\".  Хочете вибрати іншу програму?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
 "\"%s\".  Хочете вибрати іншу програму?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�еможливо відкрити"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
+"\"%s\".  Хочете вибрати іншу програму?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
 "\"%s\".  �емає інших до�тупних програм дл� показу цього файла.  Якщо ви "
 "�копіюєте цей файл на ваш комп'ютер, ви напевно зможете відкрити його."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
+"\"%s\".  Хочете вибрати іншу програму?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів на "
 "\"%s\".  �емає інших до�тупних програм дл� показу цього файла.  Якщо ви "
 "�копіюєте цей файл на ваш комп'ютер, ви напевно зможете відкрити його."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Відкриванн� \"%s\""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Вибачте, але ви не можете виконувати команди з віддаленого �айту з міркувань "
 "безпеки."
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "�еможливо виконувати віддалені по�иланн�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Помилка при виконанні програми.\n"
 "\n"
 "Подробиці: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Помилка виконанн� програми"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Ціль призначенн� підтримує пере�уванн� лише локальних файлів."
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Ц� ціль призначенн� підтримує пере�уванн� лише локальних файлів.\n"
@@ -3812,15 +3808,15 @@ msgstr ""
 "Щоб відкрити віддалені файли, �копіюйте їх у локальну теку та перет�гніть їх "
 "знов."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Ціль призначенн� підтримує пере�уванн� лише локальних файлів."
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4074,14 +4070,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Елементи, що мі�т�ть \"medusa\" у назвах і є теками"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Пошук на ди�ках"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "�аутілу� шукає теки �мітників на ваших ди�ках."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Виправити"
@@ -4286,98 +4274,108 @@ msgstr "Тло"
 msgid "Empty Trash"
 msgstr "Спорожнити �мітник"
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr "Відкрити %d вікон?"
+
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Ви впевнені, що хочете безповоротно �терти \"%s\"?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
 msgstr ""
 "Це призведе до відкриванн� %d окремих вікон. Ви переконані в тому, що хочете "
 "це виконати?"
 
-#: src/file-manager/fm-directory-view.c:499
-#, c-format
-msgid "Open %d Windows?"
-msgstr "Відкрити %d вікон?"
-
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Ви впевнені, що хочете безповоротно �терти \"%s\"?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Ви впевнені, що хочете безповоротно �терти ці %d вибраних елементів?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Стерти в�і вибрані елементи безповоротно"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Стерти?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Виберіть категорію:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Візерунки"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "Вибрано \"%s\""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "Вибрано 1 теку"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "Вибрано тек: %d"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (мі�тить 0 елементів)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (мі�тить 1 елемент)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (мі�тить елементів: %d)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (загалом мі�тить 0 елементів)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (загалом мі�тить 1 елемент)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (загалом елементів: %d)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "Вибрано \"%s\" (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "Вибрано елементів: %d (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "Вибрано 1 елемент (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d інших елементів вибрано (%s)"
@@ -4389,7 +4387,7 @@ msgstr "%d інших елементів вибрано (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4398,117 +4396,132 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Тека \"%s\" мі�тить більше байтів ніж �аутілу� в змозі обробити. Де�кі файли "
 "не буде відображено."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "�адто багато файлів"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "\"%s\" не можна перено�ити в �мітник. Стерти негайно?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"%d вибраних елементів не можуть бути перене�ені у �мітник. Хочете �терти їх "
-"негайно?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "\"%s\" не можна перено�ити в �мітник. Стерти негайно?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d з вибраних елементів не можуть бути перене�ені у �мітник. Хочете �терти "
-"ці %d елементів негайно?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "\"%s\" не можна перено�ити в �мітник. Стерти негайно?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Стерти негайно?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Ви впевнені, що хочете безповоротно �терти \"%s\" з �мітника?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Ви впевнені, що хочете безповоротно �терти ці %d вибраних елементів з "
 "�мітника?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Старти з �мітника?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Викори�тати \"%s\" дл� відкриванн� вибраного елементу"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Інша програма..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Програма..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Інший перегл�дач..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Перегл�дач..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "�е вдало�� завершити вказану дію: %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "�е вдало�� завершити вказану дію."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Запу�кати \"%s\" на будь-�ких вибраних елементах"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"В�і виконувані файли у цій теці з'�вл�тимуть�� у меню �ценаріїв. Вибір "
+"�ценарію з меню запу�тить його з будь-�ким вибраним елементом у �ко�ті вводу."
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "В�і виконувані файли у цій теці з'�вл�тимуть�� у меню �ценаріїв. Вибір "
 "�ценарію з меню запу�тить його з будь-�ким вибраним елементом у �ко�ті вводу."
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Про �ценарії"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4549,17 +4562,17 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: позиці� та розмір поточного вікна"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" буде перене�ено, �кщо ви виберете команду \"В�тавити файли\""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" буде �копійовано, �кщо ви виберете команду \"В�тавити файли\""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
@@ -4567,7 +4580,7 @@ msgstr ""
 "%d вибраних елементів буде перене�ено, �кщо ви виберете команду \"В�тавити "
 "файли\""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
@@ -4575,161 +4588,168 @@ msgstr ""
 "%d вибраних елементів буде �копійовано, �кщо ви виберете команду \"В�тавити "
 "файли\""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "В кишені немає нічого дл� в�тавл�нн�."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Помилка монтуванн�"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Помилка демонтуванн�"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Помилка монтуванн�"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Вит�гнути"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Демонтувати розділ"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Відкрити у новому вікні"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Відкрити в %d нових вікнах"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Домашн� тека"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Домашн� тека"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Стерти з �мітника"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Стерти в�і вибрані елементи безповоротно"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Пере_не�ти у �мітник"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Перене�ти в�і вибрані елементи у �мітник"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Стерти"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Створити _по�иланн�"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Створити _по�иланн�"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "Споро_жнити �мітник"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Вирізати файл"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Вирізати файли"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Скопіювати файл"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "Скопіювати файли"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Це по�иланн� не може бути викори�тане тому, що воно не має цілі. Хочете "
 "зане�ти його в �мітник?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Це по�иланн� не може бути викори�тане тому, що воно не має цілі. Хочете "
+"зане�ти його в �мітник?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Зіп�оване по�иланн�"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" -- виконуваний тек�товий файл. Ви хочете запу�тити його, чи "
 "відобразити вмі�т?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Запу�тити чи показати?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_Показати"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Запу�тити у _терміналі"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_Показати"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Запу�тити"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Відкриванн� \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Ска�увати відкриванн�?"
 
@@ -4750,28 +4770,33 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "�ажаль не вдало�� показати ве�ь вмі�т \"%s\"."
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "�е вдало�� визначити права до�тупу \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Помилка відображенн� теки"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 "�азва \"%s\" вже викори�товуєть�� у цій теці. Будь ла�ка, виберіть іншу."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "У цій теці немає \"%s\". Може перене�ено чи �терто?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Ви не маєте прав необхідних дл� зміни назви \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4780,84 +4805,104 @@ msgstr ""
 "�азва \"%s\" неправильна тому, що мі�тить �имвол \"/\". Будь ла�ка, "
 "викори�тайте іншу назву."
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "�азва \"%s\" непраивльна. Будь ла�ка, виберіть іншу назву."
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 "�е вдало�� змінити назву \"%s\" через те, що цей ди�к лише дл� зчитуванн�."
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "�ажаль не вдало�� перейменувати \"%s\" на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "�е вдало�� визначити права до�тупу \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Помилка перейменуванн�"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Ви не маєте до�татньо прав дл� зміни групи \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 "�е вдало�� змінити групу \"%s\" через те, що цей ди�к лише дл� зчитуванн�."
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "�ажаль не вдало�� змінити групу \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "�е вдало�� визначити права до�тупу \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Помилка в�тановленн� групи"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 "�е вдало�� змінити вла�ника \"%s\" через те, що цей ди�к лише дл� зчитуванн�."
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "�ажаль не вдало�� змінити вла�ника \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "�е вдало�� визначити права до�тупу \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Помилка в�тановленн� вла�ника"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "�е вдало�� змінити права \"%s\" через те, що цей ди�к лише дл� зчитуванн�."
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "�ажаль не вдало�� змінити права \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "�е вдало�� визначити права до�тупу \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Помилка в�тановленн� прав"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Перейменуванн� \"%s\" на \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Ска�увати перейменуванн�?"
 
@@ -4915,130 +4960,153 @@ msgstr "Відновити початкові розміри _піктограм
 msgid "Restore Icon's Original Si_ze"
 msgstr "Відновити початкові розміри _піктограми"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "вказуванн� на \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr ""
+"Пере�уванн� та в�тавленн� підтримуєть�� лише на локальних файлових �и�темах."
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 "Пере�уванн� та в�тавленн� підтримуєть�� лише на локальних файлових �и�темах."
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Помилка Пере�уванн�-в�тавленн�"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "Було викори�тано неправильний тип пере�уванн�-в�тавленн�."
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "�азва файла"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Розмір"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Тип"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Дата модифікації"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr ""
+"Ви не можете зв'�зати більше ніж з однією нетиповою піктограмою одноча�но! "
+"Будь ла�ка, перет�гніть лише одне зображенн�, щоб в�тановити іншу піктограму."
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 "Ви не можете зв'�зати більше ніж з однією нетиповою піктограмою одноча�но! "
 "Будь ла�ка, перет�гніть лише одне зображенн�, щоб в�тановити іншу піктограму."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Більш ніж одне зображенн�"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Файл, що ви вказали не локальний. Ви можете викори�товувати лише локальні "
+"зображенн� в �ко�ті нетипових піктограм."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Файл, що ви вказали не локальний. Ви можете викори�товувати лише локальні "
 "зображенн� в �ко�ті нетипових піктограм."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Лише локальні зображенн�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Файл, що ви вказали не є зображенн�м. Ви можете викори�товувати лише "
-"локальні зображенн� в �ко�ті нетипових піктограм."
+"Файл, що ви вказали не локальний. Ви можете викори�товувати лише локальні "
+"зображенн� в �ко�ті нетипових піктограм."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Лише зображенн�"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "_Вла�тиво�ті"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Вла�тиво�ті %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Ска�увати зміну групи?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Зміна групи"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Ска�увати зміну вла�ника?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Зміна вла�ника"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "нічого"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "неможливо зчитати"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 елемент об��гом %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d елементів, загалом %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(де�кий вмі�т не зчитуєть��)"
 
@@ -5048,193 +5116,193 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Вмі�т:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "О�нова"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "_�азва:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_�азва:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Розмір:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Положенн�:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Розділ:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Вільний про�тір:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Ціль по�иланн�:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Модифіковано:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "До�туп:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Вибрати нетипову піктограму..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Видалити нетипову піктограму"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "З_читуванн�"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "За_пи�"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Ви_конанн�"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "В�тановити ідентифікатор _кори�тувача"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "О�обливі ознаки:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "В�тановити ідентифікатор _групи"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Липкі�ть"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Права"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Ви не вла�ник, то ж не можете змінювати ці права."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Вла�ник файла:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Вла�ник файла:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Група _файла:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Група файла:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Вла�ник:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Група:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Інші:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Тек�тове відображенн�:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Чи�лове відображенн�:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "О�танн� зміна:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "�е вдало�� визначити права до�тупу \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 #, fuzzy
 msgid "The permissions of the selected file could not be determined."
 msgstr "�е вдало�� визначити права до�тупу \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"Стала�� помилка відображенн� довідки: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "Стала�� помилка при відображенні довідки: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "�е вдало�� показати довідку"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Ска�увати показ вікна вла�тиво�тей?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Створенн� вікна вла�тиво�тей"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 #, fuzzy
 msgid "Select an icon"
 msgstr "Виберіть піктограму:"
@@ -5253,69 +5321,110 @@ msgid "Search Results"
 msgstr "Результати пошуку"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "Вибачте, але �лужбу пошуку \"Medusa\" не в�тановлено."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Вибачте, але �лужба пошуку \"Medusa\" не до�тупна."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Служба пошуку не до�тупна"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Пошук, що ви вибрали новіший за індек� у вашій �и�темі.  Пошук не поверне "
 "результату зараз.  Бажаєте �творити зараз новий індек� шл�хом виконанн� у "
 "командному р�дку \"medusa-indexd\" від імені кори�тувача root?"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Пошук не�проможний відрити ваш індек� файлів вашої �и�теми.  Можливо він "
+"від�утній або пошкоджений. Ви можете �творити індек� шл�хом виконанн� у "
+"командному р�дку \"medusa-indexd\" від імені кори�тувача root."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Пошук надто нових файлів"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"Кожен проіндек�ований файл у вашій �и�темі відповідає вказаним критері�м. Ви "
+"можете перевірити правильні�ть вказаного чи додати критерії дл� звуженн� "
+"результатів пошуку."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "Кожен проіндек�ований файл у вашій �и�темі відповідає вказаним критері�м. Ви "
 "можете перевірити правильні�ть вказаного чи додати критерії дл� звуженн� "
 "результатів пошуку."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Помилка під ча� пошуку"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Пошук не�проможний відрити ваш індек� файлів вашої �и�теми.  Можливо він "
 "від�утній або пошкоджений. Ви можете �творити індек� шл�хом виконанн� у "
 "командному р�дку \"medusa-indexd\" від імені кори�тувача root."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Помилка зчитуванн� файлового індек�у"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Під ча� завантаженн� вмі�ту цього пошуку виникла помилка: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"Щоб зробити пошук вмі�ту, необхідно мати індек� файлів у вашій �и�темі. "
+"Пошук не може отримати до�туп до вашого індек�у. "
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"Щоб зробити пошук вмі�ту, необхідно мати індек� файлів у вашій �и�темі. "
+"Пошук не може отримати до�туп до вашого індек�у. "
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5323,25 +5432,23 @@ msgstr ""
 "Пошук не може отримати до�туп до вашого індек�у, тому буде здій�нено "
 "повільний пошук, �кий не потребує індек�у."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"Щоб зробити пошук вмі�ту, необхідно мати індек� файлів у вашій �и�темі. "
-"Пошук не може отримати до�туп до вашого індек�у. "
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Швидкі пошуки не до�тупні"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Пошук вмі�ту не до�тупний"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5355,49 +5462,76 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "Дл� здій�ненн� швидкого пошуку потрібний індек� файлів у вашій �и�темі. Ваш "
 "комп'ютер не має зараз індек�у. Через те, що пошук не викори�товує індек�у, "
 "це може зайн�ти декілька хвилин."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "Дл� здій�ненн� пошуку вмі�ту потрібний індек� файлів у вашій �и�темі. Ваш "
 "комп'ютер зараз �творює цей індек�. Пошук вмі�ту �тане до�тупним, коли "
 "індек� буде зроблено. "
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Індек�ований пошук не до�тупний"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"Щоб зробити пошук вмі�ту, необхідно мати індек� файлів у вашій �и�темі. "
+"Пошук не може отримати до�туп до вашого індек�у. "
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"Щоб зробити пошук вмі�ту, необхідно мати індек� файлів у вашій �и�темі. "
+"Пошук не може отримати до�туп до вашого індек�у. "
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "Дл� здій�ненн� швидкого пошуку потрібний індек� файлів у вашій �и�темі. "
 "Зараз немає до�тупного індек�у.  Ви можете �творити індек� шл�хом виконанн� "
 "у командному р�дку \"medusa-indexd\" від імені кори�тувача root. Доки не "
 "буде повного індек�у, пошук займатиме декілька хвилин."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "Дл� здій�ненн� пошуку вмі�ту потрібний індек� файлів у вашій �и�темі. Ваш "
 "комп'ютер не має індек�у зараз. Зараз немає до�тупного індек�у.  Ви можете "
@@ -5405,7 +5539,12 @@ msgstr ""
 "імені кори�тувача root. Доки не буде повного індек�у, пошук вмі�ту не можна "
 "виконувати."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Швидкі пошуки не до�тупні на вашому комп'ютері"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5415,11 +5554,12 @@ msgstr ""
 "�и�темний адміні�тратор заборонив швидкий пошук на вашому комп'ютері, то "
 "індек� не до�тупний."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Швидкі пошуки не до�тупні на вашому комп'ютері"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Швидкі пошуки не до�тупні"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Де"
 
@@ -5428,7 +5568,7 @@ msgstr "Де"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Відкрити в новому вікні"
@@ -5439,7 +5579,7 @@ msgstr "Відкрити в новому вікні"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "Відкрити в %d нових вікнах"
@@ -5448,15 +5588,21 @@ msgstr "Відкрити в %d нових вікнах"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "�аутілу� має більший результат пошуку ніж можливо показати. Де�кі "
 "�півпаданн� не буде відображено. "
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"�аутілу� має більший результат пошуку ніж можливо показати. Де�кі "
+"�півпаданн� не буде відображено. "
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "�адто багато �півпадань"
 
@@ -5471,12 +5617,12 @@ msgid "Create L_auncher"
 msgstr "�овий пу_�кач"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Створити новий пу�кач"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Стерти в�і елементи у �мітнику"
 
@@ -5498,7 +5644,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Викори�товувати ти_пове тло"
@@ -5521,58 +5667,68 @@ msgstr "Виберіть іншу програму длÑ� переглÑ�ду вÐ
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "Домашн� тека"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "Домашн� тека"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Створити нову порожню теку в цій"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Створити нову порожню теку в цій"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Створити �имвольне по�иланн� дл� кожного вибраного елементу"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Ду_блювати"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Стерти в�і вибрані елементи без перено�у в �мітник"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Дублювати кожен вибраний елемент"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Редагувати пу�кач"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Редагувати інформацію пу�кача"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Форматувати вибраний том."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Вла�тиво�ті но�і�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Демонтувати вибраний розділ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Перене�ти чи �копіювати файли попередньо вибрані командою \"Вирізати файли\" "
 "чи \"Скопіювати файли\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 #, fuzzy
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
@@ -5581,134 +5737,143 @@ msgstr ""
 "Перене�ти чи �копіювати файли попередньо вибрані командою \"Вирізати файли\" "
 "чи \"Скопіювати файли\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Відкрити за допомогою"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Вибрати кожен вибраний елемент у новому вікні"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Відкрити у новому вікні"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Відкрити вибраний елемент у цьому вікні"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 "Підготувати вибрані файли до копіюванн� за допомогою команди \"В�тавити файли"
 "\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 "Підготувати вибрані файли до перено�у за допомогою команди \"В�тавити файли\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "За_хи�тити"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Захи�т вибраного тому"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "Перейменувати вибраний елемент"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "Скинути відображенн� на _типове"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "Скидає пор�док �ортуванн� та ма�штаб на типові значенн� дл� цього "
 "відображенн�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Виконати або керувати �ценарі�ми у ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Вибрати _в�і файли"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Візерунки"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Показати в�і вла�тиво�ті у цьому вікні"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Показати в�і вла�тиво�ті у цьому вікні"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Показати вла�тиво�ті но�і� кожного вибраного тому"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Показати теку, �ка мі�тить �ценарії, що з'�вл�ють�� у цьому меню"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "Демонтувати вибраний розділ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Викори�товувати типове тло дл� цього мі�ц�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Показати чи модифікувати вла�тиво�ті кожного вибраного елементу"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Скопіювати файл"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "_Форматувати"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Демонтувати розділ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "Відкрити"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Відкрити теку �ценаріїв"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "В�тавити файли"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 #, fuzzy
 msgid "_Paste Files Into Folder"
 msgstr "В�тавити файли"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Вла�тиво�ті"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "Пере_йменувати"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "С_ценарії"
 
@@ -5796,7 +5961,12 @@ msgstr "В_ла�норуч"
 msgid "Indexing is %d%% complete."
 msgstr "Індек�ацію завершено на %d%%."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Ваші файли було во�таннє проіндек�овано %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5804,25 +5974,29 @@ msgstr ""
 "Раз на день ваші файли і тек�товий вмі�т індек�уєть�� дл� пришвидшенн� "
 "пошуку. "
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Стан індек�ації"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Ваші файли було во�таннє проіндек�овано %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Раз на день ваші файли і тек�товий вмі�т індек�уєть�� дл� пришвидшенн� "
-"пошуків. Ваші файли зараз проіндек�овані."
+"пошуку. "
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Зараз немає індек�у ваших файлів."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5832,15 +6006,19 @@ msgstr ""
 "пошуків.  Швидкий пошук не ввімкнено на вашому комп'ютері, тому ви ви не "
 "маєте зараз індек�."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Зараз немає індек�у ваших файлів."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Вибачте, але �лужба пошуку \"Medusa\" не до�тупна."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5864,32 +6042,37 @@ msgstr "Показати �тан індек�ації"
 msgid "Show status of indexing used when searching"
 msgstr "Показати �тан індек�ації, �кий викори�товуєть�� дл� пошуків"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "�е вдало�� �творити необхідну теку"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "�е вдало�� �творити необхідні теки"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "�аутілу� не зміг �творити необхідну теку \"%s\". Перед запу�ком �аутілу�а, "
 "будь ла�ка, �творіть цю теку чи в�тановіть такі права, щоб �аутілу� міг "
 "�творити її."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "�е вдало�� �творити необхідні теки"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5900,21 +6083,25 @@ msgstr ""
 "Перед запу�ком �аутілу�а, будь ла�ка, �творіть ці теки, чи в�тановіть такі "
 "права, щоб �аутілу� міг �творити їх."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 #, fuzzy
 msgid "Link To Old Desktop"
 msgstr "на �тільниці"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "на �тільниці"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5926,7 +6113,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5937,7 +6124,7 @@ msgstr ""
 "�пробувати перезавантажити комп'ютер чи перев�тановити �аутілу�."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5982,12 +6169,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "�аутілу� не можна викори�товувати зараз через неочікувану помилку."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5995,7 +6182,7 @@ msgstr ""
 "�аутілу� не можна викори�товувати зараз через неочікувану помилку в Bonobo "
 "на �пробі зареє�трувати �ервер перегл�ду файлового менеджера."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6005,7 +6192,7 @@ msgstr ""
 "під ча� �проби знайти фабрику. Можливо знищенн� bonobo-activation-server та "
 "перезапу�к �аутілу�а зможе вирішити цю проблему."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6015,6 +6202,17 @@ msgstr ""
 "під ча� �проби знайти об'єкт оболонки. Можливо знищенн� bonobo-activation-"
 "server та перезапу�к �аутілу�а зможе вирішити цю проблему"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Стала�� помилка відображенн� довідки: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Закладки не визначено"
@@ -6050,36 +6248,47 @@ msgstr "Менше параметрів"
 msgid "Find Them!"
 msgstr "Знайти це!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�еможливо перено�ити в �ебе"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Вибачте, але назва файла \"%s\" не правильна."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-"\"%s\" не правильне положенн�. Будь ла�ка, перевірте напи�анн� і �пробуйте "
+"�е вдало�� знайти \"%s\". Будь ла�ка, перевірте напи�анн�, та �пробуйте "
 "знову."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Сервери мережі"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_�азва:"
+msgid "_Location:"
+msgstr "Положенн�:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "Conectiva"
@@ -6282,6 +6491,20 @@ msgstr ""
 "Ви можете видалити цей файл вла�норуч, щоб знову запу�тити друід.\n"
 "\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Ви не можете зв'�зати більше ніж з однією нетиповою піктограмою одноча�но! "
+"Будь ла�ка, перет�гніть лише одне зображенн�, щоб в�тановити іншу піктограму."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Файл, що ви вказали не локальний. Ви можете викори�товувати лише локальні "
+"зображенн� в �ко�ті нетипових піктограм."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6292,24 +6515,22 @@ msgstr "Відкрити за допомогою %s"
 msgid "Open with..."
 msgstr "Відкрити у..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "�овий пу_�кач"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "С_порожнити �мітник"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -6317,82 +6538,82 @@ msgstr ""
 msgid "Go To:"
 msgstr "Перейти на:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Ви хочете продивити�ь ці %d мі�ць в окремих вікнах?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Перегл�д у багатьох вікнах?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�еможливо відкрити"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Здій�нити швидку �амоперевірку."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Створити початкове вікно з вказаною геометрією."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "ГЕОМЕТРІЯ"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Створити вікна лише з точно наведеними URI."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "�е керувати �ільницею (ігнорувати параметр в�тановлений у вікні параметрів)"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Вийти з �аутілу�а."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Перезапу�тити �аутілу�."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Керуванн� файлами"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "�аутілу�"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check не може викори�товувати�ь з URI.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: --check не може викори�товувати�ь з іншими параметрами.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus: --quit не може викори�товувати�ь разом з URI.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: --restart не може викори�товувати�ь з URI.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 "nautilus: --geometry не може викори�товувати�ь з більш ніж одним URI.\n"
@@ -6400,37 +6621,50 @@ msgstr ""
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Ви впевнені, що хочете безповоротно �терти \"%s\"?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Ви переконані в тому, що хочете �терти і�торію? Якщо ви це зробите, то не "
 "зможете її відновити."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Ви переконані в тому, що хочете знищити інформацію про відвідані вами мі�ц�?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Очи�тити і�торію"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Мі�ц� \"%s\" не і�нує. Хочете видалити в�і закладки � цим мі�цем з вашого "
 "�пи�ку?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "Мі�ц� \"%s\" більше не і�нує."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "Закладка на положенн�, що не і�нує"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Видалити"
 
@@ -6463,7 +6697,6 @@ msgid "Close _All Windows"
 msgstr "Закрити в�і вікна"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Закрити в�і вікна �аутілу�а"
@@ -6486,107 +6719,118 @@ msgid "Forward"
 msgstr "Вперед"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "Перейти у теку \"Смітник\""
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "Перейти до на�тупного відвіданого мі�ц�"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "Перейти до попереднього відвіданого мі�ц�"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "Перейти у теку \"Смітник\""
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Домівка"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Панель по_ложенн�"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Перезавантажити"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Пошук файлів на цьому комп'ютері"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Панель _�тану"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Зупинка"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Вгору"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "Додати закладку"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "_�азад"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Закладки"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "_Очи�тити і�торію"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Стійка"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Редагуванн� закладок"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "В_перед"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "Пере_йти"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "До_мівка"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Положенн�..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "_Бічна панель"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Смітник"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "В_гору"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Відображенн�"
 
@@ -6604,34 +6848,39 @@ msgstr "Показати �к..."
 msgid "File Browser: %s"
 msgstr "Вла�ник файла:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Одна з бічних панелей викликала помилку і не може викори�товувати�ь далі.\n"
 "�ажаль неможливо �казати �ка �аме."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Ви�влено помилку перегл�ду %s під ча� запу�ку."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Бічна панель %s ви�вила помилку і не зможе продовжити роботу. Якщо це буде "
 "трапл�ти�� і надалі, ви очевидно захочете вимкнути цю панель."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Збій бічної панелі"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Бічна панель"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Мі�тить бічну панель"
 
@@ -6665,148 +6914,181 @@ msgstr "_Додати нове..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Вибачте, але візерунок %s не вдало�� видалити."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "�е вдало�ь �терти візерунок"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Емблему %s не може бути �терто."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "�е вдало�� видалити емблему"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Створити нову емблему:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "К_лючове �лово:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Зображенн�:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Виберіть файл зображенн� дл� нової емблеми:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Створити новий колір:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_�азва кольору:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Значенн� кольору:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Вибачте, але назва файла \"%s\" не правильна."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Вибачте, але ви не вказали \"%s\" правильної назви файла."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "�е вдало�� в�тановити візерунок"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Вибачте, але ви не можете замінити початкове зображенн�."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�е зображенн�"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Вибачте, але візерунок %s не вдало�� в�тановити."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Виберіть файл зображенн�, щоб додати його �к візерунок"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Вам необхідно вказати не порожню назву дл� нового кольору."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "�е вдало�� в�тановити колір"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Виберіть колір, щоб його додати:"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Вибачте, але \"%s\" не є належним файлом зображенн�!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Файл \"%s\" не вдало�� розпізнати �к зображенн�."
+
+#: src/nautilus-property-browser.c:2050
 #, fuzzy
 msgid "Select a Category:"
 msgstr "Виберіть категорію:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Від_мінити видаленн�"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "_Додати новий візерунок..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Додати новий колір..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "_Додати нову емблему..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Клацніть на візерунку, щоб видалити його."
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Клацніть на кольорі, щоб видалити його"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Клацніть на емблемі, щоб видалити її"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Візерунки:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Кольори:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Емблеми:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Видалити візерунок..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Видалити колір..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Видалити емблему..."
 
@@ -7199,34 +7481,39 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Закрити в�і вікна"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Закрити бічну панель"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "Перейти у теку \"Смітник\""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "Перейти у теку \"Смітник\""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Положенн�..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Елементи, �кі є ]теками"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Візерунки"
@@ -7256,10 +7543,13 @@ msgid "View Failed"
 msgstr "Збій відображенн�"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Ви�влено помилку перегл�ду %s під ча� запу�ку."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Відображенн� %s ви�вило помилку і не зможе продовжити роботу. Ви можете "
 "вибрати інше відображенн� чи перейти до іншого мі�ц�."
@@ -7269,103 +7559,131 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Ви�влено помилку перегл�ду %s під ча� запу�ку."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Додаток �аутілу�а, що пов'�заний з цим вікном."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Відображенн� вмі�ту"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Перегл�д поточного файла чи каталога"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"�е вдало�� знайти \"%s\". Будь ла�ка, перевірте напи�анн�, та �пробуйте "
-"знову."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "�е вдало�� додати емблеми"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "�еможливо відобразити \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "�еможливо показати \"%s\" тому, що �аутілу� не може обробл�ти файли такого "
 "типу."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 "�аутілу� не має в�тановленої програми перегл�ду, �ка може показати \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "�еможливо показати \"%s\" тому, що �аутілу� не може обробл�ти адре�и %s:."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "�еможливо показати \"%s\" тому, що �аутілу�у не вдала�ь �проба реє�трації."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "�е вдало�� відобразити \"%s\" через відмову в до�тупі."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "�еможливо показати \"%s\" тому, що комп'ютер \"%s\" не знайдено. "
 "Переконайте�ь, що ви не помилили�ь при напи�анні та у ва� правильно "
 "налаштовано прок�і."
 
-#: src/nautilus-window-manage-views.c:1309
-#, fuzzy, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "�еможливо показати \"%s\" тому, що назва комп'ютера порожн�. Переконайте�ь, "
 "що у ва� правильно налаштовано прок�і."
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
 msgstr ""
-"�еможливо показати \"%s\" тому, що �аутілу� не може зв'�зати�ь з головним "
-"огл�дачем мережі SMB.\n"
-"Перевірте чи запущений �ервер SMB у локальній мережі."
+"�еможливо показати \"%s\" тому, що �аутілу� не може обробл�ти адре�и %s:."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"Пошук не до�тупний тому, що або ви не маєте індек�у, або �лужбу пошуку не "
+"запущено. Переконайте�ь, що запущено �лужбу пошуку Medusa, і �кщо ви не "
+"маєте індек�у, що індек�атор Medusa запущено."
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "Пошук не до�тупний тому, що або ви не маєте індек�у, або �лужбу пошуку не "
 "запущено. Переконайте�ь, що запущено �лужбу пошуку Medusa, і �кщо ви не "
 "маєте індек�у, що індек�атор Medusa запущено."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Пошук не до�тупний"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "�еможливо відобразити \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "�еможливо відобразити положенн�."
 
@@ -7377,7 +7695,7 @@ msgstr "Перейти до мі�ц� вказаного закладкою"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -7385,11 +7703,11 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr "Переклад здій�нено Юрієм Сиротою <yuri@renome.rovno.ua>"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7405,39 +7723,43 @@ msgstr "Перейти назад на декілька �торінок"
 msgid "Go forward a number of pages"
 msgstr "Перейти вперед на декілька �торінок"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Показати це положенн� за допомогою \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Крапки"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Перейти у теку \"Смітник\""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Ідентифікатор програми"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Ідентифікатор програми у вікні."
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Програма"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Додаток �аутілу�а, що пов'�заний з цим вікном."
 
@@ -7473,6 +7795,245 @@ msgstr "Сервери мережі"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Перегл�д �ерверів мережі у файловому менеджері \"�аутілу�\""
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Фабрика програми перегл�ду апаратного забезпеченн�"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Програма перегл�ду апаратного забезпеченн�"
+
+#~ msgid "Hardware view"
+#~ msgstr "Перегл�д апаратного забезпеченн�"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Показати �к апаратне забезпеченн�"
+
+#~ msgid "hardware view"
+#~ msgstr "перегл�д апаратного забезпеченн�"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "назва піктограми дл� відображенн� апаратного забезпеченн�"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "зведена інформаці� про апаратне забезпеченн�"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "ЦП %s\n"
+#~ "%s МГц\n"
+#~ "Об��г кеша %s К"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "ОЗП %lu Гб"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "ОЗП %lu Мб"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Гб"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu Мб"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "В роботі %d д, %d г, %d хв"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Огл�д апаратного забезпеченн�"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "Мі�це дл� �торінки ЦП."
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "Мі�це дл� �торінки ОЗП."
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "Мі�це дл� �торінки IDE."
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� копіюванн� в \"%s\".\n"
+#~ "\n"
+#~ "�е ви�тачає мі�ц� за мі�цем призначенн�."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� �творенн� по�иланн� в \"%s\".\n"
+#~ "\n"
+#~ "�е ви�тачає мі�ц� за мі�цем призначенн�."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� перене�енн� елементів у \"%s\".\n"
+#~ "\n"
+#~ "Ви не маєте прав на запи� у цю теку."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� перене�енн� елементів у \"%s\".\n"
+#~ "\n"
+#~ "Ди�к призначенн� лише дл� зчитуванн�."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� �творенн� по�илань у \"%s\".\n"
+#~ "\n"
+#~ "Ви не маєте прав на запи� у цю теку."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Стала�� помилка під ча� �творенн� по�илань у \"%s\".\n"
+#~ "\n"
+#~ "Ди�к призначенн� лише дл� зчитуванн�."
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� копіюванн� \"%s\".\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� перене�енн� \"%s\".\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� �тиранн� \"%s\".\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� копіюванн�.\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� �творенн� по�иланн�.\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Стала�� помилка \"%s\" під ча� �тиранн�.\n"
+#~ "\n"
+#~ "Бажаєте продовжити?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�еможливо копіювати у �мітник"
+
+#, fuzzy
+#~ 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 ""
+#~ "\"%s\" не може відкрити \"%s\" тому, що \"%s\" не має до�тупу до файлів "
+#~ "на \"%s\".  �емає інших до�тупних програм дл� показу цього файла.  Якщо "
+#~ "ви �копіюєте цей файл на ваш комп'ютер, ви напевно зможете відкрити його."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Пошук на ди�ках"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "�аутілу� шукає теки �мітників на ваших ди�ках."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "%d вибраних елементів не можуть бути перене�ені у �мітник. Хочете �терти "
+#~ "їх негайно?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d з вибраних елементів не можуть бути перене�ені у �мітник. Хочете "
+#~ "�терти ці %d елементів негайно?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Файл, що ви вказали не є зображенн�м. Ви можете викори�товувати лише "
+#~ "локальні зображенн� в �ко�ті нетипових піктограм."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "Вибачте, але �лужбу пошуку \"Medusa\" не в�тановлено."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Раз на день ваші файли і тек�товий вмі�т індек�уєть�� дл� пришвидшенн� "
+#~ "пошуків. Ваші файли зараз проіндек�овані."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ "\"%s\" не правильне положенн�. Будь ла�ка, перевірте напи�анн� і "
+#~ "�пробуйте знову."
+
+#~ 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 ""
+#~ "�еможливо показати \"%s\" тому, що �аутілу� не може зв'�зати�ь з головним "
+#~ "огл�дачем мережі SMB.\n"
+#~ "Перевірте чи запущений �ервер SMB у локальній мережі."
+
+#~ msgid "file icon"
+#~ msgstr "піктограма файла"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_�азва:"
+
 #~ msgid "Unknown"
 #~ msgstr "�евідомо"
 
@@ -7583,9 +8144,6 @@ msgstr "ПереглÑ�д Ñ�ерверів мережі у файловому мÐ
 #~ msgid "_Toolbar"
 #~ msgstr "_Пенал"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "Мі�ц� \"%s\" більше не і�нує."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "Перейти до мі�ц�, що не і�нує"
 
diff --git a/po/vi.po b/po/vi.po
index 0e3300230..969bd7e57 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 2.3.x\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-09-07 22:30+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -41,8 +41,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() lá»—i."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "Hình Tượng"
 
@@ -55,48 +55,60 @@ msgid "Nautilus Emblem view"
 msgstr "Khung xem hình tượng của Nautilus"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "Không thể gỡ b� hình tượng"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "Không thể gỡ b� hình tượng có tên '%s'.  Có thể vì đây là hình tượng vĩnh "
 "viễn và không phải do bạn tự thêm vào."
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "Không thể gỡ b� hình tượng"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "Không thể đổi tên hình tượng"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "Không thể đổi tên hình tượng có tên '%s'.  Có thể vì đây là hình tượng vĩnh "
 "viễn và không phải do bạn tự thêm vào."
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "Không thể đổi tên hình tượng"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "�ổi tên hình tượng"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "Nhập tên mới cho hình tượng được hiển thị:"
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "�ổi tên"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "Thêm hình tượng..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -104,7 +116,7 @@ msgstr ""
 "Nhập tên mô tả cạnh từng hình tượng. Tên này sẽ được dùng tại nơi khác để "
 "nhận biết hình tượng."
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
@@ -112,139 +124,64 @@ msgstr ""
 "Nhập tên mô tả cạnh hình tượng. Tên này sẽ được dùng tại nơi khác để nhận "
 "biết hình tượng."
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 "Không thể thêm một số tập tin làm hình tượng vì chúng không phải là ảnh hợp "
 "lệ."
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "Tập tin '%s' không phải là ảnh hợp lệ."
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "Không thể thêm hình tượng"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr ""
 "Không có tập tin nào có thể thêm để làm hình tượng vì chúng không phải là "
 "ảnh hợp lệ."
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "Văn bản được kéo không phải vị trí tập tin hợp lệ."
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "Không thể thêm hình tượng"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "Tập tin '%s' không phải là ảnh hợp lệ."
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "Tập tin được kéo không phải là ảnh hợp lệ."
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Xóa"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Factory cho hiển thị phần cứng"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Phần cứng"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Bộ quan sát phần cứng"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Cảnh xem phần cứng"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Xem theo dạng phần cứng"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "cảnh xem phần cứng"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "tên của biểu tượng cho xem phần cứng"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "tóm tắt thông tin phần cứng"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"Kích thước bộ nhớ đệm: %s K"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB RAM"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "Gi� làm việc là %d ngày, %d gi�, %d phút"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "Tổng quan phần cứng"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "�ây là một chỗ dự trữ cho trang CPU"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "�ây là một chỗ dự trữ cho trang RAM"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "�ây là một chỗ dự trữ cho trang IDE"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Biên sử"
@@ -910,6 +847,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Phần cứng"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Quốc tế"
@@ -1196,30 +1137,19 @@ msgid "Desktop trash icon name"
 msgstr "Tên biểu tượng S�t rác trên màn hình n�n"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"Thư mục 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ổ heap 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."
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "Bật chạy các flag 'đặc biệt' trong thoại tùy thích của tập tin "
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"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à "
 "true."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1227,6 +1157,19 @@ msgstr ""
 "Tên tập tin cho n�n thanh bên mặc định. Chỉ được dùng nếu "
 "side_pane_background_set là true."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"Thư mục 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ổ heap 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."
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Ẩn các �ánh Dấu mặc định trong menu �ánh Dấu"
@@ -1236,9 +1179,10 @@ msgid "Home icon visible on desktop"
 msgstr "Biểu tượng Home hiện trên màn hình n�n"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"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à true, Nautilus sẽ chỉ hiển thị thư mục trong thanh bên dạng cây. "
 "Nếu không nó sẽ hiện cả thư mục và tập tin."
@@ -1269,9 +1213,10 @@ msgstr ""
 "v� tập tin trong hộp thoại Tùy thích tập tin."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "Nếu đặt là true, Nautilus hiện thư mục trước khi hiện tập tin trong Khung "
 "xem Biểu tượng và Khung xem Danh sách."
@@ -1314,8 +1259,9 @@ msgstr ""
 "�ánh dấu."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 home của ngư�i dùng làm màn hình n�n. "
@@ -1332,9 +1278,10 @@ msgstr ""
 "lÆ°u."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "Nếu đú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 "
@@ -1358,8 +1305,9 @@ msgstr ""
 "n�n."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 "Nếu đúng, một biểu tượng liên kết với thư mục home sẽ được đặt trên màn hình "
@@ -1394,7 +1342,8 @@ msgstr ""
 "nếu sắp theo kích thước, sắp theo thứ tự giảm thay vì tăng."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "Nếu đúng, mặc định biểu tượng sẽ được đặt sát hơn trong cửa sổ mới."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1421,7 +1370,8 @@ msgid "List of possible captions on icons"
 msgstr "Danh sách tiêu đ� và biểu tượng"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "Số tập tin tối đa được xửa lý trong thư mục"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1441,11 +1391,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus xử lý việc hiển thị màn hình n�n"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Dùng thư mục nhà của bạn làm màn hình n�n"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Chỉ hiện các thư mục trong thanh bên theo cây"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1465,7 +1417,8 @@ msgid "Reverse sort order in new windows"
 msgstr "�ảo lại thứ tự sắp xếp trong cửa sổ mới"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Hiện thư mục đầu tiên trong cửa sổ"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1500,7 +1453,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1508,33 +1461,35 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "Thứ tự sắp mặc định cho Khung xem Biểu tượng. Giá trị có thể là \"name"
 "\" (sắp theo tên), \"size\" (theo kích thước), \"type\" (theo loại), "
 "\"modification_date\", \"emblems\" (theo biểu tượng)"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "Thứ tự sắp mặc định cho Khung xem Danh sách. Giá trị có thể là \"name\" (sắp "
 "theo tên), \"size\" (theo kích thước), \"type\" (theo loại), "
@@ -1581,7 +1536,8 @@ msgid "Use manual layout in new windows"
 msgstr "Dùng bố trí thủ công với cửa sổ mới"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "Dùng layout chặt chẽ hơn trong cửa sổ mới"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1611,7 +1567,8 @@ msgstr ""
 "sách) và \"icon_view\" (Khung xem Biểu tượng)."
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "Khi để hiển thị số các mục trong thư mục"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1623,7 +1580,8 @@ msgid "When to show thumbnails of image files"
 msgstr "Khi để hiển thị thumbnail của các tập tin ảnh"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "Có lập n�n thư mục mặc định hay không"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1780,65 +1738,78 @@ msgstr "�ặt lại"
 msgid "on the desktop"
 msgstr "ở trên desktop"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Không thể xóa khối"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Không thể xóa khối"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "S�t rác"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "Chuyển vào đây"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "Sao vào đây"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Nối liên kết vào đây"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "�ặt như n�n sau"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Hủy b�"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "�ặt làm n�n cho _m�i thư mục"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "�ặt làm n�n cho thư mục _này"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "Xin lỗi, bạn phải dùng từ khóa không có dấu cách cho hình tượng mới."
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "Không thể cài đặt hình tượng"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1849,18 +1820,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "Xin lỗi, đã có hình tượng tên là \"%s\" rồi. Hãy ch�n tên khác cho nó."
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "Không thể cài đặt hình tượng"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "Xin lỗi, không thể lưu hình tượng tùy ch�n."
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Xin lỗi, không thể lưu tên hình tượng tùy ch�n."
 
@@ -1879,22 +1856,28 @@ msgstr "Từ:"
 msgid "To:"
 msgstr "�ến:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "Lỗi trong khi chuyển."
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "Lỗi trong khi chuyển.\n"
 "\n"
 "\"%s\" không thể chuyển được vì nó ở một đĩa chỉ có thể đ�c."
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "Lỗi trong khi xóa."
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1903,22 +1886,17 @@ msgstr ""
 "\"%s\" không thể xóa được vì bạn không có thẩm quy�n để sửa đổi thư mục mẹ "
 "của nó."
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "Lỗi trong khi xóa.\n"
 "\n"
 "\"%s\" không thể xóa được vì nó ở một đĩa chỉ có thể đ�c."
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1927,12 +1905,15 @@ msgstr ""
 "\"%s\" không thể chuyển được vì bạn không có thẩm quy�n để sửa đổi nó hoặc "
 "thư mục mẹ của nó."
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "Lỗi trong khi chuyển."
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "Lỗi khi chuyển.\n"
@@ -1940,12 +1921,10 @@ msgstr ""
 "\"%s\" không thể chuyển được vì nó hoặc thư mục cha của nó được chứa trong "
 "đích đến."
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "Lỗi trong khi chuyển.\n"
@@ -1953,295 +1932,244 @@ msgstr ""
 "\"%s\" không thể chuyển được vào s�t rác vì bạn không có thẩm quy�n để sửa "
 "đổi nó hay thư mục mẹ của nó"
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "Lỗi trong khi sao chép."
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "Lỗi trong khi sao chép.\n"
 "\n"
 "\"%s\" không thể sao được vì bạn không có quy�n đ�c nó."
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Lỗi trong khi sao chép sang \"%s\".\n"
-"\n"
-"Nơi định sao sang không đủ có chỗ."
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "Lỗi trong khi sao chép."
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "Lỗi khi di chuyển sang \"%s\".\n"
 "\n"
 "Nơi định sao sang không có đủ chỗ."
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"Lỗi khi tạo liên kết tại \"%s\".\n"
-"\n"
-"Nơi định tạo liên kết mới không có đủ chỗ."
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "Lỗi trong khi chuyển."
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "Lỗi trong khi liên kết."
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "Lỗi khi sao chép sang \"%s\".\n"
 "\n"
 "Bạn không có quy�n ghi lên thư mục này."
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "Lỗi khi sao chép sang \"%s\".\n"
 "\n"
 "Nơi định sao chép sang là một đĩa chỉ đ�c."
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Lỗi khi sao chuyển mục sang \"%s\".\n"
-"\n"
-"Bạn không có quy�n được viết lên thư mục này."
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Lỗi khi sao chuyển mục sang \"%s\".\n"
-"\n"
-"�ĩa định chuyển sang là đĩa chỉ đ�c."
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"Lỗi khi tạo liên kết tại \"%s\".\n"
-"\n"
-"Bạn không có thẩm quy�n để viết lên thư mục này."
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "Lỗi trong khi chuyển."
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"Lỗi khi tạo liên kết tại \"%s\".\n"
-"\n"
-"�ĩa định tạo liên kết mới là đĩa chỉ đ�c"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi \"%s\" trong khi sao chép sang \"%s\".\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "Lỗi trong khi liên kết."
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "Lỗi trong khi sao chép."
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"Lỗi\"%s\" trong khi chuyển đến \"%s\".\n"
+"Lỗi\"%s\" trong khi chuyển.\n"
 "\n"
 "Bạn có muốn tiếo tục không?"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi \"%s\" trong khi tạo một liên kết đến \"%s\".\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "Lỗi trong khi chuyển."
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"Lỗi\"%s\" trong khi xóa \"%s\".\n"
+"Lỗi \"%s\" trong khi tạo một liên kết đến \"%s\".\n"
 "\n"
 "Bạn có muốn tiếo tục không?"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi\"%s\" trong khi sao chép.\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "Lỗi trong khi xóa."
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi\"%s\" trong khi chuyển.\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "Lỗi trong khi sao chép."
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi\"%s\" trong khi tạo liên kết.\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "Lỗi trong khi chuyển."
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"Lỗi\"%s\" trong khi xóa.\n"
-"\n"
-"Bạn có muốn tiếo tục không?"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "Lỗi trong khi liên kết."
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "Lỗi trong khi xóa."
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "Lỗi trong khi sao chép."
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "Lỗi trong khi chuyển."
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "Lỗi trong khi liên kết."
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "Lỗi trong khi xóa."
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "B� qua"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Thử lại"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "Không thể hoàn thành hàng động chỉ định."
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" không thể chuyển đến nơi mới được vì tên của nó đã được dùng chomột "
 "mục đặc biệt mà mục này không thể b� đi hoặc thay thế được.\n"
 "\n"
 "Nếu bạn vẫn muốn chuyển\"%s\" thì hãy đổi tên nó và thử lại một lần nữa."
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "Không thể hoàn thành hàng động chỉ định."
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "\"%s\" không thể sao đến nơi mới được vì tên của nó đã được dùng cho một mục "
 "đặc biệt mà mục này không thể b� đi hoặc thay thế được.\n"
 "\n"
 "Nếu bạn vẫn muốn chuyển\"%s\" thì hãy đổi tên nó và thử lại một lần nữa."
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "Tập tin không thể thay thế được."
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "File \"%s\" đã tồn tại.\n"
 "\n"
 "Bạn có muốn thay thế nó không?"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "Có xung đột khi đang sao chép"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Thay thế"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Thay thế tất cả"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "Liên kết tới %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "Liên kết khác tới %s"
@@ -2250,25 +2178,25 @@ msgstr "Liên kết khác tới %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dst liên kết tới %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dnd liên kết tới %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%drd liên kết tới %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dth liên kết tới %s"
@@ -2278,563 +2206,602 @@ msgstr "%dth liên kết tới %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr "(bản sao)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (bản sao khác)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr " bản sao)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr " bản sao)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr " bản sao"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd copy)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (bản sao)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (bản sao khác)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%d bản sao)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%d bản sao)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%d bản sao)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%d bản sao)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "GnomeVFSXferProgressStatus %d không được biết"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "�ang di chuyển tập tin tới s�t rác"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Tập tin ném ra ngoài:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "�ang di chuyển"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Chuẩn bị di chuyển tới S�t Rác..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Di chuyển Tập tin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Tập tin đã chuyển:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Chuẩn bị di chuyển..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "�ang hoàn tất di chuyển..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "�ang tạo liên kết tập tin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "Tập tin đã liên kết:"
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "�ang liên kết"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "Chuẩn bị tạo liên kết.."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "�ang hoàn tất tạo liên kết..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "�ang sao chép"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Tập tin đã sao chép:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "�ang sao chép"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "Chuẩn bị sao chép.."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "Bạn không thể sao mục vào s�t rác"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Không thể sao vào s�t rác"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "Bạn không thể chuyển vào thư mục s�t rác này."
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "Bạn không thể sao thư mục s�t rác này."
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "Không thể thay đổi vị trí S�t rác"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "Không thể sao s�t rác"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "Bạn không thể chuyển một thư mục vào chính nó."
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "Bạn không thể chép một thư mục vào trong chính nó"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Tạo một thư mục rỗng bên trong thư mục này"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "Không thể di chuyển vào chính nó"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "Không thể sao vào chính nó"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "Bạn không thể sao vào chính nó"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "Không thể sao vào chính nó"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "Lỗi khi tạo thư mục mới.\n"
 "\n"
 "Bạn không có quy�n viết lên nơi mới."
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "Lỗi khi tạo thư mục mới.\n"
 "\n"
 "Nơi mới không có đủ chỗ."
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "Lỗi \"%s\" khi tạo thư mục mới."
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "Lỗi khi tạo thư mục mới"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "Lỗi khi tạo thư mục mới"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "thư mục không tên"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "Lỗi \"%s\" khi tạo thư mục mới."
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "Lỗi khi tạo thư mục mới"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "Lỗi khi tạo thư mục mới"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 tập tin"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "�ang xóa tập tin"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Tập tin đã xóa:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "�ang xóa"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "Chuẩn bị xóa tập tin..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "�ang đổ rác"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Chuẩn bị đổ rác..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 "Bạn có chắc chắn muốn xóa vĩnh viễn toàn bộ các mục có chứa trong s�t rác "
 "không?"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "Rá»—ng"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (bản sao)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (bản sao)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (bản sao).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (bản sao)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (bản sao).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (bản sao).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (bản sao).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (bản sao).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo...(bản sao)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (bản sao)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (bản sao khác)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (bản sao khác)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (bản sao khác).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (bản sao thứ ba)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (bản sao thứ ba).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (bản sao khác).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (bản sao thứ ba).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (bản sao thứ 13)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (bản sao thứ 14)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (bản sao thứ 13).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (bản sao thứ 14).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (bản sao thứ 21)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (bản sao thứ 22)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (bản sao thứ 21).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (bản sao thứ 22).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (bản sao thứ 23)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (bản sao thứ 23).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (bản sao thứ 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (bản sao thứ 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (bản sao thứ 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (bản sao thứ 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (bản sao thứ 24)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (bản sao thứ 25)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (bản sao thứ 24).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (bản sao thứ 25).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (bản sao thứ 100000000000000).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (bản sao thứ 10)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (bản sao thứ 11)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (bản sao thứ 11).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (bản sao thứ 10).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (bản sao thứ 12)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (bản sao thứ 12.txt)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (bản sao thứ 110)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (bản sao thứ 111)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (bản sao thứ 110).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (bản sao thứ 111).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (bản sao thứ 122)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (bản sao thứ 123)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (bản sao thứ 122).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (bản sao thứ 123).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (bản sao thứ 124)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (bản sao thứ 124).txt"
 
@@ -2853,64 +2820,64 @@ msgstr "foo (bản sao thứ 124).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "hôm nay vào 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "hôm nay vào lúc %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "hôm nay vào 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "hôm nay vào lúc %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "hôm nay, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "hôm nay, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "hôm nay"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "hôm qua vào 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "hôm qua vào lúc %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "hôm qua vào 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "hôm qua vào lúc %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "hôm qua, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "hôm qua, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "hôm qua"
 
@@ -2919,133 +2886,133 @@ msgstr "hôm qua"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Thứ tư, 00 tháng chín 0000 vào 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y vào lúc %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Thứ hai, 00 T10 0000 vào 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y vào lúc %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Thứ hai, 00 T10 0000 vào 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y vào lúc %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 T10 0000 vào 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %b %Y vào lúc %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 T10 0000, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00.00.00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d.%m.%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00.00.00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d.%m.%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 mục"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 thư mục"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 tập tin"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 mục"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u mục"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u thư mục"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u tập tin"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? mục"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? bytes"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "dạng không rõ"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "dạng MIME không rõ"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "không rõ"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "chương trình"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3055,7 +3022,7 @@ msgstr ""
 "do tập tin gnome-vfs.keys của bạn nằm ở vùng không đúng hoặc vì một lý do "
 "nào đó mà không thể tìm thấy được."
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3064,11 +3031,11 @@ msgstr ""
 "Không tìm thấy mô tả cho \"%s\" dạng mime (tập tin là \"%s\"), xin hãy thông "
 "báo cho gnome-vfs mailing list."
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "liên kết"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "liên kết (vỡ)"
 
@@ -3189,11 +3156,13 @@ msgid "Search for files by file name and file properties"
 msgstr "Tìm các tập tin theo tên và tính chất của nó"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Xem Biểu tượng"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Xem danh sách"
@@ -3337,148 +3306,153 @@ msgstr "Nhà của %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "CNET Computers.com"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "biểu tượng tập tin"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "văn bản thay đổi được"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "Nhãn biên soạn được"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "văn bản thêm"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "Thêm vài văn bản"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "�iểm sáng để ch�n"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "có phải chúng ta đã đánh dấu một lựa ch�n"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "đánh dấu theo tiêu điểm bàn phím"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "có phải chúng ta đã dánh dấu để trình tiêu điểm bàn phím"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "đánh dấu cho thả rơi"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "có phải chúng ta đã dánh dấu cho một thả D&D"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Lựa ch�n chữ nhật"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "Khung Văn Bản"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Vẽ khung quanh văn bản không được ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Màu hộp ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Màu của hộp ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alpha hộp ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "�ộ đục của hộp ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "Alpha điểm sáng"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "�ộ đục của nổi bật cho các biểu tượng được ch�n"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "Màu thông tin nhạt"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "Màu dùng cho text thông tin tương phản lại n�n tối."
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "Màu thông tin đậm"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "Màu dùng cho text thông tin tương phản lại n�n sáng."
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it? This will clobber the stored manual layout."
 msgstr ""
 "Thư mục này dùng xếp đặt tự động. Bạn có muốn chuyển sang xếp đặt tay và r�i "
 "kh�i mục này, nơi nào bạn đã  b� nó? Ở đây sẽ được thay bằng xếp đặt tay."
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them? This will clobber the stored manual layout."
 msgstr ""
 "Thư mục này dùng xếp đặt tự động. Bạn có muốn chuyển sang xếp đặt tay và r�i "
 "kh�i các mục này, nơi nào bạn đã thả chúng? Ở đây sẽ được thay bằng xếp đặt "
 "tay."
 
 # libnautilus-p
-#: libnautilus-private/nautilus-icon-dnd.c:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "Thư mục này dùng xếp đặt tự động. Bạn có muốn chuyển sang xếp đặt tay và r�i "
 "kh�i mục này, nơi nào bạn đã thả nó?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "Thư mục này dùng xếp đặt tự động. Bạn có muốn chuyển sang xếp đặt tay và r�i "
 "kh�i các mục này, nơi nào bạn đã thả chúng?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "Có bật xắp xếp tay không?"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "Bật"
 
@@ -3586,72 +3560,72 @@ msgstr "Có dạng mặc định cho các mục \"%s\"."
 msgid "Is the default for all \"%s\" items."
 msgstr "Có dạng mặc định cho tất cả các mục \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "Sửa đổi \"%s\""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "Trong thực đợn bao gồm cho các mục \"%s\""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "Dùng dạng mặc định cho các mục \"%s\""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "Trong thực đợn chỉ bao gồm cho các mục \"%s\""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "Dùng như dạng mặc định chỉ cho các mục \"%s\""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "Trong thực đơn không bao gồm các mục cho \"%s\""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "Tên"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Trạng thái"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "Ch�n"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Thực hiện"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "Sửa đổi..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "Các chương trình và dạng tập tin"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "�i đến đó"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
@@ -3659,48 +3633,48 @@ msgstr ""
 "Bạn có thể tạo cấu hình trong đối thoại \"Các chương trình và dạng tập tin"
 "\", chương trình nào sẽ dành cho các dạng tập tin nào."
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Mở với ứng dụng khác"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "Ch�n một ứng dụng để mở \"%s\": trong ứng dụng này"
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Mở với trình quan sát khác"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "Ch�n một bộ xem cho \"%s\":"
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "Không có bộ quan sát nào dùng được cho \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "Không có quan sát nào dùng được"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Không có ứng dụng nào được kết hợp với \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Không có ứng được kết hợp"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Không có hành động nào liên quan với \"%s\"."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Không liên quan với hành động nào"
 
@@ -3708,11 +3682,9 @@ msgstr "Không liên quan với hành động nào"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3721,42 +3693,41 @@ msgstr ""
 "Bạn có thể lập cấu hình GNOME để lên kết các ứng dụng với loại tập tin. Bạn "
 "muốn liên kết một ứng dụng với tập tin này không?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "Các ứng dụng liên kết"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Trình xem liên quan với \"%s\" là không hợp lệ."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "Liên kết với trình xem không hợp lệ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Ứng dụng liên quan với \"%s\" là không hợp lệ."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "Liên quan với ứng dụng không hợp lệ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "Hành động liên quan với \"%s\" là không hợp lệ."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "Liên quan với hành động không hợp lệ"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3767,93 +3738,134 @@ msgstr ""
 "loại tập tin này. Bạn muốn liên kết ứng dụng hay trình xem khác với tập tin "
 "này không?"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "Hành động liên quan"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"\"%s\" không thể mở \"%s\" được vì \"%s\" không thể truy cập các tập tin tại "
+"địa điểm \"%s\". Bạn có muốn ch�n một ứng dụng khác không?"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "\"%s\" không thể mở \"%s\" được vì \"%s\" không thể truy cập các tập tin tại "
 "địa điểm \"%s\". Bạn có muốn ch�n một ứng dụng khác không?"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "Hành động mặc định không thể mở \"%s\" vì  nó không thể truy cập các tập tin "
 "tại vị trí \"%s\" . Bạn muốn ch�n hành động khác không?"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "�ịa điểm không mở được"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"\"%s\" không thể mở \"%s\" được vì \"%s\" không thể truy cập các tập tin tại "
+"địa điểm \"%s\". Bạn có muốn ch�n một ứng dụng khác không?"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "\"%s\" không thể mở \"%s\" được vì \"%s\" không thể truy cập các tập tin tại "
 "địa điểm \"%s\". Không có một ứng dụng nào có thể dùng để xem tập tin này. "
 "Nếu bạn sao tập tin này vào máy tính của bạn thì bạn có thể mở nó được"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
 "Hành động mặc định không thể mở \"%s\" vì  nó không thể truy cập các tập tin "
-"tại vị trí \"%s\". Không có hành động khác nào có thể xem tập tin này. Nếu "
-"bạn sao chép tập tin này vào máy tính của bạn thì bạn có thể mở được nó."
+"tại vị trí \"%s\" . Bạn muốn ch�n hành động khác không?"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"\"%s\" không thể mở \"%s\" được vì \"%s\" không thể truy cập các tập tin tại "
+"địa điểm \"%s\". Không có một ứng dụng nào có thể dùng để xem tập tin này. "
+"Nếu bạn sao tập tin này vào máy tính của bạn thì bạn có thể mở nó được"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "�ang mở %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 "Xin lỗi, bạn không thể thực hiện các lệnh của một máy tính đi�u khiển từ xa "
 "do lý do an toàn"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Không thể thực hiện liên kết từ xa"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "�ã có một lỗi khi khởi động ứng dụng. \n"
 "\n"
 "Chi tiết: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "Lỗi khi khởi động ứng dụng"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "Mục đích thả chỉ nhằm ủng hộ các tập tin cục bộ"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Mục đích thả chỉ để hỗ trợ các tập tin cục bộ \n"
@@ -3861,15 +3873,15 @@ msgstr ""
 "�ể mở các tập tin không cục bộ bạn hãy sao các tậo tin này vào một thư mục "
 "cục bộ và sau đó thả chúng một lần nữa."
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "Mục đích thả chỉ nhằm ủng hộ các tập tin cục bộ"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4123,14 +4135,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Các mục có chứa \"medusa\" trong tên của chúng và là những thư mục"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "�ang tìm kiếm trên các ổ đĩa"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus đang tìm kiếm các thư mục s�t rác trên đĩa của bạn."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Biên tập"
@@ -4332,96 +4336,106 @@ msgstr "N�n sau"
 msgid "Empty Trash"
 msgstr "�ổ rác"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "Nó sẽ mở %d cửa sổ tách biệt. Bạn có muốn thực hiện không?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Mở %d cửa sổ ?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Bạn có chắc là muốn xoá \"%s\" vĩnh viễn?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "Nó sẽ mở %d cửa sổ tách biệt. Bạn có muốn thực hiện không?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Bạn có chắc là muốn xoá \"%s\" vĩnh viễn?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Bạn có chắc chắn xóa những mục %d đã ch�n vĩnh viễn không?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "Xóa vĩnh viễn m�i mục được ch�n"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Xóa?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Ch�n hạng mục:"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Mẫu"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" đã ch�n"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 thư mục đã được ch�n"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d thư mục đã được ch�n"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "(Không chứa mục nào)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (đang chứa 1 mục)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (đang chứa %d mục)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (không chứa toàn bộ mục nào)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (đang chứa toàn bộ mục)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (đang chứa toàn bộ %d mục)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "\"%s\" đã ch�n (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d mục đã ch�n (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 mục khác đã ch�n (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d mục khác đã ch�n (%s)"
@@ -4433,7 +4447,7 @@ msgstr "%d mục khác đã ch�n (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4442,108 +4456,128 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, 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ể chở được. "
 "Một vài tập tin sẽ không được hiển thị."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Quá nhi�u tập tin"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "\"%s\" không thể chuyển vào s�t rác được. Bạn có muốn xóa nó ngay lập tức "
 "không?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Các mục %d đã ch�n không thể chuyển vào s�t rác được. Bạn có muốn xóa chúng "
-"ngay lập tức không?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+"\"%s\" không thể chuyển vào s�t rác được. Bạn có muốn xóa nó ngay lập tức "
+"không?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
-"%d của các mục đã ch�n không thể chuyển vào s�t rác được. Bạn có muốn xóa %d "
-"những  mục này ngay lập tức không?"
+"\"%s\" không thể chuyển vào s�t rác được. Bạn có muốn xóa nó ngay lập tức "
+"không?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Có xóa ngay không?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Bạn có chắc chắn là bạn muốn xóa vĩnh viễn \"%s\" trong s�t rác không?"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Bạn có chắc chắn là bạn muốn xóa vĩnh viễn %d các mục đã ch�n trong s�t rác "
 "không?"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "�ổ rác không?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Dùng \"%s\" để mở mục đã ch�n"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Ứng dụng khác..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "Một ứng dụng..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Bộ quan sát khác..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "Một bộ quan sát..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "Không thể hoàn thành hàng động chỉ định:  %s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "Không thể hoàn thành hàng động chỉ định."
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Thực hiện \"%s\" trên tất cả các mục đã ch�n"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"Tất cả các tập tin khả thi trong thư mục này sẽ xuất hiện trên thực đơn "
+"Script. Khi ch�n một script trong các thực đơn này, script này sẽ thực thi "
+"với tất cả các mục được ch�n theo tư cách của nhập"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
@@ -4551,11 +4585,11 @@ msgstr ""
 "Script. Khi ch�n một script trong các thực đơn này, script này sẽ thực thi "
 "với tất cả các mục được ch�n theo tư cách của nhập"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "V� Scripts"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4595,184 +4629,191 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: vị trí và kích cỡ cửa sổ hiện th�i"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "\"%s\" sẽ được chuyển đi nếu bạn dùng lệnh »ghép tập tin«"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "\"%s\" sẽ được sao nếu bạn dùng lệnh »ghép tập tin«"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 "%d các mục đư�c ch�n sẽ được chuyển đi nếu bạn dùng lệnh »ghép tập tin«"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "%d các mục đư�c ch�n sẽ được sao nếu bạn dùng lệnh »ghép tập tin«"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "Không có gì trong bảng trích giữ để ghép được."
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Lỗi Gắn kết"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Lỗi b� Gắn kết"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Lỗi Gắn kết"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Nhả R_a"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_B� Gắn Kết Khối Tin"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Mở trong của sổ mới"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Mở trong %d cửa sổ mới"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Thư mục Home"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Thư mục Home"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "Xóa kh�i s�t rác"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "Xóa vĩnh viễn m�i mục được ch�n"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "_Chuyển vào s�t rác"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Di chuyển các mục được ch�n vào S�t rác"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "Xóa"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "Thiết lập các liên kết"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "Thiết đặt liên kết"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "�ổ s�t rác"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cắt tập tin"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cắt tập tin"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "Sao tập tin"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Sao chép Tập tin"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 "Không thể dùng liên kết này vì nó không có đích. Bạn có muốn xóa nó vào s�t "
 "rác không?"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr ""
+"Không thể dùng liên kết này vì nó không có đích. Bạn có muốn xóa nó vào s�t "
+"rác không?"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, c-format
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 "Không thể dùng liên kết này vì đối tượng liên kết của nó là \"%s\" không tồn "
 "tại. Bạn muốn xóa nó vào s�t rác không?"
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "Liên kết bị phá vỡ"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 "\"%s\" là tập tin text có thể thực thi. Bạn có muốn thực thi nó, hay hiển "
 "thị nội dung của nó?"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Thực thi hoặc hiển thị?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "Hiển thị"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Thực hiện trên thiết bị đầu cuối mới"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "Hiển thị"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "Thá»±c thi"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "�ang mở \"%s\""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Có hủy mở không?"
 
@@ -4793,16 +4834,21 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "Xin lỗi, không thể hiển thị toàn bộ nội dung của \"%s\". "
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "Không thể xác định quy�n truy cập của \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "Lỗi hiển thị thư mục"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: 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. Xin hãy dùng một tên khác."
 
-#: src/file-manager/fm-error-reporting.c:107
+#: 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?"
@@ -4810,12 +4856,12 @@ 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?"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "Bạn không có đủ quy�n cần thiết để đổi tên của \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
@@ -4824,81 +4870,101 @@ msgstr ""
 "Tên \"%s\" là không hợp lệ vì nó có chứa ký tự \"/\". Xin hãy dùng một tên "
 "khác "
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "Tên \"%s\" là không hợp lệ. Xin hãy dùng một tên khác "
 
-#: src/file-manager/fm-error-reporting.c:127
+#: 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 "Không thể thay đổi tên của \"%s\" vì vì nó nằm trên một đĩa chỉ đ�c"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "Xin lỗi, không thể đổi tên \"%s\" thành \"%s\" được."
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "Không thể xác định quy�n truy cập của \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "Lỗi khi đổi tên"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "Bạn không có đủ quy�n cần thiết để thay đổi nhóm của \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "Không thể thay đổi nhóm của \"%s\" vì nó nằm trên một đĩa chỉ đ�c"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "Xin lỗi, không thể thay đổi nhóm của \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "Không thể xác định quy�n truy cập của \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "Lỗi khi tạo nhóm"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "Không thể thay đổi chủ của \"%s\" vì nó nằm trên một đĩa chỉ đ�c"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "Xin lỗi, không thể thay đổi chủ s� hữu của \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "Không thể xác định quy�n truy cập của \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "Lỗi khi thay đổi chủ"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 "Không thể thay đổi quy�n truy nhập của \"%s\" vì nó nằm trên một đĩa chỉ đ�c"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "Xin lỗi, không thể thay đổi quy�n truy nhập của \"%s\""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "Không thể xác định quy�n truy cập của \"%s\"."
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "Lỗi khi thiết đặt quy�n truy nhập"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "�ổi tên \"%s\" thành \"%s\"."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Có hủy đổi tên không?"
 
@@ -4956,128 +5022,150 @@ msgstr "�ưa biểu tượng v� kích thước nguyên dạng"
 msgid "Restore Icon's Original Si_ze"
 msgstr "�ưa v� kích thước nguyên dạng của biểu tượng"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "Chỉ vào \"%s\""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "Tính năng kéo và thả chỉ được hỗ trợ trên hệ thống tập tin cục bộ "
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "Tính năng kéo và thả chỉ được hỗ trợ trên hệ thống tập tin cục bộ "
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "Lỗi kéo và thả"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "�ã dùng một dạng kéo không hợp lệ"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Kích thước"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Dạng"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Ngày được sửa đổi"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr ""
 "Bạn không thể gán nhi�u hơn một biểu tượng riêng trong một th�i điểm! Xin "
 "hãy chỉ kéo một ảnh để tạo một biểu tượng riêng."
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+"Bạn không thể gán nhi�u hơn một biểu tượng riêng trong một th�i điểm! Xin "
+"hãy chỉ kéo một ảnh để tạo một biểu tượng riêng."
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "Nhi�u hơn một ảnh"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
+msgstr ""
+"Tập tin mà bạn thả vào không phải là tập tin cục bộ. Bạn chỉ có thể dùng ảnh "
+"cục bộ như biểu tượng riêng mà thôi."
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
 msgstr ""
 "Tập tin mà bạn thả vào không phải là tập tin cục bộ. Bạn chỉ có thể dùng ảnh "
 "cục bộ như biểu tượng riêng mà thôi."
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Chỉ ảnh cục bộ thôi"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not an image."
 msgstr ""
-"Tập tin mà bạn đã thả vào không phải là một ảnh. Bạn chỉ có thể dùng ảnh cục "
-"bộ như biểu tượng riêng mà thôi."
+"Tập tin mà bạn thả vào không phải là tập tin cục bộ. Bạn chỉ có thể dùng ảnh "
+"cục bộ như biểu tượng riêng mà thôi."
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Chỉ có ảnh"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Thuộc tính %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "Có hủy thay đổi nhóm không?"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "Thay đổi nhóm"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "Có hủy thay đổi chủ không?"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "Thay đổi chủ"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "không có gì"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "không đ�c được"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 mục với kích thước %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d mục, tổng lớn %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(không đ�c được một vài nội dung)"
 
@@ -5087,191 +5175,191 @@ msgstr "(không đ�c được một vài nội dung)"
 #. * 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Ná»™i dung:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Cơ sở"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Tên:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "Tên:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Dạng:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Kích thước:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Vị trí:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "Âm lượng:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Không gian trống:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "�ích liên kết:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Dạng MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Sửa đổi:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Truy cập:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "Ch�n biểu tượng riêng..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "Xóa biểu tượng riêng"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "��c"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "Viết"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "Khả thi"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Tạo nhận diện ID cho ngư�i sử dụng"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "C� đặc biệt:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Tạo nhận diện ID nhóm"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Quy�n"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "Bạn không phải là chủ nên bạn không thể thay đổi các quy�n truy cập."
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Chủ tập tin:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Chủ tập tin:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "Nhóm tập tin:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Nhóm tập tin:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Chủ:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Nhóm:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Ngư�i khác:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Xem văn bản"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Xem theo số:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Thay đổi cuối cùng:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "Không thể xác định quy�n truy cập của \"%s\"."
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "Không thể xác định quy�n truy cập của các tập tin được ch�n."
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"�ã có một lỗi khi hiển thị trợ giúp: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "�ã có một lỗi khi hiển thị trợ giúp: %s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Không thể hiển thị trợ giúp"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Có hủy b� hiển thị của sổ tính chất không?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Tạo của sổ tính chất"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Ch�n biểu tượng"
 
@@ -5289,70 +5377,110 @@ msgid "Search Results"
 msgstr "Kết quả tìm kiếm"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr ""
-"Xin lỗi, hiện không có dịch vụ tìm kiếm Medusa vì nó chưa được cài đặt."
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "Xin lỗi, dịch vụ tìm kiếm medusa hiện th�i không có."
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "Dịch vụ tìm kiếm hiện th�i không có"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "Việc tìm kiếm mà bạn ch�n mới hơn phụ lục của hệ thống. Việc tìm kiếm sẽ "
 "không trả lại kết quả. Bạn cần tạo một phụ lục mới bằng cách chạy \"medusa-"
 "indexd\" trong dòng lệnh của root."
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Tìm kiếm không thể mở phụ lục hệ thống tập tin. Phụ lục của bạn có thể bị "
+"thiếu hay h�ng. Bạn có thể tạo phụ lục mới bằng việc chạy \"medusa-indexd\" "
+"trong dòng lệnh của root."
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "Tìm kiếm các mục thật mới"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"M�i tập tin có phụ lục trên hệ thống khớp với kịch bản được ch�n. Bạn có thể "
+"kiểm tra chính tả trên các phần ch�n của bạn hay thêm kịch bản để thu hẹp "
+"kết quả."
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "M�i tập tin có phụ lục trên hệ thống khớp với kịch bản được ch�n. Bạn có thể "
 "kiểm tra chính tả trên các phần ch�n của bạn hay thêm kịch bản để thu hẹp "
 "kết quả."
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "Lỗi khi đang tìm kiếm"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Tìm kiếm không thể mở phụ lục hệ thống tập tin. Phụ lục của bạn có thể bị "
 "thiếu hay h�ng. Bạn có thể tạo phụ lục mới bằng việc chạy \"medusa-indexd\" "
 "trong dòng lệnh của root."
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "Lỗi đ�c phụ lục tập tin"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "Lỗi xảy ra khi đang nạp nội dung tìm kiếm này: %s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"�ể thực hiện tìm kiếm nội dung, tìm kiếm cần có phụ lục các tập tin trên hệ "
+"thống. Tìm kiếm không thể truy cập phụ lục của bạn lúc này."
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"�ể thực hiện tìm kiếm nội dung, tìm kiếm cần có phụ lục các tập tin trên hệ "
+"thống. Tìm kiếm không thể truy cập phụ lục của bạn lúc này."
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
@@ -5360,25 +5488,23 @@ msgstr ""
 "kiếm không thể truy cập phụ lục lúc này do vậy sẽ thực hiện tìm kiếm chậm và "
 "không cần dùng phụ lục."
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"�ể thực hiện tìm kiếm nội dung, tìm kiếm cần có phụ lục các tập tin trên hệ "
-"thống. Tìm kiếm không thể truy cập phụ lục của bạn lúc này."
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "Tìm kiếm nhanh hiện th�i không có"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "Tìm kiếm nội dung hiện th�i không có"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5391,56 +5517,88 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "�ể thực hiện tìm kiếm nhanh, Tìm kiếm cần có phụ lục các tập tin trên hệ "
 "thống. Máy tính hiện đang tạo phụ lục đó. Vì Tìm kiếm không thể dùng phụ "
 "lục, việc tìm kiếm này sẽ kéo dài vài phút."
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "�ể thực hiện tìm kiếm nội dung, Tìm kiếm cần có phụ lục nội dung trên hệ "
 "thống. Máy tíng hiện đang tạo phụ lục đó. Tìm kiếm nội dung sẽ sẵn sàng khi "
 "hoàn thành phụ lục."
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "Tìm kiếm theo chỉ mục không sẵn có"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"�ể thực hiện tìm kiếm nội dung, tìm kiếm cần có phụ lục các tập tin trên hệ "
+"thống. Tìm kiếm không thể truy cập phụ lục của bạn lúc này."
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"�ể thực hiện tìm kiếm nội dung, tìm kiếm cần có phụ lục các tập tin trên hệ "
+"thống. Tìm kiếm không thể truy cập phụ lục của bạn lúc này."
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "�ể thực hiện tìm kiếm nhanh, Tìm kiếm cần có phụ lục các tập tin trên hệ "
 "thống. Hiện th�i không có phụ lục. Bạn có thể tạo phụ lục bằng cách chạy "
 "\"medusa-indexd\" trong dòng lệnh của root. Tới khi hoàn thành phụ lục, việc "
 "tìm kiếm sẽ kéo dài chừng vài phút."
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "�ể thực hiện tìm kiếm nội dung, Tìm kiếm cần có phụ lục nội dung trên hệ "
 "thống. Hiện chưa có phụ lục. Bạn có thể tạo phụ lục bằng cách chạy \"medusa-"
 "indexd\" trong dòng lệnh của root. Tới khi hoàn thành phụ lục, việc tìm kiếm "
 "nội dung mới có thể thực hiện được."
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "Tìm kiếm nhanh không thể chạy trên máy của bạn"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5450,11 +5608,12 @@ msgstr ""
 "thống. Ngư�i quản trị hệ thống đã tắt chức năng này, do vậy mà không có phụ "
 "lục."
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "Tìm kiếm nhanh không thể chạy trên máy của bạn"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "Tìm kiếm nhanh hiện th�i không có"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Vị Trí"
 
@@ -5463,7 +5622,7 @@ msgstr "Vị Trí"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "Ch�n và bao tại Cửa sổ Mới"
@@ -5474,7 +5633,7 @@ msgstr "Ch�n và bao tại Cửa sổ Mới"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "�ể lộ tại %d_Cửa sổ Mới"
@@ -5483,15 +5642,21 @@ msgstr "�ể lộ tại %d_Cửa sổ Mới"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 "Nautilus đã tìm thấy nhi�u kết quả hơn khả năng hiển thị. Một vàikết quả sẽ "
 "không được hiển thị."
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr ""
+"Nautilus đã tìm thấy nhi�u kết quả hơn khả năng hiển thị. Một vàikết quả sẽ "
+"không được hiển thị."
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "Quá nhi�u trùng hợp"
 
@@ -5505,12 +5670,12 @@ msgid "Create L_auncher"
 msgstr "Tạo _Bộ phóng"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Tạo một khởi đầu mới"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Xóa tất cả các mục trong s�t rác"
 
@@ -5529,7 +5694,7 @@ msgstr "Trình diá»…n má»™t của sổ cho phép bạn tạo mẫu hay mầu cá»
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Dùng n�n sau dạng mặc định"
@@ -5551,58 +5716,68 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "Ch�n bộ quan sát khác để xem các mục đã ch�n"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Tạo _Thư mục"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Tạo _Thư mục"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Tạo một thư mục rỗng bên trong thư mục này"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Tạo một thư mục rỗng bên trong thư mục này"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "Tạo một liên kết biểu tượng cho mỗi mục đã ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "Tạo bản sao"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Xóa mỗi mục dã ch�n mà không b� vào s�t rác"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Tạo bản sao cho mỗi mục đã ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Biên tập khởi động"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Biên tập thông tin khởi động"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "�ịnh dạng cho khối đã ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Các tính chất Media"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "B� gắn kết khối được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 "Chuyển hoặc sao các tập tin đã được ch�n truớc đây bởi một lệnh như Cắt hay "
 "Sao tập tin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5610,130 +5785,139 @@ 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 tập "
 "tin hoặc Chép tập tin, vào thư mục được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Mở với"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Mở mỗi mục đã ch�n trong một cửa sổ mới"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Mở trong của sổ mới"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Mở một mục đã ch�n trong cửa sổ này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "Chuẩn bị các tập tin được ch�n để sao với lệnh \"Ghép tập tin\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "Chuẩn bị các tập tin được ch�n để chuyển với lệnh \"Ghép tập tin\""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "Bảo vệ"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "Bảo vệ khối đã được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "�ổi tên mục đã ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "�ặt lại Xem cho Dạng mặc định"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 "�ặt lại xắp xếp theo thứ tự và lớp thu phóng v� chỉnh lý trước cho cảnh xem "
 "này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "Thực hiện hoặc quản lý các script từ ~/Nautilus/scripts"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "Ch�n tất cả các tập tin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "Mẫu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Ch�n tất cả các mục trong cửa sổ này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Ch�n tất cả các mục trong cửa sổ này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "Trình các tính chất media của mỗi mục được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 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 script xuất hiện trong thực đơn này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "B� gắn kết khối được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "Dùng phông n�n sau mặc dịnh cho định vị này"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "Xem hoặc sửa đổi các tính chất của mỗi mục được ch�n"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "Sao tập tin"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "�ịnh dạng"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_B� Gắn Kết Khối Tin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "Mở"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "Mở thư mục các script"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Ghép các tập tin"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "_Dán tập tin vào thư mục"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "Các tính chất"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "�ổ_i tên..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "Các script"
 
@@ -5820,7 +6004,12 @@ msgstr "Sắp xếp bằng tay"
 msgid "Indexing is %d%% complete."
 msgstr "Tạo chỉ mục hoàn thành  %d%%  ."
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "Tập tin của bạn được đặt chỉ mục mới đây nhất là vào %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
@@ -5828,25 +6017,29 @@ msgstr ""
 "Ngày nào mà bạn tạo chỉ mục cho các tập tin và nội dung văn bản thì chúng sẽ "
 "được tìm kiếm rất nhanh."
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "Trạng thái Chỉ mục"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "Tập tin của bạn được đặt chỉ mục mới đây nhất là vào %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 "Ngày nào mà bạn tạo chỉ mục cho các tập tin và nội dung văn bản thì chúng sẽ "
-"được tìm kiếm rất nhanh. Các tập tin của bạn hiện th�i đang có chỉ mục."
+"được tìm kiếm rất nhanh."
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "Hiện gi� tập tin của bạn không có chỉ mục."
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5855,15 +6048,19 @@ msgstr ""
 "Khi bật chạy tìm kiếm nhanh, Tìm kiếm tạo một phụ lục để tăng tốc tìm kiếm. "
 "Tìm kiếm nhanh không được chạy trên máy của bạn, vì bạn chưa có phụ lục."
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "Hiện gi� tập tin của bạn không có chỉ mục."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "Xin lỗi, dịch vụ tìm kiếm medusa hiện th�i không có."
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%I:%M %p, %x"
 
@@ -5887,31 +6084,36 @@ msgstr "Hiển Thị Trạng Thái Chỉ _Mục"
 msgid "Show status of indexing used when searching"
 msgstr "Hiển Thị Trạng Thái Chỉ Mục được dùng khi Tìm kiếm"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "Không thể tạo thư mục theo yêu cầu"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "Không thể tạo các thư mục theo yêu cầu"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus đã không tạo được thư mục theo yêu cầu \"%s\". Trước khi chạy "
 "Nautilus, hãy tạo thư mục này, hay đặt quy�n hạn để Nautilus có thể tạo nó."
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "Không thể tạo các thư mục theo yêu cầu"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5922,24 +6124,29 @@ msgstr ""
 "Trước khi chạy Nautilus, hãy tạo các thư mục này, hoặc lập quy�n sử dụng mà "
 "Nautilus có thể tạo chúng."
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "Liên kết tới màn hình n�n cũ"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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àn hình n�n đã thay đổi trong GNOME 2.4. Liên kết "
 "tên \"Liên kết đến Màn hình n�n cũ\" đã được tạo trên Màn hình n�n. 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 liên kết đi."
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
-msgstr ""
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
+msgstr "Liên kết tới màn hình n�n cũ"
 
 #. Can't register myself due to trouble locating the
 #. * Nautilus_Shell.server file. This has happened when you
@@ -5951,7 +6158,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5962,7 +6169,7 @@ msgstr ""
 "hoặc cài đặt lại Nautilus."
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -6008,12 +6215,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Không thể dùng Nautilus lúc này vì có một lỗi không mong muốn."
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -6021,7 +6228,7 @@ msgstr ""
 "Không thể dùng Nautilus bây gi� vì có lỗi không mong muốn ở Bonobo khi cố "
 "gắng đăng ký với máy chủ xem trình quản lý tập tin."
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -6031,7 +6238,7 @@ msgstr ""
 "gắng định vị factory. Việc giệt bonobo-activation-server và khởi chạy lại "
 "Nautilus có thể giúp khắc phục trục trặc này."
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -6041,6 +6248,17 @@ msgstr ""
 "gắng định vị một đối tượng shell. Việc giệt bonobo-activation-server và khởi "
 "chạy lại Nautilus có thể giúp khắc phục trục trặc này."
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"�ã có một lỗi khi hiển thị trợ giúp: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Không có �ánh dấu nào được định nghĩa"
@@ -6074,36 +6292,47 @@ msgstr "�t lựa ch�n hơn"
 msgid "Find Them!"
 msgstr "Tìm chúng!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "Không thể di chuyển vào chính nó"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "Xin lỗi, nhưng '%s' không phải là một tập tin hợp lệ."
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
 msgstr ""
-" \"%s\" không phải là một địa điểm hợp lệ.Xin hãy kiểm tra lại lỗi chính tả "
-"và thử lại một lần nữa."
+"Không tìm thấy \"%s\". Xin hãy kiểm tra lại lỗi chính tả và thử lại một lần "
+"nữa."
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Máy chủ mạng"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "Tên:"
+msgid "_Location:"
+msgstr "Vị trí:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Kết nối"
@@ -6304,6 +6533,20 @@ msgstr ""
 "\n"
 "Bạn có thể tự xóa tập tin này để hiện lại đồ thuật.\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+"Bạn không thể gán nhi�u hơn một biểu tượng riêng trong một th�i điểm! Xin "
+"hãy chỉ kéo một ảnh để tạo một biểu tượng riêng."
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr ""
+"Tập tin mà bạn thả vào không phải là tập tin cục bộ. Bạn chỉ có thể dùng ảnh "
+"cục bộ như biểu tượng riêng mà thôi."
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6314,26 +6557,25 @@ msgstr "Mở với %s"
 msgid "Open with..."
 msgstr "Mở với..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "Không thể chạy trình ghi CD:\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "không thể chạy trình ghi CD"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "�ổ _rác"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "_Ghi nội dung vào CD"
 
@@ -6341,120 +6583,133 @@ msgstr "_Ghi nội dung vào CD"
 msgid "Go To:"
 msgstr "�i đến:"
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "Bạn có muốn xem những vị trí %d này trên các cửa sổ riêng biệt không?"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "Có xem trên da cửa sổ không?"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "�ịa điểm không mở được"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "Thi hành một tập hợp nhanh của tự kiển tra."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "Tạo cửa sổ đầu với một cấu hình đã cho."
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "HÌNH HỌC"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Chỉ tạo cửa sổ cho URIs đặc biệt rõ ràng."
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 "Không được quản trị desktop (B� qua phần chỉnh lý trong hội thoại ưa thích)."
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Thoát kh�i Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Khởi động lại Nautilus"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Trình Quản Lý Tập Tin"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus: --check không thể dùng được với URIs.\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus: không thể dùng được -- check với các lựa ch�n khác.\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus:  không thể dùng --quit được với URIs.\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus: không thể dùng --restart với URIs.\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus: không thể dùng --geometry với nhi�u hơn một 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Bạn có chắc là muốn xoá \"%s\" vĩnh viễn?"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 "Bạn có chắc chắn là bạn muốn quên biên sử này không? Nếu bạn quên nó thì bạn "
 "sẽ trở thành kẻ ngốc để nhắc lại nó."
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 "Bạn có chắc chắn muốn xóa danh sách của các địa điểm mà bạn đã viếng thăm "
 "không?"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Xóa biên sử"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 "Không tồn tại địa điểm \"%s\". Bạn có muốn b� bất kỳ đánh dấu nào liên quan "
 "với vị trí này ra kh�i danh sách của bạn không?"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "�ịa điểm \"%s\" không còn tồn tại."
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "�ánh Dấu cho Vị Trí Không Tồn Tại"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Loại b�"
 
@@ -6487,7 +6742,6 @@ msgid "Close _All Windows"
 msgstr "�óng tất cả các của sổ"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "�óng tất cả các của sổ Nautilus"
@@ -6510,107 +6764,118 @@ msgid "Forward"
 msgstr "Tiến lên"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "�i tới thư mục s�t rác"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "�i tới chỗ đã thăm tiếp theo"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "�i v� chỗ đã thăm trước đó"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "�i tới thư mục s�t rác"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Thanh vị trí"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Tải lại"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "Tìm các tập tin trong máy"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Thanh trạng thái"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Ngừng"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Lên"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "Ghi vào CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "T_hêm �ánh Dấu"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "Quay lại"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "�ánh _Dấu"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "Xóa Biên sử"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "Sao vào đây"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Biên soạn các �ánh Dấu"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "Tiến lên"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "�i đế_n"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Home"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "�ịa điểm..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "Ô vạch l�"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "S�t rác"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "Lên"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Xem"
 
@@ -6628,34 +6893,39 @@ msgstr "Xem theo..."
 msgid "File Browser: %s"
 msgstr "Chủ tập tin:"
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "Một trong những panel vạch l� gặp một lỗi và không thể tiếp tục được. �áng "
 "tiếc tôi không thể nói cho bạn biết đó là lỗi gì được."
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "Cảnh xem %s gặp một lỗi trong khi khởi động."
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "Panel của thanh bên %s gặp lỗi và không tiếp tục được. Nếu vẫn còn xảy ra, "
 "bạn có thể cần tắt panel đi."
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Panel thanh vạch l� H�ng"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "Ô vạch l�"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "Có chứa một cảnh xem của ô vạch l�"
 
@@ -6689,147 +6959,180 @@ msgstr "Thêm mới..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "Xin lỗi, nhưng mẫu %s không xóa được."
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "Không xóa được mẫu"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "Xin lỗi, không thể xóa hình tượng %s."
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Không thể gỡ b� hình tượng"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "Tạo hình tượng mới:"
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "Từ khóa:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "Ảnh:"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "Ch�n tập tin ảnh cho hình tượng mới:"
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "Tạo một mầu mới:"
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "Tên màu:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "Giá trị mầu:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "Xin lỗi, nhưng '%s' không phải là một tập tin hợp lệ."
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "Xin lỗi, nhưng bạn đã không cung cấp một tập tin hợp lệ."
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "Mẫu không thể cài đặt"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "Xin lỗi, nhưng bạn không thể thay thế ảnh gốc."
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "Không phải là một ảnh"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "Xin lỗi, nhưng không thể cài đặt mẫu %s."
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "Hãy ch�n một tập tin để thêm mẫu"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Xin lỗi, nhưng bạn phải dùng tên không có khoảng trắng cho màu mới."
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "Không thể cài đặt màu"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "Ch�n một màu để thêm vào:"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Xin lỗi, nhưng không thể dùng tập tin ảnh %s!"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "Tập tin '%s' không phải là ảnh hợp lệ."
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "Ch�n hạng mục:"
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "Hủy Loại b�"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "Thêm một mẫu mới:"
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "Thêm một mầu mới..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "Thê_m hình tượng mới..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "Ấn vào mẫu để loại b� nó"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "Ấn vào mầu để loại b� nó"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "Nhấn lên hình tượng muốn gỡ b�"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Mẫu:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Mầu:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "Hình tượng:"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "Loại b� một mẫu..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "Loại b� một mầu..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "_Gỡ b� hình tượng..."
 
@@ -7218,34 +7521,39 @@ msgstr "Trình tạo _CD"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "�óng tất cả các của sổ"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "�óng ô bên l�"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "�i tới thư mục CD rỗng"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "�i tới thư mục s�t rác"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "�ịa điểm..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Các mục là ]các thư mục"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "Mẫu"
@@ -7275,10 +7583,13 @@ msgid "View Failed"
 msgstr "Cảnh xem bị sai"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "Cảnh xem %s gặp một lỗi trong khi khởi động."
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "Cảnh xem %s gặp một lỗi và không tiếp tục được. Bạn có thể ch�n cảnh xem "
 "khác hoặc đi tới một vị trí khác."
@@ -7288,104 +7599,133 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "Cảnh xem %s gặp một lỗi trong khi khởi động."
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Bộ ứng dụng Nautilus có liên hệ với của sổ này."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "Xem Ná»™i dung"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Cảnh xem của tập tin hin hay thư mục hiện th�i"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr ""
-"Không tìm thấy \"%s\". Xin hãy kiểm tra lại lỗi chính tả và thử lại một lần "
-"nữa."
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "Không thể thêm hình tượng"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus không thể hiển thị được \"%s\"."
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 "Không thể hiển thị được \"%s\" vì Nautilus không xác định được dạng tập tin "
 "của nó."
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus đã không cài đặt bộ quan sát để có hể hiển thị được \"%s\"."
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 "Không thể hiển thị được \"%s\" vì Nautilus không thể liên hệ đuợc với %s: "
 "địa điểm."
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr ""
 "Không hiển thị được \"%s\" vì đã không thành công khi thử thực hiện truy "
 "nhập."
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "Không hiển thị được \"%s\" vì truy cập bị từ chối."
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Không hiển thị được \"%s\" vì không thể tìm thấy máy chủ \"%s\". Xin hãy "
 "kiểm tra lại lỗi chính tả tên của máy hoặc là bạn đã thiết đặt không đúng "
 "proxy của bạn."
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr ""
 "Không hiển thị được \"%s\". Xin hãy kiểm tra lại sự thiết đặt proxy của bạn "
 "xem chúng có đúng không"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr ""
+"Không thể hiển thị được \"%s\" vì Nautilus không thể liên hệ đuợc với %s: "
+"địa điểm."
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"Không hiển thị được \"%s\" vì Nautilus không thể liên lạc với duyệt qua SMB "
-"master.\n"
-"Chắc chắn rằng một trạm dịch vụ SMB đang chạc trên mạng cục bộ."
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 "Trong lúc này tìm kiếm không thể sử dụng được vì bạn không có chỉ số hoặc là "
 "dịch vụ tìm không hoạt động. Hãy chắc chắn là bạn đã khởi động dịch vụ tìm "
 "Medusa đồng th�i nếu bạn chưa có một chỉ số để bộ chỉ số Medusa hoạt động."
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
+"Trong lúc này tìm kiếm không thể sử dụng được vì bạn không có chỉ số hoặc là "
+"dịch vụ tìm không hoạt động. Hãy chắc chắn là bạn đã khởi động dịch vụ tìm "
+"Medusa đồng th�i nếu bạn chưa có một chỉ số để bộ chỉ số Medusa hoạt động."
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "Tìm kiếm không sử dụng được"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus không thể hiển thị được \"%s\"."
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "Không thể hiển thị được địa điểm."
 
@@ -7397,7 +7737,7 @@ msgstr "�i đến vị trí được chỉ ra bởi �ánh Dấu này"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 
@@ -7405,14 +7745,14 @@ msgstr "Copyright (C) 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Hoàng Ng�c Tú\n"
 "Jörn von Kattchée\n"
 "Nguyễn Thái Ng�c Duy"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7428,39 +7768,43 @@ msgstr "Quay lại một vài trang"
 msgid "Go forward a number of pages"
 msgstr "Tiến lên một vài trang tiếp theo"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "Hiển thị địa điểm này với \"%s\""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Chấm"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "Trình tạo _CD"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "Bộ nhận diện ứng dụng "
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "Bộ nhận diện ứng dụng của của sổ"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Ứng dụng"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "Bộ ứng dụng Nautilus có liên hệ với của sổ này."
 
@@ -7496,6 +7840,246 @@ msgstr "Máy chủ mạng"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Xem máy chủ mạng trong trình quản lý tập tin của Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Factory cho hiển thị phần cứng"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Bộ quan sát phần cứng"
+
+#~ msgid "Hardware view"
+#~ msgstr "Cảnh xem phần cứng"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Xem theo dạng phần cứng"
+
+#~ msgid "hardware view"
+#~ msgstr "cảnh xem phần cứng"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "tên của biểu tượng cho xem phần cứng"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "tóm tắt thông tin phần cứng"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "Kích thước bộ nhớ đệm: %s K"
+
+#~ 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 "Gi� làm việc là %d ngày, %d gi�, %d phút"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "Tổng quan phần cứng"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "�ây là một chỗ dự trữ cho trang CPU"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "�ây là một chỗ dự trữ cho trang RAM"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "�ây là một chỗ dự trữ cho trang IDE"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Lỗi trong khi sao chép sang \"%s\".\n"
+#~ "\n"
+#~ "Nơi định sao sang không đủ có chỗ."
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "Lỗi khi tạo liên kết tại \"%s\".\n"
+#~ "\n"
+#~ "Nơi định tạo liên kết mới không có đủ chỗ."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Lỗi khi sao chuyển mục sang \"%s\".\n"
+#~ "\n"
+#~ "Bạn không có quy�n được viết lên thư mục này."
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Lỗi khi sao chuyển mục sang \"%s\".\n"
+#~ "\n"
+#~ "�ĩa định chuyển sang là đĩa chỉ đ�c."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "Lỗi khi tạo liên kết tại \"%s\".\n"
+#~ "\n"
+#~ "Bạn không có thẩm quy�n để viết lên thư mục này."
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "Lỗi khi tạo liên kết tại \"%s\".\n"
+#~ "\n"
+#~ "�ĩa định tạo liên kết mới là đĩa chỉ đ�c"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi \"%s\" trong khi sao chép sang \"%s\".\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi\"%s\" trong khi chuyển đến \"%s\".\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi\"%s\" trong khi xóa \"%s\".\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi\"%s\" trong khi sao chép.\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi\"%s\" trong khi tạo liên kết.\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "Lỗi\"%s\" trong khi xóa.\n"
+#~ "\n"
+#~ "Bạn có muốn tiếo tục không?"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Không thể sao vào s�t rác"
+
+#~ 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 ""
+#~ "Hành động mặc định không thể mở \"%s\" vì  nó không thể truy cập các tập "
+#~ "tin tại vị trí \"%s\". Không có hành động khác nào có thể xem tập tin "
+#~ "này. Nếu bạn sao chép tập tin này vào máy tính của bạn thì bạn có thể mở "
+#~ "được nó."
+
+#~ msgid "Searching Disks"
+#~ msgstr "�ang tìm kiếm trên các ổ đĩa"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus đang tìm kiếm các thư mục s�t rác trên đĩa của bạn."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Các mục %d đã ch�n không thể chuyển vào s�t rác được. Bạn có muốn xóa "
+#~ "chúng ngay lập tức không?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d của các mục đã ch�n không thể chuyển vào s�t rác được. Bạn có muốn xóa "
+#~ "%d những  mục này ngay lập tức không?"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "Tập tin mà bạn đã thả vào không phải là một ảnh. Bạn chỉ có thể dùng ảnh "
+#~ "cục bộ như biểu tượng riêng mà thôi."
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr ""
+#~ "Xin lỗi, hiện không có dịch vụ tìm kiếm Medusa vì nó chưa được cài đặt."
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "Ngày nào mà bạn tạo chỉ mục cho các tập tin và nội dung văn bản thì chúng "
+#~ "sẽ được tìm kiếm rất nhanh. Các tập tin của bạn hiện th�i đang có chỉ mục."
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr ""
+#~ " \"%s\" không phải là một địa điểm hợp lệ.Xin hãy kiểm tra lại lỗi chính "
+#~ "tả và thử lại một lần nữa."
+
+#~ 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 ""
+#~ "Không hiển thị được \"%s\" vì Nautilus không thể liên lạc với duyệt qua "
+#~ "SMB master.\n"
+#~ "Chắc chắn rằng một trạm dịch vụ SMB đang chạc trên mạng cục bộ."
+
+#~ msgid "file icon"
+#~ msgstr "biểu tượng tập tin"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "Tên:"
+
 #~ msgid "Unknown"
 #~ msgstr "Không được biết"
 
@@ -7589,9 +8173,6 @@ msgstr "Xem máy chủ mạng trong trình quản lý tập tin của Nautilus"
 #~ msgid "_Toolbar"
 #~ msgstr "Thanh công cụ"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "�ịa điểm \"%s\" không còn tồn tại."
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "�i tới địa điểm không tồn tại"
 
diff --git a/po/wa.po b/po/wa.po
index 472766dab..669bc3e5b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nautilus 2.2.0.2\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-07-12 06:09+0200\n"
 "Last-Translator: Lucyin Mahin <lucyin@walon.org>\n"
 "Language-Team: Walon <linux-wa@walon.org>\n"
@@ -43,8 +43,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "Li fonccion bonobo_ui_init() a fwaut berwete."
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr ""
 
@@ -58,183 +58,111 @@ msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+msgid "Couldn't remove emblem with name '%s'."
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "Rilomer..."
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "Disfacer"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "Oujhene pol vuwe del éndjolreye"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "Éndjolreye"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "Håyneu del éndjolreye"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "Vuwe del éndjolreye"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "Vey come del éndjolreye"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "vuwe del éndjolreye"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "no del imådjete pol vuwe del éndjolreye"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "rascourti del informåcion so l' éndjolreye"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s Ko di muchete"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu Go di memwere"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu Mo di memwere"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu Go"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu Mo"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr ""
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "Istwere"
@@ -900,6 +828,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "Éndjolreye"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "Eternåcionå"
@@ -1176,26 +1108,19 @@ msgid "Desktop trash icon name"
 msgstr "No del imådjete do batch"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "No do fitchî pol prémetou fond des ridants. Seulmint eployî si "
 "«background_set» est metou."
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1203,6 +1128,14 @@ msgstr ""
 "No do fitchî pol prémetou fond do panea di costé. Seulmint eployî si "
 "«side_pane_background_set» est metou."
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "Catchî les prémetowès rmåkes dins l' menu des rmåkes"
@@ -1213,8 +1146,8 @@ msgstr "Imådjete «måjhon» veyåve sol sicribanne"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1242,8 +1175,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1277,7 +1210,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1291,7 +1224,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1308,7 +1241,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1334,7 +1267,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1358,7 +1291,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1379,11 +1312,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus eploye li ridant måjhon di l' uzeu come sicribanne"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "Mostrer les ridants seulmint dins l' åbe del bår di costé"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1401,7 +1336,8 @@ msgid "Reverse sort order in new windows"
 msgstr "Relére dins l' ôte sinse po les noveas purneas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "Mostrer d' aprume les ridants ezès purneas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1436,7 +1372,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1444,30 +1380,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1507,8 +1443,9 @@ msgid "Use manual layout in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
-msgstr ""
+#, fuzzy
+msgid "Use tighter layout in new windows"
+msgstr "Mostrer li panea di costé ezès noveas purneas"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
 msgid "What to do with executable text files when activated"
@@ -1531,7 +1468,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1543,7 +1480,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1701,68 +1638,81 @@ msgstr ""
 msgid "on the desktop"
 msgstr "sol sicribanne"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "Dji n' pou disfacer l' pårticion"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"If you want to eject the volume, please use Eject in the right-click menu of "
+"the volume."
 msgstr ""
 "Vos n' poloz nén disfacer ene imådjete di pårticion. Si vos l' voloz fé "
 "rexhe, eployîz l' intrêye «Fé rexhe» do menu k' aparexhe tot clitchant avou "
 "l' boton d' droete so l' imådjete."
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "Dji n' pou disfacer l' pårticion"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "Batch"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "_Bodjî chal"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "_Copyî chal"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "Fé on _loyén chal"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "Mete come _fond"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "Mete come fond po _tos les ridants"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "Mete come fond po _ci ridant chal"
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1771,18 +1721,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1801,282 +1757,256 @@ msgstr "Di:"
 msgid "To:"
 msgstr "Viè:"
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while copying to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while moving to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while moving items to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+msgid "Error while creating links in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while deleting \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while linking."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "Passer houte"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "Rissayî"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "Replaecî"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "Replaecî ttafwait"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "loyén viè %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "èn ôte loyén viè %s"
@@ -2085,25 +2015,25 @@ msgstr "èn ôte loyén viè %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "%dî loyén viè %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "%dinme loyén viè %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "%dinme loyén viè %s"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "%dinnme loyén viè %s"
@@ -2113,555 +2043,589 @@ msgstr "%dinnme loyén viè %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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copeye)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (ene ôte copeye)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "inme copeye)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "ire copeye)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "inme copeye)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "inme copeye)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copeye)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (ôte copeye)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dinme copeye)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dire copeye)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dinme copeye)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%dinme copeye)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "Dji bodje les fitchîs e batch"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "Fitchîs tapés å diale:"
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "Dji bodje"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "Preparant a-z evoyî å batch..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "Dji bodje les fitchî"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "Fitchîs bodjîs ôte pårt:"
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "Preparant a bodjî..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "Finixhant d' bodjî..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "Dji copeye les fitchîs"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "Fitchî copyîs:"
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "Dji copeye"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
-msgstr ""
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
+msgstr "Disfacer tos les cayets k' i gn a-st e batch"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "Dji n' pout nén copyî viè l' batch"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "Ahiver on novea vude ridant å dvins di ç' ridant chal"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
 msgstr ""
 
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
+msgstr "Ahiver _ridant"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "novea ridant"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 fitchî"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "Dji disface les fitchîs"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "Fitchîs disfacés:"
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "Dji disface"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "Dji vude li batch"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "Preparant a vudî l' batch..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "Estoz vs seur ki vos vloz disfacer po do bon «%s», foû do batch? "
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "_Vudî"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copeye).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (ene ôte copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (ene ôte copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (ene ôte copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (ene ôte copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123inme copeye).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124inme copeye)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124inme copeye).txt"
 
@@ -2680,64 +2644,64 @@ msgstr "foo (124inme copeye).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "ouy a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "ouy a %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "ouy a 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "ouy a %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "ouy, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "ouy, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "ouy"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "ayir a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "ayir a %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "ayir a 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "ayir a %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "ayir, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "ayir, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "ayir"
 
@@ -2746,151 +2710,151 @@ msgstr "ayir"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "mierkidi, 00 di decimbe 0000 a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A %-d di %B %Y a %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "mie, 00 di dec 0000 a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a %-d di %b %Y a %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "mie, 00 di dec 0000 a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a %-d di %b %Y a %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 di dec 0000 a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d di %b %Y a %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 di dec 0000 a 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d di %b %Y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "nou cayet"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "nou ridant"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "nou fitchî"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 cayet"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 ridant"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 fitchî"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u cayets"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u ridants"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u fitchîs"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? cayets"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? octets"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "sôre nén cnoxhowe"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 msgid "unknown MIME type"
 msgstr "sôre MIME nén cnoxhowe"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: libnautilus-private/nautilus-file.c:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "nén cnoxhou"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "programe"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "loyén"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr ""
 
@@ -3011,11 +2975,13 @@ msgid "Search for files by file name and file properties"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "Vuwe en imådjetes"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "Vuwe e djivêye"
@@ -3159,138 +3125,139 @@ msgstr "Rid. måjhon da %s"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "NET Computers.com"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "imådjete fitchî"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "tecse aspougnåve"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "l' aspougnåve etikete"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "tecse di rawete"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "co do tecse"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "Li rectangue di tchoezixhaedje"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "CÃ¥de tecse"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "Dessiner on cåde åtoû do tecse nén tchoezi"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "Coleur boesse di tchoezixhaedje"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "Coleur pol boesse di tchoezixhaedje"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "Alfa boesse di tchoezixhaedje"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr ""
 
@@ -3383,119 +3350,119 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr ""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "No"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "Estat"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "_Tchoezi"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "Fwait"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "_Candjî..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "_Potchî a"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "Drovi avou èn ôte programe"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "Drovi avou èn ôte håyneu"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "Nou programe associé avou «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "Nou programe associé"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "Nole accion associêye avou «%s»."
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "Nole accion associêye"
 
@@ -3503,151 +3470,173 @@ msgstr "Nole accion associêye"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
-msgstr ""
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
+msgstr "Programes favorits"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "Li håyneu associé avou «%s» n' est nén valåve."
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "Li programe associé avou «%s» n' est nén valåve."
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "L' accion associêye avou «%s» n' est nén valåve."
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "« %s » èn pout nén drovi « %s » ca « %s » n' pout nén acceder ås fitchîs ki "
 "sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout "
 "siervi po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da "
 "vosse, vos pôroz motoit l' drovi."
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
-"Li prémetowe accion èn pout nén drovi « %s » la k' ele ni pout nén acceder "
-"ås fitchîs ki sont a l' eplaeçmint « %s ».  Nole ôte accion k' i gn a "
-"n' pout siervi po håyner ç' fitchî la.  Si vos copyîz l' fitchî sol "
-"copiutrece da vosse, vos pôroz motoit l' drovi."
+"« %s » èn pout nén drovi « %s » ca « %s » n' pout nén acceder ås fitchîs ki "
+"sont a l' eplaeçmint « %s ». Nouk des ôtes programes k' i gn a n' pout "
+"siervi po håyner ç' fitchî la. Si vos copyîz l' fitchî sol copiutrece da "
+"vosse, vos pôroz motoit l' drovi."
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "Dji droveye «%s»"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "Dji n' sai enonder les loyéns då lon"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "Åk n' a nén stî tot-z enondant li programe.\n"
 "\n"
 "Detays: "
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3895,14 +3884,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "Cayets avou «medusa» dins leu nos eyet ki sont des ridants"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "Dji cwir ezès plakes"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus cwire ezès plakes da vosse après des ridants batch."
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "Candjî"
@@ -4107,97 +4088,106 @@ msgstr "Fond"
 msgid "Empty Trash"
 msgstr "Vudî l' batch"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr ""
-"Çouchal droveyrè %d purnea diferins. Estoz vs seur ki c' est ça k' vos vloz?"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "Drovi %d purneas?"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "Estoz seur do voleur disfacer «%s» po do bon?"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr ""
+"Çouchal droveyrè %d purnea diferins. Estoz vs seur ki c' est ça k' vos vloz?"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Estoz seur do voleur disfacer «%s» po do bon?"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "Estoz seur do voleur disfacer po do bon les %d cayets tchoezis?"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "Disfacer?"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "Tchoezi ene imådjete"
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Motifs"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "«%s» tchoezi"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "1 ridant di tchoezi"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "%d ridants di tchoezis"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (sins nou elemint)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (avou 1 elemint)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (avou %d elemints)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (avou nou elemint å totå)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (avou 1 elemint å totå)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (avou %d elemints å totå)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "«%s» tchoezi (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "%d cayets di tchoezis (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "1 ôte cayet di tchoezi (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "%d ôtes cayets di tchoezis (%s)"
@@ -4209,7 +4199,7 @@ msgstr "%d ôtes cayets di tchoezis (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
@@ -4218,115 +4208,126 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "Li ridant «%s» a pus di fitchîs ki Nautilus n' è pout manaedjî. Sacwants di "
 "zels èn seront nén håynés."
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "Pår trop d' fitchîs"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "« %s » èn pout nén esse tapé å batch. El voloz disfacer do côp?"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
-"Les %d cayets di tchoezis n' polèt nén esse tapés å batch. Les vloz disfacer "
-"do côp?"
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "« %s » èn pout nén esse tapé å batch. El voloz disfacer do côp?"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"%d des cayets di tchoezis n' polèt nén esse tapés å batch. Voloz vs disfacer "
-"do côp ces %d cayets la?"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "« %s » èn pout nén esse tapé å batch. El voloz disfacer do côp?"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "Disfacer do côp?"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "Estoz vs seur ki vos vloz disfacer po do bon «%s», foû do batch? "
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr ""
 "Estoz vs seur ki vos vloz disfacer po do bon les %d cayets tchoezis, foû do "
 "batch? "
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "Disfacer foû do batch?"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "Eployî «%s» po drovi l' tchoezi cayet"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "Ôte _programe..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "On _programe..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "Ôte _håyneu..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "On _håyneu..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Enonder «%s» so tot l' minme ké tchoezi cayet"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "Ã… dfait des scripes"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4348,177 +4349,181 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "Aroke di montaedje"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "Aroke di dismontaedje"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "Aroke di montaedje"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "Fé re_xhe"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "_Dismonter l' pårticion"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Drovi en on _novea purnea"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "Drovi e %d _noveas purneas"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "Ridant måjhon"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "Ridant måjhon"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "_Disfacer foû do batch"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "Evoyî å _batch"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "Taper tchaeke cayet di tchoezi å batch"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "_Disfacer"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "_Fé des loyéns"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "_Fé on loyén"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "_Vudî l' batch"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "Cô_per l' fitchî"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "Cô_per les fitchîs"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "_Copyî l' fitchî"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "_Copyî les fitchîs"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
+msgstr "Estoz vs seur ki vos vloz disfacer po do bon «%s», foû do batch? "
+
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "Enonder ou håyner?"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "_HÃ¥yner"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "Enonder en on _terminå"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "_HÃ¥yner"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "_Enonder"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "Dji droveye «%s»"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "Rinoncî a drovi?"
 
@@ -4539,107 +4544,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Dji rlome «%s» a «%s»."
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "Rinoncî a rlomer?"
 
@@ -4697,122 +4722,130 @@ msgstr "Rimete come divant les _grandeus des imådjetes"
 msgid "Restore Icon's Original Si_ze"
 msgstr "Rimete come divant li _grandeu del imådjete"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "No do fitchî"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "Grandeu"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "Sôre"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "Dierin candjmint"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "Rén k' les imådjes locåles"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "Rén k' les imådjes"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "Prôpietés"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "Prôpietés di %s"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "rén"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "nén léjhåve"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 cayet di grandeu %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d cayets, å totå %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4822,191 +4855,193 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "Ã… dvins:"
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "Di båze"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "_Nos:"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "_No:"
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "Sôre:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "Grandeu:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "Eplaeçmint:"
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "PÃ¥rticion:"
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "Plaece libe:"
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "Såme do loyén:"
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "Sôre MIME:"
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "Dierin candjmint:"
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "Dierin accès:"
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "_Tchoezi imådjete da vosse..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "_Oister imådjete da vosse"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "_Lére"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "_Sicrire"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "_Enonder"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "Drapeas speciås:"
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "Permissions"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "Prôpietåre do fitchî:"
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "Prôpietåre do fitchî:"
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "_Groupe do fitchî:"
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "Groupe do fitchî:"
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "Prôpietåre:"
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "Groupe:"
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "Ôtes:"
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "Vuwe tecse:"
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "Vuwe limero:"
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "Dierin candjmint:"
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
 msgstr ""
 "Åk n' a nén stî tot håynant l' aidance: \n"
 "%s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "Dji n' sai håyner l' aidance"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "Rinoncî a håyner l' purnea des prôpietés?"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "Dji fwait l' purnea des prôpietés"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "Tchoezi ene imådjete"
 
@@ -5022,81 +5057,97 @@ msgid "Search Results"
 msgstr "Rizultats do cweraedje"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr ""
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5105,53 +5156,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "Wice"
 
@@ -5160,7 +5231,7 @@ msgstr "Wice"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5171,7 +5242,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5180,13 +5251,17 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"Vuwe e djiveye do rzultat d' on cweraedje do manaedjeu di fitchîs Nautilus"
+
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr ""
 
@@ -5200,12 +5275,12 @@ msgid "Create L_auncher"
 msgstr "Ahiver _enondeu"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "Ahiver on novea enondeu"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "Disfacer tos les cayets k' i gn a-st e batch"
 
@@ -5224,7 +5299,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "Eployî li _prémetou fond"
@@ -5246,183 +5321,202 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "Ahiver _ridant"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "Ahiver _ridant"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "Ahiver on novea vude ridant å dvins di ç' ridant chal"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "Ahiver on novea vude ridant å dvins di ç' ridant chal"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "Copyî e dobe tchaeke des cayets tchoezis"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "Candjî enondeu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "Candjî l' informåcion di l' enondeu"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "Abwesner li tchoezeye pårticion"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "Prôpietés do _sopoirt"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "Abwesner li tchoezeye pårticion"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "Drovi _avou"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "Drovi tchaeke des cayets tchoezis en on novea purnea"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "Drovi en on _novea purnea"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "Drovi l' cayet tchoezi e ci purnea chal"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "_Motifs"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "Tchoezi tos les cayets di ç' purnea chal"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "Tchoezi tos les cayets di ç' purnea chal"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "_Copyî l' fitchî"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "Ab_wesner"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "_Dismonter l' pårticion"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "_Drovi"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "_Drovi l' ridant des scripes"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "Ac_laper les fitchîs"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "Ac_laper les fitchîs dins l' ridant"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "_Prôpietés"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "_Rilomer..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "_Sicripes"
 
@@ -5507,44 +5601,55 @@ msgstr "Al _mwin"
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%H:%M, %x"
 
@@ -5568,46 +5673,52 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr ""
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr ""
 
 #. Can't register myself due to trouble locating the
@@ -5620,7 +5731,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5628,7 +5739,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5657,31 +5768,42 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tot håynant l' aidance: \n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "Nole rimåke di defineye"
@@ -5715,33 +5837,44 @@ msgstr "Moens di tchuzes"
 msgid "Find Them!"
 msgstr "Elzès trover!"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+#, fuzzy
+msgid "Can't Connect to Server"
+msgstr "Sierveus rantoele"
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "Sierveus rantoele"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "_No:"
+msgid "_Location:"
+msgstr "Eplaeçmint:"
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "_Raloyî"
@@ -5938,6 +6071,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5948,24 +6089,22 @@ msgstr "Drovi avou %s"
 msgid "Open with..."
 msgstr "Drovi avou..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
-msgstr ""
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
+msgstr "Ahiver _enondeu"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "_Vudî l' batch"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5973,113 +6112,124 @@ msgstr ""
 msgid "Go To:"
 msgstr "Potchî a:"
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+msgid "Do you want to view %d locations?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "Eplaeçmint:"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "DJEYOMETREYE"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "Cwiter Nautilus."
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "Renonder Nautilus."
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "Manaedjeu di fitchîs"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus."
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "Estoz seur do voleur disfacer «%s» po do bon?"
+
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "Netyî l' istwere"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "Oister"
 
@@ -6112,7 +6262,6 @@ msgid "Close _All Windows"
 msgstr "Clôre _tos les purneas"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "Clôre tos les purneas Nautilus"
@@ -6135,107 +6284,117 @@ msgid "Forward"
 msgstr "Shuvant"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
+msgid "Go to the next visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
+msgid "Go to the previous visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "Rid. måjhon"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "Bår d' _eplaeçmint"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "Ritcherdjî"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "Bår ås _messaedjes"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "Ã…we"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "Ã… dzeur"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "_Radjouter rmåke"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "En _erî"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "_Rimåkes"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "_Copyî chal"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "_Candjî les rmåkes"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "_Shuvant"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "_Potchî a"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "_Ridant måjhon"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "_Eplaeçmint..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "_Batch"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "Al _copete"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "_Vey"
 
@@ -6253,29 +6412,33 @@ msgstr "Vey come..."
 msgid "File Browser: %s"
 msgstr "Prôpietåre do fitchî:"
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "Li håynaedje a fwait berwete"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6309,147 +6472,177 @@ msgstr "_Radjouter novea..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
+msgstr "Tchoezi ene imådjete"
+
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "Dji n' pou disfacer l' pårticion"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "_Mot-clé:"
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "_Imådje"
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr ""
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "_No del coleur:"
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "_Valixhance del coleur:"
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
+msgstr ""
+
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "nén ene imådje"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
-msgid "Select a Category:"
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
 msgstr ""
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "_Disfé li oistaedje"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "_Radjouter ene nouve coleur..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "Patrons:"
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "Coleurs:"
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "_Oister on patron..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "_Oister ene coleur...  "
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr ""
 
@@ -6830,32 +7023,37 @@ msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "Clôre _tos les purneas"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "Clôre li panea di costé"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "_Eplaeçmint..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[Cayets ki sont des ]ridants"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "_Motifs"
@@ -6886,9 +7084,11 @@ msgstr "Li håynaedje a fwait berwete"
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6896,85 +7096,110 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "Li programe associé avou «%s» n' est nén valåve."
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "HÃ¥ynaedje do contnou"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "Håynaedje do fitchî ou do ridant do moumint"
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
+"Nautilus n' a nén savou monter li pårticion. Motoit bén k' i gn a rén el "
+"léjheu."
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1347
+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 ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr ""
 
@@ -6986,7 +7211,7 @@ msgstr ""
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "Copyright © 1999-2001 Eazel, Inc."
 
@@ -6994,7 +7219,7 @@ msgstr "Copyright © 1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Ratournaedje e walon fwait pa:\n"
@@ -7004,7 +7229,7 @@ msgstr ""
 "Lucyin Mahin <lucyin@walon.org>\n"
 "Lorint Hendschel"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7020,38 +7245,42 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Sierveus rantoele"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "Ponts"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr ""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "ID do programe"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "Programe"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -7087,6 +7316,88 @@ msgstr "Sierveus rantoele"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "Oujhene pol vuwe del éndjolreye"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "Håyneu del éndjolreye"
+
+#~ msgid "Hardware view"
+#~ msgstr "Vuwe del éndjolreye"
+
+#~ msgid "View as Hardware"
+#~ msgstr "Vey come del éndjolreye"
+
+#~ msgid "hardware view"
+#~ msgstr "vuwe del éndjolreye"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "no del imådjete pol vuwe del éndjolreye"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "rascourti del informåcion so l' éndjolreye"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s Ko di muchete"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu Go di memwere"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu Mo di memwere"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu Go"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu Mo"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "Dji n' pout nén copyî viè l' batch"
+
+#~ 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 ""
+#~ "Li prémetowe accion èn pout nén drovi « %s » la k' ele ni pout nén "
+#~ "acceder ås fitchîs ki sont a l' eplaeçmint « %s ».  Nole ôte accion k' i "
+#~ "gn a n' pout siervi po håyner ç' fitchî la.  Si vos copyîz l' fitchî sol "
+#~ "copiutrece da vosse, vos pôroz motoit l' drovi."
+
+#~ msgid "Searching Disks"
+#~ msgstr "Dji cwir ezès plakes"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus cwire ezès plakes da vosse après des ridants batch."
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr ""
+#~ "Les %d cayets di tchoezis n' polèt nén esse tapés å batch. Les vloz "
+#~ "disfacer do côp?"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "%d des cayets di tchoezis n' polèt nén esse tapés å batch. Voloz vs "
+#~ "disfacer do côp ces %d cayets la?"
+
+#~ msgid "file icon"
+#~ msgstr "imådjete fitchî"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "_No:"
+
 #~ msgid "Unknown"
 #~ msgstr "Nén cnoxhou"
 
@@ -7113,13 +7424,6 @@ msgstr "Vey vos sierveus rantoele dins l' manaedjeu di fitchîs Nautilus"
 #~ "plakete el léjheu."
 
 #~ msgid ""
-#~ "Nautilus was unable to mount the volume. There is probably no media in "
-#~ "the device."
-#~ msgstr ""
-#~ "Nautilus n' a nén savou monter li pårticion. Motoit bén k' i gn a rén el "
-#~ "léjheu."
-
-#~ msgid ""
 #~ "Nautilus was unable to mount the floppy drive. The floppy is probably in "
 #~ "a format that cannot be mounted."
 #~ msgstr ""
diff --git a/po/yi.po b/po/yi.po
index bdbba8f90..d66938c67 100644
--- a/po/yi.po
+++ b/po/yi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-03-19\n"
 "Last-Translator: Raphael Finkel <raphael@cs.uky.edu>\n"
 "Language-Team: Yiddish <raphael@cs.uky.edu>\n"
@@ -36,8 +36,8 @@ msgid "bonobo_ui_init() failed."
 msgstr ""
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr ""
 
@@ -51,178 +51,109 @@ msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:203
 #, c-format
-msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+msgid "Couldn't remove emblem with name '%s'."
 msgstr ""
 
 #: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+msgid ""
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:205
+msgid "Couldn't Remove Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:238
+#: components/emblem/nautilus-emblem-view.c:239
 #, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:240
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+msgid "Couldn't Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "פֿ�ַרװ�ַנדל"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr ""
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:762
-msgid "The dragged text was not a valid file location."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
-#, c-format
-msgid "The file '%s' does not appear to be a valid image."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:784
-msgid "The dragged file does not appear to be a valid image."
-msgstr ""
-
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
-msgid "Erase"
-msgstr ""
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
+#: components/emblem/nautilus-emblem-view.c:742
+msgid "Some of the files could not be added as emblems."
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "The emblems do not appear to be valid images."
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "Couldn't Add Emblems"
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
+#: components/emblem/nautilus-emblem-view.c:744
+msgid "None of the files could be added as emblems."
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
 msgstr ""
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
+#: components/emblem/nautilus-emblem-view.c:765
+msgid "The dragged text was not a valid file location."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "Couldn't Add Emblem"
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:483
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr ""
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr ""
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
+msgid "The file '%s' does not appear to be a valid image."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
+#: components/emblem/nautilus-emblem-view.c:788
+msgid "The dragged file does not appear to be a valid image."
 msgstr ""
 
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
+msgid "Erase"
 msgstr ""
 
 #: components/history/Nautilus_View_history.server.in.in.h:1
@@ -885,6 +816,10 @@ msgstr ""
 msgid "GNU.org"
 msgstr ""
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr ""
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr ""
@@ -1161,27 +1096,27 @@ msgid "Desktop trash icon name"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
+msgid "Enable 'special' flags in file preferences dialog"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
-msgid "Enable 'special' flags in file preferences dialog"
+msgid ""
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default side pane background. Only used if "
+"side_pane_background_set is true."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid ""
-"Filename for the default side pane background. Only used if "
-"side_pane_background_set is true."
+"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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
@@ -1194,8 +1129,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
@@ -1223,8 +1158,8 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1258,7 +1193,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 
@@ -1272,7 +1207,7 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
@@ -1289,7 +1224,7 @@ msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr ""
 
@@ -1315,7 +1250,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1339,7 +1274,7 @@ msgid "List of possible captions on icons"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+msgid "Maximum handled files in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1357,11 +1292,11 @@ msgid "Nautilus handles drawing the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+msgid "Only show folders in the tree sidebar"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1379,7 +1314,7 @@ msgid "Reverse sort order in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+msgid "Show folders first in windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1414,7 +1349,7 @@ msgstr ""
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1422,30 +1357,30 @@ msgstr ""
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:76
@@ -1485,7 +1420,7 @@ msgid "Use manual layout in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+msgid "Use tighter layout in new windows"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1508,7 +1443,7 @@ msgid ""
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+msgid "When to show number of items in a folder"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1520,7 +1455,7 @@ msgid "When to show thumbnails of image files"
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+msgid "Whether a custom default folder background has been set."
 msgstr ""
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1677,65 +1612,75 @@ msgstr ""
 msgid "on the desktop"
 msgstr ""
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+msgid "You cannot delete a volume icon."
+msgstr ""
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+msgid "Can't Delete Volume"
 msgstr ""
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "רוף �ָפּ"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:197
-msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+#: 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 ""
 
 #: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
+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:276
+msgid "Couldn't Install Emblem"
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr ""
@@ -1744,18 +1689,24 @@ msgstr ""
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
+#: libnautilus-private/nautilus-emblem-utils.c:213
 #, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr ""
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr ""
 
@@ -1774,282 +1725,252 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:545
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:550
 #, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:556
+#: libnautilus-private/nautilus-file-operations.c:561
 #, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:562
+#: libnautilus-private/nautilus-file-operations.c:567
 #, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:593
+#: libnautilus-private/nautilus-file-operations.c:598
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:598
+#: libnautilus-private/nautilus-file-operations.c:602
+msgid "Error while moving. "
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:603
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:608
+#: libnautilus-private/nautilus-file-operations.c:613
 #, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:631
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:636
 #, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:652
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while copying to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+msgid "There is not enough space on the destination."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:661
 #, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+msgid "Error while moving to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:673
+#: libnautilus-private/nautilus-file-operations.c:665
 #, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while creating link in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+msgid "The destination disk is read-only."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:688
+#: libnautilus-private/nautilus-file-operations.c:692
 #, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+msgid "Error while moving items to \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:699
+#: libnautilus-private/nautilus-file-operations.c:703
 #, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+msgid "Error while creating links in \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:727
+#: libnautilus-private/nautilus-file-operations.c:731
 #, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+msgid "Would you like to continue?"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:735
 #, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:741
+#: libnautilus-private/nautilus-file-operations.c:739
 #, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:756
+#: libnautilus-private/nautilus-file-operations.c:745
 #, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while deleting \"%s\"."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:760
 #, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while copying."
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:764
 #, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while moving."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:770
+#: libnautilus-private/nautilus-file-operations.c:768
 #, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
+msgid "Error \"%s\" while linking."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, c-format
+msgid "Error \"%s\" while deleting."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:900
+msgid "Error While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:903
+msgid "Error While Moving"
 msgstr ""
 
 #: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+msgid "Error While Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:911
+msgid "Error While Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Skip"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1017
+#: libnautilus-private/nautilus-file-operations.c:959
+msgid "_Retry"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1025
 #, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1028
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1023
+#: libnautilus-private/nautilus-file-operations.c:1032
 #, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1035
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+msgid "Unable to Replace File"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1044
+#: libnautilus-private/nautilus-file-operations.c:1054
 #, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+msgid "Conflict While Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "_Replace"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+msgid "Replace _All"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr ""
@@ -2058,25 +1979,25 @@ msgstr ""
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr ""
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr ""
@@ -2086,554 +2007,585 @@ msgstr ""
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr ""
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr ""
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr ""
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr ""
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr ""
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr ""
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr ""
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr ""
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr ""
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr ""
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+msgid "You cannot copy items into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+msgid "The destination folder is inside the source folder."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+msgid "There is no space on the destination."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+msgid "Error creating new folder."
 msgstr ""
 
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
+msgstr "נײַע פּ�ַפּקע"
+
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr ""
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, c-format
+msgid "Error \"%s\" creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error creating new document."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+msgid "Error Creating New Document"
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+msgid "new file"
+msgstr ""
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr ""
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr ""
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr ""
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr ""
 
@@ -2652,64 +2604,64 @@ msgstr ""
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr ""
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr ""
 
@@ -2718,151 +2670,151 @@ msgstr ""
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr ""
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "�ומב�ַק�ַנט"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 msgid ""
 "Can't find description even for \"x-directory/normal\". This probably means "
 "that your gnome-vfs.keys file is in the wrong place or isn't being found for "
 "some other reason."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr ""
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr ""
 
@@ -2983,11 +2935,13 @@ msgid "Search for files by file name and file properties"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr ""
@@ -3131,137 +3085,138 @@ msgstr ""
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 msgid "Computer"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr ""
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:735
+#: libnautilus-private/nautilus-icon-dnd.c:736
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr ""
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr ""
 
@@ -3354,119 +3309,119 @@ msgstr ""
 msgid "Is the default for all \"%s\" items."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr ""
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr ""
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr ""
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr ""
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr ""
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "נ�ָמען"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr ""
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr ""
 
@@ -3474,140 +3429,157 @@ msgstr ""
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+msgid "_Associate Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
 msgid ""
-"%s\n"
-"\n"
 "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 ""
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+msgid "_Associate Action"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:505
+msgid "Open Failed, would you like to choose another application?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:504
+#: libnautilus-private/nautilus-program-choosing.c:506
 #, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:509
+#: libnautilus-private/nautilus-program-choosing.c:512
 #, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:534
+#: libnautilus-private/nautilus-program-choosing.c:538
 #, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:540
+#: libnautilus-private/nautilus-program-choosing.c:545
 #, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+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."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1170
+msgid "Can't Execute Remote Links"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+msgid "There was an error launching the application."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+msgid "Error Launching Application"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+msgid "This drop target only supports local files."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+msgid "Drop Target Only Supports Local Files"
 msgstr ""
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -3853,14 +3825,6 @@ msgstr ""
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr ""
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr ""
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr ""
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr ""
@@ -4057,94 +4021,102 @@ msgstr "הינטערגרונט"
 msgid "Empty Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:497
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
+msgid "Open %d Windows?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:542
+msgid "Are you sure you want to open all files?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
 #, c-format
-msgid "Open %d Windows?"
+msgid "This will open %d separate windows."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 msgid "Select Pattern"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 msgid "_Pattern:"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr ""
@@ -4156,7 +4128,7 @@ msgstr ""
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr ""
@@ -4165,107 +4137,119 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-directory-view.c:1793
+#: src/file-manager/fm-directory-view.c:1954
 #, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
+msgid "The file \"%s\" cannot be moved to the trash."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3220
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
+"Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3081
+#: src/file-manager/fm-directory-view.c:3259
 #, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3085
+#: src/file-manager/fm-directory-view.c:3263
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4830
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4287,175 +4271,178 @@ msgid ""
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 msgid "Eject Error"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 msgid "Open in New Window"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, c-format
 msgid "Open in %d New Windows"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "נײַע פּ�ַפּקע"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "נײַע פּ�ַפּקע"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "מעק �ָפּ"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5360
+#: src/file-manager/fm-directory-view.c:5850
+msgid "This link can't be used, because it has no target."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5852
 #, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+msgid "This link can't be used, because its target \"%s\" doesn't exist."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5423
+#: src/file-manager/fm-directory-view.c:5915
 #, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5429
-msgid "Run or Display?"
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
+#: src/file-manager/fm-directory-view.c:5923
+msgid "Run or Display?"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5686
+#: src/file-manager/fm-directory-view.c:6196
 #, c-format
-msgid "Opening \"%s\""
+msgid "Opening \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr ""
 
@@ -4476,107 +4463,127 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr ""
 
 #: src/file-manager/fm-error-reporting.c:71
+msgid "The folder contents could not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+msgid "The item could not be renamed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+msgid "The group could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+msgid "The owner could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 ""
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+msgid "The permissions could not be changed."
+msgstr ""
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr ""
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr ""
 
@@ -4634,123 +4641,131 @@ msgstr ""
 msgid "Restore Icon's Original Si_ze"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+msgid "Drag and drop is not supported."
+msgstr ""
+
+#: src/file-manager/fm-icon-view.c:2546
+msgid "Drag and drop is only supported on local file systems."
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+msgid "Drag and Drop Error"
 msgstr ""
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr ""
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "גרײס"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "טיפּ"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: 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:483
+#: src/nautilus-information-panel.c:507
+msgid "Please drag just one image to set a custom icon."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not local."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+msgid "You can only use local images as custom icons."
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
+msgid "The file that you dropped is not an image."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 #, fuzzy
 msgid "Properties"
 msgstr "נ�ַטורן"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+msgid "Changing group."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+msgid "Changing owner."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr ""
 
@@ -4760,190 +4775,188 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 #, fuzzy
 msgid "_Names:"
 msgstr "נ�ָמען"
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "טיפּ:"
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "גרײס:"
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+msgid "File _owner:"
+msgstr ""
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "There was an error displaying help."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+msgid "Couldn't Show Help"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+msgid "Creating Properties window."
 msgstr ""
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr ""
 
@@ -4959,81 +4972,97 @@ msgid "Search Results"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
+msgid "Sorry, but the Medusa search service is not available."
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr ""
 
 #: src/file-manager/fm-search-list-view.c:190
 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."
+"search will return no results right now."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:197
+msgid "Search For Items That Are Too New"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:203
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+msgid "Error During Search"
 msgstr ""
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
 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."
+"corrupt."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+msgid "Error Reading File Index"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+msgid "An error occurred while loading this search's contents."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:242
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:245
 msgid ""
-"To do a fast search, Find requires an index of the files on your system.  "
 "Find can't access your index right now so a slower search will be performed "
 "that doesn't use the index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+msgid "Fast Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+msgid "Content Searches Are Not Available"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5042,53 +5071,73 @@ msgid ""
 "medusa-searchd"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
 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."
+"Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+msgid "Indexed Searches Are Not Available"
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:293
 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."
+"index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:296
 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."
+"system.  No index is available right now."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:300
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:305
+msgid ""
+"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 ""
+
+#: src/file-manager/fm-search-list-view.c:329
+msgid "Fast searches are not enabled on your computer."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:330
 msgid ""
 "To do a fast search, Find requires an index of the files on your system. "
 "Your system administrator has disabled fast search on your computer, so no "
 "index is available."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
+#: src/file-manager/fm-search-list-view.c:334
+msgid "Fast Searches Not Enabled"
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr ""
 
@@ -5097,7 +5146,7 @@ msgstr ""
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr ""
@@ -5108,7 +5157,7 @@ msgstr ""
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr ""
@@ -5117,13 +5166,15 @@ msgstr ""
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+msgid "Nautilus found more search results than it can display."
 msgstr ""
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+msgid "Some matching items will not be displayed. "
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr ""
 
@@ -5137,12 +5188,12 @@ msgid "Create L_auncher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr ""
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr ""
 
@@ -5161,7 +5212,7 @@ msgstr ""
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr ""
@@ -5184,177 +5235,194 @@ msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
 #, fuzzy
-msgid "Create _Folder"
+msgid "Create _Document"
 msgstr "נײַע פּ�ַפּקע"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+#, fuzzy
+msgid "Create _Folder"
+msgstr "נײַע פּ�ַפּקע"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+msgid "Create a new empty file inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
-msgid "Create a symbolic link for each selected item"
+msgid "Create a new empty folder inside this folder"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:10
-msgid "D_uplicate"
+msgid "Create a symbolic link for each selected item"
 msgstr ""
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:12
+msgid "D_uplicate"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 msgid "Mount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 msgid "Open each selected item in a navigation window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 msgid "Open in Navigation Window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 msgid "Select _Pattern"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 msgid "Select items in this window matching a given pattern"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+msgid "_Empty File"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 msgid "_Mount Volume"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "עפֿן"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "נ�ַטורן"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr ""
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr ""
 
@@ -5439,44 +5507,55 @@ msgstr ""
 msgid "Indexing is %d%% complete."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, c-format
+msgid "Your files were last indexed at %s."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+msgid "Your files are currently being indexed."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 ""
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr ""
 
@@ -5500,46 +5579,52 @@ msgstr ""
 msgid "Show status of indexing used when searching"
 msgstr ""
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr ""
 
-#: src/nautilus-application.c:256
+#: src/nautilus-application.c:257
 #, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr ""
+
+#: src/nautilus-application.c:259
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr ""
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr ""
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+msgid "Migrated Old Desktop"
 msgstr ""
 
 #. Can't register myself due to trouble locating the
@@ -5552,7 +5637,7 @@ msgstr ""
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5560,7 +5645,7 @@ msgid ""
 msgstr ""
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5589,31 +5674,40 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr ""
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
 msgstr ""
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
 "restarting Nautilus may help fix the problem."
 msgstr ""
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr ""
@@ -5647,32 +5741,41 @@ msgstr ""
 msgid "Find Them!"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
-msgid "Can't connect to server"
+msgid "Please enter a name and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:100
-#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
+msgid "Can't Connect to Server"
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
 #, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
+msgid "\"%s\" is not a valid location."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
+#: src/nautilus-window-manage-views.c:1245
+#: src/nautilus-window-manage-views.c:1253
+msgid "Please check the spelling and try again."
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 msgid "Connect to Server"
 msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:185
-#, fuzzy
-msgid "Name:"
-msgstr "נ�ָמען"
+#: src/nautilus-connect-server-dialog.c:205
+msgid "_Location:"
+msgstr ""
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 msgid "Connect"
 msgstr ""
 
@@ -5866,6 +5969,14 @@ msgid ""
 "You can manually erase this file to present the druid again.\n"
 msgstr ""
 
+#: src/nautilus-information-panel.c:506
+msgid "You can't assign more than one custom icon at a time."
+msgstr ""
+
+#: src/nautilus-information-panel.c:535
+msgid "You can only use images as custom icons."
+msgstr ""
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -5876,24 +5987,21 @@ msgstr ""
 msgid "Open with..."
 msgstr ""
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+msgid "Unable to launch the cd burner application."
 msgstr ""
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+msgid "Can't Launch CD Burner"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr ""
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr ""
 
@@ -5901,112 +6009,122 @@ msgstr ""
 msgid "Go To:"
 msgstr ""
 
-#: src/nautilus-location-bar.c:154
+#: src/nautilus-location-bar.c:155
 #, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+msgid "Do you want to view %d locations?"
 msgstr ""
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr ""
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 msgid "Open Location"
 msgstr ""
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr ""
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr ""
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr ""
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr ""
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr ""
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr ""
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr ""
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr ""
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr ""
 
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+msgid "Are you sure you want to forget history?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:188
+msgid "If you do, you will be doomed to repeat it."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, c-format
+msgid "The location \"%s\" does not exist."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr ""
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr ""
 
@@ -6039,7 +6157,6 @@ msgid "Close _All Windows"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 msgid "Close all Navigation windows"
 msgstr ""
 
@@ -6061,106 +6178,116 @@ msgid "Forward"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:14
-msgid "Go to the next visited location"
+#: src/nautilus-spatial-window-ui.xml.h:6
+msgid "Go to templates folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:15
-msgid "Go to the previous visited location"
+msgid "Go to the next visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
-msgid "Go to the trash folder"
+msgid "Go to the previous visited location"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:17
-msgid "Home"
+#: src/nautilus-spatial-window-ui.xml.h:8
+msgid "Go to the trash folder"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:18
-msgid "Location _Bar"
+msgid "Home"
 msgstr ""
 
 #: src/nautilus-navigation-window-ui.xml.h:19
+msgid "Location _Bar"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "צוריק"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 msgid "_Computer"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "פֿ�ָרױס"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "�ַהײ�"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr ""
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "�ַרױף"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr ""
 
@@ -6178,28 +6305,32 @@ msgstr ""
 msgid "File Browser: %s"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1099
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+#: src/nautilus-navigation-window.c:1105
+msgid "One of the side panels encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1109
 #, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1110
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 msgid "Side Panel Failed"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr ""
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr ""
 
@@ -6233,147 +6364,175 @@ msgstr ""
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+msgid "Couldn't Delete Pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr ""
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+msgid "Couldn't Delete Emblem"
+msgstr ""
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr ""
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr ""
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr ""
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+msgid "Couldn't Install Pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr ""
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+msgid "Couldn't Install Color"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr ""
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
 #, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2041
-msgid "Select a Category:"
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+msgid "The file is not an image."
 msgstr ""
 
 #: src/nautilus-property-browser.c:2050
+msgid "Select a Category:"
+msgstr ""
+
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr ""
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr ""
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr ""
 
@@ -6753,30 +6912,35 @@ msgid "CD _Creator"
 msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:2
-msgid "Close _All Parents"
+#, fuzzy
+msgid "Close P_arent Folders"
+msgstr "נײַע פּ�ַפּקע"
+
+#: src/nautilus-spatial-window-ui.xml.h:3
+msgid "Close this folder's parents"
 msgstr ""
 
 #: src/nautilus-spatial-window-ui.xml.h:5
 msgid "Go to Computer"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 msgid "Go to the CD Creator"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 msgid "Open _Location..."
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 msgid "Open the parent folder"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 msgid "_Places"
 msgstr ""
 
@@ -6806,9 +6970,11 @@ msgstr ""
 
 #: src/nautilus-window-manage-views.c:828
 #, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+msgid "The %s view encountered an error and can't continue."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:829
+msgid "You can choose another view or go to a different location."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:839
@@ -6816,85 +6982,106 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:986
-msgid "Content View"
+#: src/nautilus-window-manage-views.c:840
+msgid "The location cannot be displayed with this viewer."
 msgstr ""
 
 #: src/nautilus-window-manage-views.c:987
+msgid "Content View"
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1239
+#: src/nautilus-window-manage-views.c:1242
 #, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
+msgid "Couldn't find \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1259
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
 #, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+msgid "Couldn't display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1269
+msgid "Nautilus cannot determine what type of file it is."
 msgstr ""
 
-#. Shouldn't have gotten this error unless there's a : separator.
 #: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1285
+#: src/nautilus-window-manage-views.c:1292
 #, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+msgid "Nautilus cannot handle %s: locations."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1300
+msgid "The attempt to log in failed."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1301
+#: src/nautilus-window-manage-views.c:1316
 #, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1319
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+msgid "Check that your proxy settings are correct."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1316
+#: src/nautilus-window-manage-views.c:1331
 #, c-format
 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."
+"browser."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1347
+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 ""
+
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr ""
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr ""
 
@@ -6906,7 +7093,7 @@ msgstr ""
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr ""
 
@@ -6914,11 +7101,11 @@ msgstr ""
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -6932,37 +7119,41 @@ msgstr ""
 msgid "Go forward a number of pages"
 msgstr ""
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr ""
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 msgid "Network"
 msgstr ""
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "פּינטלעך:"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 msgid "CD Creator"
 msgstr ""
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr ""
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr ""
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr ""
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr ""
 
@@ -6998,5 +7189,9 @@ msgstr ""
 msgid "View your network servers in the Nautilus file manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "נ�ָמען"
+
 #~ msgid "_Find"
 #~ msgstr "געפֿין"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 32687a012..a7afdaf42 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-08-09 04:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -39,8 +39,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() 失败。"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "徽标"
 
@@ -53,185 +53,122 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus 徽标视图"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "无法删除徽标"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr "无法删除�称为“%s�的徽标。�能由于该徽标是永久的，而�是您自行添加的。"
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "无法删除徽标"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "无法�命�徽标"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "无法将�称为“%s�的徽标�命�。�能由于该徽标是永久的，而�是您自行添加的。"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "无法�命�徽标"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "�命�徽标"
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "输入所显示的徽标的新�称："
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "�命�"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "添加徽标..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "输入�个徽标�边的�述性�称。此�称将在其它�置用于标识徽标。"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "输入徽标�边的�述性�称。此�称将在其它�置用于标识徽标。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr "�些文件无法添加为徽标，原因是这些文件��是有效的图�。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "文件“%s���是有效的图�。"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "无法添加徽标"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "无法将任�一个文件添加为徽标，原因是这些文件都��是有效的图�。"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "拖曳的文字�是有效的文件�置。"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "无法添加徽标"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "文件“%s���是有效的图�。"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "拖曳的文件��是有效的图�。"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "删除"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "硬件视图工厂"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "硬件"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "硬件查看器"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "硬件视图"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "当作硬件查看"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "硬件视图"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "硬件视图所用图标的�字"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "硬件信�摘�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K 缓存大�"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB 内存"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB 内存"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "开机时间为 %d 天 %d �时 %d 分钟"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "硬件概览"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "这里是 CPU 页的��符。"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "这里是 RAM 页的��符。"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "这里是 IDE 页的��符。"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "历�"
@@ -897,6 +834,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "硬件"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "国际"
@@ -1179,31 +1120,33 @@ msgid "Desktop trash icon name"
 msgstr "桌�回收站图标�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"超过此大�的目录将会被截断为此大�。此设置的目的在于�� Nautilus 浪费太多的"
-"时间�处��分��的目录。负值�味�没有�制。"
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "在文件首选项对�框中�用“特殊�标志"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr "默认目录背景的文件�。仅当 background_set 为 true 时使用。"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr "默认窗格背景的文件�。仅当 side_pane_background_set 为 true 时使用。"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"超过此大�的目录将会被截断为此大�。此设置的目的在于�� Nautilus 浪费太多的"
+"时间�处��分��的目录。负值�味�没有�制。"
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "在书签��中��默认书签"
@@ -1213,9 +1156,10 @@ msgid "Home icon visible on desktop"
 msgstr "在桌�上显示主目录图标"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "如果设为 true，Nautilus 将�在树侧�中显示目录。�则将�时显示目录和文件。"
 
@@ -1244,9 +1188,10 @@ msgstr ""
 "如果设为 true，Nautilus 将�许您在文件首选项对�框中编辑文件的�些机密选项。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr "如果设为 true，Nautilus 将在图标视图和列表视图中把目录显示在文件��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
@@ -1281,8 +1226,9 @@ msgid ""
 msgstr "如果设为 true，Nautilus 将在书签��中�显示用户的书签。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "如果设为 true，Nautilus 将使用用户的主目录作为桌�。如果设为 false，则会使用 "
@@ -1298,9 +1244,10 @@ msgstr ""
 "(~)结尾的文件会被认为是备份文件。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "如果设为 true，则在文件管�器中显示��文件。��文件或者是以 . 开头的文件，"
 "或者是在目录的 .hidden 文件中列出的文件。"
@@ -1321,8 +1268,9 @@ msgid ""
 msgstr "如果设为 true，会在桌�上放置一个链接到回收站的图标。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "如果设为 true，会在桌�上放置一个链接到主目录的图标。"
 
@@ -1353,7 +1301,8 @@ msgstr ""
 "最��，将最�的文件排在最��。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "如果为 true，图标将会在新窗�中默认以紧凑布局显示。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1379,7 +1328,8 @@ msgid "List of possible captions on icons"
 msgstr "图标�供选择的标题列表"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "目录�处�的最多文件数"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1398,11 +1348,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "使用 Nautilus �绘制桌�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus 使用用户的主目录作为桌�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "仅在树侧�中显示目录"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1420,7 +1372,8 @@ msgid "Reverse sort order in new windows"
 msgstr "在新窗�中逆�排�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "在窗�中先显示目录"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1455,10 +1408,11 @@ msgstr ""
 "如果设为“从��，则��预览声音。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1467,22 +1421,24 @@ msgstr ""
 "件的预览。如果设为“从��，则��读�任何预览数�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "将图�文件显示为缩略图时的速度折衷。如果设为“总是�，将会总是显示缩略图，�使"
 "目录�于远程�务器上。如果设为“�是本地�，则�会对本地文件系统上的文件创建缩"
 "略图。如果设为“从��，则��预览图�，�是使用通用图标。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "显示目录中项目数时的速度折衷。如果设为“总是�，将会总是显示项目计数，�使目录"
@@ -1490,17 +1446,19 @@ msgstr ""
 "如果设为“从��，则��计算项目数。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "图标视图中项目的默认排�顺�。�供选择的值是“�称��“大���“类型��“修改日"
 "期�和“徽标�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "列表视图中项目的默认排�顺�。�供选择的值是�称�大��类型和修改日期。"
 
@@ -1541,7 +1499,8 @@ msgid "Use manual layout in new windows"
 msgstr "在新建窗�中使用手动布局"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "在新建窗�中使用紧凑布局"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1568,7 +1527,8 @@ msgstr ""
 "值有“列表视图�和“图标视图�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "何时在目录中显示项目数"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1580,7 +1540,8 @@ msgid "When to show thumbnails of image files"
 msgstr "何时显示图�文件的缩略图"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "是�设置了自定义默认目录背景。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1737,65 +1698,79 @@ msgstr "��"
 msgid "on the desktop"
 msgstr "在桌�上"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "无法删除�"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "无法删除�"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "回收站"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "移动到此处(_M)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "�制到此处(_C)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "在此处创建链接(_L)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "设置为背景(_B)"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "�消"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "设置为所有文件夹的背景(_A)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "设置为本文件夹的背景(_T)"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "抱歉，您必须为新徽标指定一个�空的关键�。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "无法安装徽标"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "抱歉，徽标关键��能包�字��空格和数字。"
@@ -1804,18 +1779,24 @@ msgstr "抱歉，徽标关键��能包�字��空格和数字。"
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "抱歉，已�存在�称为“%s�的徽标。请为它选择一个��的�字。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "无法安装徽标"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "抱歉，无法�存自定义徽标。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "抱歉，无法�存自定义徽标�称。"
 
@@ -1834,22 +1815,28 @@ msgstr "从："
 msgid "To:"
 msgstr "到："
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "移动时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "移动时�生错误。\n"
 "\n"
 "无法移动“%s�，因为它在�读�盘上。"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "删除时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1857,22 +1844,17 @@ msgstr ""
 "\n"
 "无法删除“%s�，您没有��修改它的父目录。"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "删除时�生错误。\n"
 "\n"
 "无法删除“%s�，因为它在�读�盘上。"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1880,319 +1862,269 @@ msgstr ""
 "\n"
 "无法移动“%s�，因为您没有��修改它或者它的父目录。"
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "移动时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "移动时�生错误。\n"
 "\n"
 "无法移动“%s�，因为该文件本身或其父文件夹包�在目标�置中。"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "移动时�生错误。\n"
 "\n"
 "无法将“%s�移动到回收站，因为您没有��修改它或者它的父目录。"
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "�制时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "�制时�生错误。\n"
 "\n"
 "无法�制“%s�，因为您没有读�它的��。"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"�制到“%s�中时�生错误。\n"
-"\n"
-"目标�置中没有足够空间。"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "�制时�生错误。"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "移动到“%s�时�生错误。\n"
 "\n"
 "目标�置中没有足够空间。"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"在“%s�中创建链接时�生错误。\n"
-"\n"
-"目标�置中没有足够空间。"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "移动时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "创建链接时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "将文件�制到“%s�时�生错误。\n"
 "\n"
 "您没有该文件夹的写��。"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "将文件�制到“%s�时�生错误。\n"
 "\n"
 "目标�盘是�读的。"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"将文件移动到“%s�时�生错误。\n"
-"\n"
-"您没有该文件夹的写��。"
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"将文件移动到“%s�时�生错误。\n"
-"\n"
-"目标�盘是�读的。"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"在“%s�中创建链接时�生错误。\n"
-"\n"
-"您没有该文件夹的写��。"
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "移动时�生错误。"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"在“%s�中创建链接时�生错误。\n"
-"\n"
-"目标�盘是�读的。"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"�制“%2$s�时�生错误“%1$s�。\n"
-"\n"
-"您�继续�？"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "创建链接时�生错误。"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "�制时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"移动“%2$s�时�生错误“%1$s�。\n"
+"移动时�生错误“%s�。\n"
 "\n"
 "您�继续�？"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"创建指�“%2$s�的链接时�生错误“%1$s�。\n"
-"\n"
-"您�继续�？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "移动时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"删除“%2$s�时�生错误“%1$s�。\n"
+"创建指�“%2$s�的链接时�生错误“%1$s�。\n"
 "\n"
 "您�继续�？"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"�制时�生错误“%s�。\n"
-"\n"
-"您�继续�？"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "删除时�生错误。"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"移动时�生错误“%s�。\n"
-"\n"
-"您�继续�？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "�制时�生错误。"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"创建链接时�生错误“%s�。\n"
-"\n"
-"您�继续�？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "移动时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"删除时�生错误“%s�。\n"
-"\n"
-"您�继续�？"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "创建链接时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "删除时�生错误。"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "�制时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "移动时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "创建链接时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "删除时�生错误。"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "跳过"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "�试"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "无法完�指定�作。"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "无法将“%s�移动到新�置，因为该�称已被�一个无法被删除或替�的特殊项目使"
 "用。\n"
 "\n"
 "如果您想移动“%s�，请给它更����试。"
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "无法完�指定�作。"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "无法将“%s��制到新�置，因为该�称已被�一个无法被删除或替�的特殊项目使"
 "用。\n"
 "\n"
 "如果您想�制“%s�，请给它更����试。"
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "无法替�文件。"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "文件“%s�已�存在。\n"
 "\n"
 "您�替�它�？"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "�制时�生冲�"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "替�"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "全部替�"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "到 %s 的链接"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "到 %s 的�一个链接"
@@ -2201,25 +2133,25 @@ msgstr "到 %s 的�一个链接"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "到 %2$s 的第 %1$d 个链接"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "到 %2$s 的第 %1$d 个链接"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "到 %2$s 的第 %1$d 个链接"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "到 %2$s 的第 %1$d 个链接"
@@ -2229,561 +2161,600 @@ 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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (�件)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (�一个�件)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "�件)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (�件)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (�一个�件)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (第%d个�件)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (第%d个�件)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (第%d个�件)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, 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:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (第%d个"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "未知 GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "正在将文件移动到回收站"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "丢弃的文件："
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "正在移动"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "正在准备移到回收站..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "正在移动文件"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "移动的文件："
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "正在准备移动..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "正在完�移动..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "创建文件的链接"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "链接的文件："
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "正在链接"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "正在准备创建链接..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "正在完�创建链接..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "正在�制文件"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "�制的文件："
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "正在�制"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "正在准备�制..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "您�能把项目�制到回收站。"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "�能�制到回收站"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "您�能移动回收站文件夹。"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "您�能�制回收站文件夹。"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "�能改�回收站的�置"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "�能�制回收站"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "您�能将文件夹移动到它本身。"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "您�能将文件夹�制到它本身。"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "在该文件夹中创建新的空文件夹"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "�能移动到本身"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "�能�制到本身"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "您�能将文件�制到它本身。"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "�能�制到本身"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "创建新文件夹时�生错误。\n"
 "\n"
 "您没有写入目标�置的��。"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "创建新文件夹时�生错误。\n"
 "\n"
 "目标�置中没有空间。"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "创建新文件夹时�生错误“%s�。"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "创建新文件夹时�生错误"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "创建新文件夹时�生错误"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "未命�文件夹"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "创建新文件夹时�生错误“%s�。"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "创建新文件夹时�生错误"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "创建新文件夹时�生错误"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 个文件"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "删除文件"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "删除的文件："
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "正在删除"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "正在准备删除文件..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "正在清空回收站"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "正在准备清空回收站..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "您确定�永久删除回收站中的所有项目�？"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "清空(_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (�件).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (�一个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (�一个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (�一个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (第三个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (第三个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (�一个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (第三个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (第�三个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (第�四个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (第�三个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (第�四个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (第二�一个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (第二�二个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (第二�一个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (第二�二个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (第二�三个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (第二�三个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (第二�四个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (第二�四个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (第二�五个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (第二�五个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (第二�四个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (第二�五个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (第二�四个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (第二�五个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (第一百兆个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (第�个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (第�一个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (第�个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (第�一个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (第�二个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (第�二个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (第一百一�个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (第一百一�一个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (第一百一�个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (第一百一�一个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (第一百二�二个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (第一百二�三个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (第一百二�二个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (第一百二�三个�件).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (第一百二�四个�件)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (第124 个�件).txt"
 
@@ -2802,64 +2773,64 @@ msgstr "foo (第124 个�件).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "今天 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "今天 %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "今天 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "今天 %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "今天，00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "今天，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "今天"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "昨天 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "昨天 %-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "昨天 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "昨天 %-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "昨天，00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "昨天，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "昨天"
 
@@ -2868,133 +2839,133 @@ msgstr "昨天"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000 年 9 月 00 日星期三，00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日%A，%-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000 年 10 月 0 日星期一，00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日%A，%-H:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000 年 10 月 00 日星期一，00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y 年 %_m 月 %-d 日%a，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000 年 10 月 00 日，00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000 年 10 月 00 日，00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00，00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%Y/%-m/%-d，%-H:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%Y/%m/%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "0 项"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "0 个文件夹"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "0 个文件"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 项"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 个文件"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u 项"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u 个文件夹"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u 文件"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? 项"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? 字节"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "未知类型"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "未知"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "程�"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3003,18 +2974,18 @@ msgstr ""
 "甚至找�到关于“x-directory/normal�的�述。这�能�味�您的 gnome-vfs.keys 文"
 "件�置�对，或者由于其它原因�找�到。"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
 "gnome-vfs mailing list."
 msgstr "找�到 MIME 类型“%s� (文件为“%s�) 的�述，请通知 gnome-vfs 邮件列表。"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "链接"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "链接(�正确)"
 
@@ -3135,11 +3106,13 @@ msgid "Search for files by file name and file properties"
 msgstr "按文件�和文件属性查找文件"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "图标视图"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "列表视图"
@@ -3283,144 +3256,149 @@ msgstr "%s 的主目录"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "柜�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "文件图标"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "�编辑文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "�编辑标签"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "附加文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "更多文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "�出显示选择"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "是��出显示选择"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "�出显示为键盘�焦"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "是��出显示键盘�焦"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "�出显示拖放"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "是��出显示 D&D 拖放"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "矩形选区"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "给文本装框"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "在未选文本周围绘制外框"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "选择外框颜色"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "选择框颜色"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "选择框 Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "选择框��明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "�出显示 Alpha"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "选中项目的�出显示��明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "浅信�颜色"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "深色背景上信�文字所使用的颜色"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "深信�颜色"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "浅色背景上信�文字所使用的颜色"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "该文件夹使用自动布局。您�切�到手工布局，并将此项目留在您放置的地方�？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "该文件夹使用自动布局。您�切�到手工布局，并将这些项目留在您放置的地方�？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "切�到手工布局？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "切�"
 
@@ -3526,119 +3504,119 @@ msgstr "是“%s�项目的默认值。"
 msgid "Is the default for all \"%s\" items."
 msgstr "是所有“%s�项目的默认值。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "修改“%s�"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "包括在“%s�项目的��中"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "用作“%s�项目的默认值"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "仅包括在“%s�项目的��中"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "仅用作“%s�的默认值"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "��包括在“%s�项目的��中"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "�称"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "状�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "选择(_H)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "完�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "修改(_M)..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "文件类型和程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "转到该处(_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr "您�以在文件类型和程�对�框中�置哪�文件类型�以用哪些应用程�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "使用其它程�打开"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "选择打开“%s�所用的程�："
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "用其它查看器打开"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "选择“%s�的视图："
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "没有“%s��用的查看器。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "没有�用的查看器"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "没有与“%s�关�的应用程�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "没有关�的应用程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "没有与“%s�关�的�作。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "没有关�的�作"
 
@@ -3646,11 +3624,9 @@ msgstr "没有关�的�作"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3659,42 +3635,41 @@ msgstr ""
 "您�以�置 GNOME 将应用程�和文件类型相关�。您想现在就为该文件类型关�应用程"
 "��？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "关�应用程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "与“%s�关�的查看器无效。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "关�的查看器无效"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "与“%s�关�的应用程�无效。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "关�的应用程�无效"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "与“%s�关�的�作无效。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "关�的�作无效"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3704,102 +3679,140 @@ msgstr ""
 "您�以�置 GNOME 为此文件类型关���的应用程�或查看器。您想现在就为该文件类"
 "型关�应用程�或查看器�？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "关��作"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr ""
+"“%s�无法打开“%s�，因为“%s�无法访问�于“%s�的文件。您�选择�外的程��？"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr ""
 "“%s�无法打开“%s�，因为“%s�无法访问�于“%s�的文件。您�选择�外的程��？"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "默认�作无法打开“%s�，原因是无法访问�于“%s�的文件。您�选择�外的�作�？"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "无法打开�置"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr ""
+"“%s�无法打开“%s�，因为“%s�无法访问�于“%s�的文件。您�选择�外的程��？"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "“%s�无法打开“%s�，原因是“%s�无法访问�于“%s�的文件。没有�查看此文件的其它应"
 "用程�。如果您将该文件�制到您的机器上，也许�以打开它。"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
 msgstr ""
-"默认�作无法打开“%s�，原因是无法访问�于“%s��置的文件。没有�查看该文件的其"
-"它�作。如果您将该文件�制到您的机器上，也许�以打开它。"
+"默认�作无法打开“%s�，原因是无法访问�于“%s�的文件。您�选择�外的�作�？"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
+msgstr ""
+"“%s�无法打开“%s�，原因是“%s�无法访问�于“%s�的文件。没有�查看此文件的其它应"
+"用程�。如果您将该文件�制到您的机器上，也许�以打开它。"
+
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开“%s�"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "抱歉，鉴于安全考虑，您无法执行远程系统上的命令。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "无法执行远程链接"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "�动应用程�出错。\n"
 "\n"
 "细节："
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "�动应用程�出错"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "拖放目标�支�本地文件。"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "该拖放目标�支�本地文件。\n"
 "\n"
 "�打开�本地邮件，将它们�制到本地文件夹中�拖放它们。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "拖放目标�支�本地文件。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4049,14 +4062,6 @@ msgstr "�称中包�“stuff�且�于 2000 字节的常规文件项目"
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "�称中包�“medusa�的文件夹项目"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "正在�索�盘"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus 正在您的�盘中�索回收站文件夹。"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "编辑"
@@ -4253,96 +4258,106 @@ msgstr "背景"
 msgid "Empty Trash"
 msgstr "清空回收站"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "这将打开 %d 个独立的窗�。您确定�这样��？"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "打开 %d 个窗�？"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "您确定�永久删除“%s�？"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "这将打开 %d 个独立的窗�。您确定�这样��？"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "您确定�永久删除“%s�？"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "您确定�永久删除 %d 个选中项目？"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "永久删除所有选中的项目"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "删除�？"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "选择类别："
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "图案(_P)"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "选中了“%s�"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "选中了 1 个文件夹"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "选中了 %d 个文件夹"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr " (有 0 项)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr " (有 1 项)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr " (有 %d 项)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr " (总共有 0 项)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr " (总共有 1 项)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr " (总共有 %d 项)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "选中了“%s� (%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "选中了 %d 项 (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "�选中了 1 项 (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "�选中了 %d 项 (%s)"
@@ -4354,7 +4369,7 @@ msgstr "�选中了 %d 项 (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s，%s"
@@ -4363,110 +4378,129 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "文件夹“%s�中包�的文件多于 Nautilus 所能够处�的数�。一些文件将�会被显示。"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "文件太多"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "无法将“%s�移动到回收站。您�立�删除它�？"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr "无法将 %d 个选中项目移动到回收站。您�立刻删除它们�？"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "无法将“%s�移动到回收站。您�立�删除它�？"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr "无法将选中项目中的 %d 个移到回收站。您�立刻删除这 %d 个项目�？"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "无法将“%s�移动到回收站。您�立�删除它�？"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "立刻删除�？"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "您确定�从回收站中永久删除“%s��？"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "您确定�从回收站中永久删除这 %d 个选中项目�？"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "从回收站中删除�？"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "用“%s�打开选中的项目"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "其它应用程�(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "应用程�(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "其它查看器(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "查看器(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "无法完�指定�作：%s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "无法完�指定�作。"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "在任�选中的项目上�行“%s�"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"该文件夹中的所有执行文件将显示在脚本��中。从该��中选择�脚本将会用任�选"
+"中项目作为输入�执行那个脚本。"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "该文件夹中的所有执行文件将显示在脚本��中。从该��中选择�脚本将会用任�选"
 "中项目作为输入�执行那个脚本。"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "关于脚本"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4504,177 +4538,182 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY：当�窗�的�置和大�"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "如果您选择了粘贴文件命令，“%s�将被移动"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "如果您选择了粘贴文件命令，“%s�将被�制"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "如果您选择了粘贴文件命令，将移动选中的 %d 个项目"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "如果您选择了粘贴文件命令，将�制选中的 %d 个项目"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "剪贴�中没有东西�以粘贴。"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "挂载错误"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "�载错误"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "挂载错误"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "弹出(_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "�载文件�(_U)"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "在新建窗�中打开(_I)"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "在 %d 个新建窗�中打开(_I)"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "主文件夹"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "主文件夹"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "从回收站中删除(_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "永久删除所有选中的项目"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "移动到回收站(_V)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "把�个选中项目都移到回收站"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "创建链接(_K)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "创建链接(_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "剪切文件(_T)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "剪切文件(_T)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "�制文件(_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "�制文件(_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr "无法使用该链接，因为它没有目标。您�将该链接移动到回收站中�？"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr "无法使用该链接，因为它没有目标。您�将该链接移动到回收站中�？"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "错误链接"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "“%s�是一个�执行文本文件。您是��行它，还是显示它的内容？"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "�行还是显示？"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "显示(_D)"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "在终端中�行(_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "显示(_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "�行(_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "正在打开“%s�"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "�消打开？"
 
@@ -4695,107 +4734,132 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "抱歉，无法显示“%s�的全部内容。"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "无法确定“%s�的��。"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "显示文件夹时�生错误"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "在该文件夹中已�使用了�字“%s�。请使用�外的�字。"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "该文件夹中没有“%s�。也许它刚被移动或删除？"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "您没有�命�“%s�所必需的��。"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "�字“%s�无效，因为它包�字符“/�。请使用�外的�字。"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "�字“%s�无效。请使用�外的�字。"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "无法改�“%s�的文件�，因为它在�读�盘上"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "抱歉，无法将“%s��命�为“%s�。"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "无法确定“%s�的��。"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "�命�错误"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "您没有改�“%s�的组群所必需的��。"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "无法修改“%s�的组群，因为它在�读�盘上"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "抱歉，无法修改“%s�的组群。"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "无法确定“%s�的��。"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "设置组群时�生错误"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "因为“%s�在�读�盘上，无法改�它的所有者"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "抱歉，无法改�“%s�的所有者。"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "无法确定“%s�的��。"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "设置所有者时�生错误"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "因为“%s�在�读�盘上，无法改�它的��"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "抱歉，无法改�“%s�的��。"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "无法确定“%s�的��。"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "设置��时�生错误"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "正在将“%s��命�为“%s�。"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "�消�命�？"
 
@@ -4853,122 +4917,140 @@ msgstr "��图标的�始大�(_Z)"
 msgid "Restore Icon's Original Si_ze"
 msgstr "��图标的�始大�(_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "指�“%s�"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
+msgstr "拖放�作�能在本地文件系统中进行。"
+
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
 msgstr "拖放�作�能在本地文件系统中进行。"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "拖放错误"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "使用了无效的拖放类型。"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "文件�"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "大�"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "类型"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "修改日期"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
+msgstr "您�能一次指定多个定制图标�请仅拖放一个图�文件�设置定制图标。"
+
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
 msgstr "您�能一次指定多个定制图标�请仅拖放一个图�文件�设置定制图标。"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "�止一个图�"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr "您拖放的文件�是本地文件。您�能使用本地的图�文件作为定制图标。"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr "您拖放的文件�是本地文件。您�能使用本地的图�文件作为定制图标。"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "�支�本地图�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr "您拖放的文件�是一个图�文件。您�能使用本地的图�文件作为定制图标。"
+#, fuzzy
+msgid "The file that you dropped is not an image."
+msgstr "您拖放的文件�是本地文件。您�能使用本地的图�文件作为定制图标。"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "仅使用图�"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "属性"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s 属性"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "�消组群改动？"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "正在改�组群"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "�消所有者改动？"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "正在改�所有者"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "æ— "
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "��读"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 项，大� %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d 项，共 %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(�些内容��读)"
 
@@ -4978,191 +5060,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "内容："
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "基本"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "�称(_N)："
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "�称(_N)："
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "类型："
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "大�："
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "�置："
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "文件�："
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "剩余空间："
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "链接目标："
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME 类型："
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "修改："
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "访问："
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "选择定制图标(_S)..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "删除定制图标(_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "读�(_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "写入(_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "执行(_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "设置用户 ID(_U)"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "特殊标志："
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "设置组群 ID(_U)"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "粘附(_S)"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "��"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "您�是所有者，所以您�能改�这些��。"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "文件所有者："
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "文件所有者："
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "文件组群(_F)："
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "文件组群："
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "所有者："
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "组群："
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "其它："
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "文本视图："
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "数字视图："
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "最�修改："
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "无法确定“%s�的��。"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "无法确定选中文件的��。"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"显示帮助时出错：\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "显示帮助时出错：%s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "无法显示帮助"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "�消显示属性窗�？"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "正在创建属性窗�"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "选择图标"
 
@@ -5178,91 +5260,128 @@ msgid "Search Results"
 msgstr "�索结果"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "抱歉，Medusa 没有安装，�索�务��用。"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "抱歉，medusa �索�务��用。"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "�索�务��用"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "您选择的�索比系统上的索引更新。现在，�索将�会返回任何结果。您�以在命令行"
 "以根用户身份�行“medusa-indexd�命令�创建一个新索引。"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find 命令无法打开您的文件系统索引。您的索引�能已�失或��。您�以在命令行以"
+"根用户身份�行“medusa-indexd��创建一个新索引。"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "�索太新的项目"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"您的计算机上�个被索引的文件都匹�您的选择�件。您�以检查一下选择�件的拼写"
+"或添加更多�件�缩��索结果的范围。"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "您的计算机上�个被索引的文件都匹�您的选择�件。您�以检查一下选择�件的拼写"
 "或添加更多�件�缩��索结果的范围。"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "�索时出错"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find 命令无法打开您的文件系统索引。您的索引�能已�失或��。您�以在命令行以"
 "根用户身份�行“medusa-indexd��创建一个新索引。"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "读�文件索引时�生错误"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "载入�索内容时�生错误：%s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"�执行内容�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
+"引。"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"�执行内容�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
+"引。"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
 "�执行快速�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
 "引，因此它将执行�需索引的慢速�索。"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"�执行内容�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
-"引。"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "快速�索��用"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "内容�索��用"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5275,52 +5394,84 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "�执行快速�索，Find 需�一个您的系统上的文件索引。您的计算机目�正在创建该索"
 "引。因为 Find 无法使用索引，本项�索�能会花几分钟时间。"
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "�执行内容�索，Find 需�一个您的系统上的文件索引。您的计算机目�正在创建该索"
 "引。当索引创建完毕�，您将�以使用内容�索。"
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "索引�索��用"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"�执行内容�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
+"引。"
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"�执行内容�索，Find 需�一个您的系统上的文件索引。Find 目�无法使用您的索"
+"引。"
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "�执行快速�索，Find 需�一个您的系统上的文件索引。目�没有�用的索引。您�以"
 "在命令行以 root 用户身份�行“medusa indexd��创建索引。在完整索引�用之�，�"
 "索将会花几分钟时间。"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "�执行内容�索，Find 需�一个您的系统上的文件索引。目�没有�用的索引。您�以"
 "在命令行以 root 用户身份�行“medusa indexd��创建索引。在完整索引�用之�，将"
 "无法执行内容�索。"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "您的机器上没有�用快速�索"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5329,11 +5480,12 @@ msgstr ""
 "�执行快速�索，Find 需�有一个您的系统上的文件索引。您的系统管�员�用了系统"
 "上的快速�索，所以没有索引�用。"
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "您的机器上没有�用快速�索"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "快速�索��用"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "哪里"
 
@@ -5342,7 +5494,7 @@ msgstr "哪里"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "在新窗�中展现(_R)"
@@ -5353,7 +5505,7 @@ msgstr "在新窗�中展现(_R)"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "在 %d 个新窗�中展现(_N)"
@@ -5362,13 +5514,17 @@ msgstr "在 %d 个新窗�中展现(_N)"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
 msgstr "Nautilus 找到的结果太多，显示�下。其中一些匹�项�能将�会被显示。"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
+msgstr "Nautilus 找到的结果太多，显示�下。其中一些匹�项�能将�会被显示。"
+
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "匹�项太多"
 
@@ -5382,12 +5538,12 @@ msgid "Create L_auncher"
 msgstr "创建�动器(_A)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "创建新�动器"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "删除回收站中的所有项目"
 
@@ -5406,7 +5562,7 @@ msgstr "显示�许您设置桌�背景的图案或颜色的窗�"
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "使用默认背景(_D)"
@@ -5428,183 +5584,202 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "�选一个用�查看选中项目的查看器"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "创建文件夹(_F)"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "创建文件夹(_F)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "在该文件夹中创建新的空文件夹"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "在该文件夹中创建新的空文件夹"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "为�个选中的项目创建链接"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "就地�制(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "删除�个选中的项目，而�移动到回收站"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "�制�个选中的项"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "编辑�动器"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "编辑�动器信�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "格�化选中的文件�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "介质属性(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "�载选中的文件�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "移动或�制由��的剪切文件或�制文件命令所选中的文件"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
 msgstr "将先�由剪切文件或�制文件命令所选中的文件移动或�制到选中文件夹中"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "打开方�(_H)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "在新窗�中打开选中的项目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "在新建窗�中打开(_I)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "在本窗�中打开选中的项目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "准备将选中的文件用粘贴文件命令�制"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "准备将选中的文件用粘贴文件命令移动"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "�护(_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "�护选中的文件�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "�命�选中的项目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "将视图�置为默认值(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "�置排�和缩放级别以符�该视图的首选项"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "在 ~/Nautilus/scripts 中�行或管�脚本"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "选择全部文件(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "图案(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "选择该窗�中的所有项目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "选择该窗�中的所有项目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "显示选中文件�的介质属性"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "显示包�出现在该��中的脚本的文件夹"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "�载选中的文件�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "该�置使用默认背景"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "查看或修改�个选中项目的属性"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "�制文件(_C)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "格�化(_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "�载文件�(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "打开脚本文件夹(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "粘贴文件(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "将文件粘贴到文件夹(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "�命�(_R)..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "脚本(_S)"
 
@@ -5689,31 +5864,38 @@ msgstr "手工(_M)"
 msgid "Indexing is %d%% complete."
 msgstr "索引完�了 %d%%。"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "您的文件最�一次索引于 %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "�天将您的文件和文本内容进行一次索引，以便加快您的�索速度。"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "索引状�"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "您的文件最�一次索引于 %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
-msgstr ""
-"�天将您的文件和文字内容进行一次索引，以便加快您的�索速度。目�，您的文件正"
-"在被索引。"
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr "�天将您的文件和文本内容进行一次索引，以便加快您的�索速度。"
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "目�没有您的文件索引。"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5722,15 +5904,19 @@ msgstr ""
 "当快速�索被�用，Find 创建一个索引�加快�索速度。您的计算机上没有�用快速�"
 "索，因此您目�没有索引。"
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "目�没有您的文件索引。"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "抱歉，medusa �索�务��用。"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%Y年%-m月%-d日%-H:%M"
 
@@ -5754,31 +5940,36 @@ msgstr "显示索引状�(_I)"
 msgid "Show status of indexing used when searching"
 msgstr "在�索时显示索引状�"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "无法创建所需的文件夹"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "无法创建所需文件夹"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus 无法创建所需的文件夹“%s�。在�行 Nautilus �，请创建该文件夹，或设置"
 "好��以使 Nautilus �以创建它。"
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "无法创建所需文件夹"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5789,21 +5980,26 @@ msgstr ""
 "在�行 Nautilus �，请创建这些文件夹，或设置好��以使 Nautilus �以创建它"
 "们。"
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "旧桌�的链接"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "Gnome 2.4 中桌�目录的�置�生了�化。桌�上会创建一个�为“旧桌�的链接�的链"
 "接。您�以打开此链接，将其中的文件移出�删除此链接。"
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "��的旧桌�"
 
 #. Can't register myself due to trouble locating the
@@ -5816,7 +6012,7 @@ msgstr "��的旧桌�"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5826,7 +6022,7 @@ msgstr ""
 "果�能解决，您�以试试�新�动机器，或者�装 Nautilus。"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5869,12 +6065,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "由于未预料的错误，现在无法使用 Nautilus。"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5882,7 +6078,7 @@ msgstr ""
 "由于在试图注册文件管�器视图�务器时，�到未预料到的 Bonobo 错误，现在无法使"
 "用 Nautilus。"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -5891,7 +6087,7 @@ msgstr ""
 "由于在试图定�工厂时，�到未预料到的 Bonobo 错误，现在无法使用 Nautilus。�"
 "死 bonobo-activation-server 并��动 Nautilus �能会解决这个问题。"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -5901,6 +6097,17 @@ msgstr ""
 "Nautilus。�死 bonobo-activation-server 并��动 Nautilus �能会解决这个问"
 "题。"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"显示帮助时出错：\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "没有定义任何书签"
@@ -5934,34 +6141,45 @@ msgstr "更少选项"
 msgid "Find Them!"
 msgstr "找到了�"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "�能移动到本身"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "抱歉，“%s��是有效的文件�。"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "“%s��是有效的�置。请检查拼写��试。"
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "找�到“%s�。请检查拼写��试。"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "网络�务器"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "�称(_N)："
+msgid "_Location:"
+msgstr "�置："
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "连接(_C)"
@@ -6160,6 +6378,16 @@ msgstr ""
 "\n"
 "您�以手工删除该文件以�次�行�置�导。\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr "您�能一次指定多个定制图标�请仅拖放一个图�文件�设置定制图标。"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr "您拖放的文件�是本地文件。您�能使用本地的图�文件作为定制图标。"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6170,26 +6398,25 @@ msgstr "用 %s 打开"
 msgid "Open with..."
 msgstr "打开方�..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "无法调用 CD 刻录程�：\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "无法调用 CD 刻录程�"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "清空回收站(_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "将内容写入 CD(_W)"
 
@@ -6197,113 +6424,126 @@ msgstr "将内容写入 CD(_W)"
 msgid "Go To:"
 msgstr "转到："
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "您�在分开的窗�中查看这 %d 个�置�？"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "在多个窗�中查看？"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "无法打开�置"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "执行一组快速自我检查测试。"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "用给定的几何属性创建�始窗�。"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "几何属性"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "仅为显�指定的 URI 创建窗�。"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "�管�桌�(忽略首选项对�中设置的首选项)。"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "退出 Nautilus。"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "�新�动 Nautilus。"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "文件管�器"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus：--check 无法和 URI 一起使用。\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus：--check 无法和其它选项一起使用。\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus：--quit 无法和 URI 一起使用。\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus：--restart 无法和 URI 一起使用。\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus：--geometry 无法和多个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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "您确定�永久删除“%s�？"
+
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "您确定�丢弃访问历��？如果是的�，您注定���访问它的。"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "您确定想� Nautilus 清空您访问过的�置列表�？"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "清空历�"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "�置“%s��存在。您�从列表中删除这个�置的所有书签�？"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "�置“%s���存在。"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "�存在�置的书签"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "删除"
 
@@ -6336,7 +6576,6 @@ msgid "Close _All Windows"
 msgstr "关闭所有窗�(_A)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "关闭所有 Nautilus 窗�"
@@ -6359,107 +6598,118 @@ msgid "Forward"
 msgstr "�进"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "转到“回收站�文件夹"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "转到下一个访问过的�置"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "转到上一个访问过的�置"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "转到“回收站�文件夹"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "主文件夹"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "�置�(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "刷新"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "在该计算机上查找文件"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "状��(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "�止"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "�上一级"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "写入 CD"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "添加书签(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "�退(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "清空历�(_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "柜�"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "编辑书签(_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "�进(_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "主文件夹(_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "�置(_L)..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "窗格(_S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "回收站(_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "�上一级(_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -6477,31 +6727,36 @@ msgstr "查看方�..."
 msgid "File Browser: %s"
 msgstr "文件所有者："
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr "侧���之一�到错误，无法继续。很�幸，无法确定是哪一个。"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "%s 视图在�动时�到错误。"
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "%s 侧����到错误，无法继续。如果该情况�续�生，您应该关掉这个��。"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "侧���失败"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "窗格"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "包�一个窗格视图"
 
@@ -6535,147 +6790,180 @@ msgstr "添加新的(_A)..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "抱歉，无法删除图案 %s。"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "无法删除图案"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "抱歉，徽标“%s�无法被删除。"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "无法删除徽标"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "创建新徽标："
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "关键�(_K)："
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "图�(_I)："
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "选择新徽标的图�文件："
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "创建新颜色："
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "颜色�(_N)："
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "颜色值(_V)："
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "抱歉，“%s��是有效的文件�。"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "抱歉，您没有�供一个有效的文件�。"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "无法安装图案"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "抱歉，您�能替���图�。"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�是图�"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "抱歉，无法安装图案 %s。"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "选择一个�添加为图案的图�文件"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "抱歉，您必须指定一个�空的�字用于新建的颜色。"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "无法安装颜色"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "选择�添加的颜色"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "抱歉，“%s��是一个�用的图�文件�"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "文件“%s���是有效的图�。"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "选择类别："
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "�消删除(_A)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "添加新图案(_A)..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "添加新颜色(_A)..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "添加新徽标(_A)..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "�击图案以删除"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "�击颜色以删除"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "�击徽标以删除"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "图案："
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "颜色："
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "徽标："
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "删除图案(_R)..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "删除颜色(_R)..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "删除徽标(_R)..."
 
@@ -7063,34 +7351,39 @@ msgstr "_CD 刻录"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "关闭所有窗�(_A)"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "关闭窗格"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "转到“空 CD�文件夹"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "转到“回收站�文件夹"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "�置(_L)..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "[项目是]文件夹"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "图案(_P)"
@@ -7120,10 +7413,13 @@ msgid "View Failed"
 msgstr "视图显示失败"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "%s 视图在�动时�到错误。"
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr "%s 视图�到错误，无法继续。您�以选择其它视图或转到�一�置。"
 
 #: src/nautilus-window-manage-views.c:839
@@ -7131,90 +7427,119 @@ msgstr "%s 视图�到错误，无法继续。您�以选择其它视图或转
 msgid "The %s view encountered an error while starting up."
 msgstr "%s 视图在�动时�到错误。"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "和该窗�相关�的 Nautilus 应用程�。"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "内容视图"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "当�文件或文件夹的视图"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "找�到“%s�。请检查拼写��试。"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "无法添加徽标"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus 无法显示“%s�。"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "Nautilus 无法判定文件类型，因此无法显示“%s�。"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus 没有安装能够显示“%s�的查看器。"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "Nautilus 无法处� %2$s: �置，因此无法显示“%1$s�。"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "登录失败，因此无法显示“%s�。"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "访问被拒�，因此无法显示“%s�。"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "无法找到主机“%s�，因此无法显示“%s�。请检查拼写以�代��务器设置的正确性。"
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "无法显示“%s�。请检查您的代��务器设置的正确性。"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "Nautilus 无法处� %2$s: �置，因此无法显示“%1$s�。"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"因为 Nautilus 无法�系 SMB 主�览器，所有无法显示“%s�。\n"
-"请检查并确定局域网内有正在�行的 SMB �务器。"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"目�无法�索，�能因为您没有索引，或者因为您没有�行�索�务。请确认您�动了 "
+"Medusa �索�务；如果您没有索引，确认 Medusa 索引工具正在�行。"
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "目�无法�索，�能因为您没有索引，或者因为您没有�行�索�务。请确认您�动了 "
 "Medusa �索�务；如果您没有索引，确认 Medusa 索引工具正在�行。"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "无法�索"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus 无法显示“%s�。"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "无法显示�置"
 
@@ -7226,7 +7551,7 @@ msgstr "转到该书签指定的�置"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "版�所有 (C) 1999-2001 Eazel，Inc."
 
@@ -7234,14 +7559,14 @@ msgstr "版�所有 (C) 1999-2001 Eazel，Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "Wang Jian <lark@linux.net.cn>, 2001\n"
 "Sarah Smith <sarahs@redhat.com>, 2002\n"
 "Funda Wang <fundawang@linux.net.cn>, 2003"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7255,39 +7580,43 @@ msgstr "��翻阅几页"
 msgid "Go forward a number of pages"
 msgstr "��翻阅几页"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "用“%s�显示该�置"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "点"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "_CD 刻录"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "应用程� ID"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "该窗�的应用程� ID。"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "应用程�"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "和该窗�相关�的 Nautilus 应用程�。"
 
@@ -7323,6 +7652,235 @@ msgstr "网络�务器"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "在 Nautilus 文件管�器中查看您的网络�务器"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "硬件视图工厂"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "硬件查看器"
+
+#~ msgid "Hardware view"
+#~ msgstr "硬件视图"
+
+#~ msgid "View as Hardware"
+#~ msgstr "当作硬件查看"
+
+#~ msgid "hardware view"
+#~ msgstr "硬件视图"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "硬件视图所用图标的�字"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "硬件信�摘�"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K 缓存大�"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB 内存"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB 内存"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "开机时间为 %d 天 %d �时 %d 分钟"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "硬件概览"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "这里是 CPU 页的��符。"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "这里是 RAM 页的��符。"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "这里是 IDE 页的��符。"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "�制到“%s�中时�生错误。\n"
+#~ "\n"
+#~ "目标�置中没有足够空间。"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "在“%s�中创建链接时�生错误。\n"
+#~ "\n"
+#~ "目标�置中没有足够空间。"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "将文件移动到“%s�时�生错误。\n"
+#~ "\n"
+#~ "您没有该文件夹的写��。"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "将文件移动到“%s�时�生错误。\n"
+#~ "\n"
+#~ "目标�盘是�读的。"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "在“%s�中创建链接时�生错误。\n"
+#~ "\n"
+#~ "您没有该文件夹的写��。"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "在“%s�中创建链接时�生错误。\n"
+#~ "\n"
+#~ "目标�盘是�读的。"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "�制“%2$s�时�生错误“%1$s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "移动“%2$s�时�生错误“%1$s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "删除“%2$s�时�生错误“%1$s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "�制时�生错误“%s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "创建链接时�生错误“%s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "删除时�生错误“%s�。\n"
+#~ "\n"
+#~ "您�继续�？"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "�能�制到回收站"
+
+#~ 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 ""
+#~ "默认�作无法打开“%s�，原因是无法访问�于“%s��置的文件。没有�查看该文件的"
+#~ "其它�作。如果您将该文件�制到您的机器上，也许�以打开它。"
+
+#~ msgid "Searching Disks"
+#~ msgstr "正在�索�盘"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus 正在您的�盘中�索回收站文件夹。"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr "无法将 %d 个选中项目移动到回收站。您�立刻删除它们�？"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr "无法将选中项目中的 %d 个移到回收站。您�立刻删除这 %d 个项目�？"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr ""
+#~ "您拖放的文件�是一个图�文件。您�能使用本地的图�文件作为定制图标。"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "抱歉，Medusa 没有安装，�索�务��用。"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "�天将您的文件和文字内容进行一次索引，以便加快您的�索速度。目�，您的文件"
+#~ "正在被索引。"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "“%s��是有效的�置。请检查拼写��试。"
+
+#~ 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 ""
+#~ "因为 Nautilus 无法�系 SMB 主�览器，所有无法显示“%s�。\n"
+#~ "请检查并确定局域网内有正在�行的 SMB �务器。"
+
+#~ msgid "file icon"
+#~ msgstr "文件图标"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "�称(_N)："
+
 #~ msgid "Unknown"
 #~ msgstr "未知"
 
@@ -7409,8 +7967,5 @@ msgstr "在 Nautilus 文件管�器中查看您的网络�务器"
 #~ msgid "_Toolbar"
 #~ msgstr "工具�(_T)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "�置“%s���存在。"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "转到�存在的�置"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b3a59347d..09b35ba77 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 2.3.90\n"
-"POT-Creation-Date: 2003-11-10 12:15+0100\n"
+"POT-Creation-Date: 2003-12-29 12:11+0100\n"
 "PO-Revision-Date: 2003-05-30 10:22+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -40,8 +40,8 @@ msgid "bonobo_ui_init() failed."
 msgstr "bonobo_ui_init() 失敗。"
 
 #: components/emblem/Nautilus_View_emblem.server.in.in.h:1
-#: src/file-manager/fm-properties-window.c:2404
-#: src/file-manager/fm-search-list-view.c:500
+#: src/file-manager/fm-properties-window.c:2408
+#: src/file-manager/fm-search-list-view.c:507
 msgid "Emblems"
 msgstr "圖章"
 
@@ -54,187 +54,124 @@ msgid "Nautilus Emblem view"
 msgstr "Nautilus 圖章顯示模�"
 
 #: components/emblem/nautilus-emblem-view.c:203
-#, c-format
+#, fuzzy, c-format
+msgid "Couldn't remove emblem with name '%s'."
+msgstr "無法移除圖章"
+
+#: components/emblem/nautilus-emblem-view.c:204
+#, fuzzy
 msgid ""
-"Couldn't remove emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one you added yourself."
+"This is probably because the emblem is a permanent one, and not one you "
+"added yourself."
 msgstr ""
 "無法移除�稱為‘%s’的圖章。這�能因為它是內置的圖章，而�是您自行加上的。"
 
-#: components/emblem/nautilus-emblem-view.c:204
-msgid "Couldn't remove emblem"
+#: components/emblem/nautilus-emblem-view.c:205
+#, fuzzy
+msgid "Couldn't Remove Emblem"
 msgstr "無法移除圖章"
 
-#: components/emblem/nautilus-emblem-view.c:238
-#, c-format
+#: components/emblem/nautilus-emblem-view.c:239
+#, fuzzy, c-format
+msgid "Couldn't rename emblem with name '%s'."
+msgstr "無法為圖章�新命�"
+
+#: components/emblem/nautilus-emblem-view.c:240
+#, fuzzy
 msgid ""
-"Couldn't rename emblem with name '%s'.  This is probably because the emblem "
-"is a permanent one, and not one that you added yourself."
+"This is probably because the emblem is a permanent one, and not one that you "
+"added yourself."
 msgstr ""
 "無法將�稱為‘%s’的圖章�新命�。這�能因為它是內置的圖章，而�是您自行加上"
 "的。"
 
-#: components/emblem/nautilus-emblem-view.c:239
-msgid "Couldn't rename emblem"
+#: components/emblem/nautilus-emblem-view.c:241
+#, fuzzy
+msgid "Couldn't Rename Emblem"
 msgstr "無法為圖章�新命�"
 
-#: components/emblem/nautilus-emblem-view.c:258
+#: components/emblem/nautilus-emblem-view.c:260
 msgid "Rename Emblem"
 msgstr "移除圖章..."
 
-#: components/emblem/nautilus-emblem-view.c:277
+#: components/emblem/nautilus-emblem-view.c:279
 msgid "Enter a new name for the displayed emblem:"
 msgstr "請為目�顯示的圖章輸入新的�稱："
 
-#: components/emblem/nautilus-emblem-view.c:331
+#: components/emblem/nautilus-emblem-view.c:333
 msgid "Rename"
 msgstr "�新命�"
 
-#: components/emblem/nautilus-emblem-view.c:503
+#: components/emblem/nautilus-emblem-view.c:505
 msgid "Add Emblems..."
 msgstr "新增圖章..."
 
-#: components/emblem/nautilus-emblem-view.c:519
+#: components/emblem/nautilus-emblem-view.c:521
 msgid ""
 "Enter a descriptive name next to each emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "請在�個圖章�輸入�當的�稱。該�稱會在其它地方作為識別圖章之用。"
 
-#: components/emblem/nautilus-emblem-view.c:521
+#: components/emblem/nautilus-emblem-view.c:523
 msgid ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 msgstr "請在該圖章�輸入�當的�稱。該�稱會在其它地方作為識別圖章之用。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-msgid ""
-"Some of the files could not be added as emblems because they did not appear "
-"to be valid images."
+#: components/emblem/nautilus-emblem-view.c:742
+#, fuzzy
+msgid "Some of the files could not be added as emblems."
 msgstr "一部份檔案無法新增作為圖章使用，因為它們�能�是有效的圖�。"
 
-#: components/emblem/nautilus-emblem-view.c:739
-#: components/emblem/nautilus-emblem-view.c:741
-msgid "Couldn't add emblems"
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "The emblems do not appear to be valid images."
+msgstr "檔案‘%s’��是有效的圖�。"
+
+#: components/emblem/nautilus-emblem-view.c:742
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "Couldn't Add Emblems"
 msgstr "無法加入圖章"
 
-#: components/emblem/nautilus-emblem-view.c:741
-msgid ""
-"None of the files could be added as emblems because they did not appear to "
-"be valid images."
+#: components/emblem/nautilus-emblem-view.c:744
+#, fuzzy
+msgid "None of the files could be added as emblems."
 msgstr "沒有任何檔案�以新增作為圖章使用，因為它們�能�是有效的圖�。"
 
-#: components/emblem/nautilus-emblem-view.c:762
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+msgid "The emblem cannot be added."
+msgstr ""
+
+#: components/emblem/nautilus-emblem-view.c:765
 msgid "The dragged text was not a valid file location."
 msgstr "拖曳的文字�是有效的檔案�置。"
 
-#: components/emblem/nautilus-emblem-view.c:762
-#: components/emblem/nautilus-emblem-view.c:786
-#: components/emblem/nautilus-emblem-view.c:835
-msgid "Couldn't add emblem"
+#: components/emblem/nautilus-emblem-view.c:765
+#: components/emblem/nautilus-emblem-view.c:790
+#: components/emblem/nautilus-emblem-view.c:840
+#, fuzzy
+msgid "Couldn't Add Emblem"
 msgstr "無法加入圖章"
 
-#: components/emblem/nautilus-emblem-view.c:781
-#: components/emblem/nautilus-emblem-view.c:834
+#: components/emblem/nautilus-emblem-view.c:785
+#: components/emblem/nautilus-emblem-view.c:839
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "檔案‘%s’��是有效的圖�。"
 
-#: components/emblem/nautilus-emblem-view.c:784
+#: components/emblem/nautilus-emblem-view.c:788
 msgid "The dragged file does not appear to be a valid image."
 msgstr "拖曳的檔案��是有效的圖�。"
 
-#: components/emblem/nautilus-emblem-view.c:899 data/browser.xml.h:35
-#: src/nautilus-property-browser.c:1731
+#: components/emblem/nautilus-emblem-view.c:904 data/browser.xml.h:35
+#: src/nautilus-property-browser.c:1740
 msgid "Erase"
 msgstr "移除圖章"
 
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:1
-msgid "Factory for hardware view"
-msgstr "硬體顯示模�工廠"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:2
-#: components/hardware/nautilus-hardware-view.c:754
-#: data/static_bookmarks.xml.h:15
-msgid "Hardware"
-msgstr "硬體"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:3
-msgid "Hardware Viewer"
-msgstr "硬體顯示模�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:4
-msgid "Hardware view"
-msgstr "硬體顯示模�"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:5
-msgid "View as Hardware"
-msgstr "以硬體方�顯示"
-
-#: components/hardware/Nautilus_View_hardware.server.in.in.h:6
-msgid "hardware view"
-msgstr "硬體顯示模�"
-
-#: components/hardware/nautilus-hardware-view.c:172
-msgid "name of icon for the hardware view"
-msgstr "硬體顯示模�的圖示�稱"
-
-#: components/hardware/nautilus-hardware-view.c:174
-msgid "summary of hardware info"
-msgstr "硬體資訊摘�"
-
-#: components/hardware/nautilus-hardware-view.c:306
-#, c-format
-msgid ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K cache size"
-msgstr ""
-"%s CPU\n"
-"%s MHz\n"
-"%s K 快�記憶"
-
-#: components/hardware/nautilus-hardware-view.c:341
-#, c-format
-msgid "%lu GB RAM"
-msgstr "%lu GB 記憶體"
-
-#: components/hardware/nautilus-hardware-view.c:343
-#, c-format
-msgid "%lu MB RAM"
-msgstr "%lu MB 記憶體"
-
-#: components/hardware/nautilus-hardware-view.c:401
-#, c-format
-msgid "%lu GB"
-msgstr "%lu GB"
-
-#: components/hardware/nautilus-hardware-view.c:403
-#, c-format
-msgid "%lu MB"
-msgstr "%lu MB"
-
-#: components/hardware/nautilus-hardware-view.c:483
-#, c-format
-msgid "Uptime is %d days, %d hours, %d minutes"
-msgstr "系統連續�作了 %d 日 %d 時 %d 分"
-
-#. set up the title
-#: components/hardware/nautilus-hardware-view.c:509
-msgid "Hardware Overview"
-msgstr "硬體總覽"
-
-#: components/hardware/nautilus-hardware-view.c:632
-msgid "This is a placeholder for the CPU page."
-msgstr "這裡�留作日後顯示 CPU 資訊之用。"
-
-#: components/hardware/nautilus-hardware-view.c:657
-msgid "This is a placeholder for the RAM page."
-msgstr "這裡�留作日後顯示記憶體資訊之用。"
-
-#: components/hardware/nautilus-hardware-view.c:682
-msgid "This is a placeholder for the IDE page."
-msgstr "這裡�留作日後顯示 IDE 資訊之用。"
-
 #: components/history/Nautilus_View_history.server.in.in.h:1
 msgid "History"
 msgstr "�覽紀錄"
@@ -902,6 +839,10 @@ msgstr "GNOME.org"
 msgid "GNU.org"
 msgstr "GNU.org"
 
+#: data/static_bookmarks.xml.h:15
+msgid "Hardware"
+msgstr "硬體"
+
 #: data/static_bookmarks.xml.h:16
 msgid "International"
 msgstr "國際"
@@ -1184,29 +1125,19 @@ msgid "Desktop trash icon name"
 msgstr "桌�中垃圾桶圖示的�稱"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
-msgid ""
-"Directories 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 massive directories. A negative value denotes no limit. The "
-"limit is approximate due to the reading of directories chunk-wise."
-msgstr ""
-"如果�些目錄中的檔案/副目錄數目太多，實際上顯示的數目會減少至大約這個數字。這"
-"樣�的�義是�� Nautilus 因載入�大的目錄而�正常地��。負數表示沒有�制。"
-"這個數字�是大約的數字，因為載入目錄時，�次讀�資料都是讀�多個項目的。"
-
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Enable 'special' flags in file preferences dialog"
 msgstr "在檔案�好設定中顯示「特殊�的旗標"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#, fuzzy
 msgid ""
-"Filename for the default directory background. Only used if background_set "
-"is true."
+"Filename for the default folder background. Only used if background_set is "
+"true."
 msgstr ""
 "�設主視窗背景圖案的檔案�稱。�有在設定了 background_set �項的時候，本�項"
 "方會生效。"
 
-#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -1214,6 +1145,18 @@ msgstr ""
 "�設��窗格背景圖案的檔案�稱。�有在設定了 side_pane_background_set �項的"
 "時候，本�項方會生效。"
 
+#: libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#, fuzzy
+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 "
+"massive folders. A negative value denotes no limit. The limit is approximate "
+"due to the reading of folders chunk-wise."
+msgstr ""
+"如果�些目錄中的檔案/副目錄數目太多，實際上顯示的數目會減少至大約這個數字。這"
+"樣�的�義是�� Nautilus 因載入�大的目錄而�正常地��。負數表示沒有�制。"
+"這個數字�是大約的數字，因為載入目錄時，�次讀�資料都是讀�多個項目的。"
+
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Hide default bookmarks in the bookmark menu"
 msgstr "在書籤�單中隱��設的書籤"
@@ -1223,9 +1166,10 @@ msgid "Home icon visible on desktop"
 msgstr "在桌�中顯示個人目錄圖示"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#, fuzzy
 msgid ""
-"If set to true, Nautilus will only show directories in the tree side pane. "
-"Otherwise it will show both directories and files."
+"If set to true, Nautilus will only show folders in the tree side pane. "
+"Otherwise it will show both folders and files."
 msgstr ""
 "如�用本�項，Nautilus 目錄樹��窗格中會�顯示目錄，�則會�時顯示目錄和檔"
 "案。"
@@ -1254,9 +1198,10 @@ msgid ""
 msgstr "如�用本�項，Nautilus 會讓您在檔案�好設定中修改一些較罕用的設定。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus shows directories prior to showing files in "
-"the icon and list views."
+"If set to true, then Nautilus shows folders prior to showing files in the "
+"icon and list views."
 msgstr ""
 "如�用本�項，Nautilus 會在圖示�清單顯示模�中先顯示目錄，然後�顯示檔案。"
 
@@ -1292,8 +1237,9 @@ msgid ""
 msgstr "如�用本�項，Nautilus �會在書籤�單中顯示使用者的個人書籤。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#, fuzzy
 msgid ""
-"If set to true, then Nautilus will use the user's home directory as the "
+"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 ""
 "如�用本�項，Nautilus 會以使用者的個人目錄作為桌�，�則會使用 ~/Desktop 目"
@@ -1309,9 +1255,10 @@ msgstr ""
 "是波浪符號 (~) 的�會作為備份檔處�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#, fuzzy
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
-"files are either dotfiles or are listed in the directory's .hidden file."
+"files are either dotfiles or are listed in the folder's .hidden file."
 msgstr ""
 "如�用本�項，所有隱�檔案都會在檔案總管中顯示出來。所謂隱�檔案�是任何第一"
 "個字元為一點‘.’的檔案或者在�個目錄的 .hidden 檔案中所列出的檔案。"
@@ -1332,8 +1279,9 @@ msgid ""
 msgstr "如�用本�項，則桌�上會有一個圖示連�至垃圾桶。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#, fuzzy
 msgid ""
-"If this is set to true, an icon linking to the home directory will be put on "
+"If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "如�用本�項，則桌�上會有一個圖示連�至個人目錄。"
 
@@ -1364,7 +1312,8 @@ msgstr ""
 "列，本來是�增排列的，�在會變��減。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
-msgid "If true, icons will be layed out tighter by default in new windows."
+#, fuzzy
+msgid "If true, icons will be laid out tighter by default in new windows."
 msgstr "如�用本�項，新的視窗會使用較緊密的方�排列圖示。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
@@ -1390,7 +1339,8 @@ msgid "List of possible captions on icons"
 msgstr "圖示下方�以出�的標題"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
-msgid "Maximum handled files in a directory"
+#, fuzzy
+msgid "Maximum handled files in a folder"
 msgstr "一個目錄�容�的檔案數目上�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
@@ -1410,11 +1360,13 @@ msgid "Nautilus handles drawing the desktop"
 msgstr "Nautilus 會繪畫桌�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
-msgid "Nautilus uses the users home directory as the desktop"
+#, fuzzy
+msgid "Nautilus uses the users home folder as the desktop"
 msgstr "Nautilus 會使用用戶的個人目錄作為桌�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
-msgid "Only show directories in the tree sidebar"
+#, fuzzy
+msgid "Only show folders in the tree sidebar"
 msgstr "在目錄樹��窗格中�顯示目錄"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
@@ -1435,7 +1387,8 @@ msgid "Reverse sort order in new windows"
 msgstr "在新的視窗中以相�次�排列項目"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
-msgid "Show directories first in windows"
+#, fuzzy
+msgid "Show folders first in windows"
 msgstr "在視窗中先顯示目錄"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
@@ -1470,10 +1423,11 @@ msgstr ""
 "為“never�則一定�會播放。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:71
+#, fuzzy
 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 "
-"directory is on a remote server. If set to \"local_only\" then only show "
+"folder is on a remote server. If set to \"local_only\" then only show "
 "previews for local filesystems. If set to \"never\" then never bother to "
 "read preview data."
 msgstr ""
@@ -1482,22 +1436,24 @@ msgstr ""
 "為“never�則一定�會顯示�覽圖示。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:72
+#, fuzzy
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
-"\"always\" then always thumbnail, even if the directory is on a remote "
-"server. 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."
+"\"always\" then always thumbnail, even if the folder is on a remote server. "
+"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 ""
 "當顯示代表圖�的圖示時，決定是�使用圖�的縮圖來代替。如果設定為“always�，�"
 "使是�端檔案�然一定會顯示縮圖。如果設定為“local_only�則�會顯示本機檔案的縮"
 "圖。如果設定為“never�則一定�會顯示縮圖，�會用一般的圖示代替。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:73
+#, fuzzy
 msgid ""
-"Speed tradeoff for when to show the number of items in a directory. If set "
-"to \"always\" then always show item counts, even if the directory is on a "
-"remote server. If set to \"local_only\" then only show counts for local "
+"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 "
 "filesystems. If set to \"never\" then never bother to compute item counts."
 msgstr ""
 "決定是�顯示目錄中副目錄或檔案的數目。如果設定為“always�，�使是�端目錄�然"
@@ -1505,17 +1461,19 @@ msgstr ""
 "為“never�則一定�會計算數目。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:74
+#, fuzzy
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
-"\", \"size\", \"type\", \"modification_date\", \"emblems\"."
+"\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 msgstr ""
 "在圖示顯示模�中，�項目的�設排列方�。�接�的值為\n"
 "“name��“size��“type��“modification_date��“emblems�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:75
+#, fuzzy
 msgid ""
-"The default sort-order for the item in the list view. Possible values are "
-"name, size, type, and modification_date."
+"The default sort-order for the items in the list view. Possible values are "
+"\"name\", \"size\", \"type\", and \"modification_date\"."
 msgstr ""
 "在清單顯示模�中，�項目的�設排列方�。�接�的值為\n"
 "name�size�type�modification_date�emblems。"
@@ -1557,7 +1515,8 @@ msgid "Use manual layout in new windows"
 msgstr "在新的視窗中使用自�的圖示排列方�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:84
-msgid "Use tighter Layout in new windows"
+#, fuzzy
+msgid "Use tighter layout in new windows"
 msgstr "在新的視窗中使用較緊密的排列方�"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:85
@@ -1586,7 +1545,8 @@ msgstr ""
 "表的顯示模�。�接�的值為“list_view��“icon_view�。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:88
-msgid "When to show number of items in a directory"
+#, fuzzy
+msgid "When to show number of items in a folder"
 msgstr "何時會在目錄中顯示有多少個項目"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:89
@@ -1598,7 +1558,8 @@ msgid "When to show thumbnails of image files"
 msgstr "何時會顯示相應於圖�的縮圖"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:91
-msgid "Whether a custom default directory background has been set."
+#, fuzzy
+msgid "Whether a custom default folder background has been set."
 msgstr "是�自行設定了�設的主視窗背景。"
 
 #: libnautilus-private/apps_nautilus_preferences.schemas.in.h:92
@@ -1755,67 +1716,81 @@ msgstr "�設"
 msgid "on the desktop"
 msgstr "在桌�上"
 
-#: libnautilus-private/nautilus-desktop-link-monitor.c:110
+#: libnautilus-private/nautilus-desktop-link-monitor.c:105
+#, fuzzy
+msgid "You cannot delete a volume icon."
+msgstr "��刪除檔案系統"
+
+#: libnautilus-private/nautilus-desktop-link-monitor.c:106
+#, fuzzy
 msgid ""
-"You cannot delete a volume icon. If you want to eject the volume, please use "
-"Eject in the right-click menu of the volume."
+"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:113
-msgid "Can't delete volume"
+#: libnautilus-private/nautilus-desktop-link-monitor.c:108
+#, fuzzy
+msgid "Can't Delete Volume"
 msgstr "��刪除檔案系統"
 
 #: libnautilus-private/nautilus-desktop-link.c:169
-#: libnautilus-private/nautilus-file.c:5713
+#: libnautilus-private/nautilus-file.c:5739
 #: libnautilus-private/nautilus-global-preferences.c:555
-#: libnautilus-private/nautilus-trash-directory.c:376
+#: libnautilus-private/nautilus-trash-directory.c:343
 msgid "Trash"
 msgstr "垃圾桶"
 
-#: libnautilus-private/nautilus-dnd.c:617
+#: libnautilus-private/nautilus-dnd.c:615
 msgid "_Move here"
 msgstr "移至此處(_M)"
 
-#: libnautilus-private/nautilus-dnd.c:622
+#: libnautilus-private/nautilus-dnd.c:620
 msgid "_Copy here"
 msgstr "複製至此處(_C)"
 
-#: libnautilus-private/nautilus-dnd.c:627
+#: libnautilus-private/nautilus-dnd.c:625
 msgid "_Link here"
 msgstr "連�至此處(_L)"
 
-#: libnautilus-private/nautilus-dnd.c:632
+#: libnautilus-private/nautilus-dnd.c:630
 msgid "Set as _Background"
 msgstr "設定為背景圖案(_B)"
 
-#: libnautilus-private/nautilus-dnd.c:641
-#: libnautilus-private/nautilus-dnd.c:696
+#: libnautilus-private/nautilus-dnd.c:639
+#: libnautilus-private/nautilus-dnd.c:694
 msgid "Cancel"
 msgstr "�消"
 
-#: libnautilus-private/nautilus-dnd.c:682
+#: libnautilus-private/nautilus-dnd.c:680
 msgid "Set as background for _all folders"
 msgstr "設定為所有資料夾的背景圖案(_A)"
 
-#: libnautilus-private/nautilus-dnd.c:687
+#: libnautilus-private/nautilus-dnd.c:685
 msgid "Set as background for _this folder"
 msgstr "設定為本資料夾的背景圖案(_T)"
 
 #: 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 ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:198
 msgid "Sorry, but you must specify a non-blank keyword for the new emblem."
 msgstr "抱歉，新的圖章的�稱��以是空白字串。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:198
-#: libnautilus-private/nautilus-emblem-utils.c:202
-#: libnautilus-private/nautilus-emblem-utils.c:213
-#: libnautilus-private/nautilus-emblem-utils.c:256
-#: libnautilus-private/nautilus-emblem-utils.c:271
-msgid "Couldn't install emblem"
+#: 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
+#, fuzzy
+msgid "Couldn't Install Emblem"
 msgstr "無法安�圖章"
 
-#: libnautilus-private/nautilus-emblem-utils.c:201
+#: libnautilus-private/nautilus-emblem-utils.c:203
 msgid ""
 "Sorry, but emblem keywords can only contain letters, spaces and numbers."
 msgstr "抱歉，圖章的�稱��包括字��空格�數字。"
@@ -1824,18 +1799,24 @@ msgstr "抱歉，圖章的�稱��包括字��空格�數字。"
 #. * what a keyword is, and people should be passing a unique
 #. * keyword to us anyway
 #.
-#: libnautilus-private/nautilus-emblem-utils.c:211
-#, c-format
-msgid ""
-"Sorry, but there is already an emblem named \"%s\".  Please choose a "
-"different name for it."
+#: libnautilus-private/nautilus-emblem-utils.c:213
+#, fuzzy, c-format
+msgid "Sorry, but there is already an emblem named \"%s\"."
 msgstr "抱歉，稱為“%s�的圖章已經存在。請使用其它�稱。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:255
+#: libnautilus-private/nautilus-emblem-utils.c:214
+msgid "Please choose a different emblem name."
+msgstr ""
+
+#: libnautilus-private/nautilus-emblem-utils.c:215
+msgid "Couldn't install emblem"
+msgstr "無法安�圖章"
+
+#: libnautilus-private/nautilus-emblem-utils.c:258
 msgid "Sorry, unable to save custom emblem."
 msgstr "抱歉，無法儲存自�的圖章。"
 
-#: libnautilus-private/nautilus-emblem-utils.c:270
+#: libnautilus-private/nautilus-emblem-utils.c:275
 msgid "Sorry, unable to save custom emblem name."
 msgstr "抱歉，無法儲存自�圖章的�稱。"
 
@@ -1854,22 +1835,28 @@ msgstr "從："
 msgid "To:"
 msgstr "至："
 
-#: libnautilus-private/nautilus-file-operations.c:545
-#, c-format
-msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:549
+#: libnautilus-private/nautilus-file-operations.c:597
+#: libnautilus-private/nautilus-file-operations.c:612
+msgid "Error while moving."
+msgstr "移動時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:550
+#, fuzzy, c-format
+msgid "\"%s\" cannot be moved because it is on a read-only disk."
 msgstr ""
 "移動時發生錯誤。\n"
 "\n"
 "無法移動“%s�，因為它存放於唯讀的�碟內。"
 
-#: libnautilus-private/nautilus-file-operations.c:556
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:560
+#: libnautilus-private/nautilus-file-operations.c:566
+msgid "Error while deleting."
+msgstr "刪除時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:561
+#, fuzzy, c-format
 msgid ""
-"Error while deleting.\n"
-"\n"
 "\"%s\" cannot be deleted because you do not have permissions to modify its "
 "parent folder."
 msgstr ""
@@ -1877,22 +1864,17 @@ msgstr ""
 "\n"
 "無法刪除“%s�，因為沒有權�修改它或上一層的資料夾。"
 
-#: libnautilus-private/nautilus-file-operations.c:562
-#, c-format
-msgid ""
-"Error while deleting.\n"
-"\n"
-"\"%s\" cannot be deleted because it is on a read-only disk."
+#: libnautilus-private/nautilus-file-operations.c:567
+#, fuzzy, c-format
+msgid "\"%s\" cannot be deleted because it is on a read-only disk."
 msgstr ""
 "刪除時發生錯誤。\n"
 "\n"
 "無法刪除“%s�，因為它存放於唯讀的�碟內。"
 
-#: libnautilus-private/nautilus-file-operations.c:593
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:598
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
 "\"%s\" cannot be moved because you do not have permissions to change it or "
 "its parent folder."
 msgstr ""
@@ -1900,319 +1882,269 @@ msgstr ""
 "\n"
 "無法移動“%s�，因為沒有權�修改它或上一層的資料夾。"
 
-#: libnautilus-private/nautilus-file-operations.c:598
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:602
+#, fuzzy
+msgid "Error while moving. "
+msgstr "移動時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:603
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved because it or its parent folder are contained in the "
+"Cannot move \"%s\" because it or its parent folder are contained in the "
 "destination."
 msgstr ""
 "移動時發生錯誤。\n"
 "\n"
 "無法移動“%s�，因為目的地根本是它的副目錄或是它本身。"
 
-#: libnautilus-private/nautilus-file-operations.c:608
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:613
+#, fuzzy, c-format
 msgid ""
-"Error while moving.\n"
-"\n"
-"\"%s\" cannot be moved to the Trash because you do not have permissions to "
+"Cannot move \"%s\" to the trash because you do not have permissions to "
 "change it or its parent folder."
 msgstr ""
 "移動時發生錯誤。\n"
 "\n"
 "無法將“%s�丟進垃圾桶，因為沒有權�修改它或上一層的資料夾。"
 
-#: libnautilus-private/nautilus-file-operations.c:631
-#, c-format
-msgid ""
-"Error while copying.\n"
-"\n"
-"\"%s\" cannot be copied because you do not have permissions to read it."
+#: libnautilus-private/nautilus-file-operations.c:635
+msgid "Error while copying."
+msgstr "複製時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:636
+#, fuzzy, c-format
+msgid "\"%s\" cannot be copied because you do not have permissions to read it."
 msgstr ""
 "複製時發生錯誤。\n"
 "\n"
 "無法複製“%s�，因為沒有權�讀�它。"
 
-#: libnautilus-private/nautilus-file-operations.c:652
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"複製至“%s�時發生錯誤。\n"
-"\n"
-"目的地空間�足。"
+#: libnautilus-private/nautilus-file-operations.c:656
+#: libnautilus-private/nautilus-file-operations.c:677
+#: libnautilus-private/nautilus-file-operations.c:681
+#, fuzzy, c-format
+msgid "Error while copying to \"%s\"."
+msgstr "複製時發生錯誤。"
 
 #: libnautilus-private/nautilus-file-operations.c:657
-#, c-format
-msgid ""
-"Error while moving to \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:662
+#: libnautilus-private/nautilus-file-operations.c:666
+#, fuzzy
+msgid "There is not enough space on the destination."
 msgstr ""
 "移動至“%s�時發生錯誤。\n"
 "\n"
 "目的地空間�足。"
 
 #: libnautilus-private/nautilus-file-operations.c:661
-#, c-format
-msgid ""
-"Error while creating link in \"%s\".\n"
-"\n"
-"There is not enough space on the destination."
-msgstr ""
-"在“%s�建立��時發生錯誤。\n"
-"\n"
-"目的地空間�足。"
+#, fuzzy, c-format
+msgid "Error while moving to \"%s\"."
+msgstr "移動時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:673
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
+#: libnautilus-private/nautilus-file-operations.c:665
+#, fuzzy, c-format
+msgid "Error while creating link in \"%s\"."
+msgstr "連�時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:678
+#: libnautilus-private/nautilus-file-operations.c:689
+#: libnautilus-private/nautilus-file-operations.c:700
+#, fuzzy
+msgid "You do not have permissions to write to this folder."
 msgstr ""
 "複製至“%s�時發生錯誤。\n"
 "\n"
 "沒有寫入此資料夾的權�。"
 
-#: libnautilus-private/nautilus-file-operations.c:677
-#, c-format
-msgid ""
-"Error while copying to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
+#: libnautilus-private/nautilus-file-operations.c:682
+#: libnautilus-private/nautilus-file-operations.c:693
+#: libnautilus-private/nautilus-file-operations.c:704
+#, fuzzy
+msgid "The destination disk is read-only."
 msgstr ""
 "複製至“%s�時發生錯誤。\n"
 "\n"
 "目的地是唯讀的�碟。"
 
-#: libnautilus-private/nautilus-file-operations.c:684
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"移動項目至“%s�時發生錯誤。\n"
-"\n"
-"沒有寫入此資料夾的權�。"
-
 #: libnautilus-private/nautilus-file-operations.c:688
-#, c-format
-msgid ""
-"Error while moving items to \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"移動項目至“%s�時發生錯誤。\n"
-"\n"
-"目的地是唯讀的�碟。"
-
-#: libnautilus-private/nautilus-file-operations.c:695
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"You do not have permissions to write to this folder."
-msgstr ""
-"在“%s�裡建立��時發生錯誤。\n"
-"\n"
-"沒有寫入此資料夾的權�。"
+#: libnautilus-private/nautilus-file-operations.c:692
+#, fuzzy, c-format
+msgid "Error while moving items to \"%s\"."
+msgstr "移動時發生錯誤。"
 
 #: libnautilus-private/nautilus-file-operations.c:699
-#, c-format
-msgid ""
-"Error while creating links in \"%s\".\n"
-"\n"
-"The destination disk is read-only."
-msgstr ""
-"在“%s�裡建立��時發生錯誤。\n"
-"\n"
-"目的地是唯讀的�碟。"
-
-#: libnautilus-private/nautilus-file-operations.c:727
-#, c-format
-msgid ""
-"Error \"%s\" while copying \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"複製“%2$s�時發生錯誤“%1$s�。\n"
-"\n"
-"是��繼續？"
+#: libnautilus-private/nautilus-file-operations.c:703
+#, fuzzy, c-format
+msgid "Error while creating links in \"%s\"."
+msgstr "連�時發生錯誤。"
 
 #: libnautilus-private/nautilus-file-operations.c:731
-#, c-format
-msgid ""
-"Error \"%s\" while moving \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying \"%s\"."
+msgstr "複製時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:732
+#: libnautilus-private/nautilus-file-operations.c:736
+#: libnautilus-private/nautilus-file-operations.c:740
+#: libnautilus-private/nautilus-file-operations.c:746
+#: libnautilus-private/nautilus-file-operations.c:761
+#: libnautilus-private/nautilus-file-operations.c:765
+#: libnautilus-private/nautilus-file-operations.c:769
+#: libnautilus-private/nautilus-file-operations.c:775
+#, fuzzy
+msgid "Would you like to continue?"
 msgstr ""
-"移動“%2$s�時發生錯誤“%1$s�。\n"
+"移動時發生錯誤“%s�。\n"
 "\n"
 "是��繼續？"
 
 #: libnautilus-private/nautilus-file-operations.c:735
-#, c-format
-msgid ""
-"Error \"%s\" while creating a link to \"%s\".\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"建立��至“%2$s�時發生錯誤“%1$s�。\n"
-"\n"
-"是��繼續？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving \"%s\"."
+msgstr "移動時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:741
-#, c-format
-msgid ""
-"Error \"%s\" while deleting \"%s\".\n"
-"\n"
-"Would you like to continue?"
+#: libnautilus-private/nautilus-file-operations.c:739
+#, fuzzy, c-format
+msgid "Error \"%s\" while creating a link to \"%s\"."
 msgstr ""
-"刪除“%2$s�時發生錯誤“%1$s�。\n"
+"建立��至“%2$s�時發生錯誤“%1$s�。\n"
 "\n"
 "是��繼續？"
 
-#: libnautilus-private/nautilus-file-operations.c:756
-#, c-format
-msgid ""
-"Error \"%s\" while copying.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"複製時發生錯誤“%s�。\n"
-"\n"
-"是��繼續？"
+#: libnautilus-private/nautilus-file-operations.c:745
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting \"%s\"."
+msgstr "刪除時發生錯誤。"
 
 #: libnautilus-private/nautilus-file-operations.c:760
-#, c-format
-msgid ""
-"Error \"%s\" while moving.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"移動時發生錯誤“%s�。\n"
-"\n"
-"是��繼續？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while copying."
+msgstr "複製時發生錯誤。"
 
 #: libnautilus-private/nautilus-file-operations.c:764
-#, c-format
-msgid ""
-"Error \"%s\" while linking.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"建立��時發生錯誤“%s�。\n"
-"\n"
-"是��繼續？"
+#, fuzzy, c-format
+msgid "Error \"%s\" while moving."
+msgstr "移動時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:770
-#, c-format
-msgid ""
-"Error \"%s\" while deleting.\n"
-"\n"
-"Would you like to continue?"
-msgstr ""
-"刪除時發生錯誤“%s�。\n"
-"\n"
-"是��繼續？"
+#: libnautilus-private/nautilus-file-operations.c:768
+#, fuzzy, c-format
+msgid "Error \"%s\" while linking."
+msgstr "連�時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:895
-msgid "Error while copying."
+#: libnautilus-private/nautilus-file-operations.c:774
+#, fuzzy, c-format
+msgid "Error \"%s\" while deleting."
+msgstr "刪除時發生錯誤。"
+
+#: libnautilus-private/nautilus-file-operations.c:900
+#, fuzzy
+msgid "Error While Copying"
 msgstr "複製時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:898
-msgid "Error while moving."
+#: libnautilus-private/nautilus-file-operations.c:903
+#, fuzzy
+msgid "Error While Moving"
 msgstr "移動時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:901
-msgid "Error while linking."
+#: libnautilus-private/nautilus-file-operations.c:906
+#, fuzzy
+msgid "Error While Linking"
 msgstr "連�時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:906
-msgid "Error while deleting."
+#: libnautilus-private/nautilus-file-operations.c:911
+#, fuzzy
+msgid "Error While Deleting"
 msgstr "刪除時發生錯誤。"
 
-#: libnautilus-private/nautilus-file-operations.c:932
-#: libnautilus-private/nautilus-file-operations.c:952
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Skip"
+#: libnautilus-private/nautilus-file-operations.c:938
+#: libnautilus-private/nautilus-file-operations.c:959
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Skip"
 msgstr "略�"
 
-#: libnautilus-private/nautilus-file-operations.c:952
-msgid "Retry"
+#: libnautilus-private/nautilus-file-operations.c:959
+#, fuzzy
+msgid "_Retry"
 msgstr "�試"
 
-#: libnautilus-private/nautilus-file-operations.c:1017
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1025
+#, fuzzy, c-format
+msgid "Could not move \"%s\" to the new location."
+msgstr "無法完�指定的行動。"
+
+#: libnautilus-private/nautilus-file-operations.c:1028
+#, fuzzy
 msgid ""
-"\"%s\" could not be moved to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to move \"%s\", rename it and try again."
+"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."
 msgstr ""
 "無法移動“%s�到新的�置，因為此�稱已經被一個��刪除或�代的特別項目使用"
 "了。\n"
 "\n"
 "如果�然�移動“%s�，請將它�新命�並�試一次。"
 
-#: libnautilus-private/nautilus-file-operations.c:1023
-#, c-format
+#: libnautilus-private/nautilus-file-operations.c:1032
+#, fuzzy, c-format
+msgid "Could not copy \"%s\" to the new location."
+msgstr "無法完�指定的行動。"
+
+#: libnautilus-private/nautilus-file-operations.c:1035
+#, fuzzy
 msgid ""
-"\"%s\" could not be copied to the new location, because its name is already "
-"used for a special item that cannot be removed or replaced.\n"
-"\n"
-"If you still want to copy \"%s\", rename it and try again."
+"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."
 msgstr ""
 "無法複製“%s�到新的�置，因為此�稱已經被一個��刪除或�代的特別項目使用"
 "了。\n"
 "\n"
 "如果�然�複製“%s�，請將它�新命�並�試一次。"
 
-#: libnautilus-private/nautilus-file-operations.c:1031
-msgid "Unable to replace file."
+#: libnautilus-private/nautilus-file-operations.c:1041
+#, fuzzy
+msgid "Unable to Replace File"
 msgstr "無法�代檔案。"
 
-#: libnautilus-private/nautilus-file-operations.c:1044
-#, c-format
-msgid ""
-"File \"%s\" already exists.\n"
-"\n"
-"Would you like to replace it?"
+#: libnautilus-private/nautilus-file-operations.c:1054
+#, fuzzy, c-format
+msgid "The file \"%s\" already exists.  Would you like to replace it?"
 msgstr ""
 "檔案“%s�已經存在。\n"
 "\n"
 "��代它嗎？"
 
-#: libnautilus-private/nautilus-file-operations.c:1055
-#: libnautilus-private/nautilus-file-operations.c:1073
-msgid "Conflict while copying"
+#: libnautilus-private/nautilus-file-operations.c:1067
+#: libnautilus-private/nautilus-file-operations.c:1086
+msgid "If you replace an existing file, its contents will be overwritten."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1068
+#: libnautilus-private/nautilus-file-operations.c:1087
+#, fuzzy
+msgid "Conflict While Copying"
 msgstr "複製時發生��"
 
-#: libnautilus-private/nautilus-file-operations.c:1056
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace"
+#: libnautilus-private/nautilus-file-operations.c:1069
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "_Replace"
 msgstr "�代"
 
-#: libnautilus-private/nautilus-file-operations.c:1074
-msgid "Replace All"
+#: libnautilus-private/nautilus-file-operations.c:1088
+#, fuzzy
+msgid "Replace _All"
 msgstr "全部�代"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1132
-#: libnautilus-private/nautilus-file.c:4534
+#: libnautilus-private/nautilus-file-operations.c:1146
+#: libnautilus-private/nautilus-file.c:4539
 #, c-format
 msgid "link to %s"
 msgstr "%s的��"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1136
+#: libnautilus-private/nautilus-file-operations.c:1150
 #, c-format
 msgid "another link to %s"
 msgstr "�一個%s的��"
@@ -2221,25 +2153,25 @@ msgstr "�一個%s的��"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: libnautilus-private/nautilus-file-operations.c:1152
+#: libnautilus-private/nautilus-file-operations.c:1166
 #, c-format
 msgid "%dst link to %s"
 msgstr "第 %d 個連至%s的��"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1156
+#: libnautilus-private/nautilus-file-operations.c:1170
 #, c-format
 msgid "%dnd link to %s"
 msgstr "第 %d 個連至%s的��"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1160
+#: libnautilus-private/nautilus-file-operations.c:1174
 #, c-format
 msgid "%drd link to %s"
 msgstr "第 %d 個連至%s的��"
 
 #. appended to new link file
-#: libnautilus-private/nautilus-file-operations.c:1164
+#: libnautilus-private/nautilus-file-operations.c:1178
 #, c-format
 msgid "%dth link to %s"
 msgstr "第 %d 個連至%s的��"
@@ -2249,561 +2181,600 @@ msgstr "第 %d 個連至%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:1185
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (copy)"
 msgstr " (copy)"
 
 #. localizers: tag used to detect the second copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1187
-#: libnautilus-private/nautilus-file-operations.c:2365
+#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:2589
 msgid " (another copy)"
 msgstr " (another copy)"
 
 #. localizers: tag used to detect the x11th copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1190
-#: libnautilus-private/nautilus-file-operations.c:1192
-#: libnautilus-private/nautilus-file-operations.c:1194
 #: libnautilus-private/nautilus-file-operations.c:1204
+#: libnautilus-private/nautilus-file-operations.c:1206
+#: libnautilus-private/nautilus-file-operations.c:1208
+#: libnautilus-private/nautilus-file-operations.c:1218
 msgid "th copy)"
 msgstr "th copy)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1197
+#: libnautilus-private/nautilus-file-operations.c:1211
 msgid "st copy)"
 msgstr "st copy)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1199
+#: libnautilus-private/nautilus-file-operations.c:1213
 msgid "nd copy)"
 msgstr "nd copy)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: libnautilus-private/nautilus-file-operations.c:1201
+#: libnautilus-private/nautilus-file-operations.c:1215
 msgid "rd copy)"
 msgstr "rd copy)"
 
 #. localizers: appended to first file copy
-#: libnautilus-private/nautilus-file-operations.c:1218
+#: libnautilus-private/nautilus-file-operations.c:1232
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copy)%s"
 
 #. localizers: appended to second file copy
-#: libnautilus-private/nautilus-file-operations.c:1220
+#: libnautilus-private/nautilus-file-operations.c:1234
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (another copy)%s"
 
 #. localizers: appended to x11th file copy
-#: libnautilus-private/nautilus-file-operations.c:1223
-#: libnautilus-private/nautilus-file-operations.c:1225
-#: libnautilus-private/nautilus-file-operations.c:1227
-#: libnautilus-private/nautilus-file-operations.c:1236
+#: libnautilus-private/nautilus-file-operations.c:1237
+#: libnautilus-private/nautilus-file-operations.c:1239
+#: libnautilus-private/nautilus-file-operations.c:1241
+#: libnautilus-private/nautilus-file-operations.c:1250
 #, c-format
 msgid "%s (%dth copy)%s"
 msgstr "%s (%dth copy)%s"
 
 #. localizers: appended to x1st file copy
-#: libnautilus-private/nautilus-file-operations.c:1230
+#: libnautilus-private/nautilus-file-operations.c:1244
 #, c-format
 msgid "%s (%dst copy)%s"
 msgstr "%s (%dst copy)%s"
 
 #. localizers: appended to x2nd file copy
-#: libnautilus-private/nautilus-file-operations.c:1232
+#: libnautilus-private/nautilus-file-operations.c:1246
 #, c-format
 msgid "%s (%dnd copy)%s"
 msgstr "%s (%dnd copy)%s"
 
 #. localizers: appended to x3rd file copy
-#: libnautilus-private/nautilus-file-operations.c:1234
+#: libnautilus-private/nautilus-file-operations.c:1248
 #, c-format
 msgid "%s (%drd copy)%s"
 msgstr "%s (%drd copy)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1334
+#: libnautilus-private/nautilus-file-operations.c:1348
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: libnautilus-private/nautilus-file-operations.c:1342
+#: libnautilus-private/nautilus-file-operations.c:1356
 #, c-format
 msgid " (%d"
 msgstr " (%d"
 
-#: libnautilus-private/nautilus-file-operations.c:1527
-#: libnautilus-private/nautilus-file-operations.c:2102
+#: libnautilus-private/nautilus-file-operations.c:1541
+#: libnautilus-private/nautilus-file-operations.c:2123
+#: libnautilus-private/nautilus-file-operations.c:2284
 #, c-format
 msgid "Unknown GnomeVFSXferProgressStatus %d"
 msgstr "�明的 GnomeVFSXferProgressStatus %d"
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1854
+#: libnautilus-private/nautilus-file-operations.c:1868
 msgid "Moving files to the Trash"
 msgstr "將檔案丟進垃圾桶"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1856
+#: libnautilus-private/nautilus-file-operations.c:1870
 msgid "Files thrown out:"
 msgstr "已丟棄的檔案："
 
 #. localizers: label prepended to the name of the current file moved
-#: libnautilus-private/nautilus-file-operations.c:1858
-#: libnautilus-private/nautilus-file-operations.c:1869
+#: libnautilus-private/nautilus-file-operations.c:1872
+#: libnautilus-private/nautilus-file-operations.c:1883
 msgid "Moving"
 msgstr "正在移動"
 
-#: libnautilus-private/nautilus-file-operations.c:1859
+#: libnautilus-private/nautilus-file-operations.c:1873
 msgid "Preparing to Move to Trash..."
 msgstr "準備移入垃圾桶..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1865
+#: libnautilus-private/nautilus-file-operations.c:1879
 msgid "Moving files"
 msgstr "正在移動檔案"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1867
+#: libnautilus-private/nautilus-file-operations.c:1881
 msgid "Files moved:"
 msgstr "已移動的檔案："
 
-#: libnautilus-private/nautilus-file-operations.c:1870
+#: libnautilus-private/nautilus-file-operations.c:1884
 msgid "Preparing To Move..."
 msgstr "準備移動..."
 
-#: libnautilus-private/nautilus-file-operations.c:1871
+#: libnautilus-private/nautilus-file-operations.c:1885
 msgid "Finishing Move..."
 msgstr "完�移動..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1879
+#: libnautilus-private/nautilus-file-operations.c:1893
 msgid "Creating links to files"
 msgstr "正在建立檔案的��"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1881
+#: libnautilus-private/nautilus-file-operations.c:1895
 msgid "Files linked:"
 msgstr "已連�的檔案："
 
 #. localizers: label prepended to the name of the current file linked
-#: libnautilus-private/nautilus-file-operations.c:1883
+#: libnautilus-private/nautilus-file-operations.c:1897
 msgid "Linking"
 msgstr "正在連�"
 
-#: libnautilus-private/nautilus-file-operations.c:1884
+#: libnautilus-private/nautilus-file-operations.c:1898
 msgid "Preparing to Create Links..."
 msgstr "準備建立��..."
 
-#: libnautilus-private/nautilus-file-operations.c:1885
+#: libnautilus-private/nautilus-file-operations.c:1899
 msgid "Finishing Creating Links..."
 msgstr "完�建立��..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:1891
+#: libnautilus-private/nautilus-file-operations.c:1905
 msgid "Copying files"
 msgstr "正在複製檔案"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:1893
+#: libnautilus-private/nautilus-file-operations.c:1907
 msgid "Files copied:"
 msgstr "已複製的檔案："
 
 #. localizers: label prepended to the name of the current file copied
-#: libnautilus-private/nautilus-file-operations.c:1895
+#: libnautilus-private/nautilus-file-operations.c:1909
 msgid "Copying"
 msgstr "正在複製"
 
-#: libnautilus-private/nautilus-file-operations.c:1896
+#: libnautilus-private/nautilus-file-operations.c:1910
 msgid "Preparing To Copy..."
 msgstr "準備複製..."
 
-#: libnautilus-private/nautilus-file-operations.c:1912
-msgid "You cannot copy items into the Trash."
+#: libnautilus-private/nautilus-file-operations.c:1927
+#, fuzzy
+msgid "You cannot copy items into the trash."
 msgstr "��將項目複製至垃圾桶。"
 
-#: libnautilus-private/nautilus-file-operations.c:1913
-msgid "Can't Copy to Trash"
-msgstr "��複製至垃圾桶"
+#: libnautilus-private/nautilus-file-operations.c:1928
+msgid "Files and folders can only be moved into the trash."
+msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:1935
+#: libnautilus-private/nautilus-file-operations.c:1952
 msgid "You cannot move this trash folder."
 msgstr "��移動垃圾桶資料夾。"
 
-#: libnautilus-private/nautilus-file-operations.c:1936
+#: libnautilus-private/nautilus-file-operations.c:1953
 msgid "You cannot copy this trash folder."
 msgstr "��複製垃圾桶資料夾。"
 
-#: libnautilus-private/nautilus-file-operations.c:1938
+#: libnautilus-private/nautilus-file-operations.c:1954
+msgid "A trash folder is used for storing items moved to the trash."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:1956
 msgid "Can't Change Trash Location"
 msgstr "��更改垃圾桶�置"
 
-#: libnautilus-private/nautilus-file-operations.c:1939
+#: libnautilus-private/nautilus-file-operations.c:1957
 msgid "Can't Copy Trash"
 msgstr "��複製垃圾桶"
 
-#: libnautilus-private/nautilus-file-operations.c:1962
+#: libnautilus-private/nautilus-file-operations.c:1981
 msgid "You cannot move a folder into itself."
 msgstr "��將資料夾移至資料夾本身之內。"
 
-#: libnautilus-private/nautilus-file-operations.c:1963
+#: libnautilus-private/nautilus-file-operations.c:1982
 msgid "You cannot copy a folder into itself."
 msgstr "��將資料夾複製至資料夾本身之內。"
 
-#: libnautilus-private/nautilus-file-operations.c:1965
+#: libnautilus-private/nautilus-file-operations.c:1983
+#, fuzzy
+msgid "The destination folder is inside the source folder."
+msgstr "在本資料夾中新增空白資料夾"
+
+#: libnautilus-private/nautilus-file-operations.c:1985
 msgid "Can't Move Into Self"
 msgstr "��移至自身之內"
 
-#: libnautilus-private/nautilus-file-operations.c:1966
+#: libnautilus-private/nautilus-file-operations.c:1986
 msgid "Can't Copy Into Self"
 msgstr "��複製至自身之內"
 
-#: libnautilus-private/nautilus-file-operations.c:1978
+#: libnautilus-private/nautilus-file-operations.c:1999
 msgid "You cannot copy a file over itself."
 msgstr "��將檔案複製至�一�置之上。"
 
-#: libnautilus-private/nautilus-file-operations.c:1979
+#: libnautilus-private/nautilus-file-operations.c:2000
+msgid "The destination and source are the same file."
+msgstr ""
+
+#: libnautilus-private/nautilus-file-operations.c:2001
 msgid "Can't Copy Over Self"
 msgstr "��複製檔案至�一�置"
 
-#: libnautilus-private/nautilus-file-operations.c:2031
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"You do not have permissions to write to the destination."
+#: libnautilus-private/nautilus-file-operations.c:2053
+#: libnautilus-private/nautilus-file-operations.c:2187
+#, fuzzy
+msgid "You do not have permissions to write to the destination."
 msgstr ""
 "新增資料夾時發生錯誤。\n"
 "\n"
 "沒有寫入目的地的權�。"
 
-#: libnautilus-private/nautilus-file-operations.c:2034
-msgid ""
-"Error creating new folder.\n"
-"\n"
-"There is no space on the destination."
+#: libnautilus-private/nautilus-file-operations.c:2055
+#: libnautilus-private/nautilus-file-operations.c:2189
+#, fuzzy
+msgid "There is no space on the destination."
 msgstr ""
 "新增資料夾時發生錯誤。\n"
 "\n"
 "目的地沒有足夠空間。"
 
-#: libnautilus-private/nautilus-file-operations.c:2037
+#: libnautilus-private/nautilus-file-operations.c:2057
 #, c-format
 msgid "Error \"%s\" creating new folder."
 msgstr "新增資料夾時發生錯誤“%s�。"
 
-#: libnautilus-private/nautilus-file-operations.c:2041
-msgid "Error creating new folder"
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error creating new folder."
+msgstr "新增資料夾時發生錯誤"
+
+#: libnautilus-private/nautilus-file-operations.c:2062
+#, fuzzy
+msgid "Error Creating New Folder"
 msgstr "新增資料夾時發生錯誤"
 
 #. localizers: the initial name of a new folder
-#: libnautilus-private/nautilus-file-operations.c:2130
+#: libnautilus-private/nautilus-file-operations.c:2151
 msgid "untitled folder"
 msgstr "untitled folder"
 
-#. localizers: progress dialog title
 #: libnautilus-private/nautilus-file-operations.c:2191
+#, fuzzy, c-format
+msgid "Error \"%s\" creating new document."
+msgstr "新增資料夾時發生錯誤“%s�。"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error creating new document."
+msgstr "新增資料夾時發生錯誤"
+
+#: libnautilus-private/nautilus-file-operations.c:2196
+#, fuzzy
+msgid "Error Creating New Document"
+msgstr "新增資料夾時發生錯誤"
+
+#: libnautilus-private/nautilus-file-operations.c:2342
+#, fuzzy
+msgid "new file"
+msgstr "1 個檔案"
+
+#. localizers: progress dialog title
+#: libnautilus-private/nautilus-file-operations.c:2414
 msgid "Deleting files"
 msgstr "正在刪除檔案"
 
 #. localizers: label prepended to the progress count
-#: libnautilus-private/nautilus-file-operations.c:2193
-#: libnautilus-private/nautilus-file-operations.c:2228
+#: libnautilus-private/nautilus-file-operations.c:2416
+#: libnautilus-private/nautilus-file-operations.c:2451
 msgid "Files deleted:"
 msgstr "已刪除的檔案："
 
 #. localizers: label prepended to the name of the current file deleted
-#: libnautilus-private/nautilus-file-operations.c:2195
-#: libnautilus-private/nautilus-file-operations.c:2230
+#: libnautilus-private/nautilus-file-operations.c:2418
+#: libnautilus-private/nautilus-file-operations.c:2453
 msgid "Deleting"
 msgstr "正在刪除"
 
-#: libnautilus-private/nautilus-file-operations.c:2196
+#: libnautilus-private/nautilus-file-operations.c:2419
 msgid "Preparing to Delete files..."
 msgstr "準備刪除檔案..."
 
 #. localizers: progress dialog title
-#: libnautilus-private/nautilus-file-operations.c:2226
+#: libnautilus-private/nautilus-file-operations.c:2449
 msgid "Emptying the Trash"
 msgstr "清�垃圾桶"
 
-#: libnautilus-private/nautilus-file-operations.c:2231
+#: libnautilus-private/nautilus-file-operations.c:2454
 msgid "Preparing to Empty the Trash..."
 msgstr "準備清�垃圾桶..."
 
-#: libnautilus-private/nautilus-file-operations.c:2293
+#: libnautilus-private/nautilus-file-operations.c:2517
 #, fuzzy
 msgid "Are you sure you want to empty all of the items from the trash?"
 msgstr "確定�永久刪除垃圾桶內的所有項目嗎？"
 
-#: libnautilus-private/nautilus-file-operations.c:2307
+#: libnautilus-private/nautilus-file-operations.c:2531
 msgid "If you empty the trash, items will be permanently deleted."
 msgstr ""
 
-#: libnautilus-private/nautilus-file-operations.c:2319
+#: libnautilus-private/nautilus-file-operations.c:2543
 msgid "_Empty"
 msgstr "清�(_E)"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
+#: libnautilus-private/nautilus-file-operations.c:2590
 msgid "foo"
 msgstr "foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2366
-#: libnautilus-private/nautilus-file-operations.c:2376
+#: libnautilus-private/nautilus-file-operations.c:2590
+#: libnautilus-private/nautilus-file-operations.c:2600
 msgid "foo (copy)"
 msgstr "foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc"
 msgstr ".bashrc"
 
-#: libnautilus-private/nautilus-file-operations.c:2367
+#: libnautilus-private/nautilus-file-operations.c:2591
 msgid ".bashrc (copy)"
 msgstr ".bashrc (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo.txt"
 msgstr ".foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2368
+#: libnautilus-private/nautilus-file-operations.c:2592
 msgid ".foo (copy).txt"
 msgstr ".foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo"
 msgstr "foo foo"
 
-#: libnautilus-private/nautilus-file-operations.c:2369
+#: libnautilus-private/nautilus-file-operations.c:2593
 msgid "foo foo (copy)"
 msgstr "foo foo (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
+#: libnautilus-private/nautilus-file-operations.c:2594
 msgid "foo.txt"
 msgstr "foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2370
-#: libnautilus-private/nautilus-file-operations.c:2377
+#: libnautilus-private/nautilus-file-operations.c:2594
+#: libnautilus-private/nautilus-file-operations.c:2601
 msgid "foo (copy).txt"
 msgstr "foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
+#: libnautilus-private/nautilus-file-operations.c:2595
 msgid "foo foo.txt"
 msgstr "foo foo.txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2371
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2595
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (copy).txt"
 msgstr "foo foo (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo.txt txt"
 msgstr "foo foo.txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2372
+#: libnautilus-private/nautilus-file-operations.c:2596
 msgid "foo foo (copy).txt txt"
 msgstr "foo foo (copy).txt txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo...txt"
 msgstr "foo...txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2373
+#: libnautilus-private/nautilus-file-operations.c:2597
 msgid "foo.. (copy).txt"
 msgstr "foo.. (copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo..."
 msgstr "foo..."
 
-#: libnautilus-private/nautilus-file-operations.c:2374
+#: libnautilus-private/nautilus-file-operations.c:2598
 msgid "foo... (copy)"
 msgstr "foo... (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (copy)"
 msgstr "foo. (copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2375
+#: libnautilus-private/nautilus-file-operations.c:2599
 msgid "foo. (another copy)"
 msgstr "foo. (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2376
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2600
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (another copy)"
 msgstr "foo (another copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2377
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2601
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (another copy).txt"
 msgstr "foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2378
+#: libnautilus-private/nautilus-file-operations.c:2602
 msgid "foo (3rd copy)"
 msgstr "foo (3rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2379
+#: libnautilus-private/nautilus-file-operations.c:2603
 msgid "foo (3rd copy).txt"
 msgstr "foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (another copy).txt"
 msgstr "foo foo (another copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2380
+#: libnautilus-private/nautilus-file-operations.c:2604
 msgid "foo foo (3rd copy).txt"
 msgstr "foo foo (3rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2605
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (13th copy)"
 msgstr "foo (13th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2381
+#: libnautilus-private/nautilus-file-operations.c:2605
 msgid "foo (14th copy)"
 msgstr "foo (14th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2606
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (13th copy).txt"
 msgstr "foo (13th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2382
+#: libnautilus-private/nautilus-file-operations.c:2606
 msgid "foo (14th copy).txt"
 msgstr "foo (14th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
+#: libnautilus-private/nautilus-file-operations.c:2607
 msgid "foo (21st copy)"
 msgstr "foo (21st copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2383
-#: libnautilus-private/nautilus-file-operations.c:2385
+#: libnautilus-private/nautilus-file-operations.c:2607
+#: libnautilus-private/nautilus-file-operations.c:2609
 msgid "foo (22nd copy)"
 msgstr "foo (22nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
+#: libnautilus-private/nautilus-file-operations.c:2608
 msgid "foo (21st copy).txt"
 msgstr "foo (21st copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2384
-#: libnautilus-private/nautilus-file-operations.c:2386
+#: libnautilus-private/nautilus-file-operations.c:2608
+#: libnautilus-private/nautilus-file-operations.c:2610
 msgid "foo (22nd copy).txt"
 msgstr "foo (22nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2385
-#: libnautilus-private/nautilus-file-operations.c:2387
+#: libnautilus-private/nautilus-file-operations.c:2609
+#: libnautilus-private/nautilus-file-operations.c:2611
 msgid "foo (23rd copy)"
 msgstr "foo (23rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2386
-#: libnautilus-private/nautilus-file-operations.c:2388
+#: libnautilus-private/nautilus-file-operations.c:2610
+#: libnautilus-private/nautilus-file-operations.c:2612
 msgid "foo (23rd copy).txt"
 msgstr "foo (23rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2387
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2611
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (24th copy)"
 msgstr "foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2388
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2612
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (24th copy).txt"
 msgstr "foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2389
+#: libnautilus-private/nautilus-file-operations.c:2613
 msgid "foo (25th copy)"
 msgstr "foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2390
+#: libnautilus-private/nautilus-file-operations.c:2614
 msgid "foo (25th copy).txt"
 msgstr "foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (24th copy)"
 msgstr "foo foo (24th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2391
+#: libnautilus-private/nautilus-file-operations.c:2615
 msgid "foo foo (25th copy)"
 msgstr "foo foo (25th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (24th copy).txt"
 msgstr "foo foo (24th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2392
+#: libnautilus-private/nautilus-file-operations.c:2616
 msgid "foo foo (25th copy).txt"
 msgstr "foo foo (25th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2393
+#: libnautilus-private/nautilus-file-operations.c:2617
 msgid "foo foo (100000000000000th copy).txt"
 msgstr "foo foo (100000000000000th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
+#: libnautilus-private/nautilus-file-operations.c:2618
 msgid "foo (10th copy)"
 msgstr "foo (10th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2394
-#: libnautilus-private/nautilus-file-operations.c:2396
+#: libnautilus-private/nautilus-file-operations.c:2618
+#: libnautilus-private/nautilus-file-operations.c:2620
 msgid "foo (11th copy)"
 msgstr "foo (11th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
+#: libnautilus-private/nautilus-file-operations.c:2619
 msgid "foo (10th copy).txt"
 msgstr "foo (10th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2395
-#: libnautilus-private/nautilus-file-operations.c:2397
+#: libnautilus-private/nautilus-file-operations.c:2619
+#: libnautilus-private/nautilus-file-operations.c:2621
 msgid "foo (11th copy).txt"
 msgstr "foo (11th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2396
-#: libnautilus-private/nautilus-file-operations.c:2398
+#: libnautilus-private/nautilus-file-operations.c:2620
+#: libnautilus-private/nautilus-file-operations.c:2622
 msgid "foo (12th copy)"
 msgstr "foo (12th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2397
-#: libnautilus-private/nautilus-file-operations.c:2399
+#: libnautilus-private/nautilus-file-operations.c:2621
+#: libnautilus-private/nautilus-file-operations.c:2623
 msgid "foo (12th copy).txt"
 msgstr "foo (12th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (110th copy)"
 msgstr "foo (110th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2400
+#: libnautilus-private/nautilus-file-operations.c:2624
 msgid "foo (111th copy)"
 msgstr "foo (111th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (110th copy).txt"
 msgstr "foo (110th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2401
+#: libnautilus-private/nautilus-file-operations.c:2625
 msgid "foo (111th copy).txt"
 msgstr "foo (111th copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
+#: libnautilus-private/nautilus-file-operations.c:2626
 msgid "foo (122nd copy)"
 msgstr "foo (122nd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2402
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2626
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (123rd copy)"
 msgstr "foo (123rd copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
+#: libnautilus-private/nautilus-file-operations.c:2627
 msgid "foo (122nd copy).txt"
 msgstr "foo (122nd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2403
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2627
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (123rd copy).txt"
 msgstr "foo (123rd copy).txt"
 
-#: libnautilus-private/nautilus-file-operations.c:2404
+#: libnautilus-private/nautilus-file-operations.c:2628
 msgid "foo (124th copy)"
 msgstr "foo (124th copy)"
 
-#: libnautilus-private/nautilus-file-operations.c:2405
+#: libnautilus-private/nautilus-file-operations.c:2629
 msgid "foo (124th copy).txt"
 msgstr "foo (124th copy).txt"
 
@@ -2822,64 +2793,64 @@ msgstr "foo (124th copy).txt"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: libnautilus-private/nautilus-file.c:2760
+#: libnautilus-private/nautilus-file.c:2765
 msgid "today at 00:00:00 PM"
 msgstr "今天凌晨 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2761
+#: libnautilus-private/nautilus-file.c:2766
 msgid "today at %-I:%M:%S %p"
 msgstr "今天%p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2763
+#: libnautilus-private/nautilus-file.c:2768
 msgid "today at 00:00 PM"
 msgstr "今天凌晨 00:00"
 
-#: libnautilus-private/nautilus-file.c:2764
+#: libnautilus-private/nautilus-file.c:2769
 msgid "today at %-I:%M %p"
 msgstr "今天%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2766
+#: libnautilus-private/nautilus-file.c:2771
 msgid "today, 00:00 PM"
 msgstr "今天，凌晨 00:00"
 
-#: libnautilus-private/nautilus-file.c:2767
+#: libnautilus-private/nautilus-file.c:2772
 msgid "today, %-I:%M %p"
 msgstr "今天，%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2769
-#: libnautilus-private/nautilus-file.c:2770
+#: libnautilus-private/nautilus-file.c:2774
+#: libnautilus-private/nautilus-file.c:2775
 msgid "today"
 msgstr "今天"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: libnautilus-private/nautilus-file.c:2779
+#: libnautilus-private/nautilus-file.c:2784
 msgid "yesterday at 00:00:00 PM"
 msgstr "昨天凌晨 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2780
+#: libnautilus-private/nautilus-file.c:2785
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "昨天%p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2782
+#: libnautilus-private/nautilus-file.c:2787
 msgid "yesterday at 00:00 PM"
 msgstr "昨天凌晨 00:00"
 
-#: libnautilus-private/nautilus-file.c:2783
+#: libnautilus-private/nautilus-file.c:2788
 msgid "yesterday at %-I:%M %p"
 msgstr "昨天%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2785
+#: libnautilus-private/nautilus-file.c:2790
 msgid "yesterday, 00:00 PM"
 msgstr "昨天，凌晨 00:00"
 
-#: libnautilus-private/nautilus-file.c:2786
+#: libnautilus-private/nautilus-file.c:2791
 msgid "yesterday, %-I:%M %p"
 msgstr "昨天，%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2788
-#: libnautilus-private/nautilus-file.c:2789
+#: libnautilus-private/nautilus-file.c:2793
+#: libnautilus-private/nautilus-file.c:2794
 msgid "yesterday"
 msgstr "昨天"
 
@@ -2888,133 +2859,133 @@ msgstr "昨天"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: libnautilus-private/nautilus-file.c:2800
+#: libnautilus-private/nautilus-file.c:2805
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "公元0000年00月00日(週三)於下� 00時00分00秒"
 
-#: libnautilus-private/nautilus-file.c:2801
+#: libnautilus-private/nautilus-file.c:2806
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "公元%Y年%m月%-d日(%A)於%p %-I時%M分%S秒"
 
-#: libnautilus-private/nautilus-file.c:2803
+#: libnautilus-private/nautilus-file.c:2808
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000年00月00日(一)於下� 00:00:00"
 
-#: libnautilus-private/nautilus-file.c:2804
+#: libnautilus-private/nautilus-file.c:2809
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Y年%m月%-d日(%a)於%p %-I:%M:%S"
 
-#: libnautilus-private/nautilus-file.c:2806
+#: libnautilus-private/nautilus-file.c:2811
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000年00月00日(週一)於下� 00:00"
 
-#: libnautilus-private/nautilus-file.c:2807
+#: libnautilus-private/nautilus-file.c:2812
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Y年%m月%-d日(%a)於%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2809
+#: libnautilus-private/nautilus-file.c:2814
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000年00月00日下� 00:00"
 
-#: libnautilus-private/nautilus-file.c:2810
+#: libnautilus-private/nautilus-file.c:2815
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Y年%m月%-d日%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2812
+#: libnautilus-private/nautilus-file.c:2817
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000年00月00日，下� 00:00"
 
-#: libnautilus-private/nautilus-file.c:2813
+#: libnautilus-private/nautilus-file.c:2818
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Y年%m月%-d日，%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2815
+#: libnautilus-private/nautilus-file.c:2820
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00，下� 00:00"
 
-#: libnautilus-private/nautilus-file.c:2816
+#: libnautilus-private/nautilus-file.c:2821
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%y/%m/%-d，%p %-I:%M"
 
-#: libnautilus-private/nautilus-file.c:2818
+#: libnautilus-private/nautilus-file.c:2823
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: libnautilus-private/nautilus-file.c:2819
+#: libnautilus-private/nautilus-file.c:2824
 msgid "%m/%d/%y"
 msgstr "%y/%m/%d"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 items"
 msgstr "沒有項目"
 
-#: libnautilus-private/nautilus-file.c:4114
+#: libnautilus-private/nautilus-file.c:4119
 msgid "0 folders"
 msgstr "沒有資料夾"
 
-#: libnautilus-private/nautilus-file.c:4115
+#: libnautilus-private/nautilus-file.c:4120
 msgid "0 files"
 msgstr "沒有檔案"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 item"
 msgstr "1 個項目"
 
-#: libnautilus-private/nautilus-file.c:4119
+#: libnautilus-private/nautilus-file.c:4124
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: libnautilus-private/nautilus-file.c:4120
+#: libnautilus-private/nautilus-file.c:4125
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u items"
 msgstr "%u 個項目"
 
-#: libnautilus-private/nautilus-file.c:4123
+#: libnautilus-private/nautilus-file.c:4128
 #, c-format
 msgid "%u folders"
 msgstr "%u 個資料夾"
 
-#: libnautilus-private/nautilus-file.c:4124
+#: libnautilus-private/nautilus-file.c:4129
 #, c-format
 msgid "%u files"
 msgstr "%u 個檔案"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4436
-#: libnautilus-private/nautilus-file.c:4452
+#: libnautilus-private/nautilus-file.c:4441
+#: libnautilus-private/nautilus-file.c:4457
 msgid "? items"
 msgstr "? 個項目"
 
 #. This means no contents at all were readable
-#: libnautilus-private/nautilus-file.c:4442
+#: libnautilus-private/nautilus-file.c:4447
 msgid "? bytes"
 msgstr "? 個�元組"
 
-#: libnautilus-private/nautilus-file.c:4457
+#: libnautilus-private/nautilus-file.c:4462
 msgid "unknown type"
 msgstr "類型�詳"
 
-#: libnautilus-private/nautilus-file.c:4460
+#: libnautilus-private/nautilus-file.c:4465
 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:4466
-#: src/file-manager/fm-properties-window.c:1149
+#: libnautilus-private/nautilus-file.c:4471
+#: src/file-manager/fm-properties-window.c:1152
 msgid "unknown"
 msgstr "�詳"
 
-#: libnautilus-private/nautilus-file.c:4498
+#: libnautilus-private/nautilus-file.c:4503
 msgid "program"
 msgstr "程�"
 
-#: libnautilus-private/nautilus-file.c:4510
+#: libnautilus-private/nautilus-file.c:4515
 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 "
@@ -3023,7 +2994,7 @@ msgstr ""
 "連“x-directory/normal�的�述也無法找到。這�能表示 gnome-vfs.keys 檔放在錯誤"
 "的�置或是因其它的原因而找�到。"
 
-#: libnautilus-private/nautilus-file.c:4514
+#: libnautilus-private/nautilus-file.c:4519
 #, c-format
 msgid ""
 "No description found for mime type \"%s\" (file is \"%s\"), please tell the "
@@ -3031,11 +3002,11 @@ msgid ""
 msgstr ""
 "沒有任何有關 mime 類型“%s�的說明 (檔案為“%s�)，請回報至 gnome-vfs 電郵論壇。"
 
-#: libnautilus-private/nautilus-file.c:4528
+#: libnautilus-private/nautilus-file.c:4533
 msgid "link"
 msgstr "��"
 
-#: libnautilus-private/nautilus-file.c:4548
+#: libnautilus-private/nautilus-file.c:4553
 msgid "link (broken)"
 msgstr "�� (目標�存在)"
 
@@ -3156,11 +3127,13 @@ msgid "Search for files by file name and file properties"
 msgstr "根據檔案�稱�屬性�尋檔案"
 
 #: libnautilus-private/nautilus-global-preferences.c:178
+#: src/file-manager/fm-icon-container.c:499
 #: src/nautilus-file-management-properties.glade.h:50
 msgid "Icon View"
 msgstr "圖示顯示模�"
 
 #: libnautilus-private/nautilus-global-preferences.c:179
+#: src/file-manager/fm-list-view.c:866
 #: src/nautilus-file-management-properties.glade.h:51
 msgid "List View"
 msgstr "清單顯示模�"
@@ -3304,144 +3277,149 @@ msgstr "%s 的個人目錄"
 
 #: libnautilus-private/nautilus-global-preferences.c:549
 #: nautilus-computer.desktop.in.h:1 src/nautilus-navigation-window-ui.xml.h:9
-#: src/nautilus-window.c:1169
+#: src/nautilus-window.c:1176
 #, fuzzy
 msgid "Computer"
 msgstr "料�檯�"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2149
-msgid "file icon"
-msgstr "檔案圖示"
-
-#: libnautilus-private/nautilus-icon-canvas-item.c:2522
+#: libnautilus-private/nautilus-icon-canvas-item.c:2758
 msgid "editable text"
 msgstr "�修改的文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2523
+#: libnautilus-private/nautilus-icon-canvas-item.c:2759
 msgid "the editable label"
 msgstr "�修改的標籤"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2530
+#: libnautilus-private/nautilus-icon-canvas-item.c:2766
 msgid "additional text"
 msgstr "�外的文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2531
+#: libnautilus-private/nautilus-icon-canvas-item.c:2767
 msgid "some more text"
 msgstr "其它文字"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2538
+#: libnautilus-private/nautilus-icon-canvas-item.c:2774
 msgid "highlighted for selection"
 msgstr "加強顯示�擇�域"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2539
+#: libnautilus-private/nautilus-icon-canvas-item.c:2775
 msgid "whether we are highlighted for a selection"
 msgstr "是�將�擇�域加強顯示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2546
+#: libnautilus-private/nautilus-icon-canvas-item.c:2782
 msgid "highlighted as keyboard focus"
 msgstr "加強顯示輸入焦點"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2547
+#: libnautilus-private/nautilus-icon-canvas-item.c:2783
 msgid "whether we are highlighted to render keyboard focus"
 msgstr "是�在顯示輸入焦點時加強顯示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2555
+#: libnautilus-private/nautilus-icon-canvas-item.c:2791
 msgid "highlighted for drop"
 msgstr "拖曳時加強顯示"
 
-#: libnautilus-private/nautilus-icon-canvas-item.c:2556
+#: libnautilus-private/nautilus-icon-canvas-item.c:2792
 msgid "whether we are highlighted for a D&D drop"
 msgstr "是�在拖曳時加強顯示"
 
-#: libnautilus-private/nautilus-icon-container.c:2025
+#: libnautilus-private/nautilus-icon-container.c:2071
 msgid "The selection rectangle"
 msgstr "矩形�擇�域"
 
-#: libnautilus-private/nautilus-icon-container.c:4100
+#: libnautilus-private/nautilus-icon-container.c:4165
 msgid "Frame Text"
 msgstr "文字邊框"
 
-#: libnautilus-private/nautilus-icon-container.c:4101
+#: libnautilus-private/nautilus-icon-container.c:4166
 msgid "Draw a frame around unselected text"
 msgstr "在沒有��的文字周�繪畫邊框"
 
-#: libnautilus-private/nautilus-icon-container.c:4107
+#: libnautilus-private/nautilus-icon-container.c:4172
 msgid "Selection Box Color"
 msgstr "�擇�域�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4108
+#: libnautilus-private/nautilus-icon-container.c:4173
 msgid "Color of the selection box"
 msgstr "�擇�域的�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4113
+#: libnautilus-private/nautilus-icon-container.c:4178
 msgid "Selection Box Alpha"
 msgstr "�擇�域�明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4114
+#: libnautilus-private/nautilus-icon-container.c:4179
 msgid "Opacity of the selection box"
 msgstr "�擇�域的�明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4121
+#: libnautilus-private/nautilus-icon-container.c:4186
 msgid "Highlight Alpha"
 msgstr "加強顯示時的�明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4122
+#: libnautilus-private/nautilus-icon-container.c:4187
 msgid "Opacity of the highlight for selected icons"
 msgstr "加強顯示已��的圖示時使用的�明度"
 
-#: libnautilus-private/nautilus-icon-container.c:4128
+#: libnautilus-private/nautilus-icon-container.c:4193
 msgid "Light Info Color"
 msgstr "淺色資訊文字�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4129
+#: libnautilus-private/nautilus-icon-container.c:4194
 msgid "Color used for information text against a dark background"
 msgstr "在較深色的背景中，顯示資訊文字所用的�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4134
+#: libnautilus-private/nautilus-icon-container.c:4199
 msgid "Dark Info Color"
 msgstr "深色資訊文字�色"
 
-#: libnautilus-private/nautilus-icon-container.c:4135
+#: libnautilus-private/nautilus-icon-container.c:4200
 msgid "Color used for information text against a light background"
 msgstr "在較淺色的背景中，顯示資訊文字所用的�色"
 
-#: libnautilus-private/nautilus-icon-dnd.c:731
+#: libnautilus-private/nautilus-icon-dnd.c:732
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it? This will clobber the stored "
-"manual layout."
+"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:735
+#: libnautilus-private/nautilus-icon-dnd.c:734
+#: libnautilus-private/nautilus-icon-dnd.c:738
+#: libnautilus-private/nautilus-icon-dnd.c:743
+#: libnautilus-private/nautilus-icon-dnd.c:746
+msgid "This folder uses automatic layout."
+msgstr ""
+
+#: libnautilus-private/nautilus-icon-dnd.c:736
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them? This will clobber the stored "
-"manual layout."
+"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:741
+#: libnautilus-private/nautilus-icon-dnd.c:742
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave this item where you dropped it?"
+"Do you want to switch to manual layout and leave this item where you dropped "
+"it?"
 msgstr ""
 "本資料夾採用自動排列方�。是�切�為自�排列方�並且�調整圖示拖放後的�置？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:744
+#: libnautilus-private/nautilus-icon-dnd.c:745
+#, fuzzy
 msgid ""
-"This folder uses automatic layout. Do you want to switch to manual layout "
-"and leave these items where you dropped them?"
+"Do you want to switch to manual layout and leave these items where you "
+"dropped them?"
 msgstr ""
 "本資料夾採用自動排列方�。是�切�為自�排列方�並且�調整圖示拖放後的�置？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:749
+#: libnautilus-private/nautilus-icon-dnd.c:751
 msgid "Switch to Manual Layout?"
 msgstr "是�切�為自�排列方�？"
 
-#: libnautilus-private/nautilus-icon-dnd.c:750
+#: libnautilus-private/nautilus-icon-dnd.c:752
 msgid "Switch"
 msgstr "切�"
 
@@ -3546,119 +3524,119 @@ msgstr "是「%s�項目的�設值。"
 msgid "Is the default for all \"%s\" items."
 msgstr "是所有“%s�項目的�設值。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1041
+#: libnautilus-private/nautilus-program-chooser.c:1030
 #, c-format
 msgid "Modify \"%s\""
 msgstr "修改“%s�"
 
 #. Radio button for adding to short list for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1067
+#: libnautilus-private/nautilus-program-chooser.c:1056
 #, c-format
 msgid "Include in the menu for \"%s\" items"
 msgstr "包�在「%s��項的�單中"
 
 #. Radio button for setting default for file type.
-#: libnautilus-private/nautilus-program-chooser.c:1074
+#: libnautilus-private/nautilus-program-chooser.c:1063
 #, c-format
 msgid "Use as default for \"%s\" items"
 msgstr "作為「%s�項目的�設值"
 
 #. Radio button for adding to short list for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1081
+#: libnautilus-private/nautilus-program-chooser.c:1070
 #, c-format
 msgid "Include in the menu for \"%s\" only"
 msgstr "�會在“%s�的�單中出�"
 
 #. Radio button for setting default for specific file.
-#: libnautilus-private/nautilus-program-chooser.c:1087
+#: libnautilus-private/nautilus-program-chooser.c:1076
 #, c-format
 msgid "Use as default for \"%s\" only"
 msgstr "�會作為“%s�的�設值"
 
 #. Radio button for not including program in short list for type or file.
-#: libnautilus-private/nautilus-program-chooser.c:1094
+#: libnautilus-private/nautilus-program-chooser.c:1083
 #, c-format
 msgid "Don't include in the menu for \"%s\" items"
 msgstr "�包�在「%s��項的�單中"
 
-#: libnautilus-private/nautilus-program-chooser.c:1252
-#: src/file-manager/fm-search-list-view.c:494
+#: libnautilus-private/nautilus-program-chooser.c:1241
+#: src/file-manager/fm-search-list-view.c:501
 msgid "Name"
 msgstr "�稱"
 
-#: libnautilus-private/nautilus-program-chooser.c:1261
+#: libnautilus-private/nautilus-program-chooser.c:1250
 msgid "Status"
 msgstr "狀態"
 
-#: libnautilus-private/nautilus-program-chooser.c:1352
+#: libnautilus-private/nautilus-program-chooser.c:1341
 msgid "C_hoose"
 msgstr "�擇(_H)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1355
+#: libnautilus-private/nautilus-program-chooser.c:1344
 msgid "Done"
 msgstr "完�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1429
+#: libnautilus-private/nautilus-program-chooser.c:1418
 msgid "_Modify..."
 msgstr "修改(_M)..."
 
 #. Framed area with button to launch mime type editing capplet.
-#: libnautilus-private/nautilus-program-chooser.c:1439
+#: libnautilus-private/nautilus-program-chooser.c:1428
 msgid "File Types and Programs"
 msgstr "檔案類型�程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1451
+#: libnautilus-private/nautilus-program-chooser.c:1440
 msgid "_Go There"
 msgstr "進行設定(_G)"
 
-#: libnautilus-private/nautilus-program-chooser.c:1458
+#: libnautilus-private/nautilus-program-chooser.c:1447
 msgid ""
 "You can configure which programs are offered for which file types in the "
 "File Types and Programs dialog."
 msgstr "請在「檔案類型�程���話方塊中���應�種檔案的處�程�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1493
+#: libnautilus-private/nautilus-program-chooser.c:1482
 msgid "Open with Other Application"
 msgstr "以其它程�開啟"
 
-#: libnautilus-private/nautilus-program-chooser.c:1494
+#: libnautilus-private/nautilus-program-chooser.c:1483
 #, c-format
 msgid "Choose an application with which to open \"%s\":"
 msgstr "請��用來開啟“%s�的程�："
 
-#: libnautilus-private/nautilus-program-chooser.c:1498
+#: libnautilus-private/nautilus-program-chooser.c:1487
 msgid "Open with Other Viewer"
 msgstr "以其它顯示模�開啟"
 
-#: libnautilus-private/nautilus-program-chooser.c:1499
+#: libnautilus-private/nautilus-program-chooser.c:1488
 #, c-format
 msgid "Choose a view for \"%s\":"
 msgstr "請��用來開啟“%s�的顯示模�："
 
-#: libnautilus-private/nautilus-program-chooser.c:1601
+#: libnautilus-private/nautilus-program-chooser.c:1591
 #, c-format
 msgid "No viewers are available for \"%s\"."
 msgstr "沒有�開啟“%s�的顯示模�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1602
+#: libnautilus-private/nautilus-program-chooser.c:1592
 msgid "No Viewers Available"
 msgstr "沒有�用的顯示模�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1604
+#: libnautilus-private/nautilus-program-chooser.c:1594
 #, c-format
 msgid "There is no application associated with \"%s\"."
 msgstr "沒有任何和“%s�有關�的程�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1605
+#: libnautilus-private/nautilus-program-chooser.c:1595
 msgid "No Application Associated"
 msgstr "沒有任何有關�的程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1607
+#: libnautilus-private/nautilus-program-chooser.c:1597
 #, c-format
 msgid "There is no action associated with \"%s\"."
 msgstr "沒有任何和“%s�有關�的處�程�。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1608
+#: libnautilus-private/nautilus-program-chooser.c:1598
 msgid "No Action Associated"
 msgstr "沒有任何有關�的處�程�"
 
@@ -3666,11 +3644,9 @@ msgstr "沒有任何有關�的處�程�"
 #. * user can't add components to the complete list even from the capplet.
 #. * (They can add applications though.)
 #.
-#: libnautilus-private/nautilus-program-chooser.c:1615
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1605
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "You can configure GNOME to associate applications with file types. Do you "
 "want to associate an application with this file type now?"
 msgstr ""
@@ -3679,42 +3655,41 @@ msgstr ""
 "您�以在 GNOME 中將��的檔案類型�程�建立�繫。是�立刻將這種檔案和其它程�"
 "建立�繫？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1622
-msgid "Associate Application"
+#: libnautilus-private/nautilus-program-chooser.c:1610
+#, fuzzy
+msgid "_Associate Application"
 msgstr "和程�建立�繫"
 
-#: libnautilus-private/nautilus-program-chooser.c:1648
+#: libnautilus-private/nautilus-program-chooser.c:1639
 #, c-format
 msgid "The viewer associated with \"%s\" is invalid."
 msgstr "這個和“%s�有�繫的顯示模�是無效的。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1649
+#: libnautilus-private/nautilus-program-chooser.c:1640
 msgid "Invalid Viewer Associated"
 msgstr "�繫了無效的顯示模�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1651
+#: libnautilus-private/nautilus-program-chooser.c:1642
 #, c-format
 msgid "The application associated with \"%s\" is invalid."
 msgstr "這個和“%s�有�繫的程�是無效的。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1652
+#: libnautilus-private/nautilus-program-chooser.c:1643
 msgid "Invalid Application Associated"
 msgstr "�繫了無效的程�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1654
+#: libnautilus-private/nautilus-program-chooser.c:1645
 #, c-format
 msgid "The action associated with \"%s\" is invalid."
 msgstr "這個和“%s�有�繫的處�方�是無效的。"
 
-#: libnautilus-private/nautilus-program-chooser.c:1655
+#: libnautilus-private/nautilus-program-chooser.c:1646
 msgid "Invalid Action Associated"
 msgstr "�繫了無效的處�方�"
 
-#: libnautilus-private/nautilus-program-chooser.c:1658
-#, c-format
+#: libnautilus-private/nautilus-program-chooser.c:1649
+#, fuzzy
 msgid ""
-"%s\n"
-"\n"
 "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?"
@@ -3724,101 +3699,137 @@ msgstr ""
 "您�以在 GNOME 中將這類檔案和��的程�/顯示模�建立�繫。是�立刻將這類檔案"
 "和其它程�/顯示模�建立�繫？"
 
-#: libnautilus-private/nautilus-program-chooser.c:1665
-msgid "Associate Action"
+#: libnautilus-private/nautilus-program-chooser.c:1654
+#, fuzzy
+msgid "_Associate Action"
 msgstr "和其它處�方�建立�繫"
 
-#: libnautilus-private/nautilus-program-choosing.c:504
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:505
+#, fuzzy
+msgid "Open Failed, would you like to choose another application?"
+msgstr "“%s�無法開啟“%s�，因為“%s�無法存�“%s�中的檔案。是���其它應用程�？"
+
+#: libnautilus-private/nautilus-program-choosing.c:506
+#, fuzzy, c-format
 msgid ""
 "\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  Would you like to choose another application?"
+"locations."
 msgstr "“%s�無法開啟“%s�，因為“%s�無法存�“%s�中的檔案。是���其它應用程�？"
 
-#: libnautilus-private/nautilus-program-choosing.c:509
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:511
+msgid "Open Failed, would you like to choose another action?"
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:512
+#, fuzzy, c-format
 msgid ""
 "The default action can't open \"%s\" because it can't access files at \"%s\" "
-"locations.  Would you like to choose another action?"
+"locations."
 msgstr ""
 "�設的處�方�無法開啟“%s�，因為無法存�“%s�中的檔案。是�使用其它處�方�？"
 
-#: libnautilus-private/nautilus-program-choosing.c:515
-#: libnautilus-private/nautilus-program-choosing.c:546
+#: libnautilus-private/nautilus-program-choosing.c:519
+#: libnautilus-private/nautilus-program-choosing.c:552
 msgid "Can't Open Location"
 msgstr "無法開啟�置"
 
-#: libnautilus-private/nautilus-program-choosing.c:534
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:538
+#, fuzzy, c-format
 msgid ""
-"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
-"locations.  No other applications are available to view this file.  If you "
-"copy this file onto your computer, you may be able to open it."
+"\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\"."
+"locations."
+msgstr "“%s�無法開啟“%s�，因為“%s�無法存�“%s�中的檔案。是���其它應用程�？"
+
+#: libnautilus-private/nautilus-program-choosing.c:541
+#, fuzzy
+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."
 msgstr ""
 "“%s�無法開啟“%s�，因為“%s�無法存�“%s�中的檔案。目�沒有其它應用程��以用來"
 "顯示該檔案。如果將該檔案複製至您的電腦中，也許�以開啟該檔案。"
 
-#: libnautilus-private/nautilus-program-choosing.c:540
-#, c-format
+#: libnautilus-private/nautilus-program-choosing.c:545
+#, fuzzy, c-format
 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."
+"The default action can't open \"%s\" because it can't access files at \"%s\"."
+"locations."
+msgstr ""
+"�設的處�方�無法開啟“%s�，因為無法存�“%s�中的檔案。是�使用其它處�方�？"
+
+#: libnautilus-private/nautilus-program-choosing.c:547
+#, fuzzy
+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."
 msgstr ""
-"�設的處�方�無法開啟“%s�，因為無法存�“%s�中的檔案。目�沒有其它方��以顯"
-"示該檔案。如果將該檔案複製至您的電腦中，也許�以開啟它。"
+"“%s�無法開啟“%s�，因為“%s�無法存�“%s�中的檔案。目�沒有其它應用程��以用來"
+"顯示該檔案。如果將該檔案複製至您的電腦中，也許�以開啟該檔案。"
 
-#: libnautilus-private/nautilus-program-choosing.c:800
-#: libnautilus-private/nautilus-program-choosing.c:1017
+#: libnautilus-private/nautilus-program-choosing.c:806
+#: libnautilus-private/nautilus-program-choosing.c:1023
 #, c-format
 msgid "Opening %s"
 msgstr "正在開啟 %s"
 
-#: libnautilus-private/nautilus-program-choosing.c:1161
-msgid ""
-"Sorry, but you can't execute commands from a remote site due to security "
-"considerations."
+#: libnautilus-private/nautilus-program-choosing.c:1167
+#, fuzzy
+msgid "Sorry, but you can't execute commands from a remote site."
 msgstr "抱歉，因系統�安�由，�能執行�端站�的指令。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1163
-msgid "Can't execute remote links"
+#: libnautilus-private/nautilus-program-choosing.c:1169
+msgid "This is disabled due to security considerations."
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1170
+#, fuzzy
+msgid "Can't Execute Remote Links"
 msgstr "無法執行�端��"
 
-#: libnautilus-private/nautilus-program-choosing.c:1173
-#: libnautilus-private/nautilus-program-choosing.c:1239
-msgid ""
-"There was an error launching the application.\n"
-"\n"
-"Details: "
+#: libnautilus-private/nautilus-program-choosing.c:1180
+#: libnautilus-private/nautilus-program-choosing.c:1246
+msgid "Details: "
+msgstr ""
+
+#: libnautilus-private/nautilus-program-choosing.c:1182
+#: libnautilus-private/nautilus-program-choosing.c:1248
+#, fuzzy
+msgid "There was an error launching the application."
 msgstr ""
 "啟動程�時發生錯誤。\n"
 "\n"
 "原因："
 
-#: libnautilus-private/nautilus-program-choosing.c:1177
-#: libnautilus-private/nautilus-program-choosing.c:1243
-msgid "Error launching application"
+#: libnautilus-private/nautilus-program-choosing.c:1184
+#: libnautilus-private/nautilus-program-choosing.c:1250
+#, fuzzy
+msgid "Error Launching Application"
 msgstr "啟動程�時發生錯誤"
 
-#: libnautilus-private/nautilus-program-choosing.c:1205
+#: libnautilus-private/nautilus-program-choosing.c:1212
+#: libnautilus-private/nautilus-program-choosing.c:1224
+#, fuzzy
+msgid "This drop target only supports local files."
+msgstr "拖放圖示��用於本地的檔案"
+
+#: libnautilus-private/nautilus-program-choosing.c:1213
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "拖曳時放置檔案的目的地�置�支�本地的檔案。\n"
 "\n"
 "如果�開啟�端的檔案，請先將檔案複製至本地的資料夾�進行拖曳的動作。"
 
-#: libnautilus-private/nautilus-program-choosing.c:1208
-#: libnautilus-private/nautilus-program-choosing.c:1220
-msgid "Drop target only supports local files"
+#: libnautilus-private/nautilus-program-choosing.c:1215
+#: libnautilus-private/nautilus-program-choosing.c:1227
+#, fuzzy
+msgid "Drop Target Only Supports Local Files"
 msgstr "拖放圖示��用於本地的檔案"
 
-#: libnautilus-private/nautilus-program-choosing.c:1217
+#: libnautilus-private/nautilus-program-choosing.c:1225
+#, fuzzy
 msgid ""
-"This drop target only supports local files.\n"
-"\n"
 "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."
 msgstr ""
@@ -4068,14 +4079,6 @@ msgstr "é …ç›®å��稱中包å�«â€œstuffâ€�ã€�是普通檔案而且å°�æ–¼ 2000 ä½�å
 msgid "Items containing \"medusa\" in their names and that are folders"
 msgstr "項目�稱中包�“medusa�而且是資料夾"
 
-#: libnautilus-private/nautilus-trash-directory.c:69
-msgid "Searching Disks"
-msgstr "正在�尋�碟"
-
-#: libnautilus-private/nautilus-trash-directory.c:70
-msgid "Nautilus is searching your disks for trash folders."
-msgstr "Nautilus 正在��碟中�尋垃圾桶資料夾。"
-
 #: libnautilus-private/nautilus-undo-signal-handlers.c:174
 msgid "Edit"
 msgstr "修改"
@@ -4272,96 +4275,106 @@ msgstr "背景"
 msgid "Empty Trash"
 msgstr "清�垃圾桶"
 
-#: src/file-manager/fm-directory-view.c:497
-#, c-format
-msgid "This will open %d separate windows. Are you sure you want to do this?"
-msgstr "這樣會開啟 %d 個��的視窗。是�確定�這樣�？"
-
-#: src/file-manager/fm-directory-view.c:499
+#: src/file-manager/fm-directory-view.c:541
 #, c-format
 msgid "Open %d Windows?"
 msgstr "開啟 %d 個新視窗？"
 
-#: src/file-manager/fm-directory-view.c:823
+#: src/file-manager/fm-directory-view.c:542
+#, fuzzy
+msgid "Are you sure you want to open all files?"
+msgstr "確定�將“%s�永久刪除嗎？"
+
+#: src/file-manager/fm-directory-view.c:543 src/nautilus-location-bar.c:157
+#, fuzzy, c-format
+msgid "This will open %d separate windows."
+msgstr "這樣會開啟 %d 個��的視窗。是�確定�這樣�？"
+
+#: src/file-manager/fm-directory-view.c:898
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "確定�將“%s�永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:827
+#: src/file-manager/fm-directory-view.c:902
 #, c-format
 msgid "Are you sure you want to permanently delete the %d selected items?"
 msgstr "確定�將這 %d 個項目永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:833
+#: src/file-manager/fm-directory-view.c:908
+#, fuzzy
+msgid "If you delete an item, it is permanently lost."
+msgstr "永久刪除�定的項目"
+
+#: src/file-manager/fm-directory-view.c:909
 msgid "Delete?"
 msgstr "刪除？"
 
-#: src/file-manager/fm-directory-view.c:972
+#: src/file-manager/fm-directory-view.c:1048
 #, fuzzy
 msgid "Select Pattern"
 msgstr "��類別："
 
-#: src/file-manager/fm-directory-view.c:988
+#: src/file-manager/fm-directory-view.c:1064
 #, fuzzy
 msgid "_Pattern:"
 msgstr "圖樣(_P)"
 
-#: src/file-manager/fm-directory-view.c:1585
+#: src/file-manager/fm-directory-view.c:1746
 #, c-format
 msgid "\"%s\" selected"
 msgstr "已��“%s�"
 
-#: src/file-manager/fm-directory-view.c:1587
+#: src/file-manager/fm-directory-view.c:1748
 msgid "1 folder selected"
 msgstr "已�� 1 個目錄"
 
-#: src/file-manager/fm-directory-view.c:1590
+#: src/file-manager/fm-directory-view.c:1751
 #, c-format
 msgid "%d folders selected"
 msgstr "已�� %d 個目錄"
 
-#: src/file-manager/fm-directory-view.c:1597
+#: src/file-manager/fm-directory-view.c:1758
 msgid " (containing 0 items)"
 msgstr "(包� 0 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1599
+#: src/file-manager/fm-directory-view.c:1760
 msgid " (containing 1 item)"
 msgstr "(包� 1 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1601
+#: src/file-manager/fm-directory-view.c:1762
 #, c-format
 msgid " (containing %d items)"
 msgstr "(包� %d 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1608
+#: src/file-manager/fm-directory-view.c:1769
 msgid " (containing a total of 0 items)"
 msgstr "(總共包� 0 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1610
+#: src/file-manager/fm-directory-view.c:1771
 msgid " (containing a total of 1 item)"
 msgstr "(總共包� 1 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1612
+#: src/file-manager/fm-directory-view.c:1773
 #, c-format
 msgid " (containing a total of %d items)"
 msgstr "(總共包� %d 個項目)"
 
-#: src/file-manager/fm-directory-view.c:1625
+#: src/file-manager/fm-directory-view.c:1786
 #, c-format
 msgid "\"%s\" selected (%s)"
 msgstr "已��“%s�(%s)"
 
-#: src/file-manager/fm-directory-view.c:1629
+#: src/file-manager/fm-directory-view.c:1790
 #, c-format
 msgid "%d items selected (%s)"
 msgstr "已�� %d 個項目 (%s)"
 
-#: src/file-manager/fm-directory-view.c:1636
+#: src/file-manager/fm-directory-view.c:1797
 #, c-format
 msgid "1 other item selected (%s)"
 msgstr "�� 1 個項目 (%s)"
 
-#: src/file-manager/fm-directory-view.c:1639
+#: src/file-manager/fm-directory-view.c:1800
 #, c-format
 msgid "%d other items selected (%s)"
 msgstr "�� %d 個項目 (%s)"
@@ -4373,7 +4386,7 @@ msgstr "�� %d 個項目 (%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/file-manager/fm-directory-view.c:1668
+#: src/file-manager/fm-directory-view.c:1829
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s，%s"
@@ -4382,111 +4395,129 @@ 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:1793
-#, c-format
-msgid ""
-"The folder \"%s\" contains more files than Nautilus can handle. Some files "
-"will not be displayed."
+#: src/file-manager/fm-directory-view.c:1954
+#, fuzzy, c-format
+msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr ""
 "資料夾“%s�中的檔案數目超出 Nautilus 所能處�的最大數目。�些檔案會無法顯示。"
 
-#: src/file-manager/fm-directory-view.c:1800
+#: src/file-manager/fm-directory-view.c:1960
+msgid "Some files will not be displayed."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:1961
 msgid "Too Many Files"
 msgstr "檔案太多"
 
-#: src/file-manager/fm-directory-view.c:3032
-#, c-format
-msgid ""
-"\"%s\" cannot be moved to the Trash. Do you want to delete it immediately?"
+#: src/file-manager/fm-directory-view.c:3212
+#, fuzzy
+msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "無法將“%s�移到垃圾桶。�立刻永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:3037
+#: src/file-manager/fm-directory-view.c:3213
 #, c-format
-msgid ""
-"The %d selected items cannot be moved to the Trash. Do you want to delete "
-"them immediately?"
-msgstr "無法將已��的 %d 個項目移到垃圾桶。�立刻永久刪除嗎？"
+msgid "The file \"%s\" cannot be moved to the trash."
+msgstr ""
 
-#: src/file-manager/fm-directory-view.c:3041
-#, c-format
+#: src/file-manager/fm-directory-view.c:3217
+#, fuzzy
+msgid "Cannot move items to trash, do you want to delete them immediately?"
+msgstr "無法將“%s�移到垃圾桶。�立刻永久刪除嗎？"
+
+#: src/file-manager/fm-directory-view.c:3220
+#, fuzzy
 msgid ""
-"%d of the selected items cannot be moved to the Trash. Do you want to delete "
-"those %d items immediately?"
-msgstr ""
-"無法將所�項目中的 %d 個項目移到垃圾桶。�立刻將這 %d 個項目永久刪除嗎？"
+"Cannot move some items to trash, do you want to delete these immediately?"
+msgstr "無法將“%s�移到垃圾桶。�立刻永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:3049
+#: src/file-manager/fm-directory-view.c:3227
 msgid "Delete Immediately?"
 msgstr "立刻刪除？"
 
-#: src/file-manager/fm-directory-view.c:3081
-#, c-format
-msgid "Are you sure you want to permanently delete \"%s\" from the Trash?"
+#: src/file-manager/fm-directory-view.c:3259
+#, fuzzy, c-format
+msgid "Are you sure you want to permanently delete \"%s\" from the trash?"
 msgstr "確定�將“%s�從垃圾桶中永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:3085
-#, c-format
+#: src/file-manager/fm-directory-view.c:3263
+#, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the %d selected items from the "
-"Trash?"
+"trash?"
 msgstr "確定�將所�的 %d 個項目從垃圾桶中永久刪除嗎？"
 
-#: src/file-manager/fm-directory-view.c:3091
+#: src/file-manager/fm-directory-view.c:3268
+msgid "If you delete an item, it will be permanently lost."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:3269
 msgid "Delete From Trash?"
 msgstr "是�從垃圾桶中刪除？"
 
-#: src/file-manager/fm-directory-view.c:3370
-#: src/file-manager/fm-directory-view.c:3412
+#: src/file-manager/fm-directory-view.c:3644
+#: src/file-manager/fm-directory-view.c:3686
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgstr "使用“%s�來開啟已��的項目"
 
-#: src/file-manager/fm-directory-view.c:3491
-#: src/file-manager/nautilus-directory-view-ui.xml.h:28
+#: src/file-manager/fm-directory-view.c:3762
+#: src/file-manager/nautilus-directory-view-ui.xml.h:31
 msgid "Other _Application..."
 msgstr "其它應用程�(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3491
+#: src/file-manager/fm-directory-view.c:3762
 msgid "An _Application..."
 msgstr "應用程�(_A)..."
 
-#: src/file-manager/fm-directory-view.c:3513
-#: src/file-manager/nautilus-directory-view-ui.xml.h:29
+#: src/file-manager/fm-directory-view.c:3784
+#: src/file-manager/nautilus-directory-view-ui.xml.h:32
 msgid "Other _Viewer..."
 msgstr "其它顯示模�(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3513
+#: src/file-manager/fm-directory-view.c:3784
 msgid "A _Viewer..."
 msgstr "顯示模�(_V)..."
 
-#: src/file-manager/fm-directory-view.c:3606
+#: src/file-manager/fm-directory-view.c:3877
 #, c-format
 msgid "Could not complete specified action:  %s"
 msgstr "無法完�指定的行動：%s"
 
-#: src/file-manager/fm-directory-view.c:3630
+#: src/file-manager/fm-directory-view.c:3901
 msgid "Could not complete specified action."
 msgstr "無法完�指定的行動。"
 
-#: src/file-manager/fm-directory-view.c:4139
+#: src/file-manager/fm-directory-view.c:4410
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "��所有�定的項目執行“%s�"
 
-#: src/file-manager/fm-directory-view.c:4356
+#: src/file-manager/fm-directory-view.c:4644
+#, c-format
+msgid "Create Document from template \"%s\""
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:4828
+#, fuzzy
+msgid "All executable files in this folder will appear in the Scripts menu."
+msgstr ""
+"所有此資料夾的�執行檔都會在「指令稿��單中出�。在�單中��其中一個指令稿"
+"會以所有已��的項目作為輸入資料來執行該指令稿。"
+
+#: src/file-manager/fm-directory-view.c:4830
+#, fuzzy
 msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr ""
 "所有此資料夾的�執行檔都會在「指令稿��單中出�。在�單中��其中一個指令稿"
 "會以所有已��的項目作為輸入資料來執行該指令稿。"
 
-#: src/file-manager/fm-directory-view.c:4359
+#: src/file-manager/fm-directory-view.c:4832
 msgid "About Scripts"
 msgstr "關於「指令稿�"
 
-#: src/file-manager/fm-directory-view.c:4360
+#: src/file-manager/fm-directory-view.c:4833
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -4524,177 +4555,182 @@ msgstr ""
 "\n"
 "NAUTILUS_SCRIPT_WINDOW_GEOMETRY：目�視窗的�置�尺寸"
 
-#: src/file-manager/fm-directory-view.c:4481
+#: src/file-manager/fm-directory-view.c:4963
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste Files command"
 msgstr "如果��「貼上檔案�指令將會移動“%s�"
 
-#: src/file-manager/fm-directory-view.c:4485
+#: src/file-manager/fm-directory-view.c:4967
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste Files command"
 msgstr "如果��「貼上檔案�指令將會複製“%s�"
 
-#: src/file-manager/fm-directory-view.c:4492
+#: src/file-manager/fm-directory-view.c:4974
 #, c-format
 msgid ""
 "The %d selected items will be moved if you select the Paste Files command"
 msgstr "如果��「貼上檔案�指令將會移動 %d 個�定的項目"
 
-#: src/file-manager/fm-directory-view.c:4496
+#: src/file-manager/fm-directory-view.c:4978
 #, c-format
 msgid ""
 "The %d selected items will be copied if you select the Paste Files command"
 msgstr "如果��「貼上檔案�指令將會複製 %d 個�定的項目"
 
-#: src/file-manager/fm-directory-view.c:4575
+#: src/file-manager/fm-directory-view.c:5057
 msgid "There is nothing on the clipboard to paste."
 msgstr "剪貼簿中沒有內容�供貼上。"
 
-#: src/file-manager/fm-directory-view.c:4676
-#: src/file-manager/fm-directory-view.c:5562
+#: src/file-manager/fm-directory-view.c:5159
+#: src/file-manager/fm-directory-view.c:6063
 msgid "Mount Error"
 msgstr "掛載錯誤"
 
-#: src/file-manager/fm-directory-view.c:4737
+#: src/file-manager/fm-directory-view.c:5221
 msgid "Unmount Error"
 msgstr "�載錯誤"
 
-#: src/file-manager/fm-directory-view.c:4739
+#: src/file-manager/fm-directory-view.c:5224
 #, fuzzy
 msgid "Eject Error"
 msgstr "掛載錯誤"
 
-#: src/file-manager/fm-directory-view.c:4961
+#: src/file-manager/fm-directory-view.c:5449
 msgid "E_ject"
 msgstr "退出(_J)"
 
-#: src/file-manager/fm-directory-view.c:4961
-#: src/file-manager/nautilus-directory-view-ui.xml.h:60
+#: src/file-manager/fm-directory-view.c:5449
+#: src/file-manager/nautilus-directory-view-ui.xml.h:64
 msgid "_Unmount Volume"
 msgstr "�載檔案系統(_U)"
 
-#: src/file-manager/fm-directory-view.c:5041
+#: src/file-manager/fm-directory-view.c:5529
 #, fuzzy
 msgid "Open in New Window"
 msgstr "用新視窗開啟(_I)"
 
-#: src/file-manager/fm-directory-view.c:5043
+#: src/file-manager/fm-directory-view.c:5531
 #, fuzzy, c-format
 msgid "Open in %d New Windows"
 msgstr "用 %d 個新視窗開啟(_I)"
 
-#: src/file-manager/fm-directory-view.c:5048
+#: src/file-manager/fm-directory-view.c:5536
 #, fuzzy
 msgid "Browse Folder"
 msgstr "個人資料夾"
 
-#: src/file-manager/fm-directory-view.c:5050
+#: src/file-manager/fm-directory-view.c:5538
 #, fuzzy
 msgid "Browse Folders"
 msgstr "個人資料夾"
 
-#: src/file-manager/fm-directory-view.c:5073
+#: src/file-manager/fm-directory-view.c:5561
 msgid "_Delete from Trash"
 msgstr "從垃圾桶中刪除(_D)"
 
-#: src/file-manager/fm-directory-view.c:5075
+#: src/file-manager/fm-directory-view.c:5563
 msgid "Delete all selected items permanently"
 msgstr "永久刪除�定的項目"
 
-#: src/file-manager/fm-directory-view.c:5078
-#: src/file-manager/fm-directory-view.c:5366
-#: src/file-manager/nautilus-directory-view-ui.xml.h:19
+#: src/file-manager/fm-directory-view.c:5566
+#: src/file-manager/fm-directory-view.c:5857
+#: src/file-manager/nautilus-directory-view-ui.xml.h:21
 msgid "Mo_ve to Trash"
 msgstr "丟進垃圾桶(_V)"
 
-#: src/file-manager/fm-directory-view.c:5080
-#: src/file-manager/nautilus-directory-view-ui.xml.h:21
+#: src/file-manager/fm-directory-view.c:5568
+#: src/file-manager/nautilus-directory-view-ui.xml.h:23
 msgid "Move each selected item to the Trash"
 msgstr "將指定項目丟進垃圾桶"
 
-#: src/file-manager/fm-directory-view.c:5104
-#: src/file-manager/nautilus-directory-view-ui.xml.h:49
+#: src/file-manager/fm-directory-view.c:5592
+#: src/file-manager/nautilus-directory-view-ui.xml.h:52
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: src/file-manager/fm-directory-view.c:5124
+#: src/file-manager/fm-directory-view.c:5612
 msgid "Ma_ke Links"
 msgstr "建立��(_K)"
 
-#: src/file-manager/fm-directory-view.c:5125
-#: src/file-manager/nautilus-directory-view-ui.xml.h:17
+#: src/file-manager/fm-directory-view.c:5613
+#: src/file-manager/nautilus-directory-view-ui.xml.h:19
 msgid "Ma_ke Link"
 msgstr "建立��(_K)"
 
-#: src/file-manager/fm-directory-view.c:5138
-#: src/file-manager/nautilus-directory-view-ui.xml.h:50
+#: src/file-manager/fm-directory-view.c:5626
+#: src/file-manager/nautilus-directory-view-ui.xml.h:54
 msgid "_Empty Trash"
 msgstr "清�垃圾桶(_E)"
 
-#: src/file-manager/fm-directory-view.c:5154
+#: src/file-manager/fm-directory-view.c:5642
 msgid "Cu_t File"
 msgstr "剪下檔案(_T)"
 
-#: src/file-manager/fm-directory-view.c:5155
-#: src/file-manager/nautilus-directory-view-ui.xml.h:9
+#: src/file-manager/fm-directory-view.c:5643
+#: src/file-manager/nautilus-directory-view-ui.xml.h:11
 msgid "Cu_t Files"
 msgstr "剪下檔案(_T)"
 
-#: src/file-manager/fm-directory-view.c:5164
+#: src/file-manager/fm-directory-view.c:5652
 msgid "_Copy File"
 msgstr "複製檔案(_C)"
 
-#: src/file-manager/fm-directory-view.c:5165
-#: src/file-manager/nautilus-directory-view-ui.xml.h:48
+#: src/file-manager/fm-directory-view.c:5653
+#: src/file-manager/nautilus-directory-view-ui.xml.h:51
 msgid "_Copy Files"
 msgstr "複製檔案(_C)"
 
-#: src/file-manager/fm-directory-view.c:5357
-msgid ""
-"This link can't be used, because it has no target. Do you want to move this "
-"link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5848
+#, fuzzy
+msgid "The link is borken, do you want to move it to the Trash?"
 msgstr "該��無法使用，因為它沒有任何目標�置。是�將該��丟進垃圾桶？"
 
-#: src/file-manager/fm-directory-view.c:5360
-#, c-format
-msgid ""
-"This link can't be used, because its target \"%s\" doesn't exist. Do you "
-"want to move this link to the Trash?"
+#: src/file-manager/fm-directory-view.c:5850
+#, fuzzy
+msgid "This link can't be used, because it has no target."
+msgstr "該��無法使用，因為它沒有任何目標�置。是�將該��丟進垃圾桶？"
+
+#: src/file-manager/fm-directory-view.c:5852
+#, fuzzy, 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:5366
+#: src/file-manager/fm-directory-view.c:5857
 msgid "Broken Link"
 msgstr "目標�存在的��"
 
-#: src/file-manager/fm-directory-view.c:5423
-#, c-format
-msgid ""
-"\"%s\" is an executable text file. Do you want to run it, or display its "
-"contents?"
+#: src/file-manager/fm-directory-view.c:5915
+#, fuzzy, c-format
+msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "“%s�是一個�執行的文字檔。�執行它，還是顯示它的內容？"
 
-#: src/file-manager/fm-directory-view.c:5429
+#: src/file-manager/fm-directory-view.c:5917
+#, c-format
+msgid "\"%s\" is an executable text file."
+msgstr ""
+
+#: src/file-manager/fm-directory-view.c:5923
 msgid "Run or Display?"
 msgstr "執行還是顯示？"
 
-#: src/file-manager/fm-directory-view.c:5430
-msgid "_Display"
-msgstr "顯示(_D)"
-
-#: src/file-manager/fm-directory-view.c:5431
+#: src/file-manager/fm-directory-view.c:5924
 msgid "Run in _Terminal"
 msgstr "在終端機中執行(_T)"
 
-#: src/file-manager/fm-directory-view.c:5434
+#: src/file-manager/fm-directory-view.c:5925
+msgid "_Display"
+msgstr "顯示(_D)"
+
+#: src/file-manager/fm-directory-view.c:5928
 msgid "_Run"
 msgstr "執行(_R)"
 
-#: src/file-manager/fm-directory-view.c:5686
-#, c-format
-msgid "Opening \"%s\""
+#: src/file-manager/fm-directory-view.c:6196
+#, fuzzy, c-format
+msgid "Opening \"%s\"."
 msgstr "開啟“%s�"
 
-#: src/file-manager/fm-directory-view.c:5692
+#: src/file-manager/fm-directory-view.c:6202
 msgid "Cancel Open?"
 msgstr "�消開啟？"
 
@@ -4715,107 +4751,132 @@ msgid "Sorry, couldn't display all the contents of \"%s\"."
 msgstr "抱歉，無法顯示“%s�的所有內容。"
 
 #: src/file-manager/fm-error-reporting.c:71
+#, fuzzy
+msgid "The folder contents could not be displayed."
+msgstr "無法得知“%s�的權�。"
+
+#: src/file-manager/fm-error-reporting.c:72
 msgid "Error Displaying Folder"
 msgstr "顯示資料夾發生錯誤"
 
-#: src/file-manager/fm-error-reporting.c:102
+#: src/file-manager/fm-error-reporting.c:103
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "這個目錄內已經有稱為“%s�的項目。請使用其它�稱。"
 
-#: src/file-manager/fm-error-reporting.c:107
+#: src/file-manager/fm-error-reporting.c:108
 #, c-format
 msgid ""
 "There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
 msgstr "資料夾內沒有“%s�。也許它剛剛被移動或刪除了？"
 
-#: src/file-manager/fm-error-reporting.c:112
+#: src/file-manager/fm-error-reporting.c:113
 #, c-format
 msgid "You do not have the permissions necessary to rename \"%s\"."
 msgstr "沒有將“%s��新命�的權�"
 
-#: src/file-manager/fm-error-reporting.c:117
+#: src/file-manager/fm-error-reporting.c:118
 #, c-format
 msgid ""
 "The name \"%s\" is not valid because it contains the character \"/\". Please "
 "use a different name."
 msgstr "�稱“%s�無效，因為它�有字元“/�。請使用其它�稱。"
 
-#: src/file-manager/fm-error-reporting.c:121
+#: src/file-manager/fm-error-reporting.c:122
 #, c-format
 msgid "The name \"%s\" is not valid. Please use a different name."
 msgstr "�稱“%s�無效。請使用其它�稱。"
 
-#: src/file-manager/fm-error-reporting.c:127
+#: src/file-manager/fm-error-reporting.c:128
 #, c-format
 msgid "Couldn't change the name of \"%s\" because it is on a read-only disk"
 msgstr "無法將“%s��新命�，因為它存放於唯讀的�碟內"
 
-#: src/file-manager/fm-error-reporting.c:136
+#: src/file-manager/fm-error-reporting.c:137
 #, c-format
 msgid "Sorry, couldn't rename \"%s\" to \"%s\"."
 msgstr "抱歉，無法將“%s��新命�為“%s�。"
 
-#: src/file-manager/fm-error-reporting.c:143
+#: src/file-manager/fm-error-reporting.c:144
+#, fuzzy
+msgid "The item could not be renamed."
+msgstr "無法得知“%s�的權�。"
+
+#: src/file-manager/fm-error-reporting.c:145
 msgid "Renaming Error"
 msgstr "�新命�發生錯誤"
 
-#: src/file-manager/fm-error-reporting.c:163
+#: 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 "沒有更改“%s�所屬群組的權�。"
 
-#: src/file-manager/fm-error-reporting.c:167
+#: 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 "無法更改“%s�的群組，因為它存放於唯讀的�碟內"
 
-#: src/file-manager/fm-error-reporting.c:175
+#: src/file-manager/fm-error-reporting.c:177
 #, c-format
 msgid "Sorry, couldn't change the group of \"%s\"."
 msgstr "抱歉，無法更改“%s�的所屬群組。"
 
-#: src/file-manager/fm-error-reporting.c:179
+#: src/file-manager/fm-error-reporting.c:181
+#, fuzzy
+msgid "The group could not be changed."
+msgstr "無法得知“%s�的權�。"
+
+#: src/file-manager/fm-error-reporting.c:181
 msgid "Error Setting Group"
 msgstr "設定群組時發生錯誤"
 
-#: src/file-manager/fm-error-reporting.c:201
+#: 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 "無法更改“%s�的�有者，因為它存放於唯讀的�碟內"
 
-#: src/file-manager/fm-error-reporting.c:208
+#: src/file-manager/fm-error-reporting.c:210
 #, c-format
 msgid "Sorry, couldn't change the owner of \"%s\"."
 msgstr "抱歉，無法更改“%s�的�有者。"
 
-#: src/file-manager/fm-error-reporting.c:211
+#: src/file-manager/fm-error-reporting.c:213
+#, fuzzy
+msgid "The owner could not be changed."
+msgstr "無法得知“%s�的權�。"
+
+#: src/file-manager/fm-error-reporting.c:213
 msgid "Error Setting Owner"
 msgstr "設定�有者時發生錯誤"
 
-#: src/file-manager/fm-error-reporting.c:233
+#: 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 "無法更改“%s�的權�，因為它存放於唯讀的�碟內"
 
-#: src/file-manager/fm-error-reporting.c:240
+#: src/file-manager/fm-error-reporting.c:242
 #, c-format
 msgid "Sorry, couldn't change the permissions of \"%s\"."
 msgstr "抱歉，無法更改“%s�的權�。"
 
-#: src/file-manager/fm-error-reporting.c:243
+#: src/file-manager/fm-error-reporting.c:245
+#, fuzzy
+msgid "The permissions could not be changed."
+msgstr "無法得知“%s�的權�。"
+
+#: src/file-manager/fm-error-reporting.c:246
 msgid "Error Setting Permissions"
 msgstr "設定權�時發生錯誤"
 
-#: src/file-manager/fm-error-reporting.c:309
+#: src/file-manager/fm-error-reporting.c:312
 #, c-format
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "將“%s��新命�為“%s�。"
 
-#: src/file-manager/fm-error-reporting.c:314
+#: src/file-manager/fm-error-reporting.c:317
 msgid "Cancel Rename?"
 msgstr "是��消�新命�？"
 
@@ -4873,122 +4934,140 @@ msgstr "還原圖示尺寸(_Z)"
 msgid "Restore Icon's Original Si_ze"
 msgstr "還原圖示尺寸(_Z)"
 
-#: src/file-manager/fm-icon-view.c:1961
+#: src/file-manager/fm-icon-view.c:1962
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "目標為“%s�"
 
-#: src/file-manager/fm-icon-view.c:2544
-msgid "Drag and drop is only supported to local file systems."
+#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2569
+#, fuzzy
+msgid "Drag and drop is not supported."
 msgstr "拖放圖示�在本機的檔案系統之間�用。"
 
-#: src/file-manager/fm-icon-view.c:2545 src/file-manager/fm-icon-view.c:2568
-msgid "Drag and Drop error"
+#: src/file-manager/fm-icon-view.c:2546
+#, fuzzy
+msgid "Drag and drop is only supported on local file systems."
+msgstr "拖放圖示�在本機的檔案系統之間�用。"
+
+#: src/file-manager/fm-icon-view.c:2547 src/file-manager/fm-icon-view.c:2571
+#, fuzzy
+msgid "Drag and Drop Error"
 msgstr "拖放時發生錯誤"
 
-#: src/file-manager/fm-icon-view.c:2567
+#: src/file-manager/fm-icon-view.c:2570
 msgid "An invalid drag type was used."
 msgstr "拖曳方��正確。"
 
-#: src/file-manager/fm-list-view.c:762
+#: src/file-manager/fm-list-view.c:808
 msgid "File name"
 msgstr "檔案�稱"
 
-#: src/file-manager/fm-list-view.c:786
-#: src/file-manager/fm-search-list-view.c:512
+#: src/file-manager/fm-list-view.c:832
+#: src/file-manager/fm-search-list-view.c:519
 msgid "Size"
 msgstr "大�"
 
-#: src/file-manager/fm-list-view.c:797
-#: src/file-manager/fm-search-list-view.c:518
+#: src/file-manager/fm-list-view.c:843
+#: src/file-manager/fm-search-list-view.c:525
 msgid "Type"
 msgstr "é¡žåž‹"
 
-#: src/file-manager/fm-list-view.c:808
-#: src/file-manager/fm-search-list-view.c:524
+#: src/file-manager/fm-list-view.c:854
+#: src/file-manager/fm-search-list-view.c:531
 msgid "Date Modified"
 msgstr "最後修改日期"
 
-#: src/file-manager/fm-properties-window.c:479
-#: src/nautilus-information-panel.c:506
-msgid ""
-"You can't assign more than one custom icon at a time! Please drag just one "
-"image to set a custom icon."
+#: src/file-manager/fm-properties-window.c:482
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time!"
 msgstr "�能�時分�一個以上的自�圖示�請�拖曳一個圖�作為自�圖示。"
 
-#: src/file-manager/fm-properties-window.c:481
+#: src/file-manager/fm-properties-window.c:483
+#: src/nautilus-information-panel.c:507
+#, fuzzy
+msgid "Please drag just one image to set a custom icon."
+msgstr "�能�時分�一個以上的自�圖示�請�拖曳一個圖�作為自�圖示。"
+
+#: src/file-manager/fm-properties-window.c:484
 #: src/nautilus-information-panel.c:508
 msgid "More Than One Image"
 msgstr "多於一個圖�"
 
-#: src/file-manager/fm-properties-window.c:490
+#: src/file-manager/fm-properties-window.c:493
 #: src/nautilus-information-panel.c:527
-msgid ""
-"The file that you dropped is not local.  You can only use local images as "
-"custom icons."
+#, fuzzy
+msgid "The file that you dropped is not local."
 msgstr "所拖放的檔案並�本地的檔案。�許使用本地的圖示作為自�圖示。"
 
-#: src/file-manager/fm-properties-window.c:492
+#: src/file-manager/fm-properties-window.c:494
+#: src/file-manager/fm-properties-window.c:501
+#: src/nautilus-information-panel.c:528
+#, fuzzy
+msgid "You can only use local images as custom icons."
+msgstr "所拖放的檔案並�本地的檔案。�許使用本地的圖示作為自�圖示。"
+
+#: src/file-manager/fm-properties-window.c:495
 #: src/nautilus-information-panel.c:529
 msgid "Local Images Only"
 msgstr "��使用本地的圖�"
 
-#: src/file-manager/fm-properties-window.c:497
+#: src/file-manager/fm-properties-window.c:500
 #: src/nautilus-information-panel.c:534
-msgid ""
-"The file that you dropped is not an image.  You can only use local images as "
-"custom icons."
-msgstr "所拖放的檔案並�圖�檔。�許使用本地的圖示作為自�圖示。"
+#, fuzzy
+msgid "The file that you dropped is not an image."
+msgstr "所拖放的檔案並�本地的檔案。�許使用本地的圖示作為自�圖示。"
 
-#: src/file-manager/fm-properties-window.c:499
+#: src/file-manager/fm-properties-window.c:502
 #: src/nautilus-information-panel.c:536
 msgid "Images Only"
 msgstr "��使用圖�"
 
-#: src/file-manager/fm-properties-window.c:916
+#: src/file-manager/fm-properties-window.c:919
 msgid "Properties"
 msgstr "屬性"
 
-#: src/file-manager/fm-properties-window.c:919
+#: src/file-manager/fm-properties-window.c:922
 #, c-format
 msgid "%s Properties"
 msgstr "%s 屬性"
 
-#: src/file-manager/fm-properties-window.c:1380
+#: src/file-manager/fm-properties-window.c:1383
 msgid "Cancel Group Change?"
 msgstr "�消更改群組？"
 
-#: src/file-manager/fm-properties-window.c:1381
-msgid "Changing group"
+#: src/file-manager/fm-properties-window.c:1384
+#, fuzzy
+msgid "Changing group."
 msgstr "正在更改群組"
 
-#: src/file-manager/fm-properties-window.c:1542
+#: src/file-manager/fm-properties-window.c:1545
 msgid "Cancel Owner Change?"
 msgstr "�消更改�有者？"
 
-#: src/file-manager/fm-properties-window.c:1543
-msgid "Changing owner"
+#: src/file-manager/fm-properties-window.c:1546
+#, fuzzy
+msgid "Changing owner."
 msgstr "正在更改�有者"
 
-#: src/file-manager/fm-properties-window.c:1748
+#: src/file-manager/fm-properties-window.c:1752
 msgid "nothing"
 msgstr "沒有項目"
 
-#: src/file-manager/fm-properties-window.c:1750
+#: src/file-manager/fm-properties-window.c:1754
 msgid "unreadable"
 msgstr "無法讀�"
 
-#: src/file-manager/fm-properties-window.c:1761
+#: src/file-manager/fm-properties-window.c:1765
 #, c-format
 msgid "1 item, with size %s"
 msgstr "1 個項目，大�為 %s"
 
-#: src/file-manager/fm-properties-window.c:1764
+#: src/file-manager/fm-properties-window.c:1768
 #, c-format
 msgid "%d items, totalling %s"
 msgstr "%d 個項目，總共 %s"
 
-#: src/file-manager/fm-properties-window.c:1772
+#: src/file-manager/fm-properties-window.c:1776
 msgid "(some contents unreadable)"
 msgstr "(無法讀��部份內容)"
 
@@ -4998,191 +5077,191 @@ 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:1789
+#: src/file-manager/fm-properties-window.c:1793
 msgid "Contents:"
 msgstr "內容："
 
-#: src/file-manager/fm-properties-window.c:2180
+#: src/file-manager/fm-properties-window.c:2184
 msgid "Basic"
 msgstr "基本"
 
-#: src/file-manager/fm-properties-window.c:2208
+#: src/file-manager/fm-properties-window.c:2212
 msgid "_Names:"
 msgstr "�稱(_N)："
 
-#: src/file-manager/fm-properties-window.c:2210
+#: src/file-manager/fm-properties-window.c:2214
+#: src/nautilus-connect-server-dialog.c:187
 msgid "_Name:"
 msgstr "�稱(_N)："
 
-#: src/file-manager/fm-properties-window.c:2259
+#: src/file-manager/fm-properties-window.c:2263
 msgid "Type:"
 msgstr "類型："
 
-#: src/file-manager/fm-properties-window.c:2261
-#: src/file-manager/fm-properties-window.c:2271
-#: src/file-manager/fm-properties-window.c:2277
-#: src/file-manager/fm-properties-window.c:2284
+#: src/file-manager/fm-properties-window.c:2265
+#: src/file-manager/fm-properties-window.c:2275
+#: src/file-manager/fm-properties-window.c:2281
 #: src/file-manager/fm-properties-window.c:2288
-#: src/file-manager/fm-properties-window.c:2296
-#: src/file-manager/fm-properties-window.c:2302
-#: src/file-manager/fm-properties-window.c:2311
-#: src/file-manager/fm-properties-window.c:2317
-#: src/file-manager/fm-properties-window.c:2887
-#: src/file-manager/fm-properties-window.c:2908
-#: src/file-manager/fm-properties-window.c:2990
-#: src/file-manager/fm-properties-window.c:2994
-#: src/file-manager/fm-properties-window.c:2998
+#: src/file-manager/fm-properties-window.c:2292
+#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2306
+#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2321
+#: src/file-manager/fm-properties-window.c:2905
+#: src/file-manager/fm-properties-window.c:2926
+#: src/file-manager/fm-properties-window.c:3017
+#: src/file-manager/fm-properties-window.c:3021
+#: src/file-manager/fm-properties-window.c:3025
 msgid "--"
 msgstr "--"
 
-#: src/file-manager/fm-properties-window.c:2269
+#: src/file-manager/fm-properties-window.c:2273
 msgid "Size:"
 msgstr "大�："
 
-#: src/file-manager/fm-properties-window.c:2275
-#: src/nautilus-connect-server-dialog.c:202 src/nautilus-location-bar.c:61
-#: src/nautilus-location-dialog.c:145
+#: src/file-manager/fm-properties-window.c:2279 src/nautilus-location-bar.c:61
+#: src/nautilus-location-dialog.c:144
 msgid "Location:"
 msgstr "�置："
 
-#: src/file-manager/fm-properties-window.c:2282
+#: src/file-manager/fm-properties-window.c:2286
 msgid "Volume:"
 msgstr "總容�："
 
-#: src/file-manager/fm-properties-window.c:2286
+#: src/file-manager/fm-properties-window.c:2290
 msgid "Free space:"
 msgstr "�用空間："
 
-#: src/file-manager/fm-properties-window.c:2294
+#: src/file-manager/fm-properties-window.c:2298
 msgid "Link target:"
 msgstr "��目標："
 
-#: src/file-manager/fm-properties-window.c:2300
+#: src/file-manager/fm-properties-window.c:2304
 msgid "MIME type:"
 msgstr "MIME 類型："
 
-#: src/file-manager/fm-properties-window.c:2309
+#: src/file-manager/fm-properties-window.c:2313
 msgid "Modified:"
 msgstr "修改時間："
 
-#: src/file-manager/fm-properties-window.c:2315
+#: src/file-manager/fm-properties-window.c:2319
 msgid "Accessed:"
 msgstr "存�時間："
 
-#: src/file-manager/fm-properties-window.c:2331
+#: src/file-manager/fm-properties-window.c:2335
 msgid "_Select Custom Icon..."
 msgstr "自行指定圖示(_S)..."
 
-#: src/file-manager/fm-properties-window.c:2337
+#: src/file-manager/fm-properties-window.c:2341
 msgid "_Remove Custom Icon"
 msgstr "移除自�圖示(_R)"
 
-#: src/file-manager/fm-properties-window.c:2678
+#: src/file-manager/fm-properties-window.c:2684
 msgid "_Read"
 msgstr "讀�(_R)"
 
-#: src/file-manager/fm-properties-window.c:2680
+#: src/file-manager/fm-properties-window.c:2686
 msgid "_Write"
 msgstr "寫入(_W)"
 
-#: src/file-manager/fm-properties-window.c:2682
+#: src/file-manager/fm-properties-window.c:2688
 msgid "E_xecute"
 msgstr "執行(_X)"
 
-#: src/file-manager/fm-properties-window.c:2759
+#: src/file-manager/fm-properties-window.c:2771
 msgid "Set _user ID"
 msgstr "Set _user ID"
 
-#: src/file-manager/fm-properties-window.c:2764
+#: src/file-manager/fm-properties-window.c:2776
 msgid "Special flags:"
 msgstr "特殊屬性："
 
-#: src/file-manager/fm-properties-window.c:2767
+#: src/file-manager/fm-properties-window.c:2779
 msgid "Set gro_up ID"
 msgstr "Set gro_up ID"
 
-#: src/file-manager/fm-properties-window.c:2769
+#: src/file-manager/fm-properties-window.c:2781
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: src/file-manager/fm-properties-window.c:2853
+#: src/file-manager/fm-properties-window.c:2870
 msgid "Permissions"
 msgstr "權�"
 
-#: src/file-manager/fm-properties-window.c:2863
+#: src/file-manager/fm-properties-window.c:2880
 msgid "You are not the owner, so you can't change these permissions."
 msgstr "您並��有者，所以無法更改這些權�。"
 
-#: src/file-manager/fm-properties-window.c:2876
+#: src/file-manager/fm-properties-window.c:2894
+#, fuzzy
+msgid "File _owner:"
+msgstr "檔案�有者："
+
+#: src/file-manager/fm-properties-window.c:2900
 msgid "File owner:"
 msgstr "檔案�有者："
 
-#: src/file-manager/fm-properties-window.c:2893
+#: src/file-manager/fm-properties-window.c:2911
 msgid "_File group:"
 msgstr "檔案群組(_F)："
 
-#: src/file-manager/fm-properties-window.c:2902
+#: src/file-manager/fm-properties-window.c:2920
 msgid "File group:"
 msgstr "檔案群組："
 
-#: src/file-manager/fm-properties-window.c:2914
+#: src/file-manager/fm-properties-window.c:2932
 msgid "Owner:"
 msgstr "�有者："
 
-#: src/file-manager/fm-properties-window.c:2915
+#: src/file-manager/fm-properties-window.c:2933
 msgid "Group:"
 msgstr "群組："
 
-#: src/file-manager/fm-properties-window.c:2916
+#: src/file-manager/fm-properties-window.c:2934
 msgid "Others:"
 msgstr "其它："
 
-#: src/file-manager/fm-properties-window.c:2989
+#: src/file-manager/fm-properties-window.c:3016
 msgid "Text view:"
 msgstr "文字顯示模�："
 
-#: src/file-manager/fm-properties-window.c:2993
+#: src/file-manager/fm-properties-window.c:3020
 msgid "Number view:"
 msgstr "數字顯示："
 
-#: src/file-manager/fm-properties-window.c:2997
+#: src/file-manager/fm-properties-window.c:3024
 msgid "Last changed:"
 msgstr "最後修改時間："
 
-#: src/file-manager/fm-properties-window.c:3003
+#: src/file-manager/fm-properties-window.c:3030
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "無法得知“%s�的權�。"
 
-#: src/file-manager/fm-properties-window.c:3006
+#: src/file-manager/fm-properties-window.c:3033
 msgid "The permissions of the selected file could not be determined."
 msgstr "無法得知指定的檔案的權�。"
 
-#: src/file-manager/fm-properties-window.c:3322
-#: src/nautilus-bookmarks-window.c:146
-#: src/nautilus-file-management-properties.c:237
-#: src/nautilus-property-browser.c:1446 src/nautilus-window-menus.c:629
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"顯示說明文件時發生錯誤：\n"
-"%s"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "There was an error displaying help."
+msgstr "顯示說明文件時發生錯誤：%s"
 
-#: src/file-manager/fm-properties-window.c:3324
-msgid "Couldn't show help"
+#: src/file-manager/fm-properties-window.c:3348
+#, fuzzy
+msgid "Couldn't Show Help"
 msgstr "無法顯示說明文件"
 
-#: src/file-manager/fm-properties-window.c:3661
+#: src/file-manager/fm-properties-window.c:3684
 msgid "Cancel Showing Properties Window?"
 msgstr "是��消顯示屬性視窗？"
 
-#: src/file-manager/fm-properties-window.c:3662
-msgid "Creating Properties window"
+#: src/file-manager/fm-properties-window.c:3685
+#, fuzzy
+msgid "Creating Properties window."
 msgstr "正在顯示屬性視窗"
 
-#: src/file-manager/fm-properties-window.c:3788
+#: src/file-manager/fm-properties-window.c:3811
 msgid "Select an icon"
 msgstr "��圖示"
 
@@ -5199,91 +5278,128 @@ msgid "Search Results"
 msgstr "�尋�果"
 
 #: src/file-manager/fm-search-list-view.c:166
-msgid ""
-"Sorry, but the Medusa search service is not available because it is not "
-"installed."
-msgstr "抱歉，Medusa �尋�務因並未安�，所以無法使用。"
+#, fuzzy
+msgid "Sorry, but the Medusa search service is not available."
+msgstr "抱歉，目�無法�供 medusa �尋�務。"
 
 #: src/file-manager/fm-search-list-view.c:167
-#: src/file-manager/nautilus-indexing-info.c:303
+msgid "Medusa is not installed."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:168
+#: src/file-manager/nautilus-indexing-info.c:301
 msgid "Search Service Not Available"
 msgstr "無法�供�尋�務"
 
 #: src/file-manager/fm-search-list-view.c:190
+#, fuzzy
 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."
+"search will return no results right now."
 msgstr ""
 "�尋�件中的時間比最後一次進行索引的時間還�新。�在進行�尋�會輸出任何�"
 "果。�以用 root 的身分在指令列中執行“medusa-indexd�來產生新的索引。"
 
-#: src/file-manager/fm-search-list-view.c:196
-msgid "Search for items that are too new"
+#: src/file-manager/fm-search-list-view.c:194
+#: src/file-manager/fm-search-list-view.c:213
+#, fuzzy
+msgid ""
+"You can create a new index by running \"medusa-indexd\" as root on the "
+"command line."
+msgstr ""
+"Find 無法開啟檔案系統索引。索引檔�能消失了或者已經�壞。您�以用 root 的身分"
+"在指令列中執行“medusa-indexd�來產生新的索引。"
+
+#: src/file-manager/fm-search-list-view.c:197
+#, fuzzy
+msgid "Search For Items That Are Too New"
 msgstr "�尋的項目太新"
 
-#: src/file-manager/fm-search-list-view.c:200
+#: src/file-manager/fm-search-list-view.c:201
+#, fuzzy
+msgid "Every indexed file on your computer matches the criteria you selected. "
+msgstr ""
+"索引中的�個檔案都符��尋�件。您�以檢查一下有沒有拼字錯誤，或是加上新的�"
+"件來縮窄�尋範�。"
+
+#: src/file-manager/fm-search-list-view.c:203
+#, fuzzy
 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 "
+"You can check the spelling on your selections or add more criteria to narrow "
 "your results."
 msgstr ""
 "索引中的�個檔案都符��尋�件。您�以檢查一下有沒有拼字錯誤，或是加上新的�"
 "件來縮窄�尋範�。"
 
-#: src/file-manager/fm-search-list-view.c:204
-#: src/file-manager/fm-search-list-view.c:225
-msgid "Error during search"
+#: src/file-manager/fm-search-list-view.c:205
+#: src/file-manager/fm-search-list-view.c:223
+#, fuzzy
+msgid "Error During Search"
 msgstr "�尋時發生錯誤"
 
 #. FIXME: This dialog does not get shown because a slow search
 #. will be performed and will not return an error.
-#: src/file-manager/fm-search-list-view.c:210
+#: src/file-manager/fm-search-list-view.c:211
+#, fuzzy
 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."
+"corrupt."
 msgstr ""
 "Find 無法開啟檔案系統索引。索引檔�能消失了或者已經�壞。您�以用 root 的身分"
 "在指令列中執行“medusa-indexd�來產生新的索引。"
 
-#: src/file-manager/fm-search-list-view.c:214
-msgid "Error reading file index"
+#: src/file-manager/fm-search-list-view.c:215
+#, fuzzy
+msgid "Error Reading File Index"
 msgstr "讀�檔案索引時發生錯誤"
 
-#: src/file-manager/fm-search-list-view.c:220
-#, c-format
-msgid "An error occurred while loading this search's contents: %s"
+#: src/file-manager/fm-search-list-view.c:221
+#, fuzzy
+msgid "An error occurred while loading this search's contents."
 msgstr "當載入今次�尋的內容時發生錯誤︰%s"
 
-#: src/file-manager/fm-search-list-view.c:244
+#: src/file-manager/fm-search-list-view.c:240
+#, fuzzy
+msgid ""
+"To do a fast search, Find requires an index of the files on your system."
+msgstr ""
+"如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
+"存�該索引檔。"
+
+#: src/file-manager/fm-search-list-view.c:242
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the files on your system."
+msgstr ""
+"如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
+"存�該索引檔。"
+
+#: src/file-manager/fm-search-list-view.c:245
+#, fuzzy
 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 ""
 "如果�進行快速�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
 "存�該索引檔，因此會使用�一種較慢但�需�該索引檔的�尋方法。"
 
-#: src/file-manager/fm-search-list-view.c:249
-msgid ""
-"To do a content search, Find requires an index of the files on your system.  "
-"Find can't access your index right now. "
+#: src/file-manager/fm-search-list-view.c:248
+msgid "Find can't access your index right now."
 msgstr ""
-"如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
-"存�該索引檔。"
 
-#: src/file-manager/fm-search-list-view.c:253
-msgid "Fast searches are not available"
+#: src/file-manager/fm-search-list-view.c:250
+#, fuzzy
+msgid "Fast Searches Are Not Available"
 msgstr "無法�供快速�尋功能"
 
-#: src/file-manager/fm-search-list-view.c:254
-#: src/file-manager/fm-search-list-view.c:284
-#: src/file-manager/fm-search-list-view.c:307
-msgid "Content searches are not available"
+#: src/file-manager/fm-search-list-view.c:251
+#: src/file-manager/fm-search-list-view.c:285
+#: src/file-manager/fm-search-list-view.c:312
+#, fuzzy
+msgid "Content Searches Are Not Available"
 msgstr "無法�供內容�尋功能"
 
-#: src/file-manager/fm-search-list-view.c:257
+#: src/file-manager/fm-search-list-view.c:255
 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 "
@@ -5296,52 +5412,84 @@ msgstr ""
 "\n"
 "medusa-searchd"
 
-#: src/file-manager/fm-search-list-view.c:271
+#: src/file-manager/fm-search-list-view.c:269
+#, fuzzy
 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."
+"Your computer is currently creating that index."
 msgstr ""
 "如果�進行快速�尋，Find 需�使用一個包�系統中所有檔案的索引。目�系統正在產"
 "生該索引檔。因為 Find 無法使用索引，今次的�尋�求�能會需時數分�。"
 
-#: src/file-manager/fm-search-list-view.c:277
+#: src/file-manager/fm-search-list-view.c:273
+#, fuzzy
 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."
+"system.  Your computer is currently creating that index."
 msgstr ""
 "如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案內容的索引。目�系統正"
 "在產生該索引檔。當索引完�後系統就�以�供內容�尋�務。"
 
-#: src/file-manager/fm-search-list-view.c:283
-#: src/file-manager/fm-search-list-view.c:306
-msgid "Indexed searches are not available"
+#: src/file-manager/fm-search-list-view.c:278
+msgid "Because Find cannot use an index, this search may take several minutes."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:281
+msgid "Content searches will be available when the index is complete."
+msgstr ""
+
+#: src/file-manager/fm-search-list-view.c:284
+#: src/file-manager/fm-search-list-view.c:311
+#, fuzzy
+msgid "Indexed Searches Are Not Available"
 msgstr "無法�供索引�尋功能"
 
-#: src/file-manager/fm-search-list-view.c:291
+#: src/file-manager/fm-search-list-view.c:293
+#, fuzzy
 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."
+"index is available right now."
+msgstr ""
+"如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
+"存�該索引檔。"
+
+#: src/file-manager/fm-search-list-view.c:296
+#, fuzzy
+msgid ""
+"To do a content search, Find requires an index of the content on your "
+"system.  No index is available right now."
+msgstr ""
+"如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案的索引。Find 目�無法"
+"存�該索引檔。"
+
+#: src/file-manager/fm-search-list-view.c:300
+#, fuzzy
+msgid ""
+"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 ""
 "如果�進行快速�尋，Find 需�使用一個包�系統中所有檔案的索引。目�該索引�存"
 "在。您�以用 root 的身分執行“medusa-indexd�來產生索引。今次的�尋�求�能會需"
 "時數分�，直至有完整的索引為止。"
 
-#: src/file-manager/fm-search-list-view.c:298
+#: src/file-manager/fm-search-list-view.c:305
+#, fuzzy
 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."
+"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 ""
 "如果�進行內容�尋，Find 需�使用一個包�系統中所有檔案內容的索引。目�該索引"
 "檔�存在。您�以用 root 的身分執行“medusa-indexd�來產生索引。目�無法進行�"
 "尋，直至有完整的索引為止。"
 
-#: src/file-manager/fm-search-list-view.c:323
+#: src/file-manager/fm-search-list-view.c:329
+#, fuzzy
+msgid "Fast searches are not enabled on your computer."
+msgstr "電腦未有啟用快速�尋�務"
+
+#: src/file-manager/fm-search-list-view.c:330
 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 "
@@ -5350,11 +5498,12 @@ msgstr ""
 "如果�進行快速�尋，Find 需�使用一個包�系統中所有檔案的索引。但系統管�員已"
 "關閉了快速�尋功能，所以無法�供索引。"
 
-#: src/file-manager/fm-search-list-view.c:327
-msgid "Fast searches are not enabled on your computer"
-msgstr "電腦未有啟用快速�尋�務"
+#: src/file-manager/fm-search-list-view.c:334
+#, fuzzy
+msgid "Fast Searches Not Enabled"
+msgstr "無法�供快速�尋功能"
 
-#: src/file-manager/fm-search-list-view.c:506
+#: src/file-manager/fm-search-list-view.c:513
 msgid "Where"
 msgstr "�置"
 
@@ -5363,7 +5512,7 @@ msgstr "�置"
 #. * and scroll as necessary to make that item visible (this comment
 #. * is to inform translators of this tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:560
+#: src/file-manager/fm-search-list-view.c:567
 #: src/file-manager/nautilus-search-list-view-ui.xml.h:6
 msgid "_Reveal in New Window"
 msgstr "以新的視窗顯示(_R)"
@@ -5374,7 +5523,7 @@ msgstr "以新的視窗顯示(_R)"
 #. * items visible (this comment is to inform translators of this
 #. * tricky concept).
 #.
-#: src/file-manager/fm-search-list-view.c:568
+#: src/file-manager/fm-search-list-view.c:575
 #, c-format
 msgid "Reveal in %d _New Windows"
 msgstr "以 %d 個新的視窗顯示(_N)"
@@ -5383,14 +5532,19 @@ msgstr "以 %d 個新的視窗顯示(_N)"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: src/file-manager/fm-search-list-view.c:684
-msgid ""
-"Nautilus found more search results than it can display. Some matching items "
-"will not be displayed. "
+#: src/file-manager/fm-search-list-view.c:691
+#, fuzzy
+msgid "Nautilus found more search results than it can display."
+msgstr ""
+"�尋�果的數目多於 Nautilus �顯示的最大數目。�些符��件的項目將�會顯示。"
+
+#: src/file-manager/fm-search-list-view.c:692
+#, fuzzy
+msgid "Some matching items will not be displayed. "
 msgstr ""
 "�尋�果的數目多於 Nautilus �顯示的最大數目。�些符��件的項目將�會顯示。"
 
-#: src/file-manager/fm-search-list-view.c:686
+#: src/file-manager/fm-search-list-view.c:693
 msgid "Too Many Matches"
 msgstr "符�的項目太多"
 
@@ -5404,12 +5558,12 @@ msgid "Create L_auncher"
 msgstr "新增啟動圖示(_A)"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:3
-#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#: src/file-manager/nautilus-directory-view-ui.xml.h:9
 msgid "Create a new launcher"
 msgstr "新增啟動圖示"
 
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:4
-#: src/file-manager/nautilus-directory-view-ui.xml.h:11
+#: src/file-manager/nautilus-directory-view-ui.xml.h:13
 msgid "Delete all items in the Trash"
 msgstr "清�垃圾桶所有項目"
 
@@ -5428,7 +5582,7 @@ msgstr "顯示一個�設定桌�背景圖樣或�色的視窗"
 
 #. add the reset background item, possibly disabled
 #: src/file-manager/nautilus-desktop-icon-view-ui.xml.h:9
-#: src/file-manager/nautilus-directory-view-ui.xml.h:45
+#: src/file-manager/nautilus-directory-view-ui.xml.h:48
 #: src/nautilus-information-panel.c:349
 msgid "Use _Default Background"
 msgstr "使用�設背景(_D)"
@@ -5450,56 +5604,66 @@ msgid "Choose another viewer with which to view the selected item"
 msgstr "請��其它顯示模�來顯示�定的項目"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:5
-msgid "Create _Folder"
+#, fuzzy
+msgid "Create _Document"
 msgstr "新增資料夾(_F)"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:6
-msgid "Create a new empty folder inside this folder"
+msgid "Create _Folder"
+msgstr "新增資料夾(_F)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:7
+#, fuzzy
+msgid "Create a new empty file inside this folder"
 msgstr "在本資料夾中新增空白資料夾"
 
 #: src/file-manager/nautilus-directory-view-ui.xml.h:8
+msgid "Create a new empty folder inside this folder"
+msgstr "在本資料夾中新增空白資料夾"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:10
 msgid "Create a symbolic link for each selected item"
 msgstr "為所有�定的項目建立��"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:10
+#: src/file-manager/nautilus-directory-view-ui.xml.h:12
 msgid "D_uplicate"
 msgstr "複製(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:12
+#: src/file-manager/nautilus-directory-view-ui.xml.h:14
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "將所有�定的項目直接刪除而�丟進垃圾桶"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:13
+#: src/file-manager/nautilus-directory-view-ui.xml.h:15
 msgid "Duplicate each selected item"
 msgstr "複製所有�定的項目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:14
+#: src/file-manager/nautilus-directory-view-ui.xml.h:16
 msgid "Edit Launcher"
 msgstr "修改啟動圖示"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:15
+#: src/file-manager/nautilus-directory-view-ui.xml.h:17
 msgid "Edit the launcher information"
 msgstr "修改啟動圖示資訊"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:16
+#: src/file-manager/nautilus-directory-view-ui.xml.h:18
 msgid "Format the selected volume"
 msgstr "將�定的檔案系統格�化"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:18
+#: src/file-manager/nautilus-directory-view-ui.xml.h:20
 msgid "Medi_a Properties"
 msgstr "媒體屬性(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:20
+#: src/file-manager/nautilus-directory-view-ui.xml.h:22
 #, fuzzy
 msgid "Mount the selected volume"
 msgstr "�載已��的檔案系統。"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:22
+#: src/file-manager/nautilus-directory-view-ui.xml.h:24
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command"
 msgstr "移動或複製從「剪下檔案�或「複製檔案�指令��的檔案"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:23
+#: src/file-manager/nautilus-directory-view-ui.xml.h:25
 msgid ""
 "Move or copy files previously selected by a Cut Files or Copy Files command "
 "into the selected folder"
@@ -5507,128 +5671,137 @@ msgstr ""
 "如果曾使用「剪下檔案�或「複製檔案�指令��檔案，則�以將這些檔案移動或複製"
 "至指定的資料夾"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:24
+#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+msgid "No templates Installed"
+msgstr ""
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:27
 msgid "Open Wit_h"
 msgstr "以其它方�開啟(_H)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:25
+#: src/file-manager/nautilus-directory-view-ui.xml.h:28
 #, fuzzy
 msgid "Open each selected item in a navigation window"
 msgstr "用新視窗開啟�一個�定的項目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:26
+#: src/file-manager/nautilus-directory-view-ui.xml.h:29
 #, fuzzy
 msgid "Open in Navigation Window"
 msgstr "用新視窗開啟(_I)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:27
+#: src/file-manager/nautilus-directory-view-ui.xml.h:30
 msgid "Open the selected item in this window"
 msgstr "在本視窗中開啟�定的項目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:30
+#: src/file-manager/nautilus-directory-view-ui.xml.h:33
 msgid "Prepare the selected files to be copied with a Paste Files command"
 msgstr "使用此項�作後���「貼上檔案��以複製指定的檔案"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:31
+#: src/file-manager/nautilus-directory-view-ui.xml.h:34
 msgid "Prepare the selected files to be moved with a Paste Files command"
 msgstr "使用此項�作後���「貼上檔案��以移動指定的檔案"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:32
+#: src/file-manager/nautilus-directory-view-ui.xml.h:35
 msgid "Prot_ect"
 msgstr "�護(_E)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:33
+#: src/file-manager/nautilus-directory-view-ui.xml.h:36
 msgid "Protect the selected volume"
 msgstr "�護�定的檔案系統"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:34
+#: src/file-manager/nautilus-directory-view-ui.xml.h:37
 msgid "Rename selected item"
 msgstr "將�定的項目�新命�"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:35
+#: src/file-manager/nautilus-directory-view-ui.xml.h:38
 msgid "Reset View to _Defaults"
 msgstr "�新設定顯示模�(_D)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:36
+#: src/file-manager/nautilus-directory-view-ui.xml.h:39
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "�設此顯示模�的排列次��縮放�率以���好設定"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:37
+#: src/file-manager/nautilus-directory-view-ui.xml.h:40
 msgid "Run or manage scripts from ~/Nautilus/scripts"
 msgstr "執行或管�在 ~/Nautilus/scripts 的指令稿"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:38
+#: src/file-manager/nautilus-directory-view-ui.xml.h:41
 msgid "Select _All Files"
 msgstr "��所有檔案(_A)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:39
+#: src/file-manager/nautilus-directory-view-ui.xml.h:42
 #, fuzzy
 msgid "Select _Pattern"
 msgstr "圖樣(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:40
+#: src/file-manager/nautilus-directory-view-ui.xml.h:43
 msgid "Select all items in this window"
 msgstr "��本視窗中的所有項目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:41
+#: src/file-manager/nautilus-directory-view-ui.xml.h:44
 #, fuzzy
 msgid "Select items in this window matching a given pattern"
 msgstr "��本視窗中的所有項目"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:42
+#: src/file-manager/nautilus-directory-view-ui.xml.h:45
 msgid "Show media properties for the selected volume"
 msgstr "顯示�定的檔案系統的媒體屬性"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:43
+#: src/file-manager/nautilus-directory-view-ui.xml.h:46
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "顯示載有本�單中出�的指令稿的資料夾"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:44
+#: src/file-manager/nautilus-directory-view-ui.xml.h:47
 msgid "Unmount the selected volume"
 msgstr "�載已��的檔案系統。"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:46
+#: src/file-manager/nautilus-directory-view-ui.xml.h:49
 msgid "Use the default background for this location"
 msgstr "使用�設的背景圖案顯示本�置"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:47
+#: src/file-manager/nautilus-directory-view-ui.xml.h:50
 msgid "View or modify the properties of each selected item"
 msgstr "顯示或修改�個�定的項目的屬性"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:51
+#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#, fuzzy
+msgid "_Empty File"
+msgstr "複製檔案(_C)"
+
+#: src/file-manager/nautilus-directory-view-ui.xml.h:55
 msgid "_Format"
 msgstr "格�化(_F)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:52
+#: src/file-manager/nautilus-directory-view-ui.xml.h:56
 #, fuzzy
 msgid "_Mount Volume"
 msgstr "�載檔案系統(_U)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:53
+#: src/file-manager/nautilus-directory-view-ui.xml.h:57
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:54
+#: src/file-manager/nautilus-directory-view-ui.xml.h:58
 msgid "_Open Scripts Folder"
 msgstr "開啟指令稿資料夾(_O)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:55
+#: src/file-manager/nautilus-directory-view-ui.xml.h:59
 msgid "_Paste Files"
 msgstr "貼上檔案(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:56
+#: src/file-manager/nautilus-directory-view-ui.xml.h:60
 msgid "_Paste Files Into Folder"
 msgstr "將檔案貼上至資料夾內(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:57
+#: src/file-manager/nautilus-directory-view-ui.xml.h:61
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:58
+#: src/file-manager/nautilus-directory-view-ui.xml.h:62
 msgid "_Rename..."
 msgstr "�新命�(_R)..."
 
-#: src/file-manager/nautilus-directory-view-ui.xml.h:59
+#: src/file-manager/nautilus-directory-view-ui.xml.h:63
 msgid "_Scripts"
 msgstr "指令稿(_S)"
 
@@ -5713,31 +5886,38 @@ msgstr "手動(_M)"
 msgid "Indexing is %d%% complete."
 msgstr "已經產生了 %d%% 索引。"
 
-#: src/file-manager/nautilus-indexing-info.c:164
+#: src/file-manager/nautilus-indexing-info.c:165
+#, fuzzy, c-format
+msgid "Your files were last indexed at %s."
+msgstr "上次產生檔案索引的時間是 %s"
+
+#: src/file-manager/nautilus-indexing-info.c:170
 msgid ""
 "Once a day your files and text content are indexed so your searches are "
 "fast. "
 msgstr "系統�天都會將檔案�檔案內容進行索引，因此�以�供快速的�尋�務。"
 
-#: src/file-manager/nautilus-indexing-info.c:166
-#: src/file-manager/nautilus-indexing-info.c:204
+#: src/file-manager/nautilus-indexing-info.c:172
+#: src/file-manager/nautilus-indexing-info.c:200
 msgid "Indexing Status"
 msgstr "索引化狀態"
 
-#: src/file-manager/nautilus-indexing-info.c:171
-#, c-format
-msgid "Your files were last indexed at %s"
+#: src/file-manager/nautilus-indexing-info.c:197
+#, fuzzy
+msgid "Your files are currently being indexed."
 msgstr "上次產生檔案索引的時間是 %s"
 
-#: src/file-manager/nautilus-indexing-info.c:202
+#: src/file-manager/nautilus-indexing-info.c:198
+#, fuzzy
 msgid ""
-"Once a day your files and text content are indexed so your searches are "
-"fast.  Your files are currently being indexed."
-msgstr ""
-"系統�天都會將檔案�檔案內容進行索引，因此�以�供快速的�尋�務。檔案目�已"
-"完�索引化。"
+"Once a day your files and text content are indexed so your searches are fast."
+msgstr "系統�天都會將檔案�檔案內容進行索引，因此�以�供快速的�尋�務。"
+
+#: src/file-manager/nautilus-indexing-info.c:257
+msgid "There is no index of your files right now."
+msgstr "目�沒有檔案索引。"
 
-#: src/file-manager/nautilus-indexing-info.c:261
+#: src/file-manager/nautilus-indexing-info.c:258
 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 "
@@ -5746,15 +5926,19 @@ msgstr ""
 "當啟用快速�尋功能時，Find 會產生索引來加快�尋速度。但電腦中沒有啟用快速�尋"
 "功能，因此沒有檔案索引。"
 
-#: src/file-manager/nautilus-indexing-info.c:265
-msgid "There is no index of your files right now."
-msgstr "目�沒有檔案索引。"
+#: src/file-manager/nautilus-indexing-info.c:262
+msgid "No Index of Files"
+msgstr ""
 
-#: src/file-manager/nautilus-indexing-info.c:302
+#: src/file-manager/nautilus-indexing-info.c:299
 msgid "Sorry, but the medusa search service is not available."
 msgstr "抱歉，目�無法�供 medusa �尋�務。"
 
-#: src/file-manager/nautilus-indexing-info.c:317
+#: src/file-manager/nautilus-indexing-info.c:300
+msgid "Please verify medusa has been setup correctly."
+msgstr ""
+
+#: src/file-manager/nautilus-indexing-info.c:315
 msgid "%I:%M %p, %x"
 msgstr "%x %p %I:%M"
 
@@ -5778,31 +5962,36 @@ msgstr "顯示索引化狀態(_I)"
 msgid "Show status of indexing used when searching"
 msgstr "當�尋時顯示索引的狀態"
 
-#: src/nautilus-application.c:255
+#: src/nautilus-application.c:256
 msgid "Couldn't Create Required Folder"
 msgstr "無法新增所需的資料夾"
 
-#: src/nautilus-application.c:256
-#, c-format
+#: src/nautilus-application.c:257
+#, fuzzy, c-format
+msgid "Nautilus could not create the required folder \"%s\"."
+msgstr "無法新增所需的資料夾"
+
+#: src/nautilus-application.c:259
+#, fuzzy
 msgid ""
-"Nautilus could not create the required folder \"%s\". Before running "
-"Nautilus, please create this folder, or set permissions such that Nautilus "
-"can create it."
+"Before running Nautilus, please create the following folder, or set "
+"permissions such that Nautilus can create it."
 msgstr ""
 "Nautilus 無法新增所需的資料夾“%s�。執行 Nautilus 之�，請自行新增這些資料夾，"
 "或是設定正確的權�使 Nautilus �以新增這些資料夾。"
 
-#: src/nautilus-application.c:261
+#: src/nautilus-application.c:262
 msgid "Couldn't Create Required Folders"
 msgstr "無法新增所需的資料夾"
 
-#: src/nautilus-application.c:262
+#: src/nautilus-application.c:263
 #, c-format
+msgid "Nautilus could not create the following required folders: %s."
+msgstr ""
+
+#: src/nautilus-application.c:265
+#, fuzzy
 msgid ""
-"Nautilus could not create the following required folders:\n"
-"\n"
-"%s\n"
-"\n"
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 msgstr ""
@@ -5813,21 +6002,26 @@ msgstr ""
 "執行 Nautilus 之�，請自行新增這些資料夾，或是設定正確的權�使 Nautilus �以"
 "新增這些資料夾。"
 
-#: src/nautilus-application.c:334
+#: src/nautilus-application.c:333
 msgid "Link To Old Desktop"
 msgstr "舊桌�的��"
 
+#: src/nautilus-application.c:349
+msgid "A link called \"Link To Old Desktop\" has been created on the desktop."
+msgstr ""
+
 #: src/nautilus-application.c:350
+#, fuzzy
 msgid ""
-"The location of the desktop directory has changed in GNOME 2.4. A link "
-"called \"Link To Old Desktop\" has been created on the desktop. You can open "
-"this to move over the files you want, then delete the link."
+"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 ""
 "在 GNOME 2.4 中，桌�目錄的�置有所更改。桌�上會有一個新的��，稱為「舊桌�"
 "的���。您�以在其中，將所有需��留的檔案移至新的桌�，然後刪除該��。"
 
-#: src/nautilus-application.c:353
-msgid "Migrated old desktop"
+#: src/nautilus-application.c:352
+#, fuzzy
+msgid "Migrated Old Desktop"
 msgstr "�功�併舊的桌�"
 
 #. Can't register myself due to trouble locating the
@@ -5840,7 +6034,7 @@ msgstr "�功�併舊的桌�"
 #. * this problem but we don't exactly understand why,
 #. * since neither of the above causes explain it.
 #.
-#: src/nautilus-application.c:522
+#: src/nautilus-application.c:521
 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 "
@@ -5850,7 +6044,7 @@ msgstr ""
 "請�新啟動電腦或是�新安� Nautilus。"
 
 #. FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame.
-#: src/nautilus-application.c:528
+#: src/nautilus-application.c:527
 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 "
@@ -5892,12 +6086,12 @@ msgstr ""
 #. * current OAF. I guess I read the code wrong. Need to figure out when and make a
 #. * good message.
 #.
-#: src/nautilus-application.c:558 src/nautilus-application.c:576
-#: src/nautilus-application.c:583
+#: src/nautilus-application.c:557 src/nautilus-application.c:575
+#: src/nautilus-application.c:582
 msgid "Nautilus can't be used now, due to an unexpected error."
 msgstr "Nautilus 因為�計之外的錯誤而無法使用。"
 
-#: src/nautilus-application.c:559
+#: src/nautilus-application.c:558
 msgid ""
 "Nautilus can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the file manager view server."
@@ -5905,7 +6099,7 @@ msgstr ""
 "目�無法使用 Nautilus，因為當嘗試登記檔案總管顯示模�伺�器時，Bonobo 出��"
 "計之外的錯誤。"
 
-#: src/nautilus-application.c:577
+#: src/nautilus-application.c:576
 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 "
@@ -5914,7 +6108,7 @@ msgstr ""
 "Nautilus 目�無法使用，因為當 Bonobo 嘗試尋找工廠時出��計之外的錯誤。強行中"
 "止 bonobo-activation-server ��新啟動 Nautilus 或許�以修正�題。"
 
-#: src/nautilus-application.c:584
+#: src/nautilus-application.c:583
 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 "
@@ -5923,6 +6117,17 @@ msgstr ""
 "Nautilus 目�無法使用，因為找�到圖形指令界�物件而令 Bonobo 發生�計之外的錯"
 "誤。強行中止 bonobo-activation-server ��新啟動 Nautilus 或許�以修正�題。"
 
+#: src/nautilus-bookmarks-window.c:146
+#: src/nautilus-file-management-properties.c:237
+#: src/nautilus-property-browser.c:1455 src/nautilus-window-menus.c:643
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"顯示說明文件時發生錯誤：\n"
+"%s"
+
 #: src/nautilus-bookmarks-window.c:180
 msgid "No bookmarks defined"
 msgstr "未定義任何書籤"
@@ -5956,34 +6161,45 @@ msgstr "較少�項"
 msgid "Find Them!"
 msgstr "�尋�"
 
-#: src/nautilus-connect-server-dialog.c:87
-msgid "You must enter a name for the server"
+#: src/nautilus-connect-server-dialog.c:86
+msgid "You must enter a name for the server."
 msgstr ""
 
 #: src/nautilus-connect-server-dialog.c:87
-#: src/nautilus-connect-server-dialog.c:102
+msgid "Please enter a name and try again."
+msgstr ""
+
+#: src/nautilus-connect-server-dialog.c:88
+#: src/nautilus-connect-server-dialog.c:104
 #, fuzzy
-msgid "Can't connect to server"
+msgid "Can't Connect to Server"
 msgstr "��移至自身之內"
 
-#: src/nautilus-connect-server-dialog.c:100
+#: src/nautilus-connect-server-dialog.c:101
+#: src/nautilus-window-manage-views.c:1250
+#, fuzzy, c-format
+msgid "\"%s\" is not a valid location."
+msgstr "抱歉，“%s��是有效的檔案�稱。"
+
+#: src/nautilus-connect-server-dialog.c:103
+#: src/nautilus-property-browser.c:1105
 #: src/nautilus-window-manage-views.c:1245
-#, c-format
-msgid ""
-"\"%s\" is not a valid location. Please check the spelling and try again."
-msgstr "“%s��是有效的�置。請檢查錯字並�試一次。"
+#: src/nautilus-window-manage-views.c:1253
+#, fuzzy
+msgid "Please check the spelling and try again."
+msgstr "找�到“%s�。請檢查錯字並�試一次。"
 
-#: src/nautilus-connect-server-dialog.c:174
+#: src/nautilus-connect-server-dialog.c:176
 #, fuzzy
 msgid "Connect to Server"
 msgstr "網路伺�器"
 
-#: src/nautilus-connect-server-dialog.c:185
+#: src/nautilus-connect-server-dialog.c:205
 #, fuzzy
-msgid "Name:"
-msgstr "�稱(_N)："
+msgid "_Location:"
+msgstr "�置："
 
-#: src/nautilus-connect-server-dialog.c:226
+#: src/nautilus-connect-server-dialog.c:230
 #, fuzzy
 msgid "Connect"
 msgstr "連接(_C)"
@@ -6183,6 +6399,16 @@ msgstr ""
 "\n"
 "您�以自行刪除這個檔案來�新使用安�精�。\n"
 
+#: src/nautilus-information-panel.c:506
+#, fuzzy
+msgid "You can't assign more than one custom icon at a time."
+msgstr "�能�時分�一個以上的自�圖示�請�拖曳一個圖�作為自�圖示。"
+
+#: src/nautilus-information-panel.c:535
+#, fuzzy
+msgid "You can only use images as custom icons."
+msgstr "所拖放的檔案並�本地的檔案。�許使用本地的圖示作為自�圖示。"
+
 #: src/nautilus-information-panel.c:882
 #, c-format
 msgid "Open with %s"
@@ -6193,26 +6419,25 @@ msgstr "用 %s 開啟"
 msgid "Open with..."
 msgstr "用指定軟體開啟..."
 
-#: src/nautilus-information-panel.c:994 src/nautilus-window.c:485
-#, c-format
-msgid ""
-"Unable to launch the cd burner application:\n"
-"%s"
+#: src/nautilus-information-panel.c:993 src/nautilus-window.c:485
+#, fuzzy
+msgid "Unable to launch the cd burner application."
 msgstr ""
 "無法啟動光碟燒錄程�：\n"
 "%s"
 
-#: src/nautilus-information-panel.c:996 src/nautilus-window.c:487
-msgid "Can't launch cd burner"
+#: src/nautilus-information-panel.c:994 src/nautilus-window.c:486
+#, fuzzy
+msgid "Can't Launch CD Burner"
 msgstr "無法啟動光碟燒錄程�"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1042
+#: src/nautilus-information-panel.c:1039
 msgid "Empty _Trash"
 msgstr "清�垃圾桶(_T)"
 
 #. FIXME: We don't use spaces to pad labels!
-#: src/nautilus-information-panel.c:1058
+#: src/nautilus-information-panel.c:1055
 msgid "_Write contents to CD"
 msgstr "將內容燒錄至光碟中(_W)"
 
@@ -6220,114 +6445,127 @@ msgstr "將內容燒錄至光碟中(_W)"
 msgid "Go To:"
 msgstr "�往："
 
-#: src/nautilus-location-bar.c:154
-#, c-format
-msgid "Do you want to view these %d locations in separate windows?"
+#: src/nautilus-location-bar.c:155
+#, fuzzy, c-format
+msgid "Do you want to view %d locations?"
 msgstr "是�開啟個別的視窗顯示這 %d 個�置？"
 
-#: src/nautilus-location-bar.c:163
+#: src/nautilus-location-bar.c:167
 msgid "View in Multiple Windows?"
 msgstr "是�使用多個視窗顯示？"
 
-#: src/nautilus-location-dialog.c:138
+#: src/nautilus-location-dialog.c:137
 #, fuzzy
 msgid "Open Location"
 msgstr "無法開啟�置"
 
-#: src/nautilus-main.c:187
+#: src/nautilus-main.c:188
 msgid "Perform a quick set of self-check tests."
 msgstr "執行快速自動檢查測試。"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "Create the initial window with the given geometry."
 msgstr "以指定尺寸顯示�始視窗。"
 
-#: src/nautilus-main.c:190
+#: src/nautilus-main.c:191
 msgid "GEOMETRY"
 msgstr "�置大�"
 
-#: src/nautilus-main.c:192
+#: src/nautilus-main.c:193
 msgid "Only create windows for explicitly specified URIs."
 msgstr "�有特別指定 URI 時�會開啟新的視窗。"
 
-#: src/nautilus-main.c:194
+#: src/nautilus-main.c:195
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
 msgstr "�管�桌� (會忽略�好設定�話方塊中的設定)。"
 
-#: src/nautilus-main.c:196
+#: src/nautilus-main.c:197
 msgid "open a browser window."
 msgstr ""
 
-#: src/nautilus-main.c:198
+#: src/nautilus-main.c:199
 msgid "Quit Nautilus."
 msgstr "離開 Nautilus。"
 
-#: src/nautilus-main.c:200
+#: src/nautilus-main.c:201
 msgid "Restart Nautilus."
 msgstr "�新啟動 Nautilus。"
 
-#: src/nautilus-main.c:233
+#: src/nautilus-main.c:234
 msgid "File Manager"
 msgstr "檔案總管"
 
 #. Set initial window title
-#: src/nautilus-main.c:239 src/nautilus-spatial-window.c:263
-#: src/nautilus-window-menus.c:589 src/nautilus-window.c:173
+#: src/nautilus-main.c:240 src/nautilus-spatial-window.c:272
+#: src/nautilus-window-menus.c:603 src/nautilus-window.c:174
 msgid "Nautilus"
 msgstr "Nautilus"
 
-#: src/nautilus-main.c:258
+#: src/nautilus-main.c:259
 msgid "nautilus: --check cannot be used with URIs.\n"
 msgstr "nautilus：--check ��用於 URI。\n"
 
-#: src/nautilus-main.c:262
+#: src/nautilus-main.c:263
 msgid "nautilus: --check cannot be used with other options.\n"
 msgstr "nautilus：--check ����其它�項使用。\n"
 
-#: src/nautilus-main.c:266
+#: src/nautilus-main.c:267
 msgid "nautilus: --quit cannot be used with URIs.\n"
 msgstr "nautilus：--quit ��用於 URI。\n"
 
-#: src/nautilus-main.c:270
+#: src/nautilus-main.c:271
 msgid "nautilus: --restart cannot be used with URIs.\n"
 msgstr "nautilus：--restart ��用於 URI。\n"
 
-#: src/nautilus-main.c:274
+#: src/nautilus-main.c:275
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilus：--geometry ��用於多於一個 URI。\n"
 
-# OK, joke vs joke -- Abel
 #. 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:186
-msgid ""
-"Are you sure you want to forget history? If you do, you will be doomed to "
-"repeat it."
+#: src/nautilus-navigation-window-menus.c:187
+#, fuzzy
+msgid "Are you sure you want to forget history?"
+msgstr "確定�將“%s�永久刪除嗎？"
+
+# OK, joke vs joke -- Abel
+#: src/nautilus-navigation-window-menus.c:188
+#, fuzzy
+msgid "If you do, you will be doomed to repeat it."
 msgstr "您是��忘記�去的所作所為？如果往事��眼�，您就慘了。"
 
-#: src/nautilus-navigation-window-menus.c:189
+#: src/nautilus-navigation-window-menus.c:190
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "是�確定清除所有曾經�覽的�置的紀錄？"
 
-#: src/nautilus-navigation-window-menus.c:194
+#: src/nautilus-navigation-window-menus.c:192
+msgid "If you clear the list of locations, they will be permanently deleted."
+msgstr ""
+
+#: src/nautilus-navigation-window-menus.c:198
 msgid "Clear History"
 msgstr "清除�覽紀錄"
 
-#: src/nautilus-navigation-window-menus.c:424
-#, c-format
+#: src/nautilus-navigation-window-menus.c:427
+#, fuzzy
 msgid ""
-"The location \"%s\" does not exist. Do you want to remove any bookmarks with "
-"this location from your list?"
+"Do you want to remove any bookmarks with the non-existing location from your "
+"list?"
 msgstr "�置“%s��存在。您是��刪除所有有關這個�置的書籤？"
 
-#: src/nautilus-navigation-window-menus.c:428
+#: src/nautilus-navigation-window-menus.c:429
+#, fuzzy, c-format
+msgid "The location \"%s\" does not exist."
+msgstr "�置“%s�已經�存在。"
+
+#: src/nautilus-navigation-window-menus.c:432
 msgid "Bookmark for Nonexistent Location"
 msgstr "書籤所表示的�置�存在"
 
-#: src/nautilus-navigation-window-menus.c:429
+#: src/nautilus-navigation-window-menus.c:433
 msgid "Remove"
 msgstr "移除"
 
@@ -6360,7 +6598,6 @@ msgid "Close _All Windows"
 msgstr "關閉所有視窗(_A)"
 
 #: src/nautilus-navigation-window-ui.xml.h:8
-#: src/nautilus-spatial-window-ui.xml.h:3
 #, fuzzy
 msgid "Close all Navigation windows"
 msgstr "關閉所有 Nautilus 視窗"
@@ -6383,107 +6620,118 @@ msgid "Forward"
 msgstr "下一�"
 
 #: src/nautilus-navigation-window-ui.xml.h:14
+#: src/nautilus-spatial-window-ui.xml.h:6
+#, fuzzy
+msgid "Go to templates folder"
+msgstr "�往垃圾桶資料夾"
+
+#: src/nautilus-navigation-window-ui.xml.h:15
 msgid "Go to the next visited location"
 msgstr "�往下一個�置"
 
-#: src/nautilus-navigation-window-ui.xml.h:15
+#: src/nautilus-navigation-window-ui.xml.h:16
 msgid "Go to the previous visited location"
 msgstr "�往上一個�置"
 
-#: src/nautilus-navigation-window-ui.xml.h:16
-#: src/nautilus-spatial-window-ui.xml.h:7
+#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-spatial-window-ui.xml.h:8
 msgid "Go to the trash folder"
 msgstr "�往垃圾桶資料夾"
 
-#: src/nautilus-navigation-window-ui.xml.h:17
+#: src/nautilus-navigation-window-ui.xml.h:18
 msgid "Home"
 msgstr "首�"
 
-#: src/nautilus-navigation-window-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:19
 msgid "Location _Bar"
 msgstr "�置列(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:19
+#: src/nautilus-navigation-window-ui.xml.h:20
 msgid "Reload"
 msgstr "�新整�"
 
-#: src/nautilus-navigation-window-ui.xml.h:20 src/nautilus-shell-ui.xml.h:18
+#: src/nautilus-navigation-window-ui.xml.h:21 src/nautilus-shell-ui.xml.h:18
 msgid "Search this computer for files"
 msgstr "在本電腦中�尋檔案"
 
-#: src/nautilus-navigation-window-ui.xml.h:21
+#: src/nautilus-navigation-window-ui.xml.h:22
 msgid "St_atusbar"
 msgstr "狀態列(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:22
+#: src/nautilus-navigation-window-ui.xml.h:23
 msgid "Stop"
 msgstr "�止"
 
-#: src/nautilus-navigation-window-ui.xml.h:23
+#: src/nautilus-navigation-window-ui.xml.h:24
 msgid "Up"
 msgstr "上層"
 
-#: src/nautilus-navigation-window-ui.xml.h:24
+#: src/nautilus-navigation-window-ui.xml.h:25
 msgid "Write to CD"
 msgstr "寫入至光碟"
 
-#: src/nautilus-navigation-window-ui.xml.h:25
+#: src/nautilus-navigation-window-ui.xml.h:26
 msgid "_Add Bookmark"
 msgstr "新增書籤(_A)"
 
-#: src/nautilus-navigation-window-ui.xml.h:26
+#: src/nautilus-navigation-window-ui.xml.h:27
 msgid "_Back"
 msgstr "上一�(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:27
+#: src/nautilus-navigation-window-ui.xml.h:28
 msgid "_Bookmarks"
 msgstr "書籤(_B)"
 
-#: src/nautilus-navigation-window-ui.xml.h:28
+#: src/nautilus-navigation-window-ui.xml.h:29
 msgid "_Clear History"
 msgstr "清除�覽紀錄(_C)"
 
-#: src/nautilus-navigation-window-ui.xml.h:29
-#: src/nautilus-spatial-window-ui.xml.h:11
+#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-spatial-window-ui.xml.h:12
 #, fuzzy
 msgid "_Computer"
 msgstr "料�檯�"
 
-#: src/nautilus-navigation-window-ui.xml.h:30
+#: src/nautilus-navigation-window-ui.xml.h:31
 msgid "_Edit Bookmarks"
 msgstr "修改書籤(_E)"
 
-#: src/nautilus-navigation-window-ui.xml.h:31
+#: src/nautilus-navigation-window-ui.xml.h:32
 msgid "_Forward"
 msgstr "下一�(_F)"
 
-#: src/nautilus-navigation-window-ui.xml.h:32
+#: src/nautilus-navigation-window-ui.xml.h:33
 msgid "_Go"
 msgstr "�往(_G)"
 
-#: src/nautilus-navigation-window-ui.xml.h:33
-#: src/nautilus-spatial-window-ui.xml.h:12
+#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-spatial-window-ui.xml.h:13
 msgid "_Home"
 msgstr "首�(_H)"
 
-#: src/nautilus-navigation-window-ui.xml.h:34
+#: src/nautilus-navigation-window-ui.xml.h:35
 msgid "_Location..."
 msgstr "�置(_L)..."
 
-#: src/nautilus-navigation-window-ui.xml.h:35
+#: src/nautilus-navigation-window-ui.xml.h:36
 msgid "_Side Pane"
 msgstr "�列窗格(_S)"
 
-#: src/nautilus-navigation-window-ui.xml.h:36
-#: src/nautilus-spatial-window-ui.xml.h:14
+#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-spatial-window-ui.xml.h:15
+msgid "_Templates"
+msgstr ""
+
+#: src/nautilus-navigation-window-ui.xml.h:38
+#: src/nautilus-spatial-window-ui.xml.h:16
 msgid "_Trash"
 msgstr "垃圾桶(_T)"
 
-#: src/nautilus-navigation-window-ui.xml.h:37
+#: src/nautilus-navigation-window-ui.xml.h:39
 msgid "_Up"
 msgstr "上層(_U)"
 
-#: src/nautilus-navigation-window-ui.xml.h:38 src/nautilus-shell-ui.xml.h:49
+#: src/nautilus-navigation-window-ui.xml.h:40 src/nautilus-shell-ui.xml.h:49
 msgid "_View"
 msgstr "顯示(_V)"
 
@@ -6501,32 +6749,37 @@ msgstr "��顯示模�..."
 msgid "File Browser: %s"
 msgstr "檔案�有者："
 
-#: src/nautilus-navigation-window.c:1099
+#: src/nautilus-navigation-window.c:1105
 #, fuzzy
-msgid ""
-"One of the side panels encountered an error and can't continue. "
-"Unfortunately I couldn't tell which one."
+msgid "One of the side panels encountered an error and can't continue."
 msgstr ""
 "�列窗格的其中一個���到錯誤而且無法繼續。但很抱歉，�知�是哪一個出錯。"
 
-#: src/nautilus-navigation-window.c:1103
+#: src/nautilus-navigation-window.c:1106
+msgid "Unfortunately I couldn't tell which one."
+msgstr ""
+
+#: src/nautilus-navigation-window.c:1109
 #, fuzzy, c-format
-msgid ""
-"The %s side panel encountered an error and can't continue. If this keeps "
-"happening, you might want to turn this panel off."
+msgid "The %s side panel encountered an error and can't continue."
+msgstr "啟動 %s 顯示模�時發生錯誤。"
+
+#: src/nautilus-navigation-window.c:1110
+#, fuzzy
+msgid "If this keeps happening, you might want to turn this panel off."
 msgstr ""
 "�列窗格的 %s ���到錯誤而且無法繼續。如果此情��續發生，請關閉該��。"
 
-#: src/nautilus-navigation-window.c:1108
+#: src/nautilus-navigation-window.c:1113
 #, fuzzy
 msgid "Side Panel Failed"
 msgstr "�列窗格發生錯誤"
 
-#: src/nautilus-navigation-window.c:1239
+#: src/nautilus-navigation-window.c:1244
 msgid "Side Pane"
 msgstr "�列窗格"
 
-#: src/nautilus-navigation-window.c:1241
+#: src/nautilus-navigation-window.c:1246
 msgid "Contains a side pane view"
 msgstr "載有�列窗格顯示模�"
 
@@ -6560,147 +6813,180 @@ msgstr "新增(_A)..."
 msgid "Sorry, but pattern %s couldn't be deleted."
 msgstr "抱歉，無法刪除圖樣 %s。"
 
-#: src/nautilus-property-browser.c:914 src/nautilus-property-browser.c:943
-msgid "Couldn't delete pattern"
+#: src/nautilus-property-browser.c:914
+msgid "Check that you have permission to delete the pattern."
+msgstr ""
+
+#: src/nautilus-property-browser.c:915
+#, fuzzy
+msgid "Couldn't Delete Pattern"
 msgstr "無法刪除圖樣"
 
-#: src/nautilus-property-browser.c:942
+#: src/nautilus-property-browser.c:943
 #, c-format
 msgid "Sorry, but emblem %s couldn't be deleted."
 msgstr "抱歉，無法刪除圖章 %s。"
 
-#: src/nautilus-property-browser.c:981
+#: src/nautilus-property-browser.c:944
+msgid "Check that you have permission to delete the emblem."
+msgstr ""
+
+#: src/nautilus-property-browser.c:945
+#, fuzzy
+msgid "Couldn't Delete Emblem"
+msgstr "無法移除圖章"
+
+#: src/nautilus-property-browser.c:983
 msgid "Create a New Emblem:"
 msgstr "新增圖章："
 
 #. make the keyword label and field
-#: src/nautilus-property-browser.c:994
+#: src/nautilus-property-browser.c:996
 msgid "_Keyword:"
 msgstr "�稱(_K)："
 
 #. set up a gnome icon entry to pick the image file
-#: src/nautilus-property-browser.c:1012
+#: src/nautilus-property-browser.c:1014
 msgid "_Image:"
 msgstr "圖�(_I)："
 
-#: src/nautilus-property-browser.c:1016
+#: src/nautilus-property-browser.c:1018
 msgid "Select an image file for the new emblem:"
 msgstr "為新的圖章��圖�檔："
 
-#: src/nautilus-property-browser.c:1040
+#: src/nautilus-property-browser.c:1042
 msgid "Create a New Color:"
 msgstr "新增�色："
 
 #. make the name label and field
-#: src/nautilus-property-browser.c:1054
+#: src/nautilus-property-browser.c:1056
 msgid "Color _name:"
 msgstr "�色�稱(_N)："
 
-#: src/nautilus-property-browser.c:1070
+#: src/nautilus-property-browser.c:1072
 msgid "Color _value:"
 msgstr "�色數值(_V)："
 
-#: src/nautilus-property-browser.c:1101
+#: src/nautilus-property-browser.c:1104
 #, c-format
 msgid "Sorry, but \"%s\" is not a valid file name."
 msgstr "抱歉，“%s��是有效的檔案�稱。"
 
-#: src/nautilus-property-browser.c:1103
+#: src/nautilus-property-browser.c:1107
 msgid "Sorry, but you did not supply a valid file name."
 msgstr "抱歉，您�供的檔案�稱無效。"
 
-#: src/nautilus-property-browser.c:1105 src/nautilus-property-browser.c:1148
-msgid "Couldn't install pattern"
+#: src/nautilus-property-browser.c:1108
+msgid "Please try again."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1110 src/nautilus-property-browser.c:1155
+#, fuzzy
+msgid "Couldn't Install Pattern"
 msgstr "無法安�圖樣"
 
-#: src/nautilus-property-browser.c:1116
+#: src/nautilus-property-browser.c:1121
 msgid "Sorry, but you can't replace the reset image."
 msgstr "抱歉，��以替�用來�設圖樣或�色的圖示。"
 
-#: src/nautilus-property-browser.c:1116 src/nautilus-property-browser.c:1319
-#: src/nautilus-property-browser.c:1335
+#: src/nautilus-property-browser.c:1122
+msgid "Reset is a special image that cannot be deleted."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1123 src/nautilus-property-browser.c:1327
+#: src/nautilus-property-browser.c:1343
 msgid "Not an Image"
 msgstr "�是圖�檔"
 
-#: src/nautilus-property-browser.c:1147
+#: src/nautilus-property-browser.c:1154
 #, c-format
 msgid "Sorry, but the pattern %s couldn't be installed."
 msgstr "抱歉，無法安� %s 圖樣。"
 
-#: src/nautilus-property-browser.c:1167
+#: src/nautilus-property-browser.c:1174
 msgid "Select an image file to add as a pattern"
 msgstr "請��準備作為圖樣的圖�檔"
 
-#: src/nautilus-property-browser.c:1228
+#: src/nautilus-property-browser.c:1235
+msgid "The color cannot be installed."
+msgstr ""
+
+#: src/nautilus-property-browser.c:1236
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "抱歉，新的�色�稱��以是空白字串。"
 
-#: src/nautilus-property-browser.c:1229
-msgid "Couldn't install color"
+#: src/nautilus-property-browser.c:1237
+#, fuzzy
+msgid "Couldn't Install Color"
 msgstr "無法安��色"
 
-#: src/nautilus-property-browser.c:1281
+#: src/nautilus-property-browser.c:1289
 msgid "Select a color to add"
 msgstr "請��準備加入的�色"
 
-#: src/nautilus-property-browser.c:1318 src/nautilus-property-browser.c:1334
-#, c-format
-msgid "Sorry, but '%s' is not a usable image file!"
+#: src/nautilus-property-browser.c:1326 src/nautilus-property-browser.c:1342
+#, fuzzy, c-format
+msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "抱歉，‘%s’�是�用的圖�檔�"
 
-#: src/nautilus-property-browser.c:2041
+#: src/nautilus-property-browser.c:1327 src/nautilus-property-browser.c:1343
+#, fuzzy
+msgid "The file is not an image."
+msgstr "檔案‘%s’��是有效的圖�。"
+
+#: src/nautilus-property-browser.c:2050
 msgid "Select a Category:"
 msgstr "��類別："
 
-#: src/nautilus-property-browser.c:2050
+#: src/nautilus-property-browser.c:2059
 msgid "C_ancel Remove"
 msgstr "�消移除(_A)"
 
-#: src/nautilus-property-browser.c:2056
+#: src/nautilus-property-browser.c:2065
 msgid "_Add a New Pattern..."
 msgstr "新增圖樣(_A)..."
 
-#: src/nautilus-property-browser.c:2059
+#: src/nautilus-property-browser.c:2068
 msgid "_Add a New Color..."
 msgstr "新增�色(_A)..."
 
-#: src/nautilus-property-browser.c:2062
+#: src/nautilus-property-browser.c:2071
 msgid "_Add a New Emblem..."
 msgstr "新增圖章(_A)..."
 
-#: src/nautilus-property-browser.c:2085
+#: src/nautilus-property-browser.c:2094
 msgid "Click on a pattern to remove it"
 msgstr "按下準備移除的圖樣"
 
-#: src/nautilus-property-browser.c:2088
+#: src/nautilus-property-browser.c:2097
 msgid "Click on a color to remove it"
 msgstr "按下準備移除的�色"
 
-#: src/nautilus-property-browser.c:2091
+#: src/nautilus-property-browser.c:2100
 msgid "Click on an emblem to remove it"
 msgstr "按下準備移除的圖章"
 
-#: src/nautilus-property-browser.c:2100
+#: src/nautilus-property-browser.c:2109
 msgid "Patterns:"
 msgstr "圖樣："
 
-#: src/nautilus-property-browser.c:2103
+#: src/nautilus-property-browser.c:2112
 msgid "Colors:"
 msgstr "�色："
 
-#: src/nautilus-property-browser.c:2106
+#: src/nautilus-property-browser.c:2115
 msgid "Emblems:"
 msgstr "圖章"
 
-#: src/nautilus-property-browser.c:2126
+#: src/nautilus-property-browser.c:2135
 msgid "_Remove a Pattern..."
 msgstr "移除圖樣(_R)..."
 
-#: src/nautilus-property-browser.c:2129
+#: src/nautilus-property-browser.c:2138
 msgid "_Remove a Color..."
 msgstr "移除�色(_R)..."
 
-#: src/nautilus-property-browser.c:2132
+#: src/nautilus-property-browser.c:2141
 msgid "_Remove an Emblem..."
 msgstr "移除圖章(_R)..."
 
@@ -7088,34 +7374,39 @@ msgstr "光碟製作程�(_C)"
 
 #: src/nautilus-spatial-window-ui.xml.h:2
 #, fuzzy
-msgid "Close _All Parents"
+msgid "Close P_arent Folders"
 msgstr "關閉所有視窗(_A)"
 
+#: src/nautilus-spatial-window-ui.xml.h:3
+#, fuzzy
+msgid "Close this folder's parents"
+msgstr "關閉�列窗格"
+
 #: src/nautilus-spatial-window-ui.xml.h:5
 #, fuzzy
 msgid "Go to Computer"
 msgstr "�往空白的光碟資料夾"
 
-#: src/nautilus-spatial-window-ui.xml.h:6
+#: src/nautilus-spatial-window-ui.xml.h:7
 #, fuzzy
 msgid "Go to the CD Creator"
 msgstr "�往垃圾桶資料夾"
 
-#: src/nautilus-spatial-window-ui.xml.h:8
+#: src/nautilus-spatial-window-ui.xml.h:9
 #, fuzzy
 msgid "Open _Location..."
 msgstr "�置(_L)..."
 
-#: src/nautilus-spatial-window-ui.xml.h:9
+#: src/nautilus-spatial-window-ui.xml.h:10
 msgid "Open _Pa_rent"
 msgstr ""
 
-#: src/nautilus-spatial-window-ui.xml.h:10
+#: src/nautilus-spatial-window-ui.xml.h:11
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "資料夾"
 
-#: src/nautilus-spatial-window-ui.xml.h:13
+#: src/nautilus-spatial-window-ui.xml.h:14
 #, fuzzy
 msgid "_Places"
 msgstr "圖樣(_P)"
@@ -7145,10 +7436,13 @@ msgid "View Failed"
 msgstr "顯示模�發生錯誤"
 
 #: src/nautilus-window-manage-views.c:828
-#, c-format
-msgid ""
-"The %s view encountered an error and can't continue. You can choose another "
-"view or go to a different location."
+#, fuzzy, c-format
+msgid "The %s view encountered an error and can't continue."
+msgstr "啟動 %s 顯示模�時發生錯誤。"
+
+#: src/nautilus-window-manage-views.c:829
+#, fuzzy
+msgid "You can choose another view or go to a different location."
 msgstr ""
 "%s 顯示模�發生錯誤並無法繼續。您�以���一種顯示模�或�覽其它�置。"
 
@@ -7157,92 +7451,122 @@ msgstr ""
 msgid "The %s view encountered an error while starting up."
 msgstr "啟動 %s 顯示模�時發生錯誤。"
 
-#: src/nautilus-window-manage-views.c:986
+#: src/nautilus-window-manage-views.c:840
+#, fuzzy
+msgid "The location cannot be displayed with this viewer."
+msgstr "和該視窗有�繫的 NautilusApplication。"
+
+#: src/nautilus-window-manage-views.c:987
 msgid "Content View"
 msgstr "內容顯示模�"
 
-#: src/nautilus-window-manage-views.c:987
+#: src/nautilus-window-manage-views.c:988
 msgid "View of the current file or folder"
 msgstr "顯示目�的檔案或資料夾"
 
-#: src/nautilus-window-manage-views.c:1239
-#, c-format
-msgid "Couldn't find \"%s\". Please check the spelling and try again."
-msgstr "找�到“%s�。請檢查錯字並�試一次。"
+#: src/nautilus-window-manage-views.c:1242
+#, fuzzy, c-format
+msgid "Couldn't find \"%s\"."
+msgstr "無法加入圖章"
 
-#: src/nautilus-window-manage-views.c:1259
-#, c-format
-msgid ""
-"Couldn't display \"%s\", because Nautilus cannot determine what type of file "
-"it is."
+#. Shouldn't have gotten this error unless there's a : separator.
+#: src/nautilus-window-manage-views.c:1266
+#: src/nautilus-window-manage-views.c:1276
+#: src/nautilus-window-manage-views.c:1290
+#: src/nautilus-window-manage-views.c:1298
+#: src/nautilus-window-manage-views.c:1304
+#: src/nautilus-window-manage-views.c:1324
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\"."
+msgstr "Nautilus 無法顯示“%s�。"
+
+#: src/nautilus-window-manage-views.c:1269
+#, fuzzy
+msgid "Nautilus cannot determine what type of file it is."
 msgstr "無法顯示“%s�，因為 Nautilus 無法決定它的檔案類型。"
 
-#: src/nautilus-window-manage-views.c:1267
-#, c-format
-msgid "Nautilus has no installed viewer capable of displaying \"%s\"."
+#: src/nautilus-window-manage-views.c:1279
+#, fuzzy
+msgid "Nautilus has no installed viewer capable of displaying the file."
 msgstr "Nautilus 沒有顯示模��顯示“%s�。"
 
-#. Shouldn't have gotten this error unless there's a : separator.
-#: src/nautilus-window-manage-views.c:1279
-#, c-format
-msgid "Couldn't display \"%s\", because Nautilus cannot handle %s: locations."
+#: src/nautilus-window-manage-views.c:1292
+#, fuzzy, c-format
+msgid "Nautilus cannot handle %s: locations."
 msgstr "無法顯示“%s�，因為 Nautilus 無法處� %s: 類型的�置。"
 
-#: src/nautilus-window-manage-views.c:1285
-#, c-format
-msgid "Couldn't display \"%s\", because the attempt to log in failed."
+#: src/nautilus-window-manage-views.c:1300
+#, fuzzy
+msgid "The attempt to log in failed."
 msgstr "無法顯示“%s�，因為登入失敗。"
 
-#: src/nautilus-window-manage-views.c:1290
-#, c-format
-msgid "Couldn't display \"%s\", because access was denied."
+#: src/nautilus-window-manage-views.c:1306
+msgid "Access was denied."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1316
+#, fuzzy, c-format
+msgid "Couldn't display \"%s\", because no host \"%s\" could be found."
 msgstr "無法顯示“%s�，因為已被�止存�。"
 
-#: src/nautilus-window-manage-views.c:1301
-#, c-format
+#: src/nautilus-window-manage-views.c:1319
+#, fuzzy
 msgid ""
-"Couldn't display \"%s\", because no host \"%s\" could be found. Check that "
-"the spelling is correct and that your proxy settings are correct."
+"Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "無法顯示“%s�，因為找�到主機“%s�。請檢查是�有錯字而且代�伺�程�設定是�正"
 "確。"
 
-#: src/nautilus-window-manage-views.c:1309
-#, c-format
-msgid "Couldn't display \"%s\". Check that your proxy settings are correct."
+#: src/nautilus-window-manage-views.c:1326
+#, fuzzy
+msgid "Check that your proxy settings are correct."
 msgstr "無法顯示“%s�。請檢查代�伺�程�設定是�正確。"
 
-#: src/nautilus-window-manage-views.c:1316
-#, c-format
+#: src/nautilus-window-manage-views.c:1331
+#, fuzzy, c-format
 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."
+"browser."
+msgstr "無法顯示“%s�，因為 Nautilus 無法處� %s: 類型的�置。"
+
+#: src/nautilus-window-manage-views.c:1334
+msgid "Check that an SMB server is running in the local network."
 msgstr ""
-"無法顯示“%s�，因為 Nautilus 無法�絡 SMB master browser。\n"
-"請確�本地網路中已經有�行中的 SMB 伺�器。"
 
-#: src/nautilus-window-manage-views.c:1328
+#: src/nautilus-window-manage-views.c:1344
+#, fuzzy
 msgid ""
 "Searching is unavailable right now, because you either have no index, or the "
-"search service isn't running. Be sure that you have started the Medusa "
-"search service, and if you don't have an index, that the Medusa indexer is "
-"running."
+"search service isn't running."
+msgstr ""
+"目�無法�供�尋功能，因為檔案索引�存在，或是�尋�務並未�行。請確定 "
+"Medusa �尋�務已經啟動，�外如果沒有檔案索引，請確定 Medusa 索引產生程�已經"
+"在�行。"
+
+#: src/nautilus-window-manage-views.c:1347
+#, fuzzy
+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 ""
 "目�無法�供�尋功能，因為檔案索引�存在，或是�尋�務並未�行。請確定 "
 "Medusa �尋�務已經啟動，�外如果沒有檔案索引，請確定 Medusa 索引產生程�已經"
 "在�行。"
 
-#: src/nautilus-window-manage-views.c:1332
+#: src/nautilus-window-manage-views.c:1349
 msgid "Searching Unavailable"
 msgstr "無法�供�尋功能"
 
-#: src/nautilus-window-manage-views.c:1337
+#: src/nautilus-window-manage-views.c:1354
 #, c-format
 msgid "Nautilus cannot display \"%s\"."
 msgstr "Nautilus 無法顯示“%s�。"
 
-#: src/nautilus-window-manage-views.c:1342
+#: src/nautilus-window-manage-views.c:1356
+msgid "Please select another viewer and try again."
+msgstr ""
+
+#: src/nautilus-window-manage-views.c:1360
 msgid "Can't Display Location"
 msgstr "無法顯示�置"
 
@@ -7254,7 +7578,7 @@ msgstr "�往該書籤指定的�置"
 #. * symbol characters -- do not translate the company
 #. * name, please.
 #.
-#: src/nautilus-window-menus.c:579
+#: src/nautilus-window-menus.c:593
 msgid "Copyright (C) 1999-2001 Eazel, Inc."
 msgstr "版權所有 ©1999-2001 Eazel, Inc."
 
@@ -7262,7 +7586,7 @@ msgstr "版權所有 ©1999-2001 Eazel, Inc."
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: src/nautilus-window-menus.c:586 src/nautilus-window-menus.c:587
+#: src/nautilus-window-menus.c:600 src/nautilus-window-menus.c:601
 msgid "Translator Credits"
 msgstr ""
 "i18n 程�中文化計劃\n"
@@ -7271,7 +7595,7 @@ msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2001-2003\n"
 "Gong Yi LIAO <granziliao@sinamail.com>, 2000"
 
-#: src/nautilus-window-menus.c:592
+#: src/nautilus-window-menus.c:606
 msgid ""
 "Nautilus is a graphical shell for GNOME that makes it easy to manage your "
 "files and the rest of your system."
@@ -7286,39 +7610,43 @@ msgstr "�往其它�覽本��之�曾經�覽的�置"
 msgid "Go forward a number of pages"
 msgstr "�往其它�覽本��之後曾經�覽的�置"
 
-#: src/nautilus-window.c:902
+#: src/nautilus-window.c:907
 #, c-format
 msgid "Display this location with \"%s\""
 msgstr "使用“%s�來顯示該�置"
 
-#: src/nautilus-window.c:1172
+#: src/nautilus-window.c:1178
 #, fuzzy
 msgid "Network"
 msgstr "Red Hat Network"
 
-#: src/nautilus-window.c:1175
+#: src/nautilus-window.c:1180
 #, fuzzy
 msgid "Fonts"
 msgstr "斑點"
 
-#: src/nautilus-window.c:1178
+#: src/nautilus-window.c:1182
+msgid "Themes"
+msgstr ""
+
+#: src/nautilus-window.c:1184
 #, fuzzy
 msgid "CD Creator"
 msgstr "光碟製作程�(_C)"
 
-#: src/nautilus-window.c:1610
+#: src/nautilus-window.c:1624
 msgid "Application ID"
 msgstr "程�識別碼"
 
-#: src/nautilus-window.c:1611
+#: src/nautilus-window.c:1625
 msgid "The application ID of the window."
 msgstr "視窗的程�識別碼。"
 
-#: src/nautilus-window.c:1617
+#: src/nautilus-window.c:1631
 msgid "Application"
 msgstr "程�集"
 
-#: src/nautilus-window.c:1618
+#: src/nautilus-window.c:1632
 msgid "The NautilusApplication associated with this window."
 msgstr "和該視窗有�繫的 NautilusApplication。"
 
@@ -7354,6 +7682,235 @@ msgstr "網路伺�器"
 msgid "View your network servers in the Nautilus file manager"
 msgstr "在 Nautilus 檔案總管中�覽網路伺�器"
 
+#~ msgid "Factory for hardware view"
+#~ msgstr "硬體顯示模�工廠"
+
+#~ msgid "Hardware Viewer"
+#~ msgstr "硬體顯示模�"
+
+#~ msgid "Hardware view"
+#~ msgstr "硬體顯示模�"
+
+#~ msgid "View as Hardware"
+#~ msgstr "以硬體方�顯示"
+
+#~ msgid "hardware view"
+#~ msgstr "硬體顯示模�"
+
+#~ msgid "name of icon for the hardware view"
+#~ msgstr "硬體顯示模�的圖示�稱"
+
+#~ msgid "summary of hardware info"
+#~ msgstr "硬體資訊摘�"
+
+#~ msgid ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K cache size"
+#~ msgstr ""
+#~ "%s CPU\n"
+#~ "%s MHz\n"
+#~ "%s K 快�記憶"
+
+#~ msgid "%lu GB RAM"
+#~ msgstr "%lu GB 記憶體"
+
+#~ msgid "%lu MB RAM"
+#~ msgstr "%lu MB 記憶體"
+
+#~ msgid "%lu GB"
+#~ msgstr "%lu GB"
+
+#~ msgid "%lu MB"
+#~ msgstr "%lu MB"
+
+#~ msgid "Uptime is %d days, %d hours, %d minutes"
+#~ msgstr "系統連續�作了 %d 日 %d 時 %d 分"
+
+#~ msgid "Hardware Overview"
+#~ msgstr "硬體總覽"
+
+#~ msgid "This is a placeholder for the CPU page."
+#~ msgstr "這裡�留作日後顯示 CPU 資訊之用。"
+
+#~ msgid "This is a placeholder for the RAM page."
+#~ msgstr "這裡�留作日後顯示記憶體資訊之用。"
+
+#~ msgid "This is a placeholder for the IDE page."
+#~ msgstr "這裡�留作日後顯示 IDE 資訊之用。"
+
+#~ msgid ""
+#~ "Error while copying to \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "複製至“%s�時發生錯誤。\n"
+#~ "\n"
+#~ "目的地空間�足。"
+
+#~ msgid ""
+#~ "Error while creating link in \"%s\".\n"
+#~ "\n"
+#~ "There is not enough space on the destination."
+#~ msgstr ""
+#~ "在“%s�建立��時發生錯誤。\n"
+#~ "\n"
+#~ "目的地空間�足。"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "移動項目至“%s�時發生錯誤。\n"
+#~ "\n"
+#~ "沒有寫入此資料夾的權�。"
+
+#~ msgid ""
+#~ "Error while moving items to \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "移動項目至“%s�時發生錯誤。\n"
+#~ "\n"
+#~ "目的地是唯讀的�碟。"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "You do not have permissions to write to this folder."
+#~ msgstr ""
+#~ "在“%s�裡建立��時發生錯誤。\n"
+#~ "\n"
+#~ "沒有寫入此資料夾的權�。"
+
+#~ msgid ""
+#~ "Error while creating links in \"%s\".\n"
+#~ "\n"
+#~ "The destination disk is read-only."
+#~ msgstr ""
+#~ "在“%s�裡建立��時發生錯誤。\n"
+#~ "\n"
+#~ "目的地是唯讀的�碟。"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "複製“%2$s�時發生錯誤“%1$s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid ""
+#~ "Error \"%s\" while moving \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "移動“%2$s�時發生錯誤“%1$s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting \"%s\".\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "刪除“%2$s�時發生錯誤“%1$s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid ""
+#~ "Error \"%s\" while copying.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "複製時發生錯誤“%s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid ""
+#~ "Error \"%s\" while linking.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "建立��時發生錯誤“%s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid ""
+#~ "Error \"%s\" while deleting.\n"
+#~ "\n"
+#~ "Would you like to continue?"
+#~ msgstr ""
+#~ "刪除時發生錯誤“%s�。\n"
+#~ "\n"
+#~ "是��繼續？"
+
+#~ msgid "Can't Copy to Trash"
+#~ msgstr "��複製至垃圾桶"
+
+#~ 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 ""
+#~ "�設的處�方�無法開啟“%s�，因為無法存�“%s�中的檔案。目�沒有其它方��以"
+#~ "顯示該檔案。如果將該檔案複製至您的電腦中，也許�以開啟它。"
+
+#~ msgid "Searching Disks"
+#~ msgstr "正在�尋�碟"
+
+#~ msgid "Nautilus is searching your disks for trash folders."
+#~ msgstr "Nautilus 正在��碟中�尋垃圾桶資料夾。"
+
+#~ msgid ""
+#~ "The %d selected items cannot be moved to the Trash. Do you want to delete "
+#~ "them immediately?"
+#~ msgstr "無法將已��的 %d 個項目移到垃圾桶。�立刻永久刪除嗎？"
+
+#~ msgid ""
+#~ "%d of the selected items cannot be moved to the Trash. Do you want to "
+#~ "delete those %d items immediately?"
+#~ msgstr ""
+#~ "無法將所�項目中的 %d 個項目移到垃圾桶。�立刻將這 %d 個項目永久刪除嗎？"
+
+#~ msgid ""
+#~ "The file that you dropped is not an image.  You can only use local images "
+#~ "as custom icons."
+#~ msgstr "所拖放的檔案並�圖�檔。�許使用本地的圖示作為自�圖示。"
+
+#~ msgid ""
+#~ "Sorry, but the Medusa search service is not available because it is not "
+#~ "installed."
+#~ msgstr "抱歉，Medusa �尋�務因並未安�，所以無法使用。"
+
+#~ msgid ""
+#~ "Once a day your files and text content are indexed so your searches are "
+#~ "fast.  Your files are currently being indexed."
+#~ msgstr ""
+#~ "系統�天都會將檔案�檔案內容進行索引，因此�以�供快速的�尋�務。檔案目�"
+#~ "已完�索引化。"
+
+#~ msgid ""
+#~ "\"%s\" is not a valid location. Please check the spelling and try again."
+#~ msgstr "“%s��是有效的�置。請檢查錯字並�試一次。"
+
+#~ 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 ""
+#~ "無法顯示“%s�，因為 Nautilus 無法�絡 SMB master browser。\n"
+#~ "請確�本地網路中已經有�行中的 SMB 伺�器。"
+
+#~ msgid "file icon"
+#~ msgstr "檔案圖示"
+
+#, fuzzy
+#~ msgid "Name:"
+#~ msgstr "�稱(_N)："
+
 #~ msgid "Unknown"
 #~ msgstr "未知"
 
@@ -7443,9 +8000,6 @@ msgstr "在 Nautilus 檔案總管中�覽網路伺�器"
 #~ msgid "_Toolbar"
 #~ msgstr "工具列(_T)"
 
-#~ msgid "The location \"%s\" no longer exists."
-#~ msgstr "�置“%s�已經�存在。"
-
 #~ msgid "Go to Nonexistent Location"
 #~ msgstr "嘗試�覽�存在的�置"
 
diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in
index 51b7ef937..a9c8d9d62 100644
--- a/src/Nautilus_shell.server.in
+++ b/src/Nautilus_shell.server.in
@@ -109,4 +109,15 @@
   <oaf_attribute name="description" type="string" _value="Produces metafile objects for accessing Nautilus metadata"/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:Nautilus_File_Manager_Tree_View" type="factory" location="OAFIID:Nautilus_Factory">
+  <oaf_attribute name="repo_ids" type="stringv">
+    <item value="IDL:Bonobo/Unknown:1.0"/>
+    <item value="IDL:Bonobo/Control:1.0"/>
+    <item value="IDL:Nautilus/View:1.0"/>
+  </oaf_attribute>
+  <oaf_attribute name="name" type="string" _value="Nautilus Tree View"/>
+  <oaf_attribute name="description" type="string" _value="Nautilus Tree side pane"/>
+  <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/>
+</oaf_server>
+
 </oaf_info>
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index f96ea8ea1..03640c88a 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -27,6 +27,8 @@ libnautilus_file_manager_la_SOURCES=	\
 	fm-search-list-view.c		\
 	nautilus-indexing-info.c	\
 	fm-bonobo-provider.h 		\
+	fm-tree-model.c			\
+	fm-tree-view.c			\
 	fm-desktop-icon-view.h 		\
 	fm-directory-view.h 		\
 	fm-error-reporting.h 		\
@@ -38,6 +40,8 @@ libnautilus_file_manager_la_SOURCES=	\
 	fm-properties-window.h 		\
 	fm-search-list-view.h 		\
 	nautilus-indexing-info.h 	\
+	fm-tree-model.h			\
+	fm-tree-view.h			\
 	$(NULL)
 
 uidir = $(datadir)/gnome-2.0/ui
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index b757e08a6..336a8fad7 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -141,6 +141,8 @@
 #define FM_DIRECTORY_VIEW_COMMAND_MEDIA_PROPERTIES_VOLUME_CONDITIONAL   "/commands/Media Properties Conditional"
 
 #define FM_DIRECTORY_VIEW_MENU_PATH_OPEN_WITH				"/menu/File/Open Placeholder/Open With"
+#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS			"/menu/File/New Items Placeholder/New Documents"
+#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_NO_TEMPLATES		"/menu/File/New Items Placeholder/New Documents/No Templates"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS				"/menu/File/Open Placeholder/Scripts"
 #define FM_DIRECTORY_VIEW_MENU_PATH_TRASH                    		"/menu/Edit/Dangerous File Items Placeholder/Trash"
 #define FM_DIRECTORY_VIEW_MENU_PATH_DELETE                    		"/menu/Edit/Dangerous File Items Placeholder/Delete"
@@ -153,6 +155,8 @@
 #define FM_DIRECTORY_VIEW_MENU_PATH_OTHER_VIEWER		    	"/menu/File/Open Placeholder/Open With/OtherViewer"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER    		"/menu/File/Open Placeholder/Scripts/Scripts Placeholder"
 #define FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR    		"/menu/File/Open Placeholder/Scripts/After Scripts"
+#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER  		"/menu/File/New Items Placeholder/New Documents/New Documents Placeholder"
+#define FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_SEPARATOR    		"/menu/File/New Items Placeholder/New Documents/After New Documents"
 #define FM_DIRECTORY_VIEW_MENU_PATH_CUT_FILES    			"/menu/Edit/Cut"
 #define FM_DIRECTORY_VIEW_MENU_PATH_COPY_FILES		    		"/menu/Edit/Copy"
 #define FM_DIRECTORY_VIEW_MENU_PATH_PASTE_FILES		    		"/menu/Edit/Paste"
@@ -164,6 +168,10 @@
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS         	"/popups/background/Before Zoom Items/Scripts"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER	"/popups/background/Before Zoom Items/Scripts/Scripts Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR	"/popups/background/Before Zoom Items/Scripts/After Scripts"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS         	"/popups/background/Before Zoom Items/New Documents"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_NO_TEMPLATES "/popups/background/Before Zoom Items/New Documents/No Templates"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_PLACEHOLDER "/popups/background/Before Zoom Items/New Documents/New Documents Placeholder"
+#define FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_SEPARATOR	"/popups/background/Before Zoom Items/New Documents/After New Documents"
 
 #define FM_DIRECTORY_VIEW_POPUP_PATH_APPLICATIONS_PLACEHOLDER    	"/popups/selection/Open Placeholder/Open With/Applications Placeholder"
 #define FM_DIRECTORY_VIEW_POPUP_PATH_BEFORE_VIEWERS_SEPARATOR 		"/popups/selection/Open Placeholder/Open With/Before Viewers"
@@ -201,6 +209,9 @@ static gboolean confirm_trash_auto_value;
 static char *scripts_directory_uri;
 static int scripts_directory_uri_length;
 
+static char *templates_directory_uri;
+static int templates_directory_uri_length;
+
 struct FMDirectoryViewDetails
 {
 	NautilusView *nautilus_view;
@@ -211,9 +222,11 @@ struct FMDirectoryViewDetails
 	BonoboUIComponent *ui;
 
 	GList *scripts_directory_list;
+	GList *templates_directory_list;
 
 	guint display_selection_idle_id;
 	guint update_menus_timeout_id;
+	guint update_status_idle_id;
 	
 	guint display_pending_idle_id;
 	
@@ -237,6 +250,7 @@ struct FMDirectoryViewDetails
 	gboolean menus_merged;
 	gboolean menu_states_untrustworthy;
 	gboolean scripts_invalid;
+	gboolean templates_invalid;
 	gboolean reported_load_error;
 
 	gboolean sort_directories_first;
@@ -331,6 +345,8 @@ static void     zoomable_zoom_to_fit_callback                  (BonoboZoomable
 static void     schedule_update_menus                          (FMDirectoryView      *view);
 static void     schedule_update_menus_callback                 (gpointer              callback_data);
 static void     remove_update_menus_timeout_callback           (FMDirectoryView      *view);
+static void     schedule_update_status                          (FMDirectoryView      *view);
+static void     remove_update_status_idle_callback             (FMDirectoryView *view); 
 static void     schedule_idle_display_of_pending_files         (FMDirectoryView      *view);
 static void     unschedule_idle_display_of_pending_files       (FMDirectoryView      *view);
 static void     unschedule_display_of_pending_files            (FMDirectoryView      *view);
@@ -362,6 +378,7 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_item_count)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, is_empty)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, reset_to_defaults)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, restore_default_zoom_level)
@@ -386,6 +403,12 @@ typedef struct {
 	FMDirectoryView *directory_view;
 } ScriptLaunchParameters;
 
+typedef struct {
+	NautilusFile *file;
+	FMDirectoryView *directory_view;
+} CreateTemplateParameters;
+
+
 static ApplicationLaunchParameters *
 application_launch_parameters_new (GnomeVFSMimeApplication *application,
 			      	   NautilusFile *file,
@@ -460,6 +483,30 @@ script_launch_parameters_free (ScriptLaunchParameters *parameters)
 	g_free (parameters);
 }			      
 
+static CreateTemplateParameters *
+create_template_parameters_new (NautilusFile *file,
+				FMDirectoryView *directory_view)
+{
+	CreateTemplateParameters *result;
+
+	result = g_new0 (CreateTemplateParameters, 1);
+	g_object_ref (directory_view);
+	result->directory_view = directory_view;
+	nautilus_file_ref (file);
+	result->file = file;
+
+	return result;
+}
+
+static void
+create_templates_parameters_free (CreateTemplateParameters *parameters)
+{
+	g_object_unref (parameters->directory_view);
+	nautilus_file_unref (parameters->file);
+	g_free (parameters);
+}			      
+
+
 /* Returns the GtkWindow that this directory view occupies, or NULL
  * if at the moment this directory view is not in a GtkWindow or the
  * GtkWindow cannot be determined. Primarily used for parenting dialogs.
@@ -485,19 +532,20 @@ fm_directory_view_confirm_multiple_windows (FMDirectoryView *view, int count)
 	GtkDialog *dialog;
 	char *prompt;
 	char *title;
+	char *detail;
 	int response;
 
 	if (count <= SILENT_WINDOW_OPEN_LIMIT) {
 		return TRUE;
 	}
 
-	prompt = g_strdup_printf (_("This will open %d separate windows. "
-				    "Are you sure you want to do this?"), count);
 	title = g_strdup_printf (_("Open %d Windows?"), count);
-	dialog = eel_show_yes_no_dialog (prompt, title, 
+	prompt = _("Are you sure you want to open all files?");
+	detail = g_strdup_printf (_("This will open %d separate windows."), count);
+	dialog = eel_show_yes_no_dialog (prompt, detail, title, 
 					 GTK_STOCK_OK, GTK_STOCK_CANCEL,
 					 fm_directory_view_get_containing_window (view));
-	g_free (prompt);
+	g_free (detail);
 	g_free (title);
 
 	response = gtk_dialog_run (dialog);
@@ -552,10 +600,28 @@ open_callback (BonoboUIComponent *component, gpointer callback_data, const char
 	view = FM_DIRECTORY_VIEW (callback_data);
 
 	selection = fm_directory_view_get_selection (view);
-	fm_directory_view_activate_files (view, selection, Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE, 0);
+	fm_directory_view_activate_files (view, selection,
+					  Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
+					  0);
+	nautilus_file_list_free (selection);
+}
+
+static void
+open_close_parent_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
+{
+	GList *selection;
+	FMDirectoryView *view;
+
+	view = FM_DIRECTORY_VIEW (callback_data);
+
+	selection = fm_directory_view_get_selection (view);
+	fm_directory_view_activate_files (view, selection,
+					  Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
+					  Nautilus_ViewFrame_OPEN_FLAG_CLOSE_BEHIND);
 	nautilus_file_list_free (selection);
 }
 
+
 static void
 open_alternate_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
 {
@@ -840,6 +906,7 @@ confirm_delete_directly (FMDirectoryView *view,
 
 	dialog = eel_show_yes_no_dialog
 		(prompt,
+		 _("If you delete an item, it is permanently lost."), 
 		 _("Delete?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		 fm_directory_view_get_containing_window (view));
 
@@ -1049,6 +1116,14 @@ new_folder_callback (BonoboUIComponent *component, gpointer callback_data, const
 }
 
 static void
+new_empty_file_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
+{                
+        g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
+
+	fm_directory_view_new_file (FM_DIRECTORY_VIEW (callback_data), NULL);
+}
+
+static void
 new_launcher_callback (BonoboUIComponent *component, gpointer callback_data, const char *verb)
 {
 	char *parent_uri;
@@ -1080,7 +1155,7 @@ open_properties_window_callback (BonoboUIComponent *component, gpointer callback
         view = FM_DIRECTORY_VIEW (callback_data);
 	selection = fm_directory_view_get_selection (view);
 
-	fm_properties_window_present (selection, view);
+	fm_properties_window_present (selection, GTK_WIDGET (view));
 
         nautilus_file_list_free (selection);
 }
@@ -1262,6 +1337,17 @@ set_up_scripts_directory_global (void)
 }
 
 static void
+set_up_templates_directory_global (void)
+{
+	if (templates_directory_uri != NULL) {
+		return;
+	}
+	
+	templates_directory_uri = nautilus_get_templates_directory_uri ();
+	templates_directory_uri_length = strlen (templates_directory_uri);
+}
+
+static void
 create_scripts_directory (void)
 {
 	char *gnome1_path, *gnome1_uri_str;
@@ -1307,6 +1393,19 @@ scripts_added_or_changed_callback (NautilusDirectory *directory,
 }
 
 static void
+templates_added_or_changed_callback (NautilusDirectory *directory,
+				     GList *files,
+				     gpointer callback_data)
+{
+	FMDirectoryView *view;
+
+	view = FM_DIRECTORY_VIEW (callback_data);
+
+	view->details->templates_invalid = TRUE;
+	schedule_update_menus (view);
+}
+
+static void
 icons_changed_callback (gpointer callback_data)
 {
 	FMDirectoryView *view;
@@ -1314,57 +1413,100 @@ icons_changed_callback (gpointer callback_data)
 	view = FM_DIRECTORY_VIEW (callback_data);
 
 	view->details->scripts_invalid = TRUE;
+	view->details->templates_invalid = TRUE;
 	schedule_update_menus (view);
 }
 
 static void
-add_directory_to_scripts_directory_list (FMDirectoryView *view,
-					 NautilusDirectory *directory)
+add_directory_to_directory_list (FMDirectoryView *view,
+				 NautilusDirectory *directory,
+				 GList **directory_list,
+				 GCallback changed_callback)
 {
 	NautilusFileAttributes attributes;
 
-	if (g_list_find (view->details->scripts_directory_list, directory) == NULL) {
+	if (g_list_find (*directory_list, directory) == NULL) {
 		nautilus_directory_ref (directory);
 
 		attributes = nautilus_icon_factory_get_required_file_attributes ();
 		attributes |= NAUTILUS_FILE_ATTRIBUTE_CAPABILITIES |
 			NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT;
  
-		nautilus_directory_file_monitor_add (directory, &view->details->scripts_directory_list,
+		nautilus_directory_file_monitor_add (directory, directory_list,
 						     FALSE, FALSE, attributes,
-						     scripts_added_or_changed_callback, view);
+						     (NautilusDirectoryCallback)changed_callback, view);
 
 		g_signal_connect_object (directory, "files_added",
-					 G_CALLBACK (scripts_added_or_changed_callback), view, 0);
+					 G_CALLBACK (changed_callback), view, 0);
 		g_signal_connect_object (directory, "files_changed",
-					 G_CALLBACK (scripts_added_or_changed_callback), view, 0);
+					 G_CALLBACK (changed_callback), view, 0);
 
-		view->details->scripts_directory_list = g_list_append
-			(view->details->scripts_directory_list, directory);
+		*directory_list = g_list_append	(*directory_list, directory);
 	}
 }
 
 static void
-remove_directory_from_scripts_directory_list (FMDirectoryView *view,
-					      NautilusDirectory *directory)
+remove_directory_from_directory_list (FMDirectoryView *view,
+				      NautilusDirectory *directory,
+				      GList **directory_list,
+				      GCallback changed_callback)
 {
-	view->details->scripts_directory_list = g_list_remove
-		(view->details->scripts_directory_list, directory);
+	*directory_list = g_list_remove	(*directory_list, directory);
 
 	g_signal_handlers_disconnect_by_func (directory,
-					      G_CALLBACK (scripts_added_or_changed_callback),
+					      G_CALLBACK (changed_callback),
 					      view);
 
-	nautilus_directory_file_monitor_remove (directory, &view->details->scripts_directory_list);
+	nautilus_directory_file_monitor_remove (directory, directory_list);
 
 	nautilus_directory_unref (directory);
 }
 
+
+static void
+add_directory_to_scripts_directory_list (FMDirectoryView *view,
+					 NautilusDirectory *directory)
+{
+	add_directory_to_directory_list (view, directory,
+					 &view->details->scripts_directory_list,
+					 G_CALLBACK (scripts_added_or_changed_callback));
+}
+
+static void
+remove_directory_from_scripts_directory_list (FMDirectoryView *view,
+					      NautilusDirectory *directory)
+{
+	remove_directory_from_directory_list (view, directory,
+					      &view->details->scripts_directory_list,
+					      G_CALLBACK (scripts_added_or_changed_callback));
+}
+
+static void
+add_directory_to_templates_directory_list (FMDirectoryView *view,
+					   NautilusDirectory *directory)
+{
+	add_directory_to_directory_list (view, directory,
+					 &view->details->templates_directory_list,
+					 G_CALLBACK (templates_added_or_changed_callback));
+}
+
+static void
+remove_directory_from_templates_directory_list (FMDirectoryView *view,
+						NautilusDirectory *directory)
+{
+	remove_directory_from_directory_list (view, directory,
+					      &view->details->templates_directory_list,
+					      G_CALLBACK (templates_added_or_changed_callback));
+}
+
+
+
 static void
 fm_directory_view_init (FMDirectoryView *view)
 {
 	static gboolean setup_autos = FALSE;
 	NautilusDirectory *scripts_directory;
+	NautilusDirectory *templates_directory;
 
 	if (!setup_autos) {
 		setup_autos = TRUE;
@@ -1387,11 +1529,15 @@ fm_directory_view_init (FMDirectoryView *view)
 	view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
 
 	set_up_scripts_directory_global ();
-
 	scripts_directory = nautilus_directory_get (scripts_directory_uri);
 	add_directory_to_scripts_directory_list (view, scripts_directory);
 	nautilus_directory_unref (scripts_directory);
 
+	set_up_templates_directory_global ();
+	templates_directory = nautilus_directory_get (templates_directory_uri);
+	add_directory_to_templates_directory_list (view, templates_directory);
+	nautilus_directory_unref (templates_directory);
+
 	view->details->zoomable = bonobo_zoomable_new ();
 	bonobo_zoomable_set_parameters_full (view->details->zoomable,
 					     0.0, .25, 4.0, TRUE, TRUE, FALSE,
@@ -1489,6 +1635,12 @@ fm_directory_view_finalize (GObject *object)
 		remove_directory_from_scripts_directory_list (view, node->data);
 	}
 
+	for (node = view->details->templates_directory_list; node != NULL; node = next) {
+		next = node->next;
+		remove_directory_from_templates_directory_list (view, node->data);
+	}
+
+	
 	nautilus_directory_unref (view->details->model);
 	view->details->model = NULL;
 	nautilus_file_unref (view->details->directory_as_file);
@@ -1498,6 +1650,7 @@ fm_directory_view_finalize (GObject *object)
 	}
 
 	remove_update_menus_timeout_callback (view);
+	remove_update_status_idle_callback (view);
 
 	fm_directory_view_ignore_hidden_file_preferences (view);
 
@@ -1541,7 +1694,7 @@ fm_directory_view_display_selection_info (FMDirectoryView *view)
 	GnomeVFSFileSize non_folder_size;
 	guint non_folder_count, folder_count, folder_item_count;
 	gboolean folder_item_count_known;
-	guint item_count;
+	guint file_item_count;
 	GList *p;
 	char *first_item_name;
 	char *non_folder_str;
@@ -1568,8 +1721,8 @@ fm_directory_view_display_selection_info (FMDirectoryView *view)
 		file = p->data;
 		if (nautilus_file_is_directory (file)) {
 			folder_count++;
-			if (nautilus_file_get_directory_item_count (file, &item_count, NULL)) {
-				folder_item_count += item_count;
+			if (nautilus_file_get_directory_item_count (file, &file_item_count, NULL)) {
+				folder_item_count += file_item_count;
 			} else {
 				folder_item_count_known = FALSE;
 			}
@@ -1656,7 +1809,23 @@ fm_directory_view_display_selection_info (FMDirectoryView *view)
 	}
 
 	if (folder_count == 0 && non_folder_count == 0)	{
-		status_string = g_strdup ("");
+		char *free_space_str;
+		char *item_count_str;
+		guint item_count;
+
+		item_count = fm_directory_view_get_item_count (view);
+		
+		item_count_str = g_strdup_printf (ngettext ("%u item", "%u items", item_count), item_count);
+
+		free_space_str = nautilus_file_get_volume_free_space (view->details->directory_as_file);
+		if (free_space_str != NULL) {
+			status_string = g_strdup_printf (_("%s, Free space: %s"), item_count_str, free_space_str);
+			g_free (free_space_str);
+			g_free (item_count_str);
+		} else {
+			status_string = item_count_str;
+		}
+
 	} else if (folder_count == 0) {
 		status_string = g_strdup (non_folder_str);
 	} else if (non_folder_count == 0) {
@@ -1801,14 +1970,14 @@ real_file_limit_reached (FMDirectoryView *view)
 	 * no more than the constant limit are displayed.
 	 */
 	message = g_strdup_printf (_("The folder \"%s\" contains more files than "
-			             "Nautilus can handle. Some files will not be "
-			             "displayed."), 
+			             "Nautilus can handle."), 
 			           directory_name);
 	g_free (directory_name);
 
 	dialog = eel_show_warning_dialog (message,
-					       _("Too Many Files"),
-					       fm_directory_view_get_containing_window (view));
+					  _("Some files will not be displayed."),
+					  _("Too Many Files"),
+					  fm_directory_view_get_containing_window (view));
 	g_free (message);
 }
 
@@ -1836,6 +2005,7 @@ done_loading (FMDirectoryView *view)
 	if (view->details->nautilus_view != NULL) {
 		nautilus_view_report_load_complete (view->details->nautilus_view);
 		schedule_update_menus (view);
+		schedule_update_status (view);
 		check_for_directory_hard_limit (view);
 
 		uris_selected = view->details->pending_uris_selected;
@@ -2455,6 +2625,9 @@ files_added_callback (NautilusDirectory *directory,
 
 	view = FM_DIRECTORY_VIEW (callback_data);
 	queue_pending_files (view, files, &view->details->new_added_files);
+
+	/* The number of items could have changed */
+	schedule_update_status (view);
 }
 
 static void
@@ -2467,6 +2640,9 @@ files_changed_callback (NautilusDirectory *directory,
 	view = FM_DIRECTORY_VIEW (callback_data);
 	queue_pending_files (view, files, &view->details->new_changed_files);
 	
+	/* The free space or the number of items could have changed */
+	schedule_update_status (view);
+
 	/* A change in MIME type could affect the Open with menu, for
 	 * one thing, so we need to update menus when files change.
 	 */
@@ -2777,6 +2953,16 @@ fm_directory_view_get_selection (FMDirectoryView *view)
 		 get_selection, (view));
 }
 
+guint
+fm_directory_view_get_item_count (FMDirectoryView *view)
+{
+	g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), 0);
+
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
+		(FM_DIRECTORY_VIEW_CLASS, view,
+		 get_item_count, (view));
+}
+
 /**
  * fm_directory_view_get_bonobo_ui_container:
  *
@@ -3040,7 +3226,9 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
 {
 	GtkDialog *dialog;
 	char *prompt;
+	char *detail;
 	int uri_count;
+	char *uri;
 	char *file_name;
 	int response;
 
@@ -3050,29 +3238,31 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
 	g_assert (uri_count > 0);
 	
 	if (uri_count == 1) {
-		file_name = file_name_from_uri ((char *) uris->data);
-
-		prompt = g_strdup_printf (_("\"%s\" cannot be moved to the Trash. Do "
-					    "you want to delete it immediately?"), file_name);
+		uri = (char *) uris->data;
+		if (eel_uri_is_desktop (uri)) {
+			/* Don't ask for desktop icons */
+			return TRUE;
+		}
+		file_name = file_name_from_uri (uri);
+		prompt = _("Cannot move file to trash, do you want to delete immediately?");
+		detail = g_strdup_printf (_("The file \"%s\" cannot be moved to the trash."), file_name);
 		g_free (file_name);
 	} else {
 		if (all) {
-			prompt = g_strdup_printf (_("The %d selected items cannot be moved "
-						    "to the Trash. Do you want to delete them "
-						    "immediately?"), uri_count);
+			prompt = _("Cannot move items to trash, do you want to delete them immediately?");
+			detail = g_strdup_printf ("None of the %d selected items can be moved to the Trash", uri_count);
 		} else {
-			prompt = g_strdup_printf (_("%d of the selected items cannot be moved "
-						    "to the Trash. Do you want to delete those "
-						    "%d items immediately?"), uri_count, uri_count);
+			prompt = _("Cannot move some items to trash, do you want to delete these immediately?");
+			detail = g_strdup_printf ("%d of the selected items cannot be moved to the Trash", uri_count);
 		}
 	}
 
 	dialog = eel_show_yes_no_dialog
 		(prompt,
-		 _("Delete Immediately?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
+		 detail, _("Delete Immediately?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		 fm_directory_view_get_containing_window (view));
 	
-	g_free (prompt);
+	g_free (detail);
 
 	response = gtk_dialog_run (dialog);
 	gtk_object_destroy (GTK_OBJECT (dialog));
@@ -3102,15 +3292,15 @@ confirm_delete_from_trash (FMDirectoryView *view, GList *uris)
 	if (uri_count == 1) {
 		file_name = file_name_from_uri ((char *) uris->data);
 		prompt = g_strdup_printf (_("Are you sure you want to permanently delete \"%s\" "
-					    "from the Trash?"), file_name);
+					    "from the trash?"), file_name);
 		g_free (file_name);
 	} else {
 		prompt = g_strdup_printf (_("Are you sure you want to permanently delete "
-		  			    "the %d selected items from the Trash?"), uri_count);
+		  			    "the %d selected items from the trash?"), uri_count);
 	}
 
 	dialog = eel_show_yes_no_dialog (
-		prompt,
+		prompt, _("If you delete an item, it will be permanently lost."), 
 		_("Delete From Trash?"), GTK_STOCK_DELETE, GTK_STOCK_CANCEL,
 		fm_directory_view_get_containing_window (view));
 
@@ -3219,29 +3409,58 @@ start_renaming_file (FMDirectoryView *view, NautilusFile *file)
 }
 
 static void
+rename_file (FMDirectoryView *view, NautilusFile *new_file)
+{
+	/* no need to select because start_renaming_file selects
+	 * fm_directory_view_select_file (view, new_file);
+	 */
+	EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_file, (view, new_file));
+	fm_directory_view_reveal_selection (view);
+}
+
+static void
 reveal_newly_added_folder (FMDirectoryView *view, NautilusFile *new_file, const char *target_uri)
 {
 	if (nautilus_file_matches_uri (new_file, target_uri)) {
 		g_signal_handlers_disconnect_by_func (view,
 						      G_CALLBACK (reveal_newly_added_folder),
 						      (void *) target_uri);
-		/* no need to select because start_renaming_file selects
-		 * fm_directory_view_select_file (view, new_file);
-		 */
-		EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_file, (view, new_file));
-		fm_directory_view_reveal_selection (view);
+		rename_file (view, new_file);
 	}
 }
 
+typedef struct {
+	FMDirectoryView *directory_view;
+	GHashTable *added_uris;
+} NewFolderData;
+
+
+static void
+track_newly_added_uris (FMDirectoryView *view, NautilusFile *new_file, gpointer user_data)
+{
+	NewFolderData *data;
+
+	data = user_data;
+
+	g_hash_table_insert (data->added_uris, nautilus_file_get_uri (new_file), NULL);
+}
+
 static void
-new_folder_done (const char *new_folder_uri, gpointer data)
+new_folder_done (const char *new_folder_uri, gpointer user_data)
 {
 	FMDirectoryView *directory_view;
 	NautilusFile *file;
 	char *screen_string;
 	GdkScreen *screen;
+	NewFolderData *data;
 
-	directory_view = (FMDirectoryView *) data;
+	data = (NewFolderData *)user_data;
+	
+	if (new_folder_uri == NULL) {
+		goto fail;
+	}
+	
+	directory_view = data->directory_view;
 	g_assert (FM_IS_DIRECTORY_VIEW (directory_view));
 
 	screen = gtk_widget_get_screen (GTK_WIDGET (directory_view));
@@ -3254,31 +3473,92 @@ new_folder_done (const char *new_folder_uri, gpointer data)
 		 screen_string);
 	g_free (screen_string);
 
-	/* We need to run after the default handler adds the folder we want to
-	 * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
-	 * must use connect_after.
-	 */
-	g_signal_connect_data (directory_view,
-			       "add_file",
-			       G_CALLBACK (reveal_newly_added_folder),
-			       g_strdup (new_folder_uri),
-			       (GClosureNotify)g_free,
-			       G_CONNECT_AFTER);
+	g_signal_handlers_disconnect_by_func (directory_view,
+					      G_CALLBACK (track_newly_added_uris),
+					      (void *) data);
+
+	if (g_hash_table_lookup_extended (data->added_uris, new_folder_uri, NULL, NULL)) {
+		/* The file was already added */
+		rename_file (directory_view, file);
+	} else {
+		/* We need to run after the default handler adds the folder we want to
+		 * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
+		 * must use connect_after.
+		 */
+		g_signal_connect_data (directory_view,
+				       "add_file",
+				       G_CALLBACK (reveal_newly_added_folder),
+				       g_strdup (new_folder_uri),
+				       (GClosureNotify)g_free,
+				       G_CONNECT_AFTER);
+	}
+
+ fail:
+	g_hash_table_destroy (data->added_uris);
+	g_free (data);
 }
 
 void
 fm_directory_view_new_folder (FMDirectoryView *directory_view)
 {
 	char *parent_uri;
+	NewFolderData *data;
+
+	data = g_new (NewFolderData, 1);
+	data->directory_view = directory_view;
+	data->added_uris = g_hash_table_new_full (g_str_hash, g_str_equal,
+						  g_free, NULL);
+	
+	g_signal_connect_data (directory_view,
+			       "add_file",
+			       G_CALLBACK (track_newly_added_uris),
+			       data,
+			       (GClosureNotify)NULL,
+			       G_CONNECT_AFTER);
 
 	parent_uri = fm_directory_view_get_backing_uri (directory_view);
 	nautilus_file_operations_new_folder (GTK_WIDGET (directory_view),
 					     parent_uri,
-					     new_folder_done, directory_view);
+					     new_folder_done, data);
 
 	g_free (parent_uri);
 }
 
+void
+fm_directory_view_new_file (FMDirectoryView *directory_view,
+			    NautilusFile *source)
+{
+	char *parent_uri;
+	char *source_uri;
+	NewFolderData *data;
+
+	data = g_new (NewFolderData, 1);
+	data->directory_view = directory_view;
+	data->added_uris = g_hash_table_new_full (g_str_hash, g_str_equal,
+						  g_free, NULL);
+
+	g_signal_connect_data (directory_view,
+			       "add_file",
+			       G_CALLBACK (track_newly_added_uris),
+			       data,
+			       (GClosureNotify)NULL,
+			       G_CONNECT_AFTER);
+
+	
+	source_uri = NULL;
+	if (source != NULL) {
+		source_uri = nautilus_file_get_uri (source);
+	}
+	parent_uri = fm_directory_view_get_backing_uri (directory_view);
+	nautilus_file_operations_new_file (GTK_WIDGET (directory_view),
+					   parent_uri,
+					   source_uri,
+					   new_folder_done, data);
+	g_free (parent_uri);
+	g_free (source_uri);
+}
+
+
 /* handle the open command */
 
 static void
@@ -3337,6 +3617,10 @@ add_numbered_menu_item (BonoboUIComponent *ui,
 			GDestroyNotify destroy_notify)
 {
 	char *escaped_parent_path, *escaped_label, *verb_name, *item_path;
+
+	if (parent_path == NULL) {
+		return;
+	}
 	
 	escaped_parent_path = eel_str_double_underscores (parent_path);
 
@@ -3372,11 +3656,13 @@ add_submenu (BonoboUIComponent *ui,
 {
 	char *escaped_parent_path, *escaped_label;
 
-	escaped_parent_path = eel_str_double_underscores (parent_path);
-	escaped_label = eel_str_double_underscores (label);
-	nautilus_bonobo_add_submenu (ui, escaped_parent_path, escaped_label, pixbuf);
-	g_free (escaped_label);
-	g_free (escaped_parent_path);
+	if (parent_path != NULL) {
+		escaped_parent_path = eel_str_double_underscores (parent_path);
+		escaped_label = eel_str_double_underscores (label);
+		nautilus_bonobo_add_submenu (ui, escaped_parent_path, escaped_label, pixbuf);
+		g_free (escaped_label);
+		g_free (escaped_parent_path);
+	}
 }
 
 static void
@@ -3878,12 +4164,12 @@ run_script_callback (BonoboUIComponent *component, gpointer callback_data, const
 }
 
 static void
-add_script_to_script_menus (FMDirectoryView *directory_view,
-			    NautilusFile *file,
-			    int index,
-			    const char *menu_path,
-			    const char *popup_path, 
-			    const char *popup_bg_path)
+add_script_to_scripts_menus (FMDirectoryView *directory_view,
+			       NautilusFile *file,
+			       int index,
+			       const char *menu_path,
+			       const char *popup_path, 
+			       const char *popup_bg_path)
 {
 	ScriptLaunchParameters *launch_parameters;
 	char *tip;
@@ -3935,11 +4221,11 @@ add_script_to_script_menus (FMDirectoryView *directory_view,
 }
 
 static void
-add_submenu_to_script_menus (FMDirectoryView *directory_view,
-			     NautilusFile *file,
-			     const char *menu_path,
-			     const char *popup_path,
-			     const char *popup_bg_path)
+add_submenu_to_directory_menus (FMDirectoryView *directory_view,
+				NautilusFile *file,
+				const char *menu_path,
+				const char *popup_path,
+				const char *popup_bg_path)
 {
 	char *name;
 	GdkPixbuf *pixbuf;
@@ -3987,19 +4273,22 @@ update_directory_in_scripts_menu (FMDirectoryView *view, NautilusDirectory *dire
 	NautilusFile *file;
 	NautilusDirectory *dir;
 	char *uri;
+	char *escaped_path;
 	int i;
 	
 	uri = nautilus_directory_get_uri (directory);
+	escaped_path = gnome_vfs_escape_path_string (uri + scripts_directory_uri_length);
+	g_free (uri);
 	menu_path = g_strconcat (FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER,
-				 uri + scripts_directory_uri_length,
+				 escaped_path,
 				 NULL);
 	popup_path = g_strconcat (FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_PLACEHOLDER,
-				  uri + scripts_directory_uri_length,
+				  escaped_path,
 				  NULL);
 	popup_bg_path = g_strconcat (FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER,
-				  uri + scripts_directory_uri_length,
+				  escaped_path,
 				  NULL);
-	g_free (uri);
+	g_free (escaped_path);
 
 	file_list = nautilus_directory_get_file_list (directory);
 	filtered = nautilus_file_list_filter_hidden_and_backup (file_list, FALSE, FALSE);
@@ -4013,7 +4302,7 @@ update_directory_in_scripts_menu (FMDirectoryView *view, NautilusDirectory *dire
 		file = node->data;
 
 		if (file_is_launchable (file)) {
-			add_script_to_script_menus (view, file, i++, menu_path, popup_path, popup_bg_path);
+			add_script_to_scripts_menus (view, file, i++, menu_path, popup_path, popup_bg_path);
 			any_scripts = TRUE;
 		} else if (nautilus_file_is_directory (file)) {
 			uri = nautilus_file_get_uri (file);
@@ -4022,7 +4311,7 @@ update_directory_in_scripts_menu (FMDirectoryView *view, NautilusDirectory *dire
 				add_directory_to_scripts_directory_list (view, dir);
 				nautilus_directory_unref (dir);
 
-				add_submenu_to_script_menus (view, file, menu_path, popup_path, popup_bg_path);
+				add_submenu_to_directory_menus (view, file, menu_path, popup_path, popup_bg_path);
 
 				any_scripts = TRUE;
 			}
@@ -4097,6 +4386,204 @@ update_scripts_menu (FMDirectoryView *view)
 }
 
 static void
+create_template_callback (BonoboUIComponent *component, gpointer callback_data, const char *path)
+{
+	CreateTemplateParameters *parameters;
+
+	parameters = callback_data;
+	
+	fm_directory_view_new_file (parameters->directory_view, parameters->file);
+}
+
+
+static void
+add_template_to_templates_menus (FMDirectoryView *directory_view,
+				 NautilusFile *file,
+				 int index,
+				 const char *menu_path,
+				 const char *popup_bg_path)
+{
+	char *tip;
+	char *name;
+	char *dot;
+	GdkPixbuf *pixbuf;
+	CreateTemplateParameters *parameters;
+
+	name = nautilus_file_get_display_name (file);
+	
+	tip = g_strdup_printf (_("Create Document from template \"%s\""), name);
+
+	/* Remove extension */
+	dot = strrchr (name, '.');
+	if (dot != NULL) {
+		*dot = 0;
+	}
+
+	pixbuf = nautilus_icon_factory_get_pixbuf_for_file 
+		(file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS);
+
+	parameters = create_template_parameters_new (file, directory_view);
+	add_numbered_menu_item (directory_view->details->ui, 
+				menu_path,
+				name,
+				tip,
+				index,
+				pixbuf,
+				create_template_callback,
+				parameters,
+				(GDestroyNotify) create_templates_parameters_free);
+
+	/* Use same uri and no DestroyNotify for popup item, which has same
+	 * lifetime as the item in the File menu in the menu bar.
+	 */
+	add_numbered_menu_item (directory_view->details->ui,
+				popup_bg_path,
+				name,
+				tip,
+				index,
+				pixbuf,
+				create_template_callback,
+				parameters,
+				NULL);
+
+	g_object_unref (pixbuf);
+	g_free (name);
+	g_free (tip);
+}
+
+
+static gboolean
+directory_belongs_in_templates_menu (const char *uri)
+{
+	int num_levels;
+	int i;
+
+	if (!eel_str_has_prefix (uri, templates_directory_uri)) {
+		return FALSE;
+	}
+
+	num_levels = 0;
+	for (i = templates_directory_uri_length; uri[i] != '\0'; i++) {
+		if (uri[i] == '/') {
+			num_levels++;
+		}
+	}
+
+	if (num_levels > MAX_MENU_LEVELS) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+update_directory_in_templates_menu (FMDirectoryView *view, NautilusDirectory *directory)
+{
+	char *menu_path, *popup_bg_path;
+	GList *file_list, *filtered, *node;
+	gboolean any_templates;
+	NautilusFile *file;
+	NautilusDirectory *dir;
+	char *escaped_path;
+	char *uri;
+	int i;
+	
+	uri = nautilus_directory_get_uri (directory);
+	escaped_path = gnome_vfs_escape_path_string (uri + templates_directory_uri_length);
+	g_free (uri);
+	menu_path = g_strconcat (FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER,
+				 escaped_path,
+				 NULL);
+	popup_bg_path = g_strconcat (FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_PLACEHOLDER,
+				     escaped_path,
+				     NULL);;
+	
+	g_free (escaped_path);
+
+	file_list = nautilus_directory_get_file_list (directory);
+	filtered = nautilus_file_list_filter_hidden_and_backup (file_list, FALSE, FALSE);
+	nautilus_file_list_free (file_list);
+
+	file_list = nautilus_file_list_sort_by_display_name (filtered);
+
+	any_templates = FALSE;
+	i = 0;
+	for (node = file_list; node != NULL; node = node->next) {
+		file = node->data;
+
+		if (nautilus_file_is_directory (file)) {
+			uri = nautilus_file_get_uri (file);
+			if (directory_belongs_in_templates_menu (uri)) {
+				dir = nautilus_directory_get (uri);
+				add_directory_to_templates_directory_list (view, dir);
+				nautilus_directory_unref (dir);
+
+				add_submenu_to_directory_menus (view, file, menu_path, NULL, popup_bg_path);
+
+				any_templates = TRUE;
+			}
+			g_free (uri);
+		} else if (nautilus_file_can_read (file)) {
+			add_template_to_templates_menus (view, file, i++, menu_path, popup_bg_path);
+			any_templates = TRUE;
+		}
+	}
+
+	nautilus_file_list_free (file_list);
+
+	g_free (popup_bg_path);
+	g_free (menu_path);
+
+	return any_templates;
+}
+
+
+
+static void
+update_templates_menu (FMDirectoryView *view)
+{
+	gboolean any_templates;
+	GList *sorted_copy, *node;
+	NautilusDirectory *directory;
+	char *uri;
+
+	/* There is a race condition here.  If we don't mark the scripts menu as
+	   valid before we begin our task then we can lose template menu updates that
+	   occur before we finish. */
+	view->details->templates_invalid = FALSE;
+
+	nautilus_bonobo_remove_menu_items_and_commands
+		(view->details->ui, FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_PLACEHOLDER);
+	nautilus_bonobo_remove_menu_items_and_commands
+		(view->details->ui, FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_PLACEHOLDER);
+
+	/* As we walk through the directories, remove any that no longer belong. */
+	any_templates = FALSE;
+	sorted_copy = nautilus_directory_list_sort_by_uri
+		(nautilus_directory_list_copy (view->details->templates_directory_list));
+	for (node = sorted_copy; node != NULL; node = node->next) {
+		directory = node->data;
+
+		uri = nautilus_directory_get_uri (directory);
+		if (!directory_belongs_in_templates_menu (uri)) {
+			remove_directory_from_templates_directory_list (view, directory);
+		} else if (update_directory_in_templates_menu (view, directory)) {
+			any_templates = TRUE;
+		}
+		g_free (uri);
+	}
+	nautilus_directory_list_free (sorted_copy);
+
+	nautilus_bonobo_set_hidden (view->details->ui,
+				    FM_DIRECTORY_VIEW_MENU_PATH_NEW_DOCUMENTS_NO_TEMPLATES,
+				    any_templates);
+	nautilus_bonobo_set_hidden (view->details->ui,
+				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_NEW_DOCUMENTS_NO_TEMPLATES,
+				    any_templates);
+}
+
+
+static void
 open_scripts_folder_callback (BonoboUIComponent *component, 
 		     	      gpointer callback_data, 
 		     	      const char *verb)
@@ -4109,7 +4596,8 @@ open_scripts_folder_callback (BonoboUIComponent *component,
 	
 	eel_show_info_dialog_with_details 
 		(_("All executable files in this folder will appear in the "
-		   "Scripts menu. Choosing a script from the menu will run "
+		   "Scripts menu."),
+		 _("Choosing a script from the menu will run "
 		   "that script with any selected items as input."), 
 		 _("About Scripts"),
 		 _("All executable files in this folder will appear in the "
@@ -4437,7 +4925,8 @@ drive_mounted_callback (gboolean succeeded,
 			gpointer data)
 {
 	if (!succeeded) {
-		eel_show_error_dialog_with_details (error, _("Mount Error"), detailed_error, NULL);
+		eel_show_error_dialog_with_details (error, NULL,
+						    _("Mount Error"), detailed_error, NULL);
 	}
 }
 
@@ -4498,9 +4987,11 @@ volume_or_drive_unmounted_callback (gboolean succeeded,
 	eject = GPOINTER_TO_INT (data);
 	if (!succeeded) {
 		if (eject) {
-			eel_show_error_dialog_with_details (error, _("Unmount Error"), detailed_error, NULL);
+			eel_show_error_dialog_with_details (error, NULL, 
+			                                    _("Unmount Error"), detailed_error, NULL);
 		} else {
-			eel_show_error_dialog_with_details (error, _("Eject Error"), detailed_error, NULL);
+			eel_show_error_dialog_with_details (error, NULL, 
+			                                    _("Eject Error"), detailed_error, NULL);
 		}
 	}
 }
@@ -4564,9 +5055,11 @@ real_merge_menus (FMDirectoryView *view)
 		BONOBO_UI_VERB ("Duplicate", duplicate_callback),
 		BONOBO_UI_VERB ("Empty Trash", bonobo_menu_empty_trash_callback),
 		BONOBO_UI_VERB ("New Folder", new_folder_callback),
+		BONOBO_UI_VERB ("New Empty File", new_empty_file_callback),
 		BONOBO_UI_VERB ("New Launcher", new_launcher_callback),
 		BONOBO_UI_VERB ("Open Scripts Folder", open_scripts_folder_callback),
 		BONOBO_UI_VERB ("Open", open_callback),
+		BONOBO_UI_VERB ("OpenCloseParent", open_close_parent_callback),
 		BONOBO_UI_VERB ("OpenAlternate", open_alternate_callback),
 		BONOBO_UI_VERB ("OtherApplication", other_application_callback),
 		BONOBO_UI_VERB ("OtherViewer", other_viewer_callback),
@@ -4603,6 +5096,7 @@ real_merge_menus (FMDirectoryView *view)
 	}
 
 	view->details->scripts_invalid = TRUE;
+	view->details->templates_invalid = TRUE;
 }
 
 static void
@@ -4977,6 +5471,9 @@ real_update_menus (FMDirectoryView *view)
 	if (view->details->scripts_invalid) {
 		update_scripts_menu (view);
 	}
+	if (view->details->templates_invalid) {
+		update_templates_menu (view);
+	}
 }
 
 /**
@@ -5051,6 +5548,47 @@ schedule_update_menus (FMDirectoryView *view)
 	}
 }
 
+static void
+remove_update_status_idle_callback (FMDirectoryView *view) 
+{
+	if (view->details->update_status_idle_id != 0) {
+		g_source_remove (view->details->update_status_idle_id);
+		view->details->update_status_idle_id = 0;
+	}
+}
+
+static gboolean
+update_status_idle_callback (gpointer data)
+{
+	FMDirectoryView *view;
+
+	view = FM_DIRECTORY_VIEW (data);
+	fm_directory_view_display_selection_info (view);
+	view->details->update_status_idle_id = 0;
+	return FALSE;
+}
+
+static void
+schedule_update_status (FMDirectoryView *view) 
+{
+	g_assert (FM_IS_DIRECTORY_VIEW (view));
+
+	/* Make sure we haven't already destroyed it */
+	g_assert (view->details->nautilus_view != NULL);
+
+	if (view->details->loading) {
+		/* Don't update status bar while loading the dir */
+		return;
+	}
+
+	if (view->details->update_status_idle_id == 0) {
+		view->details->update_status_idle_id =
+			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE - 20,
+					 update_status_idle_callback, view, NULL);
+	}
+}
+
+
 /**
  * fm_directory_view_notify_selection_changed:
  * 
@@ -5110,6 +5648,7 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
 {
 	char *target_path;
 	char *prompt;
+	char *detail;
 	GtkDialog *dialog;
 	GList file_as_list;
 	int response;
@@ -5117,17 +5656,16 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
 	g_assert (nautilus_file_is_broken_symbolic_link (file));
 
 	target_path = nautilus_file_get_symbolic_link_target_path (file);
+	prompt = _("The link is borken, do you want to move it to the Trash?");
 	if (target_path == NULL) {
-		prompt = g_strdup_printf (_("This link can't be used, because it has no target. "
-					    "Do you want to move this link to the Trash?"));
+		detail = g_strdup (_("This link can't be used, because it has no target."));
 	} else {
-		prompt = g_strdup_printf (_("This link can't be used, because its target \"%s\" doesn't exist. "
-				 	    "Do you want to move this link to the Trash?"),
-					  target_path);
+		detail = g_strdup_printf (_("This link can't be used, because its target "
+					    "\"%s\" doesn't exist."), target_path);
 	}
 
 	dialog = eel_show_yes_no_dialog (prompt,
-					 _("Broken Link"), _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
+					 detail, _("Broken Link"), _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
 					 fm_directory_view_get_containing_window (view));
 
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_YES);
@@ -5152,7 +5690,7 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
 	}
 
 	g_free (target_path);
-	g_free (prompt);
+	g_free (detail);
 }
 
 static ActivationAction
@@ -5161,6 +5699,7 @@ get_executable_text_file_action (FMDirectoryView *view, NautilusFile *file)
 	GtkDialog *dialog;
 	char *file_name;
 	char *prompt;
+	char *detail;
 	int preferences_value;
 	int response;
 
@@ -5184,21 +5723,25 @@ get_executable_text_file_action (FMDirectoryView *view, NautilusFile *file)
 
 
 	file_name = nautilus_file_get_display_name (file);
-	prompt = g_strdup_printf (_("\"%s\" is an executable text file. "
-				    "Do you want to run it, or display its contents?"),
-				  file_name);
+	prompt = g_strdup_printf (_("Do you want to run \"%s\", or display its contents?"), 
+	                            file_name);
+	detail = g_strdup_printf (_("\"%s\" is an executable text file."),
+				    file_name);
 	g_free (file_name);
 
 	dialog = eel_create_question_dialog (prompt,
+					     detail,
 					     _("Run or Display?"),
-					     _("_Display"), RESPONSE_DISPLAY,
 					     _("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
+     					     _("_Display"), RESPONSE_DISPLAY,
 					     fm_directory_view_get_containing_window (view));
 	gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
+	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
 	gtk_widget_show (GTK_WIDGET (dialog));
 	
 	g_free (prompt);
+	g_free (detail);
 
 	response = gtk_dialog_run (dialog);
 	gtk_object_destroy (GTK_OBJECT (dialog));
@@ -5292,9 +5835,13 @@ activate_callback (NautilusFile *file, gpointer callback_data)
 			nautilus_launch_show_file
 				(file, fm_directory_view_get_containing_window (view));
 			
-			file_uri = nautilus_file_get_uri (file);
-			egg_recent_model_add (nautilus_recent_get_model (), file_uri);
-			g_free (file_uri);
+			/* We should not add trash and directory uris.*/
+			if ((!nautilus_file_is_in_trash (file)) && 
+			    (!nautilus_file_is_directory (file))) {
+				file_uri = nautilus_file_get_uri (file);
+				egg_recent_model_add (nautilus_recent_get_model (), file_uri);
+				g_free (file_uri);
+			}
 		}
 	}
 
@@ -5323,7 +5870,10 @@ activation_drive_mounted_callback (gboolean succeeded,
 	} else {
 		if (!parameters->cancelled) {
 			eel_timed_wait_stop (cancel_activate_callback, parameters);
-			eel_show_error_dialog_with_details (error, _("Mount Error"), detailed_error, NULL);
+			eel_show_error_dialog_with_details (error, NULL,
+							    _("Mount Error"),
+			                                    detailed_error, 
+							    NULL);
 		}
 		
 		nautilus_file_unref (parameters->file);
@@ -5454,7 +6004,7 @@ fm_directory_view_activate_file (FMDirectoryView *view,
 	parameters->cancelled = FALSE;
 
 	file_name = nautilus_file_get_display_name (file);
-	timed_wait_prompt = g_strdup_printf (_("Opening \"%s\""), file_name);
+	timed_wait_prompt = g_strdup_printf (_("Opening \"%s\"."), file_name);
 	g_free (file_name);
 	
 	eel_timed_wait_start
@@ -5523,6 +6073,7 @@ file_changed_callback (NautilusFile *file, gpointer callback_data)
 	FMDirectoryView *view = FM_DIRECTORY_VIEW (callback_data);
 
 	schedule_update_menus (view);
+	schedule_update_status (view);
 
 	/* We might have different capabilities, so we need to update
 	   relative icon emblems . (Writeable etc) */
@@ -6429,6 +6980,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed);
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_item_count);
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, is_empty);
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, reset_to_defaults);
 	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, restore_default_zoom_level);
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 2fa6afaef..6f138e9bb 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -152,6 +152,8 @@ struct FMDirectoryViewClass {
 	/* Return an array of locations of selected icons in their view. */
 	GArray * (* get_selected_icon_locations) (FMDirectoryView *view);
 
+	guint    (* get_item_count)             (FMDirectoryView *view);
+
         /* bump_zoom_level is a function pointer that subclasses must override
          * to change the zoom level of an object. */
         void    (* bump_zoom_level)      	(FMDirectoryView *view,
@@ -299,6 +301,7 @@ gboolean            fm_directory_view_can_accept_item                  (Nautilus
 void                fm_directory_view_display_selection_info           (FMDirectoryView  *view);
 GList *             fm_directory_view_get_selection                    (FMDirectoryView  *view);
 void                fm_directory_view_stop                             (FMDirectoryView  *view);
+guint               fm_directory_view_get_item_count                   (FMDirectoryView  *view);
 gboolean            fm_directory_view_can_zoom_in                      (FMDirectoryView  *view);
 gboolean            fm_directory_view_can_zoom_out                     (FMDirectoryView  *view);
 GtkWidget *         fm_directory_view_get_background_widget            (FMDirectoryView  *view);
@@ -370,6 +373,8 @@ gboolean            fm_directory_view_should_show_file                 (FMDirect
 gboolean	    fm_directory_view_should_sort_directories_first    (FMDirectoryView  *view);
 void                fm_directory_view_update_menus                     (FMDirectoryView  *view);
 void                fm_directory_view_new_folder                       (FMDirectoryView  *view);
+void                fm_directory_view_new_file                         (FMDirectoryView  *view,
+									NautilusFile     *source);
 void                fm_directory_view_ignore_hidden_file_preferences   (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 48167add6..09d22c33e 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -68,7 +68,8 @@ fm_report_error_loading_directory (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
 	}
 
-	eel_show_error_dialog (message, _("Error Displaying Folder"), parent_window);
+	eel_show_error_dialog (_("The folder contents could not be displayed."), message, 
+	                       _("Error Displaying Folder"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -140,7 +141,8 @@ fm_report_error_renaming_file (NautilusFile *file,
 	g_free (original_name_truncated);
 	g_free (new_name_truncated);
 
-	eel_show_error_dialog (message, _("Renaming Error"), parent_window);
+	eel_show_error_dialog (_("The item could not be renamed."), message, 
+	                       _("Renaming Error"), parent_window);
 	g_free (message);
 }
 
@@ -176,7 +178,7 @@ fm_report_error_setting_group (NautilusFile *file,
 		g_free (file_name);
 	}
 
-	eel_show_error_dialog (message, _("Error Setting Group"), parent_window);
+	eel_show_error_dialog (_("The group could not be changed."), message , _("Error Setting Group"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -208,7 +210,7 @@ fm_report_error_setting_owner (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't change the owner of \"%s\"."), file_name);
 	}
 
-	eel_show_error_dialog (message, _("Error Setting Owner"), parent_window);
+	eel_show_error_dialog (_("The owner could not be changed."), message, _("Error Setting Owner"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
@@ -240,7 +242,8 @@ fm_report_error_setting_permissions (NautilusFile *file,
 		message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\"."), file_name);
 	}
 
-	eel_show_error_dialog (message, _("Error Setting Permissions"), parent_window);
+	eel_show_error_dialog (_("The permissions could not be changed."), message,
+	                       _("Error Setting Permissions"), parent_window);
 
 	g_free (file_name);
 	g_free (message);
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index 6cffbaabe..b84509898 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -24,6 +24,8 @@
 #include <config.h>
 
 #include <libgnome/gnome-macros.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -54,7 +56,8 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
 				   NautilusIconData      *data,
 				   GList                **emblem_icons,
 				   char                 **embedded_text,
-				   gboolean              *embedded_text_needs_loading)
+				   gboolean              *embedded_text_needs_loading,
+				   gboolean              *has_window_open)
 {
 	FMIconView *icon_view;
 	EelStringList *emblems_to_ignore;
@@ -78,9 +81,32 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
 		eel_string_list_free (emblems_to_ignore);
 	}
 
+	*has_window_open = nautilus_file_has_open_window (file);
+	
 	return nautilus_icon_factory_get_icon_for_file (file, TRUE);
 }
 
+static char *
+fm_icon_container_get_icon_description (NautilusIconContainer *container,
+				        NautilusIconData      *data)
+{
+	NautilusFile *file;
+	char *mime_type;
+	const char *description;
+
+	file = NAUTILUS_FILE (data);
+	g_assert (NAUTILUS_IS_FILE (file));
+
+	if (NAUTILUS_IS_DESKTOP_ICON_FILE (file)) {
+		return NULL;
+	}
+
+	mime_type = nautilus_file_get_mime_type (file);
+	description = gnome_vfs_mime_get_description (mime_type);
+	g_free (mime_type);
+	return g_strdup (description);
+}
+
 static void
 fm_icon_container_start_monitor_top_left (NautilusIconContainer *container,
 					  NautilusIconData      *data,
@@ -445,6 +471,7 @@ fm_icon_container_class_init (FMIconContainerClass *klass)
 
 	ic_class->get_icon_text = fm_icon_container_get_icon_text;
 	ic_class->get_icon_images = fm_icon_container_get_icon_images;
+	ic_class->get_icon_description = fm_icon_container_get_icon_description;
 	ic_class->start_monitor_top_left = fm_icon_container_start_monitor_top_left;
 	ic_class->stop_monitor_top_left = fm_icon_container_stop_monitor_top_left;
 	ic_class->prioritize_thumbnailing = fm_icon_container_prioritize_thumbnailing;
@@ -463,9 +490,13 @@ fm_icon_container_instance_init (FMIconContainer *icon_container)
 NautilusIconContainer *
 fm_icon_container_construct (FMIconContainer *icon_container, FMIconView *view)
 {
+	AtkObject *atk_obj;
+
 	g_return_val_if_fail (FM_IS_ICON_VIEW (view), NULL);
 
 	icon_container->view = view;
+	atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_container));
+	atk_object_set_name (atk_obj, _("Icon View"));
 
 	return NAUTILUS_ICON_CONTAINER (icon_container);
 }
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index f2e66989c..3ee68925c 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -1358,6 +1358,33 @@ fm_icon_view_get_selection (FMDirectoryView *view)
 }
 
 static void
+count_item (NautilusIconData *icon_data,
+	    gpointer callback_data)
+{
+	guint *count;
+
+	count = callback_data;
+	(*count)++;
+}
+
+static guint
+fm_icon_view_get_item_count (FMDirectoryView *view)
+{
+	guint count;
+
+	g_return_val_if_fail (FM_IS_ICON_VIEW (view), 0);
+
+	count = 0;
+	
+	nautilus_icon_container_for_each
+		(get_icon_container (FM_ICON_VIEW (view)),
+		 count_item, &count);
+
+	return count;
+}
+
+
+static void
 set_sort_criterion_by_id (FMIconView *icon_view, const char *id)
 {
 	const SortCriterion *sort;
@@ -1771,8 +1798,9 @@ play_file (gpointer callback_data)
 	file_uri = nautilus_file_get_uri (file);
 	mime_type = nautilus_file_get_mime_type (file);
 	is_mp3 = eel_strcasecmp (mime_type, "audio/mpeg") == 0;
-	is_ogg = eel_strcasecmp (mime_type, "application/x-ogg") == 0;
-
+	is_ogg = eel_strcasecmp (mime_type, "application/x-ogg") == 0 ||
+                eel_strcasecmp (mime_type, "application/ogg") == 0;
+	
 	mp3_pid = fork ();
 	if (mp3_pid == (pid_t) 0) {
 		/* Set the group (session) id to this process for future killing. */
@@ -2541,8 +2569,9 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur
 
 	if (eel_vfs_has_capability (container_uri,
 				    EEL_VFS_CAPABILITY_IS_REMOTE_AND_SLOW)) {
-		eel_show_warning_dialog (_("Drag and drop is only supported to local file systems."),
-					 _("Drag and Drop error"),
+		eel_show_warning_dialog (_("Drag and drop is not supported."),
+					 _("Drag and drop is only supported on local file systems."),
+					 _("Drag and Drop Error"),
 					 fm_directory_view_get_containing_window (FM_DIRECTORY_VIEW (view)));
 		g_free (container_uri);
 		return;
@@ -2564,8 +2593,9 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur
 	    (action != GDK_ACTION_COPY) &&
 	    (action != GDK_ACTION_MOVE) &&
 	    (action != GDK_ACTION_LINK)) {
-		eel_show_warning_dialog (_("An invalid drag type was used."),
-					 _("Drag and Drop error"),
+		eel_show_warning_dialog (_("Drag and drop is not supported."),
+					 _("An invalid drag type was used."),
+					 _("Drag and Drop Error"),
 					 fm_directory_view_get_containing_window (FM_DIRECTORY_VIEW (view)));
 		g_free (container_uri);
 		return;
@@ -2747,6 +2777,7 @@ fm_icon_view_class_init (FMIconViewClass *klass)
 	fm_directory_view_class->get_background_widget = fm_icon_view_get_background_widget;
 	fm_directory_view_class->get_selected_icon_locations = fm_icon_view_get_selected_icon_locations;
 	fm_directory_view_class->get_selection = fm_icon_view_get_selection;
+	fm_directory_view_class->get_item_count = fm_icon_view_get_item_count;
 	fm_directory_view_class->is_empty = fm_icon_view_is_empty;
 	fm_directory_view_class->remove_file = fm_icon_view_remove_file;
 	fm_directory_view_class->reset_to_defaults = fm_icon_view_reset_to_defaults;
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index ad3c746f9..48558537d 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -189,6 +189,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
 	int icon_size;
 	NautilusZoomLevel zoom_level;
 	int width, height;
+	char *modifier;
 
 	model = (FMListModel *)tree_model;
 
@@ -220,7 +221,31 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
 
 		zoom_level = fm_list_model_get_zoom_level_from_column_id (column);
 		icon_size = nautilus_get_icon_size_for_zoom_level (zoom_level);
-		icon = nautilus_icon_factory_get_pixbuf_for_file (file, NULL, icon_size);
+
+		modifier = NULL;
+		if (model->details->drag_view != NULL) {
+			GtkTreePath *path_a, *path_b;
+			
+			gtk_tree_view_get_drag_dest_row (model->details->drag_view,
+							 &path_a,
+							 NULL);
+			if (path_a != NULL) {
+				path_b = gtk_tree_model_get_path (tree_model, iter);
+
+				if (gtk_tree_path_compare (path_a, path_b) == 0) {
+					modifier = "visiting";
+				}
+					
+				gtk_tree_path_free (path_a);
+				gtk_tree_path_free (path_b);
+			}
+		}
+		
+		if (nautilus_file_has_open_window (file)) {
+			modifier = "accept";
+		}
+		
+		icon = nautilus_icon_factory_get_pixbuf_for_file (file, modifier, icon_size);
 
 		height = gdk_pixbuf_get_height (icon);
 		if (height > icon_size) {
@@ -649,6 +674,13 @@ fm_list_model_is_empty (FMListModel *model)
 	return (g_sequence_get_length (model->details->files) == 0);
 }
 
+guint
+fm_list_model_get_length (FMListModel *model)
+{
+	return g_sequence_get_length (model->details->files);
+}
+
+
 static void
 fm_list_model_remove (FMListModel *model, GtkTreeIter *iter)
 {
@@ -691,6 +723,23 @@ fm_list_model_clear (FMListModel *model)
 	}
 }
 
+NautilusFile *
+fm_list_model_file_for_path (FMListModel *model, GtkTreePath *path)
+{
+	NautilusFile *file;
+	GtkTreeIter iter;
+
+	file = NULL;
+	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (model), 
+				     &iter, path)) {
+		gtk_tree_model_get (GTK_TREE_MODEL (model), 
+				    &iter, 
+				    FM_LIST_MODEL_FILE_COLUMN, &file,
+				    -1);
+	}
+	return file;
+}
+
 void
 fm_list_model_set_should_sort_directories_first (FMListModel *model, gboolean sort_directories_first)
 {
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 7c6d846ef..dcf3b4c09 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -71,6 +71,7 @@ void     fm_list_model_add_file                          (FMListModel          *
 void     fm_list_model_file_changed                      (FMListModel          *model,
 							  NautilusFile         *file);
 gboolean fm_list_model_is_empty                          (FMListModel          *model);
+guint    fm_list_model_get_length                        (FMListModel          *model);
 void     fm_list_model_remove_file                       (FMListModel          *model,
 							  NautilusFile         *file);
 void     fm_list_model_clear                             (FMListModel          *model);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index fcfd774fb..6d0355646 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -80,6 +80,7 @@ struct FMListViewDetails {
 	int drag_y;
 
 	gboolean drag_started;
+	gboolean row_selected_on_button_down;
 };
 
 /*
@@ -161,11 +162,18 @@ activate_selected_items (FMListView *view)
 }
 
 static void
-activate_selected_items_alternate (FMListView *view)
+activate_selected_items_alternate (FMListView *view,
+				   NautilusFile *file)
 {
 	GList *file_list;
-	
-	file_list = fm_list_view_get_selection (FM_DIRECTORY_VIEW (view));
+
+
+	if (file != NULL) {
+		nautilus_file_ref (file);
+		file_list = g_list_prepend (NULL, file);
+	} else {
+		file_list = fm_list_view_get_selection (FM_DIRECTORY_VIEW (view));
+	}
 	fm_directory_view_activate_files (FM_DIRECTORY_VIEW (view),
 					  file_list,
 					  Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
@@ -193,12 +201,17 @@ fm_list_view_did_not_drag (FMListView *view,
 
 	if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
 					   &path, NULL, NULL, NULL)) {
-		if((event->button == 1 || event->button == 2)
-		   && (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE)
-		   && gtk_tree_selection_path_is_selected (selection, path)
-		   && !button_event_modifies_selection (event)) {
-			gtk_tree_selection_unselect_all (selection);
-			gtk_tree_selection_select_path (selection, path);
+		if ((event->button == 1 || event->button == 2)
+		    && ((event->state & GDK_CONTROL_MASK) != 0 ||
+			(event->state & GDK_SHIFT_MASK) == 0)
+		    && view->details->row_selected_on_button_down
+		    && (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE)) {
+			if (!button_event_modifies_selection (event)) {
+				gtk_tree_selection_unselect_all (selection);
+				gtk_tree_selection_select_path (selection, path);
+			} else {
+				gtk_tree_selection_unselect_path (selection, path);
+			}
 		}
 
 		if ((click_policy_auto_value == NAUTILUS_CLICK_POLICY_SINGLE)
@@ -206,7 +219,7 @@ fm_list_view_did_not_drag (FMListView *view,
 			if (event->button == 1) {
 				activate_selected_items (view);
 			} else if (event->button == 2) {
-				activate_selected_items_alternate (view);
+				activate_selected_items_alternate (view, NULL);
 			}
 		}
 		gtk_tree_path_free (path);
@@ -436,6 +449,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 		return TRUE;
 	}
 
+	
 	call_parent = TRUE;
 	allow_drag = FALSE;
 	if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
@@ -448,15 +462,26 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 			view->details->double_click_path[1] = view->details->double_click_path[0];
 			view->details->double_click_path[0] = gtk_tree_path_copy (path);
 		}
-		
 		if (event->type == GDK_2BUTTON_PRESS) {
+			/* Double clicking does not trigger a D&D action. */
+			view->details->drag_button = 0;
+			call_parent = TRUE;
 			if (view->details->double_click_path[1] &&
-			    gtk_tree_path_compare (view->details->double_click_path[0], view->details->double_click_path[1]) == 0
-			    && !button_event_modifies_selection (event)) {
-				if ((event->button == 1 || event->button == 3)) {
-					activate_selected_items (view);
-				} else if (event->button == 2) {
-					activate_selected_items_alternate (view);
+			    gtk_tree_path_compare (view->details->double_click_path[0], view->details->double_click_path[1]) == 0) {
+				if (!button_event_modifies_selection (event)) {
+					if ((event->button == 1 || event->button == 3)) {
+						activate_selected_items (view);
+					} else if (event->button == 2) {
+						activate_selected_items_alternate (view, NULL);
+					}
+				} else if (event->button == 1 &&
+					   (event->state & GDK_SHIFT_MASK) != 0) {
+					NautilusFile *file;
+					file = fm_list_model_file_for_path (view->details->model, path);
+					if (file != NULL) {
+						activate_selected_items_alternate (view, file);
+						nautilus_file_unref (file);
+					}
 				}
 			}
 		}
@@ -471,17 +496,26 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 			call_parent = FALSE;
 		} 
 
-		if(!button_event_modifies_selection (event) &&
-		   (event->button == 1 || event->button == 2) &&
-		   gtk_tree_selection_path_is_selected (selection, path)) {
-			call_parent = FALSE;
+		if ((event->button == 1 || event->button == 2) &&
+		    ((event->state & GDK_CONTROL_MASK) != 0 ||
+		     (event->state & GDK_SHIFT_MASK) == 0)) {
+			view->details->row_selected_on_button_down = gtk_tree_selection_path_is_selected (selection, path);
+			if (view->details->row_selected_on_button_down) {
+				call_parent = FALSE;
+			} else if  ((event->state & GDK_CONTROL_MASK) != 0) {
+				call_parent = FALSE;
+				gtk_tree_selection_select_path (selection, path);
+			}
 		}
 
 		if (call_parent) {
 			tree_view_class->button_press_event (widget, event);
+		} else if (gtk_tree_selection_path_is_selected (selection, path)) {
+			gtk_widget_grab_focus (widget);
 		}
 
-		if (event->button == 1 || event->button == 2) {
+		if ((event->button == 1 || event->button == 2) &&
+		    event->type == GDK_BUTTON_PRESS) {
 			view->details->drag_started = FALSE;
 			view->details->drag_button = event->button;
 			view->details->drag_x = event->x;
@@ -494,9 +528,21 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba
 
 		gtk_tree_path_free (path);
 	} else {
+		if ((event->button == 1 || event->button == 2)  && 
+		    event->type == GDK_BUTTON_PRESS) {
+			if (view->details->double_click_path[1]) {
+				gtk_tree_path_free (view->details->double_click_path[1]);
+			}
+			view->details->double_click_path[1] = view->details->double_click_path[0];
+			view->details->double_click_path[0] = NULL;
+		}
 		/* Deselect if people click outside any row. It's OK to
 		   let default code run; it won't reselect anything. */
 		gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (tree_view));
+
+		if (event->button == 3) {
+			do_popup_menu (widget, view, event);
+		}
 	}
 	
 	/* We chained to the default handler in this method, so never
@@ -701,6 +747,7 @@ create_and_set_up_tree_view (FMListView *view)
 	GtkCellRenderer *cell;
 	GtkTreeViewColumn *column;
 	GtkTargetEntry *drag_types;
+	AtkObject *atk_obj;
 	int num_drag_types;	
 
 	view->details->tree_view = GTK_TREE_VIEW (gtk_tree_view_new ());
@@ -742,6 +789,9 @@ create_and_set_up_tree_view (FMListView *view)
 	
 	view->details->model = g_object_new (FM_TYPE_LIST_MODEL, NULL);
 	gtk_tree_view_set_model (view->details->tree_view, GTK_TREE_MODEL (view->details->model));
+	/* Need the model for the dnd drop icon "accept" change */
+	fm_list_model_set_drag_view (FM_LIST_MODEL (view->details->model),
+				     view->details->tree_view,  0, 0);
 
 	g_signal_connect_object (view->details->model, "sort_column_changed",
 				 G_CALLBACK (sort_column_changed_callback), view, 0);
@@ -815,6 +865,9 @@ create_and_set_up_tree_view (FMListView *view)
 
 	gtk_widget_show (GTK_WIDGET (view->details->tree_view));
 	gtk_container_add (GTK_CONTAINER (view), GTK_WIDGET (view->details->tree_view));
+
+        atk_obj = gtk_widget_get_accessible (GTK_WIDGET (view->details->tree_view));
+        atk_object_set_name (atk_obj, _("List View"));
 }
 
 static void
@@ -964,6 +1017,15 @@ fm_list_view_get_selection (FMDirectoryView *view)
 	return list;
 }
 
+
+static guint
+fm_list_view_get_item_count (FMDirectoryView *view)
+{
+	g_return_val_if_fail (FM_IS_LIST_VIEW (view), 0);
+
+	return fm_list_model_get_length (FM_LIST_VIEW (view)->details->model);
+}
+
 static gboolean
 fm_list_view_is_empty (FMDirectoryView *view)
 {
@@ -973,7 +1035,52 @@ fm_list_view_is_empty (FMDirectoryView *view)
 static void
 fm_list_view_remove_file (FMDirectoryView *view, NautilusFile *file)
 {
-	fm_list_model_remove_file (FM_LIST_VIEW (view)->details->model, file);
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	GtkTreeIter temp_iter;
+	GtkTreeRowReference* row_reference;
+	FMListView *list_view;
+	GtkTreeModel* tree_model; 
+	
+	path = NULL;
+	row_reference = NULL;
+	list_view = FM_LIST_VIEW (view);
+	tree_model = GTK_TREE_MODEL(list_view->details->model);
+	
+	if(fm_list_model_get_tree_iter_from_file (list_view->details->model, file, &iter)) {
+	   temp_iter = iter;
+	  
+	   /* get reference for next element in the list view. If the element to be deleted is the 
+	    * last one, get reference to previous element. If there is only one element in view
+            * no need to select anything. */		
+	   
+	   if(gtk_tree_model_iter_next (tree_model, &iter)) {
+              path = gtk_tree_model_get_path (tree_model, &iter);
+              row_reference = gtk_tree_row_reference_new (tree_model, path);
+           } else {
+              path = gtk_tree_model_get_path (tree_model, &temp_iter);
+              if(gtk_tree_path_prev (path)) {
+                 row_reference = gtk_tree_row_reference_new (tree_model, path);
+	       }
+	   }
+       
+	   gtk_tree_path_free (path);
+		
+	   fm_list_model_remove_file (list_view->details->model, file);
+	   
+	   if(gtk_tree_row_reference_valid(row_reference)) {
+	      path = gtk_tree_row_reference_get_path (row_reference);
+	      gtk_tree_view_set_cursor (list_view->details->tree_view, path, NULL, FALSE);
+              gtk_tree_path_free (path);
+	      
+	   }
+	  
+	   if(row_reference) {
+	      gtk_tree_row_reference_free (row_reference);
+	   }
+	}   
+	
+	
 }
 
 static void
@@ -1432,6 +1539,7 @@ fm_list_view_class_init (FMListViewClass *class)
 	fm_directory_view_class->file_changed = fm_list_view_file_changed;
 	fm_directory_view_class->get_background_widget = fm_list_view_get_background_widget;
 	fm_directory_view_class->get_selection = fm_list_view_get_selection;
+	fm_directory_view_class->get_item_count = fm_list_view_get_item_count;
 	fm_directory_view_class->is_empty = fm_list_view_is_empty;
 	fm_directory_view_class->remove_file = fm_list_view_remove_file;
 	fm_directory_view_class->reset_to_defaults = fm_list_view_reset_to_defaults;
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 55464fcd2..7af9e5b7c 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -26,6 +26,7 @@
 #include "fm-properties-window.h"
 
 #include "fm-error-reporting.h"
+#include <eel/eel-accessibility.h>
 #include <eel/eel-ellipsizing-label.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-glib-extensions.h>
@@ -152,7 +153,7 @@ enum {
 typedef struct {
 	GList *original_files;
 	GList *target_files;
-	FMDirectoryView *directory_view;
+	GtkWidget *parent_widget;
 	char *pending_key;
 	GHashTable *pending_files;
 } StartupData;
@@ -186,7 +187,7 @@ static void is_directory_ready_callback (NautilusFile *file,
 					 gpointer data);
 static void cancel_group_change_callback          (gpointer                 callback_data);
 static void cancel_owner_change_callback          (gpointer                 callback_data);
-static void directory_view_destroyed_callback     (FMDirectoryView         *view,
+static void parent_widget_destroyed_callback      (GtkWidget                *widget,
 						   gpointer                 callback_data);
 static void select_image_button_callback          (GtkWidget               *widget,
 						   FMPropertiesWindow      *properties_window);
@@ -473,8 +474,8 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont
 
 	if (!exactly_one) {
 		eel_show_error_dialog
-			(_("You can't assign more than one custom icon at a time! "
-			   "Please drag just one image to set a custom icon."), 
+			(_("You can't assign more than one custom icon at a time!"),
+			 _("Please drag just one image to set a custom icon."), 
 			 _("More Than One Image"),
 			 window);
 	} else {		
@@ -484,15 +485,15 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont
 		} else {	
 			if (eel_is_remote_uri (uris[0])) {
 				eel_show_error_dialog
-					(_("The file that you dropped is not local.  "
-					   "You can only use local images as custom icons."), 
+					(_("The file that you dropped is not local."),
+					 _("You can only use local images as custom icons."), 
 					 _("Local Images Only"),
 					 window);
 				
 			} else {
 				eel_show_error_dialog
-					(_("The file that you dropped is not an image.  "
-					   "You can only use local images as custom icons."),
+					(_("The file that you dropped is not an image."),
+					 _("You can only use local images as custom icons."),
 					 _("Images Only"),
 					 window);
 			}
@@ -1375,7 +1376,7 @@ activate_group_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 		(cancel_group_change_callback,
 		 pair->file,
 		 _("Cancel Group Change?"),
-		 _("Changing group"),
+		 _("Changing group."),
 		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_group
 		(pair->file, pair->name,
@@ -1537,7 +1538,7 @@ activate_owner_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 		(cancel_owner_change_callback,
 		 pair->file,
 		 _("Cancel Owner Change?"),
-		 _("Changing owner"),
+		 _("Changing owner."),
 		 NULL); /* FIXME bugzilla.gnome.org 42397: Parent this? */
 	nautilus_file_set_owner
 		(pair->file, pair->name,
@@ -2667,10 +2668,12 @@ static void
 add_permissions_checkbox (FMPropertiesWindow *window,
 			  GtkTable *table, 
 			  int row, int column, 
-			  GnomeVFSFilePermissions permission_to_check)
+			  GnomeVFSFilePermissions permission_to_check,
+			  GtkLabel *label_for)
 {
 	GtkWidget *check_button;
 	gchar *label;
+	gboolean a11y_enabled;
 
 	if (column == PERMISSIONS_CHECKBOXES_READ_COLUMN) {
 		label = _("_Read");
@@ -2691,6 +2694,12 @@ add_permissions_checkbox (FMPropertiesWindow *window,
 	set_up_permissions_checkbox (window, 
 				     check_button, 
 				     permission_to_check);
+
+	a11y_enabled = GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (check_button));
+	if (a11y_enabled) {
+		eel_accessibility_set_up_label_widget_relation (GTK_WIDGET (label_for),
+								check_button);
+	}
 }
 
 static GtkWidget *
@@ -2845,6 +2854,9 @@ create_permissions_page (FMPropertiesWindow *window)
 	guint checkbox_titles_row;
 	GtkLabel *group_label;
 	GtkLabel *owner_label;
+	GtkLabel *owner_perm_label;
+	GtkLabel *group_perm_label;
+	GtkLabel *other_perm_label;
 	GtkOptionMenu *group_menu;
 	GtkOptionMenu *owner_menu;
 	GList *file_list;
@@ -2877,7 +2889,7 @@ create_permissions_page (FMPropertiesWindow *window)
 			owner_label = attach_title_field (page_table, last_row, _("File _owner:"));
 			/* Option menu in this case. */
 			owner_menu = attach_owner_menu (page_table, last_row, get_target_file (window));
-			gtk_label_set_mnemonic_widget (GTK_LABEL (owner_label),
+			gtk_label_set_mnemonic_widget (owner_label,
 						       GTK_WIDGET (owner_menu));
 		} else {
 			attach_title_field (page_table, last_row, _("File owner:"));
@@ -2896,7 +2908,7 @@ create_permissions_page (FMPropertiesWindow *window)
 			/* Option menu in this case. */
 			group_menu = attach_group_menu (page_table, last_row,
 							get_target_file (window));
-			gtk_label_set_mnemonic_widget (GTK_LABEL (group_label),
+			gtk_label_set_mnemonic_widget (group_label,
 						       GTK_WIDGET (group_menu));
 		} else {
 			last_row = append_title_field (page_table,
@@ -2912,9 +2924,9 @@ create_permissions_page (FMPropertiesWindow *window)
 
 		append_separator (page_table);
 		
-		checkbox_titles_row = append_title_field (page_table, _("Owner:"), NULL);
-		append_title_field (page_table, _("Group:"), NULL);
-		append_title_field (page_table, _("Others:"), NULL);
+		checkbox_titles_row = append_title_field (page_table, _("Owner:"), &owner_perm_label);
+		append_title_field (page_table, _("Group:"), &group_perm_label);
+		append_title_field (page_table, _("Others:"), &other_perm_label);
 		
 		check_button_table = GTK_TABLE (gtk_table_new 
 						   (PERMISSIONS_CHECKBOXES_ROW_COUNT, 
@@ -2932,55 +2944,64 @@ create_permissions_page (FMPropertiesWindow *window)
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 					  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-					  GNOME_VFS_PERM_USER_READ);
+					  GNOME_VFS_PERM_USER_READ,
+					  owner_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 					  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-					  GNOME_VFS_PERM_USER_WRITE);
+					  GNOME_VFS_PERM_USER_WRITE,
+					  owner_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 					  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-					  GNOME_VFS_PERM_USER_EXEC);
+					  GNOME_VFS_PERM_USER_EXEC,
+					  owner_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 					  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-					  GNOME_VFS_PERM_GROUP_READ);
+					  GNOME_VFS_PERM_GROUP_READ,
+					  group_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 					  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-					  GNOME_VFS_PERM_GROUP_WRITE);
+					  GNOME_VFS_PERM_GROUP_WRITE,
+					  group_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 					  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-					  GNOME_VFS_PERM_GROUP_EXEC);
+					  GNOME_VFS_PERM_GROUP_EXEC,
+					  group_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 					  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-					  GNOME_VFS_PERM_OTHER_READ);
+					  GNOME_VFS_PERM_OTHER_READ,
+					  other_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 					  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-					  GNOME_VFS_PERM_OTHER_WRITE);
+					  GNOME_VFS_PERM_OTHER_WRITE,
+					  other_perm_label);
 
 		add_permissions_checkbox (window,
 					  check_button_table, 
 					  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 					  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-					  GNOME_VFS_PERM_OTHER_EXEC);
+					  GNOME_VFS_PERM_OTHER_EXEC,
+					  other_perm_label);
 
 		append_separator (page_table);
 
@@ -3115,7 +3136,7 @@ static StartupData *
 startup_data_new (GList *original_files, 
 		  GList *target_files,
 		  const char *pending_key,
-		  FMDirectoryView *directory_view)
+		  GtkWidget *parent_widget)
 {
 	StartupData *data;
 	GList *l;
@@ -3123,7 +3144,7 @@ startup_data_new (GList *original_files,
 	data = g_new0 (StartupData, 1);
 	data->original_files = nautilus_file_list_copy (original_files);
 	data->target_files = nautilus_file_list_copy (target_files);
-	data->directory_view = directory_view;
+	data->parent_widget = parent_widget;
 	data->pending_key = g_strdup (pending_key);
 	data->pending_files = g_hash_table_new (g_direct_hash,
 						g_direct_equal);
@@ -3149,19 +3170,15 @@ static void
 help_button_callback (GtkWidget *widget, GtkWidget *property_window)
 {
 	GError *error = NULL;
-	char *message;
 
 	egg_help_display_desktop_on_screen (NULL, "user-guide", "wgosnautilus.xml", "gosnautilus-51",
 					    gtk_window_get_screen (GTK_WINDOW (property_window)),
 &error);
 
 	if (error) {
-		message = g_strdup_printf (_("There was an error displaying help: \n%s"),
-					   error->message);
-		eel_show_error_dialog (message, _("Couldn't show help"),
+		eel_show_error_dialog (_("There was an error displaying help."), error->message, _("Couldn't Show Help"),
 				       GTK_WINDOW (property_window));
 		g_error_free (error);
-		g_free (message);
 	}
 }
 
@@ -3183,7 +3200,7 @@ create_properties_window (StartupData *startup_data)
 	gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 	gtk_window_set_screen (GTK_WINDOW (window),
-			       gtk_widget_get_screen (GTK_WIDGET (startup_data->directory_view)));
+			       gtk_widget_get_screen (startup_data->parent_widget));
 
 	/* Set initial window title */
 	update_properties_window_title (window);
@@ -3354,9 +3371,9 @@ cancel_create_properties_window_callback (gpointer callback_data)
 }
 
 static void
-directory_view_destroyed_callback (FMDirectoryView *view, gpointer callback_data)
+parent_widget_destroyed_callback (GtkWidget *widget, gpointer callback_data)
 {
-	g_assert (view == ((StartupData *)callback_data)->directory_view);
+	g_assert (widget == ((StartupData *)callback_data)->parent_widget);
 	
 	remove_pending ((StartupData *)callback_data, TRUE, TRUE, FALSE);
 }
@@ -3389,8 +3406,8 @@ remove_pending (StartupData *startup_data,
 			(cancel_create_properties_window_callback, startup_data);
 	}
 	if (cancel_destroy_handler) {
-		g_signal_handlers_disconnect_by_func (startup_data->directory_view,
-						      G_CALLBACK (directory_view_destroyed_callback),
+		g_signal_handlers_disconnect_by_func (startup_data->parent_widget,
+						      G_CALLBACK (parent_widget_destroyed_callback),
 						      startup_data);
 	}
 
@@ -3432,7 +3449,7 @@ is_directory_ready_callback (NautilusFile *file,
 
 void
 fm_properties_window_present (GList *original_files,
-			      FMDirectoryView *directory_view) 
+			      GtkWidget *parent_widget) 
 {
 	GList *l, *next;
 	GtkWidget *parent_window;
@@ -3442,7 +3459,7 @@ fm_properties_window_present (GList *original_files,
 	char *pending_key;
 
 	g_return_if_fail (original_files != NULL);
-	g_return_if_fail (FM_IS_DIRECTORY_VIEW (directory_view));
+	g_return_if_fail (GTK_IS_WIDGET (parent_widget));
 
 	/* Create the hash tables first time through. */
 	if (windows == NULL) {
@@ -3459,7 +3476,7 @@ fm_properties_window_present (GList *original_files,
 	existing_window = get_existing_window (original_files);
 	if (existing_window != NULL) {
 		gtk_window_set_screen (existing_window,
-				       gtk_widget_get_screen (GTK_WIDGET (directory_view)));
+				       gtk_widget_get_screen (parent_widget));
 		gtk_window_present (existing_window);
 		return;
 	}
@@ -3477,7 +3494,7 @@ fm_properties_window_present (GList *original_files,
 	startup_data = startup_data_new (original_files, 
 					 target_files,
 					 pending_key,
-					 directory_view);
+					 parent_widget);
 
 	nautilus_file_list_free (target_files);
 	g_free(pending_key);
@@ -3487,16 +3504,16 @@ fm_properties_window_present (GList *original_files,
 	 */
 	
 	g_hash_table_insert (pending_lists, startup_data->pending_key, startup_data->pending_key);
-	g_signal_connect (directory_view, "destroy",
-			  G_CALLBACK (directory_view_destroyed_callback), startup_data);
+	g_signal_connect (parent_widget, "destroy",
+			  G_CALLBACK (parent_widget_destroyed_callback), startup_data);
 
-	parent_window = gtk_widget_get_ancestor (GTK_WIDGET (directory_view), GTK_TYPE_WINDOW);
+	parent_window = gtk_widget_get_ancestor (parent_widget, GTK_TYPE_WINDOW);
 
 	eel_timed_wait_start
 		(cancel_create_properties_window_callback,
 		 startup_data,
 		 _("Cancel Showing Properties Window?"),
-		 _("Creating Properties window"),
+		 _("Creating Properties window."),
 		 parent_window == NULL ? NULL : GTK_WINDOW (parent_window));
 
 
diff --git a/src/file-manager/fm-properties-window.h b/src/file-manager/fm-properties-window.h
index 32d59d99a..b05c3b729 100644
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@@ -26,10 +26,9 @@
 #ifndef FM_PROPERTIES_WINDOW_H
 #define FM_PROPERTIES_WINDOW_H
 
-#include "fm-directory-view.h"
-
 #include <gtk/gtkwindow.h>
 #include <libnautilus-private/nautilus-file.h>
+#include <libnautilus/nautilus-view.h>
 
 typedef struct FMPropertiesWindow FMPropertiesWindow;
 
@@ -60,6 +59,6 @@ typedef struct FMPropertiesWindowClass FMPropertiesWindowClass;
 GType   fm_properties_window_get_type   (void);
 
 void 	fm_properties_window_present 	(GList *files,
-					 FMDirectoryView *directory_view);
+					 GtkWidget *parent_widget);
 
 #endif /* FM_PROPERTIES_WINDOW_H */
diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c
index 682daa757..8b43400fc 100644
--- a/src/file-manager/fm-search-list-view.c
+++ b/src/file-manager/fm-search-list-view.c
@@ -163,8 +163,9 @@ load_location_callback (NautilusView *nautilus_view, char *location)
 		}
 	}
 #else
-	eel_show_error_dialog (_("Sorry, but the Medusa search service is not available because it is not installed."),
-			            _("Search Service Not Available"),
+	eel_show_error_dialog (_("Sorry, but the Medusa search service is not available."), 
+			            _("Medusa is not installed."),
+				    _("Search Service Not Available"),
 			            NULL);
 #endif
 
@@ -179,7 +180,6 @@ real_load_error (FMDirectoryView *nautilus_view,
 		 GnomeVFSResult result)
 {
 	GtkDialog *load_error_dialog;
-	char *error_string;
 
 	/* Do not call parent's function; we handle all search errors
 	 * here and don't want fm-directory-view's default handling.
@@ -190,42 +190,38 @@ real_load_error (FMDirectoryView *nautilus_view,
 		load_error_dialog = eel_show_info_dialog (_("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 "
+							    "no results right now."),
+							  _("You can create a new "
+							    "index by running \"medusa-indexd\" as root "
 							    "on the command line."),
-							  _("Search for items that are too new"),
+							  _("Search For Items That Are Too New"),
 							  NULL);
 		break;
 	case GNOME_VFS_ERROR_TOO_BIG:
 		eel_show_error_dialog (_("Every indexed file on your computer "
-					 "matches the criteria you selected. "
-					 "You can check the spelling on your selections "
+					 "matches the criteria you selected. "),
+				       _("You can check the spelling on your selections "
 					 "or add more criteria to narrow your results."),
-				       _("Error during search"),
+				       _("Error During Search"),
 				       NULL);
 		break;
 	case GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE:
 		/* FIXME: This dialog does not get shown because a slow search
 		   will be performed and will not return an error.  */
 		eel_show_error_dialog (_("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 "
+					 "Your index may be missing or corrupt."),
+				       _("You can create a new index by running \"medusa-indexd\" as root "
 					 "on the command line."),
-				       _("Error reading file index"),
+				       _("Error Reading File Index"),
 				       NULL);
 		break;
 	case GNOME_VFS_ERROR_CANCELLED:
 		break;
 	default:
-		error_string = g_strdup_printf (_("An error occurred while loading "
-							  "this search's contents: "
-							  "%s"),
-							gnome_vfs_result_to_string (result));
-		eel_show_error_dialog (error_string,
-				            _("Error during search"),
-				            NULL);
-		g_free (error_string);
-		
+		eel_show_error_dialog (_("An error occurred while loading this search's contents."), 
+				            gnome_vfs_result_to_string (result),
+				            _("Error During Search"),
+				            NULL);		
 	}
 }
 
@@ -234,7 +230,7 @@ real_load_error (FMDirectoryView *nautilus_view,
 static void
 display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 {
-	const char *error_string, *title_string;
+	const char *error_string, *detail_string, *title_string;
 
 	if (medusa_indexed_search_system_index_files_look_available ()) {
 		/* There is an index on the system, but there is no
@@ -242,17 +238,19 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 		   confused.  Tell the user this. */
 		error_string = backup_search_is_available 
 			? N_("To do a fast search, Find requires an index "
-			     "of the files on your system.  "
-			     "Find can't access your index right now "
+			     "of the files on your system.") 
+			: N_("To do a content search, Find requires an index "
+			     "of the files on your system.");
+		detail_string = backup_search_is_available 
+			? N_("Find can't access your index right now "
 			     "so a slower search will be performed that "
 			     "doesn't use the index.") 
-			: N_("To do a content search, Find requires an index "
-			     "of the files on your system.  "
-			     "Find can't access your index right now. ");
+			: N_("Find can't access your index right now.");
 		title_string = backup_search_is_available 
-			?  N_("Fast searches are not available")
-			:  N_("Content searches are not available");
+			?  N_("Fast Searches Are Not Available")
+			:  N_("Content Searches Are Not Available");
 		eel_show_error_dialog_with_details (error_string,
+						    detail_string,
 						    title_string,
 						    _("Your index files are available "
 						      "but the Medusa search daemon, which handles "
@@ -270,19 +268,23 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 			error_string = backup_search_is_available 
 				? N_("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.")
+				     "Your computer is currently creating that "
+				     "index.")
 				: N_("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 "
+				     "index.");
+     			detail_string = backup_search_is_available 
+				? N_("Because Find cannot use an index, "
+				     "this search may take several "
+				     "minutes.")
+				: N_("Content searches will be available "
 				     "when the index is complete.");
 			title_string = backup_search_is_available
-				? N_("Indexed searches are not available")
-				: N_("Content searches are not available");
+				? N_("Indexed Searches Are Not Available")
+				: N_("Content Searches Are Not Available");
 			eel_show_error_dialog (error_string,
+			                       detail_string,
 					       title_string,
 					       NULL);
 		}
@@ -290,22 +292,26 @@ display_indexed_search_problems_dialog (gboolean backup_search_is_available)
 			error_string = backup_search_is_available
 				? N_("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 "
+				     "is available right now.")
+				: N_("To do a content search, Find requires an index "
+				     "of the content on your system.  No index is "
+				     "available right now.");
+			detail_string = backup_search_is_available
+				? N_("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.")
-				: N_("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 "
+				: N_("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.");
 			title_string = backup_search_is_available
-				? N_("Indexed searches are not available")
-				: N_("Content searches are not available");
+				? N_("Indexed Searches Are Not Available")
+				: N_("Content Searches Are Not Available");
 			eel_show_error_dialog (error_string,
+			                       detail_string,
 					       title_string,
 					       NULL);
 		}
@@ -320,11 +326,12 @@ display_system_services_are_disabled_dialog (gboolean unindexed_search_is_availa
 	char *details_string;
 
 	details_string = nautilus_medusa_get_explanation_of_enabling ();
-	dialog_shown = eel_show_info_dialog_with_details (_("To do a fast search, Find requires an index of "
+	dialog_shown = eel_show_info_dialog_with_details (_("Fast searches are not enabled on your computer."),
+							  _("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."),
-							  _("Fast searches are not enabled on your computer"),
+							  _("Fast Searches Not Enabled"),
 							  details_string,
 							  NULL);
 	g_free (details_string);
@@ -681,8 +688,8 @@ real_file_limit_reached (FMDirectoryView *view)
 	 * to the way files are collected in batches. So you can't assume that
 	 * no more than the constant limit are displayed.
 	 */
-	eel_show_warning_dialog (_("Nautilus found more search results than it can display. "
-				   "Some matching items will not be displayed. "), 
+	eel_show_warning_dialog (_("Nautilus found more search results than it can display."),
+				 _("Some matching items will not be displayed. "), 
 				 _("Too Many Matches"),
 				 fm_directory_view_get_containing_window (view));
 }
diff --git a/components/tree/nautilus-tree-model.c b/src/file-manager/fm-tree-model.c
index fe539fde5..bcee8867a 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -24,10 +24,10 @@
  *          Darin Adler <darin@bentspoon.com>
  */
 
-/* nautilus-tree-model.c - model for the tree view */
+/* fm-tree-model.c - model for the tree view */
 
 #include <config.h>
-#include "nautilus-tree-model.h"
+#include "fm-tree-model.h"
 
 #include <eel/eel-glib-extensions.h>
 #include <libgnome/gnome-i18n.h>
@@ -52,7 +52,7 @@ typedef gboolean (* FilePredicate) (NautilusFile *);
  */
 
 typedef struct TreeNode TreeNode;
-typedef struct NautilusTreeModelRoot NautilusTreeModelRoot;
+typedef struct FMTreeModelRoot FMTreeModelRoot;
 
 struct TreeNode {
 	/* part of this node for the file itself */
@@ -64,7 +64,7 @@ struct TreeNode {
 	GdkPixbuf *closed_pixbuf;
 	GdkPixbuf *open_pixbuf;
 
-	NautilusTreeModelRoot *root;
+	FMTreeModelRoot *root;
 
 	TreeNode *parent;
 	TreeNode *next;
@@ -87,7 +87,7 @@ struct TreeNode {
 	guint inserted : 1;
 };
 
-struct NautilusTreeModelDetails {
+struct FMTreeModelDetails {
 	int stamp;
 	
 	TreeNode *root_node;	
@@ -99,8 +99,8 @@ struct NautilusTreeModelDetails {
 	gboolean show_only_directories;
 };
 
-struct NautilusTreeModelRoot {
-	NautilusTreeModel *model;
+struct FMTreeModelRoot {
+	FMTreeModel *model;
 
 	/* separate hash table for each root node needed */
 	GHashTable *file_to_node_map;
@@ -112,19 +112,19 @@ struct NautilusTreeModelRoot {
 
 typedef struct {
 	NautilusDirectory *directory;
-	NautilusTreeModel *model;
+	FMTreeModel *model;
 } DoneLoadingParameters;
 
 static GObjectClass *parent_class;
 
-static void schedule_monitoring_update     (NautilusTreeModel *model);
-static void destroy_node_without_reporting (NautilusTreeModel *model,
+static void schedule_monitoring_update     (FMTreeModel *model);
+static void destroy_node_without_reporting (FMTreeModel *model,
 					    TreeNode          *node);
-static void report_node_contents_changed   (NautilusTreeModel *model,
+static void report_node_contents_changed   (FMTreeModel *model,
 					    TreeNode          *node);
 
 static guint
-nautilus_tree_model_get_flags (GtkTreeModel *tree_model)
+fm_tree_model_get_flags (GtkTreeModel *tree_model)
 {
 	return GTK_TREE_MODEL_ITERS_PERSIST;
 }
@@ -138,12 +138,12 @@ object_unref_if_not_NULL (gpointer object)
 	g_object_unref (object);
 }
 
-static NautilusTreeModelRoot *
-tree_model_root_new (NautilusTreeModel *model)
+static FMTreeModelRoot *
+tree_model_root_new (FMTreeModel *model)
 {
-	NautilusTreeModelRoot *root;
+	FMTreeModelRoot *root;
 
-	root = g_new0 (NautilusTreeModelRoot, 1);
+	root = g_new0 (FMTreeModelRoot, 1);
 	root->model = model;
 	root->file_to_node_map = g_hash_table_new (NULL, NULL);
 
@@ -151,7 +151,7 @@ tree_model_root_new (NautilusTreeModel *model)
 }
 
 static TreeNode *
-tree_node_new (NautilusFile *file, NautilusTreeModelRoot *root)
+tree_node_new (NautilusFile *file, FMTreeModelRoot *root)
 {
 	TreeNode *node;
 
@@ -162,7 +162,7 @@ tree_node_new (NautilusFile *file, NautilusTreeModelRoot *root)
 }
 
 static void
-tree_node_unparent (NautilusTreeModel *model, TreeNode *node)
+tree_node_unparent (FMTreeModel *model, TreeNode *node)
 {
 	TreeNode *parent, *next, *prev;
 
@@ -193,7 +193,7 @@ tree_node_unparent (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-tree_node_destroy (NautilusTreeModel *model, TreeNode *node)
+tree_node_destroy (FMTreeModel *model, TreeNode *node)
 {
 	g_assert (node->first_child == NULL);
 	g_assert (node->ref_count == 0);
@@ -399,13 +399,13 @@ make_iter_for_dummy_row (TreeNode *parent, GtkTreeIter *iter, int stamp)
 }
 
 static TreeNode *
-get_node_from_file (NautilusTreeModelRoot *root, NautilusFile *file)
+get_node_from_file (FMTreeModelRoot *root, NautilusFile *file)
 {
 	return g_hash_table_lookup (root->file_to_node_map, file);
 }
 
 static TreeNode *
-get_parent_node_from_file (NautilusTreeModelRoot *root, NautilusFile *file)
+get_parent_node_from_file (FMTreeModelRoot *root, NautilusFile *file)
 {
 	NautilusFile *parent_file;
 	TreeNode *parent_node;
@@ -417,7 +417,7 @@ get_parent_node_from_file (NautilusTreeModelRoot *root, NautilusFile *file)
 }
 
 static TreeNode *
-create_node_for_file (NautilusTreeModelRoot *root, NautilusFile *file)
+create_node_for_file (FMTreeModelRoot *root, NautilusFile *file)
 {
 	TreeNode *node;
 
@@ -450,7 +450,7 @@ get_node_uri (GtkTreeIter *iter)
 #endif
 
 static void
-decrement_ref_count (NautilusTreeModel *model, TreeNode *node, int count)
+decrement_ref_count (FMTreeModel *model, TreeNode *node, int count)
 {
 	node->all_children_ref_count -= count;
 	if (node->all_children_ref_count == 0) {
@@ -459,7 +459,7 @@ decrement_ref_count (NautilusTreeModel *model, TreeNode *node, int count)
 }
 
 static void
-abandon_node_ref_count (NautilusTreeModel *model, TreeNode *node)
+abandon_node_ref_count (FMTreeModel *model, TreeNode *node)
 {
 	if (node->parent != NULL) {
 		decrement_ref_count (model, node->parent, node->ref_count);
@@ -478,7 +478,7 @@ abandon_node_ref_count (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-abandon_dummy_row_ref_count (NautilusTreeModel *model, TreeNode *node)
+abandon_dummy_row_ref_count (FMTreeModel *model, TreeNode *node)
 {
 	decrement_ref_count (model, node, node->dummy_child_ref_count);
 	if (node->dummy_child_ref_count != 0) {
@@ -495,7 +495,7 @@ abandon_dummy_row_ref_count (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-report_row_inserted (NautilusTreeModel *model, GtkTreeIter *iter)
+report_row_inserted (FMTreeModel *model, GtkTreeIter *iter)
 {
 	GtkTreePath *path;
 
@@ -505,7 +505,7 @@ report_row_inserted (NautilusTreeModel *model, GtkTreeIter *iter)
 }
 
 static void
-report_row_contents_changed (NautilusTreeModel *model, GtkTreeIter *iter)
+report_row_contents_changed (FMTreeModel *model, GtkTreeIter *iter)
 {
 	GtkTreePath *path;
 
@@ -515,7 +515,7 @@ report_row_contents_changed (NautilusTreeModel *model, GtkTreeIter *iter)
 }
 
 static void
-report_row_has_child_toggled (NautilusTreeModel *model, GtkTreeIter *iter)
+report_row_has_child_toggled (FMTreeModel *model, GtkTreeIter *iter)
 {
 	GtkTreePath *path;
 
@@ -525,7 +525,7 @@ report_row_has_child_toggled (NautilusTreeModel *model, GtkTreeIter *iter)
 }
 
 static GtkTreePath *
-get_node_path (NautilusTreeModel *model, TreeNode *node)
+get_node_path (FMTreeModel *model, TreeNode *node)
 {
 	GtkTreeIter iter;
 
@@ -534,7 +534,7 @@ get_node_path (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-report_dummy_row_inserted (NautilusTreeModel *model, TreeNode *parent)
+report_dummy_row_inserted (FMTreeModel *model, TreeNode *parent)
 {
 	GtkTreeIter iter;
 
@@ -546,7 +546,7 @@ report_dummy_row_inserted (NautilusTreeModel *model, TreeNode *parent)
 }
 
 static void
-report_dummy_row_deleted (NautilusTreeModel *model, TreeNode *parent)
+report_dummy_row_deleted (FMTreeModel *model, TreeNode *parent)
 {
 	GtkTreeIter iter;
 	GtkTreePath *path;
@@ -563,7 +563,7 @@ report_dummy_row_deleted (NautilusTreeModel *model, TreeNode *parent)
 }
 
 static void
-report_node_inserted (NautilusTreeModel *model, TreeNode *node)
+report_node_inserted (FMTreeModel *model, TreeNode *node)
 {
 	GtkTreeIter iter;
 
@@ -580,7 +580,7 @@ report_node_inserted (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-report_node_contents_changed (NautilusTreeModel *model, TreeNode *node)
+report_node_contents_changed (FMTreeModel *model, TreeNode *node)
 {
 	GtkTreeIter iter;
 
@@ -592,7 +592,7 @@ report_node_contents_changed (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-report_node_has_child_toggled (NautilusTreeModel *model, TreeNode *node)
+report_node_has_child_toggled (FMTreeModel *model, TreeNode *node)
 {
 	GtkTreeIter iter;
 
@@ -604,7 +604,7 @@ report_node_has_child_toggled (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-report_dummy_row_contents_changed (NautilusTreeModel *model, TreeNode *parent)
+report_dummy_row_contents_changed (FMTreeModel *model, TreeNode *parent)
 {
 	GtkTreeIter iter;
 
@@ -616,7 +616,7 @@ report_dummy_row_contents_changed (NautilusTreeModel *model, TreeNode *parent)
 }
 
 static void
-stop_monitoring_directory (NautilusTreeModel *model, TreeNode *node)
+stop_monitoring_directory (FMTreeModel *model, TreeNode *node)
 {
 	NautilusDirectory *directory;
 
@@ -640,7 +640,7 @@ stop_monitoring_directory (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-destroy_children_without_reporting (NautilusTreeModel *model, TreeNode *parent)
+destroy_children_without_reporting (FMTreeModel *model, TreeNode *parent)
 {
 	while (parent->first_child != NULL) {
 		destroy_node_without_reporting (model, parent->first_child);
@@ -648,7 +648,7 @@ destroy_children_without_reporting (NautilusTreeModel *model, TreeNode *parent)
 }
 
 static void
-destroy_node_without_reporting (NautilusTreeModel *model, TreeNode *node)
+destroy_node_without_reporting (FMTreeModel *model, TreeNode *node)
 {
 	abandon_node_ref_count (model, node);
 	stop_monitoring_directory (model, node);
@@ -659,7 +659,7 @@ destroy_node_without_reporting (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-destroy_node (NautilusTreeModel *model, TreeNode *node)
+destroy_node (FMTreeModel *model, TreeNode *node)
 {
 	TreeNode *parent;
 	gboolean parent_had_dummy_child;
@@ -685,7 +685,7 @@ destroy_node (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-destroy_children (NautilusTreeModel *model, TreeNode *parent)
+destroy_children (FMTreeModel *model, TreeNode *parent)
 {
 	while (parent->first_child != NULL) {
 		destroy_node (model, parent->first_child);
@@ -693,7 +693,7 @@ destroy_children (NautilusTreeModel *model, TreeNode *parent)
 }
 
 static void
-destroy_children_by_function (NautilusTreeModel *model, TreeNode *parent, FilePredicate f)
+destroy_children_by_function (FMTreeModel *model, TreeNode *parent, FilePredicate f)
 {
 	TreeNode *child, *next;
 
@@ -708,7 +708,7 @@ destroy_children_by_function (NautilusTreeModel *model, TreeNode *parent, FilePr
 }
 
 static void
-destroy_by_function (NautilusTreeModel *model, FilePredicate f)
+destroy_by_function (FMTreeModel *model, FilePredicate f)
 {
 	TreeNode *node;
 	for (node = model->details->root_node; node != NULL; node = node->next) {
@@ -717,7 +717,7 @@ destroy_by_function (NautilusTreeModel *model, FilePredicate f)
 }
 
 static gboolean
-update_node_without_reporting (NautilusTreeModel *model, TreeNode *node)
+update_node_without_reporting (FMTreeModel *model, TreeNode *node)
 {
 	gboolean changed;
 
@@ -740,7 +740,7 @@ update_node_without_reporting (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-insert_node (NautilusTreeModel *model, TreeNode *parent, TreeNode *node)
+insert_node (FMTreeModel *model, TreeNode *parent, TreeNode *node)
 {
 	gboolean parent_empty;
 
@@ -763,7 +763,7 @@ insert_node (NautilusTreeModel *model, TreeNode *parent, TreeNode *node)
 }
 
 static void
-reparent_node (NautilusTreeModel *model, TreeNode *node)
+reparent_node (FMTreeModel *model, TreeNode *node)
 {
 	GtkTreePath *path;
 	TreeNode *new_parent;
@@ -786,7 +786,7 @@ reparent_node (NautilusTreeModel *model, TreeNode *node)
 }
 
 static gboolean
-should_show_file (NautilusTreeModel *model, NautilusFile *file)
+should_show_file (FMTreeModel *model, NautilusFile *file)
 {
 	gboolean should;
 	TreeNode *node;
@@ -815,7 +815,7 @@ should_show_file (NautilusTreeModel *model, NautilusFile *file)
 }
 
 static void
-update_node (NautilusTreeModel *model, TreeNode *node)
+update_node (FMTreeModel *model, TreeNode *node)
 {
 	gboolean had_dummy_child, has_dummy_child;
 	gboolean had_directory, has_directory;
@@ -857,7 +857,7 @@ update_node (NautilusTreeModel *model, TreeNode *node)
 }
 
 static void
-process_file_change (NautilusTreeModelRoot *root,
+process_file_change (FMTreeModelRoot *root,
 		     NautilusFile *file)
 {
 	TreeNode *node, *parent;
@@ -885,10 +885,10 @@ files_changed_callback (NautilusDirectory *directory,
 			GList *changed_files,
 			gpointer callback_data)
 {
-	NautilusTreeModelRoot *root;
+	FMTreeModelRoot *root;
 	GList *node;
 
-	root = (NautilusTreeModelRoot *) (callback_data);
+	root = (FMTreeModelRoot *) (callback_data);
 
 	for (node = changed_files; node != NULL; node = node->next) {
 		process_file_change (root, NAUTILUS_FILE (node->data));
@@ -896,7 +896,7 @@ files_changed_callback (NautilusDirectory *directory,
 }
 
 static void
-set_done_loading (NautilusTreeModel *model, TreeNode *node, gboolean done_loading)
+set_done_loading (FMTreeModel *model, TreeNode *node, gboolean done_loading)
 {
 	gboolean had_dummy;
 
@@ -925,7 +925,7 @@ set_done_loading (NautilusTreeModel *model, TreeNode *node, gboolean done_loadin
 
 static void
 done_loading_callback (NautilusDirectory *directory,
-		       NautilusTreeModelRoot *root)
+		       FMTreeModelRoot *root)
 {
 	NautilusFile *file;
 	TreeNode *node;
@@ -954,7 +954,7 @@ get_tree_monitor_attributes (void)
 }
 
 static void
-start_monitoring_directory (NautilusTreeModel *model, TreeNode *node)
+start_monitoring_directory (FMTreeModel *model, TreeNode *node)
 {
 	NautilusDirectory *directory;
 	NautilusFileAttributes attributes;
@@ -988,24 +988,24 @@ start_monitoring_directory (NautilusTreeModel *model, TreeNode *node)
 }
 
 static int
-nautilus_tree_model_get_n_columns (GtkTreeModel *model)
+fm_tree_model_get_n_columns (GtkTreeModel *model)
 {
-	return NAUTILUS_TREE_MODEL_NUM_COLUMNS;
+	return FM_TREE_MODEL_NUM_COLUMNS;
 }
 
 static GType
-nautilus_tree_model_get_column_type (GtkTreeModel *model, int index)
+fm_tree_model_get_column_type (GtkTreeModel *model, int index)
 {
 	switch (index) {
-	case NAUTILUS_TREE_MODEL_DISPLAY_NAME_COLUMN:
+	case FM_TREE_MODEL_DISPLAY_NAME_COLUMN:
 		return G_TYPE_STRING;
-	case NAUTILUS_TREE_MODEL_CLOSED_PIXBUF_COLUMN:
+	case FM_TREE_MODEL_CLOSED_PIXBUF_COLUMN:
 		return GDK_TYPE_PIXBUF;
-	case NAUTILUS_TREE_MODEL_OPEN_PIXBUF_COLUMN:
+	case FM_TREE_MODEL_OPEN_PIXBUF_COLUMN:
 		return GDK_TYPE_PIXBUF;
-	case NAUTILUS_TREE_MODEL_FONT_STYLE_COLUMN:
+	case FM_TREE_MODEL_FONT_STYLE_COLUMN:
 		return PANGO_TYPE_STYLE;
-	case NAUTILUS_TREE_MODEL_FONT_WEIGHT_COLUMN:
+	case FM_TREE_MODEL_FONT_WEIGHT_COLUMN:
 		return PANGO_TYPE_WEIGHT;
 	default:
 		g_assert_not_reached ();
@@ -1015,7 +1015,7 @@ nautilus_tree_model_get_column_type (GtkTreeModel *model, int index)
 }
 
 static gboolean
-iter_is_valid (NautilusTreeModel *model, const GtkTreeIter *iter)
+iter_is_valid (FMTreeModel *model, const GtkTreeIter *iter)
 {
 	TreeNode *node, *parent;
 
@@ -1049,7 +1049,7 @@ iter_is_valid (NautilusTreeModel *model, const GtkTreeIter *iter)
 }
 
 static gboolean
-nautilus_tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
+fm_tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path)
 {
 	int *indices;
 	GtkTreeIter parent;
@@ -1074,16 +1074,16 @@ nautilus_tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePat
 }
 
 static GtkTreePath *
-nautilus_tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
 {
-	NautilusTreeModel *tree_model;
+	FMTreeModel *tree_model;
 	TreeNode *node, *parent, *cnode;
 	GtkTreePath *path;
 	GtkTreeIter parent_iter;
 	int i;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), NULL);
-	tree_model = NAUTILUS_TREE_MODEL (model);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), NULL);
+	tree_model = FM_TREE_MODEL (model);
 	g_return_val_if_fail (iter_is_valid (tree_model, iter), NULL);
 
 	node = iter->user_data;
@@ -1110,7 +1110,7 @@ nautilus_tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
 	parent_iter.user_data2 = NULL;
 	parent_iter.user_data3 = NULL;
 
-	path = nautilus_tree_model_get_path (model, &parent_iter);
+	path = fm_tree_model_get_path (model, &parent_iter);
 	
 	gtk_tree_path_append_index (path, tree_node_get_child_index (parent, node));
 
@@ -1118,17 +1118,17 @@ nautilus_tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static void
-nautilus_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int column, GValue *value)
+fm_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int column, GValue *value)
 {
 	TreeNode *node, *parent;
 
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
-	g_return_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
+	g_return_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter));
 	
 	node = iter->user_data;
 
 	switch (column) {
-	case NAUTILUS_TREE_MODEL_DISPLAY_NAME_COLUMN:
+	case FM_TREE_MODEL_DISPLAY_NAME_COLUMN:
 		g_value_init (value, G_TYPE_STRING);
 		if (node == NULL) {
 			parent = iter->user_data2;
@@ -1138,15 +1138,15 @@ nautilus_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int colum
 			g_value_set_string (value, tree_node_get_display_name (node));
 		}
 		break;
-	case NAUTILUS_TREE_MODEL_CLOSED_PIXBUF_COLUMN:
+	case FM_TREE_MODEL_CLOSED_PIXBUF_COLUMN:
 		g_value_init (value, GDK_TYPE_PIXBUF);
 		g_value_set_object (value, node == NULL ? NULL : tree_node_get_closed_pixbuf (node));
 		break;
-	case NAUTILUS_TREE_MODEL_OPEN_PIXBUF_COLUMN:
+	case FM_TREE_MODEL_OPEN_PIXBUF_COLUMN:
 		g_value_init (value, GDK_TYPE_PIXBUF);
 		g_value_set_object (value, node == NULL ? NULL : tree_node_get_open_pixbuf (node));
 		break;
-	case NAUTILUS_TREE_MODEL_FONT_STYLE_COLUMN:
+	case FM_TREE_MODEL_FONT_STYLE_COLUMN:
 		g_value_init (value, PANGO_TYPE_STYLE);
 		if (node == NULL) {
 			g_value_set_enum (value, PANGO_STYLE_ITALIC);
@@ -1154,7 +1154,7 @@ nautilus_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int colum
 			g_value_set_enum (value, PANGO_STYLE_NORMAL);
 		}
 		break;
-	case NAUTILUS_TREE_MODEL_FONT_WEIGHT_COLUMN:
+	case FM_TREE_MODEL_FONT_WEIGHT_COLUMN:
 		g_value_init (value, PANGO_TYPE_STYLE);
 		if (node != NULL && node->parent == NULL) {
 			g_value_set_enum (value, PANGO_WEIGHT_BOLD);
@@ -1168,12 +1168,12 @@ nautilus_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, int colum
 }
 
 static gboolean
-nautilus_tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	TreeNode *node, *parent, *next;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), FALSE);
 	
 	node = iter->user_data;
 
@@ -1188,12 +1188,12 @@ nautilus_tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static gboolean
-nautilus_tree_model_iter_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent_iter)
+fm_tree_model_iter_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent_iter)
 {
 	TreeNode *parent;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), parent_iter), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), parent_iter), FALSE);
 	
 	parent = parent_iter->user_data;
 	if (parent == NULL) {
@@ -1207,11 +1207,11 @@ nautilus_tree_model_iter_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTr
 }
 
 static gboolean
-nautilus_tree_model_iter_parent (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *child_iter)
+fm_tree_model_iter_parent (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *child_iter)
 {	TreeNode *child, *parent;
 	
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), child_iter), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), child_iter), FALSE);
 
 	child = child_iter->user_data;
 
@@ -1225,13 +1225,13 @@ nautilus_tree_model_iter_parent (GtkTreeModel *model, GtkTreeIter *iter, GtkTree
 }
 
 static gboolean
-nautilus_tree_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	gboolean has_child;
 	TreeNode *node;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), FALSE);
 
 	node = iter->user_data;
 
@@ -1247,16 +1247,16 @@ nautilus_tree_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static int
-nautilus_tree_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
 {
-	NautilusTreeModel *tree_model;
+	FMTreeModel *tree_model;
 	TreeNode *parent, *node;
 	int n;
 	
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
-	g_return_val_if_fail (iter == NULL || iter_is_valid (NAUTILUS_TREE_MODEL (model), iter), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (iter == NULL || iter_is_valid (FM_TREE_MODEL (model), iter), FALSE);
 	
-	tree_model = NAUTILUS_TREE_MODEL (model);
+	tree_model = FM_TREE_MODEL (model);
 
 	if (iter == NULL) {
 		return 1;
@@ -1276,18 +1276,18 @@ nautilus_tree_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static gboolean
-nautilus_tree_model_iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
+fm_tree_model_iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
 				    GtkTreeIter *parent_iter, int n)
 {
-	NautilusTreeModel *tree_model;
+	FMTreeModel *tree_model;
 	TreeNode *parent, *node;
 	int i;
 	
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), FALSE);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), FALSE);
 	g_return_val_if_fail (parent_iter == NULL
-			      || iter_is_valid (NAUTILUS_TREE_MODEL (model), parent_iter), FALSE);
+			      || iter_is_valid (FM_TREE_MODEL (model), parent_iter), FALSE);
 	
-	tree_model = NAUTILUS_TREE_MODEL (model);
+	tree_model = FM_TREE_MODEL (model);
 
 	if (parent_iter == NULL) {
 		node = tree_model->details->root_node;
@@ -1315,7 +1315,7 @@ nautilus_tree_model_iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter,
 }
 
 static void
-update_monitoring (NautilusTreeModel *model, TreeNode *node)
+update_monitoring (FMTreeModel *model, TreeNode *node)
 {
 	TreeNode *child;
 
@@ -1333,10 +1333,10 @@ update_monitoring (NautilusTreeModel *model, TreeNode *node)
 static gboolean
 update_monitoring_idle_callback (gpointer callback_data)
 {
-	NautilusTreeModel *model;
+	FMTreeModel *model;
 	TreeNode *node;
 
-	model = NAUTILUS_TREE_MODEL (callback_data);
+	model = FM_TREE_MODEL (callback_data);
 	model->details->monitoring_update_idle_id = 0;
 	for (node = model->details->root_node; node != NULL; node = node->next) { 
 		update_monitoring (model, node);
@@ -1345,7 +1345,7 @@ update_monitoring_idle_callback (gpointer callback_data)
 }
 
 static void
-schedule_monitoring_update (NautilusTreeModel *model)
+schedule_monitoring_update (FMTreeModel *model)
 {
 	if (model->details->monitoring_update_idle_id == 0) {
 		model->details->monitoring_update_idle_id =
@@ -1354,7 +1354,7 @@ schedule_monitoring_update (NautilusTreeModel *model)
 }
 
 static void
-stop_monitoring_directory_and_children (NautilusTreeModel *model, TreeNode *node)
+stop_monitoring_directory_and_children (FMTreeModel *model, TreeNode *node)
 {
 	TreeNode *child;
 
@@ -1365,7 +1365,7 @@ stop_monitoring_directory_and_children (NautilusTreeModel *model, TreeNode *node
 }
 
 static void
-stop_monitoring (NautilusTreeModel *model)
+stop_monitoring (FMTreeModel *model)
 {
 	TreeNode *node;
 
@@ -1375,15 +1375,15 @@ stop_monitoring (NautilusTreeModel *model)
 }
 
 static void
-nautilus_tree_model_ref_node (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_ref_node (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	TreeNode *node, *parent;
 #if LOG_REF_COUNTS
 	char *uri;
 #endif
 
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
-	g_return_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
+	g_return_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter));
 
 	node = iter->user_data;
 	if (node == NULL) {
@@ -1402,7 +1402,7 @@ nautilus_tree_model_ref_node (GtkTreeModel *model, GtkTreeIter *iter)
 			if (parent->first_child == NULL) {
 				parent->done_loading = FALSE;
 			}
-			schedule_monitoring_update (NAUTILUS_TREE_MODEL (model));
+			schedule_monitoring_update (FM_TREE_MODEL (model));
 		}
 #if LOG_REF_COUNTS
 		uri = get_node_uri (iter);
@@ -1414,15 +1414,15 @@ nautilus_tree_model_ref_node (GtkTreeModel *model, GtkTreeIter *iter)
 }
 
 static void
-nautilus_tree_model_unref_node (GtkTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_unref_node (GtkTreeModel *model, GtkTreeIter *iter)
 {
 	TreeNode *node, *parent;
 #if LOG_REF_COUNTS
 	char *uri;
 #endif
 
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
-	g_return_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
+	g_return_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter));
 
 	node = iter->user_data;
 	if (node == NULL) {
@@ -1444,13 +1444,13 @@ nautilus_tree_model_unref_node (GtkTreeModel *model, GtkTreeIter *iter)
 		g_free (uri);
 #endif
 		if (--parent->all_children_ref_count == 0) {
-			schedule_monitoring_update (NAUTILUS_TREE_MODEL (model));
+			schedule_monitoring_update (FM_TREE_MODEL (model));
 		}
 	}
 }
 
 static void
-root_node_file_changed_callback (NautilusFile *file, NautilusTreeModelRoot *root)
+root_node_file_changed_callback (NautilusFile *file, FMTreeModelRoot *root)
 {
 	if (root->root_node != NULL) {
 		update_node (root->model, root->root_node);
@@ -1458,12 +1458,12 @@ root_node_file_changed_callback (NautilusFile *file, NautilusTreeModelRoot *root
 }
 
 void
-nautilus_tree_model_add_root_uri (NautilusTreeModel *model, const char *root_uri, const char *display_name, const char *icon_name)
+fm_tree_model_add_root_uri (FMTreeModel *model, const char *root_uri, const char *display_name, const char *icon_name)
 {
 	NautilusFile *file;
 	TreeNode *node, *cnode;
 	NautilusFileAttributes attributes;
-	NautilusTreeModelRoot *newroot;
+	FMTreeModelRoot *newroot;
 	
 	file = nautilus_file_get (root_uri);
 
@@ -1496,11 +1496,11 @@ nautilus_tree_model_add_root_uri (NautilusTreeModel *model, const char *root_uri
 }
 
 void
-nautilus_tree_model_remove_root_uri (NautilusTreeModel *model, const char *uri)
+fm_tree_model_remove_root_uri (FMTreeModel *model, const char *uri)
 {
 	TreeNode *node;
 	GtkTreePath *path;
-	NautilusTreeModelRoot *root;
+	FMTreeModelRoot *root;
 	NautilusFile *file;
 
 	file = nautilus_file_get (uri);
@@ -1536,18 +1536,18 @@ nautilus_tree_model_remove_root_uri (NautilusTreeModel *model, const char *uri)
 	}
 }
 
-NautilusTreeModel *
-nautilus_tree_model_new (void)
+FMTreeModel *
+fm_tree_model_new (void)
 {
-	NautilusTreeModel *model;
+	FMTreeModel *model;
 
-	model = g_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL);
+	model = g_object_new (FM_TYPE_TREE_MODEL, NULL);
 	
 	return model;
 }
 
 static void
-set_theme (TreeNode *node, NautilusTreeModel *model)
+set_theme (TreeNode *node, FMTreeModel *model)
 {
 	TreeNode *child;
 	
@@ -1562,11 +1562,11 @@ set_theme (TreeNode *node, NautilusTreeModel *model)
 } 
 
 void
-nautilus_tree_model_set_theme (NautilusTreeModel *model)
+fm_tree_model_set_theme (FMTreeModel *model)
 {
 	TreeNode *node;
 
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
 
 	node = model->details->root_node;
 	while (node != NULL) {
@@ -1577,10 +1577,10 @@ nautilus_tree_model_set_theme (NautilusTreeModel *model)
 
 
 void
-nautilus_tree_model_set_show_hidden_files (NautilusTreeModel *model,
+fm_tree_model_set_show_hidden_files (FMTreeModel *model,
 					   gboolean show_hidden_files)
 {
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
 	g_return_if_fail (show_hidden_files == FALSE || show_hidden_files == TRUE);
 
 	show_hidden_files = show_hidden_files != FALSE;
@@ -1596,10 +1596,10 @@ nautilus_tree_model_set_show_hidden_files (NautilusTreeModel *model,
 }
 
 void
-nautilus_tree_model_set_show_backup_files (NautilusTreeModel *model,
+fm_tree_model_set_show_backup_files (FMTreeModel *model,
 					   gboolean show_backup_files)
 {
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
 	g_return_if_fail (show_backup_files == FALSE || show_backup_files == TRUE);
 
 	show_backup_files = show_backup_files != FALSE;
@@ -1621,10 +1621,10 @@ file_is_not_directory (NautilusFile *file)
 }
 
 void
-nautilus_tree_model_set_show_only_directories (NautilusTreeModel *model,
+fm_tree_model_set_show_only_directories (FMTreeModel *model,
 					       gboolean show_only_directories)
 {
-	g_return_if_fail (NAUTILUS_IS_TREE_MODEL (model));
+	g_return_if_fail (FM_IS_TREE_MODEL (model));
 	g_return_if_fail (show_only_directories == FALSE || show_only_directories == TRUE);
 
 	show_only_directories = show_only_directories != FALSE;
@@ -1640,23 +1640,23 @@ nautilus_tree_model_set_show_only_directories (NautilusTreeModel *model,
 }
 
 NautilusFile *
-nautilus_tree_model_iter_get_file (NautilusTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_iter_get_file (FMTreeModel *model, GtkTreeIter *iter)
 {
 	TreeNode *node;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), 0);
-	g_return_val_if_fail (iter_is_valid (NAUTILUS_TREE_MODEL (model), iter), 0);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), 0);
+	g_return_val_if_fail (iter_is_valid (FM_TREE_MODEL (model), iter), 0);
 
 	node = iter->user_data;
 	return node == NULL ? NULL : nautilus_file_ref (node->file);
 }
 
 gboolean
-nautilus_tree_model_iter_is_root (NautilusTreeModel *model, GtkTreeIter *iter)
+fm_tree_model_iter_is_root (FMTreeModel *model, GtkTreeIter *iter)
 {
 	TreeNode *node;
 
-	g_return_val_if_fail (NAUTILUS_IS_TREE_MODEL (model), 0);
+	g_return_val_if_fail (FM_IS_TREE_MODEL (model), 0);
 	g_return_val_if_fail (iter_is_valid (model, iter), 0);
 	node = iter->user_data;
 	if (node == NULL) {
@@ -1667,7 +1667,7 @@ nautilus_tree_model_iter_is_root (NautilusTreeModel *model, GtkTreeIter *iter)
 }
 
 gboolean
-nautilus_tree_model_file_get_iter (NautilusTreeModel *model,
+fm_tree_model_file_get_iter (FMTreeModel *model,
 				   GtkTreeIter *iter,
 				   NautilusFile *file,
 				   GtkTreeIter *current_iter)
@@ -1689,9 +1689,9 @@ nautilus_tree_model_file_get_iter (NautilusTreeModel *model,
 }
 
 static void
-nautilus_tree_model_init (NautilusTreeModel *model)
+fm_tree_model_init (FMTreeModel *model)
 {
-	model->details = g_new0 (NautilusTreeModelDetails, 1);
+	model->details = g_new0 (FMTreeModelDetails, 1);
 
 	do {
 		model->details->stamp = g_random_int ();
@@ -1699,13 +1699,13 @@ nautilus_tree_model_init (NautilusTreeModel *model)
 }
 
 static void
-nautilus_tree_model_finalize (GObject *object)
+fm_tree_model_finalize (GObject *object)
 {
-	NautilusTreeModel *model;
+	FMTreeModel *model;
 	TreeNode *root_node, *next_root;
-	NautilusTreeModelRoot *root;
+	FMTreeModelRoot *root;
 
-	model = NAUTILUS_TREE_MODEL (object);
+	model = FM_TREE_MODEL (object);
 
 	for (root_node = model->details->root_node; root_node != NULL; root_node = next_root) {
 		next_root = root_node->next;
@@ -1727,17 +1727,17 @@ nautilus_tree_model_finalize (GObject *object)
 }
 
 static void
-nautilus_tree_model_class_init (NautilusTreeModelClass *class)
+fm_tree_model_class_init (FMTreeModelClass *class)
 {
 	parent_class = g_type_class_peek_parent (class);
 
-	G_OBJECT_CLASS (class)->finalize = nautilus_tree_model_finalize;
+	G_OBJECT_CLASS (class)->finalize = fm_tree_model_finalize;
 
 	tree_model_signals[ROW_LOADED] =
 		g_signal_new ("row_loaded",
-                      NAUTILUS_TYPE_TREE_MODEL,
+                      FM_TYPE_TREE_MODEL,
                       G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (NautilusTreeModelClass, row_loaded),
+                      G_STRUCT_OFFSET (FMTreeModelClass, row_loaded),
                       NULL, NULL,
                       g_cclosure_marshal_VOID__BOXED,
                       G_TYPE_NONE, 1,
@@ -1745,49 +1745,49 @@ nautilus_tree_model_class_init (NautilusTreeModelClass *class)
 }
 
 static void
-nautilus_tree_model_tree_model_init (GtkTreeModelIface *iface)
-{
-	iface->get_flags = nautilus_tree_model_get_flags;
-	iface->get_n_columns = nautilus_tree_model_get_n_columns;
-	iface->get_column_type = nautilus_tree_model_get_column_type;
-	iface->get_iter = nautilus_tree_model_get_iter;
-	iface->get_path = nautilus_tree_model_get_path;
-	iface->get_value = nautilus_tree_model_get_value;
-	iface->iter_next = nautilus_tree_model_iter_next;
-	iface->iter_children = nautilus_tree_model_iter_children;
-	iface->iter_has_child = nautilus_tree_model_iter_has_child;
-	iface->iter_n_children = nautilus_tree_model_iter_n_children;
-	iface->iter_nth_child = nautilus_tree_model_iter_nth_child;
-	iface->iter_parent = nautilus_tree_model_iter_parent;
-	iface->ref_node = nautilus_tree_model_ref_node;
-	iface->unref_node = nautilus_tree_model_unref_node;
+fm_tree_model_tree_model_init (GtkTreeModelIface *iface)
+{
+	iface->get_flags = fm_tree_model_get_flags;
+	iface->get_n_columns = fm_tree_model_get_n_columns;
+	iface->get_column_type = fm_tree_model_get_column_type;
+	iface->get_iter = fm_tree_model_get_iter;
+	iface->get_path = fm_tree_model_get_path;
+	iface->get_value = fm_tree_model_get_value;
+	iface->iter_next = fm_tree_model_iter_next;
+	iface->iter_children = fm_tree_model_iter_children;
+	iface->iter_has_child = fm_tree_model_iter_has_child;
+	iface->iter_n_children = fm_tree_model_iter_n_children;
+	iface->iter_nth_child = fm_tree_model_iter_nth_child;
+	iface->iter_parent = fm_tree_model_iter_parent;
+	iface->ref_node = fm_tree_model_ref_node;
+	iface->unref_node = fm_tree_model_unref_node;
 }
 
 GType
-nautilus_tree_model_get_type (void)
+fm_tree_model_get_type (void)
 {
 	static GType object_type = 0;
 
 	if (object_type == 0) {
 		static const GTypeInfo object_info = {
-			sizeof (NautilusTreeModelClass),
+			sizeof (FMTreeModelClass),
 			NULL,
 			NULL,
-			(GClassInitFunc) nautilus_tree_model_class_init,
+			(GClassInitFunc) fm_tree_model_class_init,
 			NULL,
 			NULL,
-			sizeof (NautilusTreeModel),
+			sizeof (FMTreeModel),
 			0,
-			(GInstanceInitFunc) nautilus_tree_model_init,
+			(GInstanceInitFunc) fm_tree_model_init,
 		};
 
 		static const GInterfaceInfo tree_model_info = {
-			(GInterfaceInitFunc) nautilus_tree_model_tree_model_init,
+			(GInterfaceInitFunc) fm_tree_model_tree_model_init,
 			NULL,
 			NULL
 		};
 
-		object_type = g_type_register_static (G_TYPE_OBJECT, "NautilusTreeModel", &object_info, 0);
+		object_type = g_type_register_static (G_TYPE_OBJECT, "FMTreeModel", &object_info, 0);
 		g_type_add_interface_static (object_type,
 					     GTK_TYPE_TREE_MODEL,
 					     &tree_model_info);
diff --git a/src/file-manager/fm-tree-model.h b/src/file-manager/fm-tree-model.h
new file mode 100644
index 000000000..5d7146de5
--- /dev/null
+++ b/src/file-manager/fm-tree-model.h
@@ -0,0 +1,88 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* 
+ * Copyright (C) 2002 Anders Carlsson
+ * Copyright (C) 2002 Bent Spoon Software
+ *
+ * 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@gnu.org>
+ */
+
+/* fm-tree-model.h - Model for the tree view */
+
+#ifndef FM_TREE_MODEL_H
+#define FM_TREE_MODEL_H
+
+#include <glib-object.h>
+#include <gtk/gtktreemodel.h>
+#include <libnautilus-private/nautilus-file.h>
+
+#define FM_TYPE_TREE_MODEL	    (fm_tree_model_get_type ())
+#define FM_TREE_MODEL(obj)	    (GTK_CHECK_CAST ((obj), FM_TYPE_TREE_MODEL, FMTreeModel))
+#define FM_TREE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FM_TYPE_TREE_MODEL, FMTreeModelClass))
+#define FM_IS_TREE_MODEL(obj)	    (GTK_CHECK_TYPE ((obj), FM_TYPE_TREE_MODEL))
+#define FM_IS_TREE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FM_TYPE_TREE_MODEL))
+
+enum {
+	FM_TREE_MODEL_DISPLAY_NAME_COLUMN,
+	FM_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
+	FM_TREE_MODEL_OPEN_PIXBUF_COLUMN,
+	FM_TREE_MODEL_FONT_STYLE_COLUMN,
+	FM_TREE_MODEL_FONT_WEIGHT_COLUMN,
+	FM_TREE_MODEL_NUM_COLUMNS
+};
+
+typedef struct FMTreeModelDetails FMTreeModelDetails;
+
+typedef struct {
+	GObject parent;
+	FMTreeModelDetails *details;
+} FMTreeModel;
+
+typedef struct {
+	GObjectClass parent_class;
+
+	void         (* row_loaded)      (FMTreeModel *tree_model,
+					  GtkTreeIter       *iter);
+} FMTreeModelClass;
+
+GType              fm_tree_model_get_type                  (void);
+FMTreeModel *fm_tree_model_new                       (void);
+void               fm_tree_model_set_show_hidden_files     (FMTreeModel *model,
+								  gboolean           show_hidden_files);
+void               fm_tree_model_set_show_backup_files     (FMTreeModel *model,
+								  gboolean           show_backup_files);
+void               fm_tree_model_set_show_only_directories (FMTreeModel *model,
+								  gboolean           show_only_directories);
+NautilusFile *     fm_tree_model_iter_get_file             (FMTreeModel *model,
+								  GtkTreeIter       *iter);
+void               fm_tree_model_add_root_uri              (FMTreeModel *model,
+								  const char        *root_uri,
+								  const char        *display_name,
+								  const char        *icon_name);
+void               fm_tree_model_remove_root_uri           (FMTreeModel *model,
+								  const char        *root_uri);
+gboolean           fm_tree_model_iter_is_root              (FMTreeModel *model,
+								  GtkTreeIter *iter);
+gboolean           fm_tree_model_file_get_iter             (FMTreeModel *model,
+								  GtkTreeIter *iter,
+								  NautilusFile *file,
+								  GtkTreeIter *currentIter);
+
+void               fm_tree_model_set_theme                 (FMTreeModel *model);
+
+#endif /* FM_TREE_MODEL_H */
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
new file mode 100644
index 000000000..9e556a1ab
--- /dev/null
+++ b/src/file-manager/fm-tree-view.c
@@ -0,0 +1,1305 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* 
+ * Copyright (C) 2000, 2001 Eazel, Inc
+ * Copyright (C) 2002 Anders Carlsson
+ * Copyright (C) 2002 Darin Adler
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: 
+ *       Maciej Stachowiak <mjs@eazel.com>
+ *       Anders Carlsson <andersca@gnu.org>
+ *       Darin Adler <darin@bentspoon.com>
+ */
+
+/* fm-tree-view.c - tree sidebar panel
+ */
+
+#include <config.h>
+#include "fm-tree-view.h"
+
+#include "fm-tree-model.h"
+#include "fm-properties-window.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-preferences.h>
+#include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
+#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtktreemodelsort.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtktreeview.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenushell.h>
+#include <gtk/gtkclipboard.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-uidefs.h>
+#include <libgnomeui/gnome-popup-menu.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+#include <libnautilus-private/nautilus-file-attributes.h>
+#include <libnautilus-private/nautilus-file-operations.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-program-choosing.h>
+#include <libnautilus-private/nautilus-tree-view-drag-dest.h>
+#include <libnautilus-private/nautilus-icon-factory.h>
+
+struct FMTreeViewDetails {
+	GtkWidget *scrolled_window;
+	GtkTreeView *tree_widget;
+	GtkTreeModelSort *sort_model;
+	FMTreeModel *child_model;
+
+	NautilusFile *activation_file;
+	gboolean activation_in_new_window;
+
+	NautilusTreeViewDragDest *drag_dest;
+
+	char *selection_location;
+	gboolean selecting;
+
+	guint show_selection_idle_id;
+	
+	GtkWidget *popup;
+	GtkWidget *popup_open;
+	GtkWidget *popup_open_in_new_window;
+	GtkWidget *popup_create_folder;
+	GtkWidget *popup_cut;
+	GtkWidget *popup_copy;
+	GtkWidget *popup_paste;
+	GtkWidget *popup_rename;
+	GtkWidget *popup_trash;
+	GtkWidget *popup_properties;
+	NautilusFile *popup_file;
+};
+
+typedef struct {
+	GList *uris;
+	FMTreeView *view;
+} PrependURIParameters;
+
+static GdkAtom copied_files_atom;
+
+enum {
+	GNOME_COPIED_FILES
+};
+
+static const GtkTargetEntry clipboard_targets[] = {
+	{ "x-special/gnome-copied-files", 0, GNOME_COPIED_FILES },
+};
+
+BONOBO_CLASS_BOILERPLATE (FMTreeView, fm_tree_view,
+			  NautilusView, NAUTILUS_TYPE_VIEW)
+
+static gboolean
+show_iter_for_file (FMTreeView *view, NautilusFile *file, GtkTreeIter *iter)
+{
+	GtkTreeModel *model;
+	NautilusFile *parent_file;
+	GtkTreeIter parent_iter;
+	GtkTreePath *path, *sort_path;
+	GtkTreeIter cur_iter;
+
+	if (view->details->child_model == NULL) {
+		return FALSE;
+	}
+	model = GTK_TREE_MODEL (view->details->child_model);
+
+	/* check if file is visible in the same root as the currently selected folder is */
+	gtk_tree_view_get_cursor (view->details->tree_widget, &path, NULL);
+	if (path != NULL) {
+		if (gtk_tree_model_get_iter (model, &cur_iter, path)) {
+			if (fm_tree_model_file_get_iter (view->details->child_model,
+							       iter, file, &cur_iter)) {
+				return TRUE;
+			}
+		}
+	}
+	/* check if file is visible at all */
+	if (fm_tree_model_file_get_iter (view->details->child_model,
+					       iter, file, NULL)) {
+		return TRUE;
+	}
+
+	parent_file = nautilus_file_get_parent (file);
+
+	if (parent_file == NULL) {
+		return FALSE;
+	}
+	if (!show_iter_for_file (view, parent_file, &parent_iter)) {
+		nautilus_file_unref (parent_file);
+		return FALSE;
+	}
+	nautilus_file_unref (parent_file);
+
+	if (parent_iter.user_data == NULL || parent_iter.stamp == 0) {
+		return FALSE;
+	}
+	path = gtk_tree_model_get_path (model, &parent_iter);
+	sort_path = gtk_tree_model_sort_convert_child_path_to_path
+		(view->details->sort_model, path);
+	gtk_tree_path_free (path);
+	gtk_tree_view_expand_row (view->details->tree_widget, sort_path, FALSE);
+	gtk_tree_path_free (sort_path);
+
+	return FALSE;
+}
+
+static gboolean
+show_selection_idle_callback (gpointer callback_data)
+{
+	FMTreeView *view;
+	NautilusFile *file, *old_file;
+	GtkTreeIter iter;
+	GtkTreePath *path, *sort_path;
+
+	view = FM_TREE_VIEW (callback_data);
+
+	view->details->show_selection_idle_id = 0;
+
+	file = nautilus_file_get (view->details->selection_location);
+	if (file == NULL) {
+		return FALSE;
+	}
+
+	if (!nautilus_file_is_directory (file)) {
+		old_file = file;
+		file = nautilus_file_get_parent (file);
+		nautilus_file_unref (old_file);
+		if (file == NULL) {
+			return FALSE;
+		}
+	}
+	
+	view->details->selecting = TRUE;
+	if (!show_iter_for_file (view, file, &iter)) {
+		nautilus_file_unref (file);
+		return FALSE;
+	}
+	view->details->selecting = FALSE;
+
+	path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->details->child_model), &iter);
+	sort_path = gtk_tree_model_sort_convert_child_path_to_path
+		(view->details->sort_model, path);
+	gtk_tree_path_free (path);
+	gtk_tree_view_set_cursor (view->details->tree_widget, sort_path, NULL, FALSE);
+	gtk_tree_view_scroll_to_cell (view->details->tree_widget, sort_path, NULL, FALSE, 0, 0);
+	gtk_tree_path_free (sort_path);
+
+	nautilus_file_unref (file);
+
+	return FALSE;
+}
+
+static void
+schedule_show_selection (FMTreeView *view)
+{
+	if (view->details->show_selection_idle_id == 0) {
+		view->details->show_selection_idle_id = g_idle_add (show_selection_idle_callback, view);
+	}
+}
+
+static void
+row_loaded_callback (GtkTreeModel     *tree_model,
+		     GtkTreeIter      *iter,
+		     FMTreeView *view)
+{
+	NautilusFile *file, *tmp_file, *selection_file;
+
+	if (view->details->selection_location == NULL
+	    || !view->details->selecting
+	    || iter->user_data == NULL || iter->stamp == 0) {
+		return;
+	}
+
+	file = fm_tree_model_iter_get_file (view->details->child_model, iter);
+	if (file == NULL) {
+		return;
+	}
+	if (!nautilus_file_is_directory (file)) {
+		nautilus_file_unref(file);
+		return;
+	}
+
+	/* if iter is ancestor of wanted selection_location then update selection */
+	selection_file = nautilus_file_get (view->details->selection_location);
+	while (selection_file != NULL) {
+		if (file == selection_file) {
+			nautilus_file_unref (file);
+			nautilus_file_unref (selection_file);
+
+			schedule_show_selection (view);
+			return;
+		}
+		tmp_file = nautilus_file_get_parent (selection_file);
+		nautilus_file_unref (selection_file);
+		selection_file = tmp_file;
+	}
+	nautilus_file_unref (file);
+}
+
+static NautilusFile *
+sort_model_iter_to_file (FMTreeView *view, GtkTreeIter *iter)
+{
+	GtkTreeIter child_iter;
+
+	gtk_tree_model_sort_convert_iter_to_child_iter (view->details->sort_model, &child_iter, iter);
+	return fm_tree_model_iter_get_file (view->details->child_model, &child_iter);
+}
+
+static NautilusFile *
+sort_model_path_to_file (FMTreeView *view, GtkTreePath *path)
+{
+	GtkTreeIter iter;
+
+	if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (view->details->sort_model), &iter, path)) {
+		return NULL;
+	}
+	return sort_model_iter_to_file (view, &iter);
+}
+
+static void
+got_activation_uri_callback (NautilusFile *file, gpointer callback_data)
+{
+        char *uri, *file_uri;
+        FMTreeView *view;
+	GdkScreen *screen;
+	Nautilus_ViewFrame_OpenMode mode;
+	
+        view = FM_TREE_VIEW (callback_data);
+
+	screen = gtk_widget_get_screen (GTK_WIDGET (view->details->tree_widget));
+
+        g_assert (file == view->details->activation_file);
+        
+        mode = view->details->activation_in_new_window ? Nautilus_ViewFrame_OPEN_IN_NAVIGATION : Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE;
+
+	/* FIXME: reenable && !eel_uris_match_ignore_fragments (view->details->current_main_view_uri, uri) */
+
+	uri = nautilus_file_get_activation_uri (file);
+	if (uri != NULL
+	    && eel_str_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER)) {
+
+		uri += strlen (NAUTILUS_COMMAND_SPECIFIER);
+		nautilus_launch_application_from_command (screen, NULL, uri, NULL, FALSE);
+
+	} else if (uri != NULL
+	    	   && eel_str_has_prefix (uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER)) {
+		   
+		file_uri = nautilus_file_get_uri (file);
+		nautilus_launch_desktop_file (screen, file_uri, NULL, NULL);
+		g_free (file_uri);
+		
+	} else if (uri != NULL
+		   && nautilus_file_is_executable (file)
+		   && nautilus_file_can_execute (file)
+		   && !nautilus_file_is_directory (file)) {	
+		   
+		file_uri = gnome_vfs_get_local_path_from_uri (uri);
+
+		/* Non-local executables don't get launched. They act like non-executables. */
+		if (file_uri == NULL) {
+			nautilus_view_open_location
+				(NAUTILUS_VIEW (view), 
+				 uri, 
+				 mode,
+				 0,
+				 NULL);
+		} else {
+			nautilus_launch_application_from_command (screen, NULL, file_uri, NULL, FALSE);
+			g_free (file_uri);
+		}
+		   
+	} else if (uri != NULL) {
+		if (view->details->selection_location == NULL ||
+		    strcmp (uri, view->details->selection_location) != 0) {
+			if (view->details->selection_location != NULL) {
+				g_free (view->details->selection_location);
+			}
+			view->details->selection_location = g_strdup (uri);
+			nautilus_view_open_location
+				(NAUTILUS_VIEW (view), 
+				 uri,
+				 mode,
+				 0,
+				 NULL);
+		}
+	}
+
+	g_free (uri);
+	nautilus_file_unref (view->details->activation_file);
+	view->details->activation_file = NULL;
+}
+
+static void
+cancel_activation (FMTreeView *view)
+{
+        if (view->details->activation_file == NULL) {
+		return;
+	}
+	
+	nautilus_file_cancel_call_when_ready
+		(view->details->activation_file,
+		 got_activation_uri_callback, view);
+	nautilus_file_unref (view->details->activation_file);
+        view->details->activation_file = NULL;
+}
+
+static void
+row_activated_callback (GtkTreeView *treeview, GtkTreePath *path, 
+			GtkTreeViewColumn *column, FMTreeView *view)
+{
+	if (gtk_tree_view_row_expanded (view->details->tree_widget, path)) {
+		gtk_tree_view_collapse_row (view->details->tree_widget, path);
+	} else {
+		gtk_tree_view_expand_row (view->details->tree_widget, 
+					  path, FALSE);
+	}
+}
+
+
+static void
+selection_changed_callback (GtkTreeSelection *selection,
+			    FMTreeView *view)
+{
+	NautilusFileAttributes attributes;
+	GtkTreeIter iter;
+
+	/* no activation if popup menu is open */
+	if (view->details->popup_file != NULL) {
+		return;
+	}
+
+	cancel_activation (view);
+
+	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
+		return;
+	}
+
+	view->details->activation_file = sort_model_iter_to_file (view, &iter);
+	if (view->details->activation_file == NULL) {
+		return;
+	}
+	view->details->activation_in_new_window = FALSE;
+		
+	attributes = NAUTILUS_FILE_ATTRIBUTE_ACTIVATION_URI;
+	nautilus_file_call_when_ready (view->details->activation_file, attributes,
+				       got_activation_uri_callback, view);
+}
+
+static int
+compare_rows (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer callback_data)
+{
+	NautilusFile *file_a, *file_b;
+	int result;
+
+	if (a->user_data == NULL) {
+		return -1;
+	}
+	else if (b->user_data == NULL) {
+		return -1;
+	}
+
+	/* don't sort root nodes */
+	if (fm_tree_model_iter_is_root (FM_TREE_MODEL (model), a)
+	    || fm_tree_model_iter_is_root (FM_TREE_MODEL (model), b)) {
+		return 0;
+	}
+
+	file_a = fm_tree_model_iter_get_file (FM_TREE_MODEL (model), a);
+	file_b = fm_tree_model_iter_get_file (FM_TREE_MODEL (model), b);
+
+	if (file_a == file_b) {
+		result = 0;
+	} else if (file_a == NULL) {
+		result = -1;
+	} else if (file_b == NULL) {
+		result = +1;
+	} else {
+		result = nautilus_file_compare_for_sort (file_a, file_b,
+							 NAUTILUS_FILE_SORT_BY_DISPLAY_NAME,
+							 FALSE, FALSE);
+	}
+
+	nautilus_file_unref (file_a);
+	nautilus_file_unref (file_b);
+
+	return result;
+}
+
+
+static char *
+get_root_uri_callback (NautilusTreeViewDragDest *dest,
+		       gpointer user_data)
+{
+	FMTreeView *view;
+	
+	view = FM_TREE_VIEW (user_data);
+
+	/* Don't allow drops on background */
+	return NULL;
+}
+
+static NautilusFile *
+get_file_for_path_callback (NautilusTreeViewDragDest *dest,
+			    GtkTreePath *path,
+			    gpointer user_data)
+{
+	FMTreeView *view;
+	
+	view = FM_TREE_VIEW (user_data);
+
+	return sort_model_path_to_file (view, path);
+}
+
+static void
+move_copy_items_callback (NautilusTreeViewDragDest *dest,
+			  const GList *item_uris,
+			  const char *target_uri,
+			  guint action,
+			  int x,
+			  int y,
+			  gpointer user_data)
+{
+	FMTreeView *view;
+
+	view = FM_TREE_VIEW (user_data);
+
+	nautilus_file_operations_copy_move
+		(item_uris,
+		 NULL,
+		 target_uri,
+		 action,
+		 GTK_WIDGET (view->details->tree_widget),
+		 NULL, NULL);
+}
+
+static void
+theme_changed_callback (GObject *icon_factory, gpointer callback_data)
+{
+        FMTreeView *view; 
+
+        view = FM_TREE_VIEW (callback_data);
+	if (view->details->child_model != NULL) {
+		fm_tree_model_set_theme (FM_TREE_MODEL (view->details->child_model));
+	}
+}
+
+static void
+add_root_for_volume (FMTreeView *view,
+		     GnomeVFSVolume *volume)
+{
+	char *icon, *mount_uri, *name;
+
+	if (!gnome_vfs_volume_is_user_visible (volume)) {
+		return;
+	}
+	
+	icon = gnome_vfs_volume_get_icon (volume);
+	mount_uri = gnome_vfs_volume_get_activation_uri (volume);
+	name = gnome_vfs_volume_get_display_name (volume);
+	
+	fm_tree_model_add_root_uri (view->details->child_model,
+					  mount_uri, name, icon);
+
+	g_free (icon);
+	g_free (name);
+	g_free (mount_uri);
+	
+}
+
+static void
+volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
+			 GnomeVFSVolume *volume,
+			 FMTreeView *view)
+{
+	add_root_for_volume (view, volume);
+}
+
+static void
+volume_unmounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
+			   GnomeVFSVolume *volume,
+			   FMTreeView *view)
+{
+	char *mount_uri;
+	
+	mount_uri = gnome_vfs_volume_get_activation_uri (volume);
+	fm_tree_model_remove_root_uri (view->details->child_model,
+					     mount_uri);
+	g_free (mount_uri);
+}
+
+static void
+clipboard_contents_received_callback (GtkClipboard     *clipboard,
+				      GtkSelectionData *selection_data,
+				      gpointer          data)
+{
+	FMTreeView *view;
+
+	view = FM_TREE_VIEW (data);
+
+	if (selection_data->type == copied_files_atom
+	    && selection_data->length > 0) {
+		gtk_widget_set_sensitive (view->details->popup_paste, TRUE);
+	}
+}
+
+static GtkClipboard *
+get_clipboard (GtkWidget *widget)
+{
+	return gtk_clipboard_get_for_display (gtk_widget_get_display (widget),
+					      GDK_SELECTION_CLIPBOARD);
+}
+
+static gboolean
+can_move_uri_to_trash (const char *file_uri_string)
+{
+	/* Return TRUE if we can get a trash directory on the same volume as this file. */
+	GnomeVFSURI *file_uri;
+	GnomeVFSURI *directory_uri;
+	GnomeVFSURI *trash_dir_uri;
+	gboolean result;
+
+	g_return_val_if_fail (file_uri_string != NULL, FALSE);
+
+	file_uri = gnome_vfs_uri_new (file_uri_string);
+
+	if (file_uri == NULL) {
+		return FALSE;
+	}
+
+	/* FIXME: Why can't we just pass file_uri to gnome_vfs_find_directory? */
+	directory_uri = gnome_vfs_uri_get_parent (file_uri);
+	gnome_vfs_uri_unref (file_uri);
+
+	if (directory_uri == NULL) {
+		return FALSE;
+	}
+
+	/*
+	 * Create a new trash if needed but don't go looking for an old Trash.
+	 * Passing 0 permissions as gnome-vfs would override the permissions 
+	 * passed with 700 while creating .Trash directory
+	 */
+	result = gnome_vfs_find_directory (directory_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
+					   &trash_dir_uri, TRUE, FALSE, 0) == GNOME_VFS_OK;
+	if (result) {
+		gnome_vfs_uri_unref (trash_dir_uri);
+	}
+	gnome_vfs_uri_unref (directory_uri);
+
+	return result;
+}
+
+static gboolean
+button_pressed_callback (GtkTreeView *treeview, GdkEventButton *event,
+			 FMTreeView *view)
+{
+	GtkTreePath *path, *cursor_path;
+	char *uri;
+
+	if (event->button == 3) {
+		if (!gtk_tree_view_get_path_at_pos (treeview, event->x, event->y,
+						    &path, NULL, NULL, NULL)) {
+			return FALSE;
+		}
+
+		view->details->popup_file = sort_model_path_to_file (view, path);
+		if (view->details->popup_file == NULL) {
+			gtk_tree_path_free (path);
+			return FALSE;
+		}
+		gtk_tree_view_get_cursor (view->details->tree_widget, &cursor_path, NULL);
+		gtk_tree_view_set_cursor (view->details->tree_widget, path, NULL, FALSE);
+		gtk_tree_path_free (path);
+		uri = nautilus_file_get_uri (view->details->popup_file);
+		
+		gtk_widget_set_sensitive (view->details->popup_open_in_new_window,
+			nautilus_file_is_directory (view->details->popup_file));
+		gtk_widget_set_sensitive (view->details->popup_create_folder,
+			nautilus_file_is_directory (view->details->popup_file) &&
+			nautilus_file_can_write (view->details->popup_file));
+		gtk_widget_set_sensitive (view->details->popup_paste, FALSE);
+		if (nautilus_file_is_directory (view->details->popup_file) &&
+			nautilus_file_can_write (view->details->popup_file)) {
+			gtk_clipboard_request_contents (get_clipboard (GTK_WIDGET (view->details->tree_widget)),
+							copied_files_atom,
+							clipboard_contents_received_callback, view);
+		}
+		gtk_widget_set_sensitive (view->details->popup_trash, can_move_uri_to_trash (uri));
+		g_free (uri);
+		
+		gnome_popup_menu_do_popup_modal (view->details->popup,
+						 NULL, NULL, event, NULL,
+						 GTK_WIDGET (treeview));
+		
+		gtk_tree_view_set_cursor (view->details->tree_widget, cursor_path, NULL, FALSE);
+		gtk_tree_path_free (cursor_path);
+
+		nautilus_file_unref (view->details->popup_file);
+		view->details->popup_file = NULL;
+		
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+fm_tree_view_activate_file (FMTreeView *view, 
+			    NautilusFile *file,
+			    gboolean open_in_new_window)
+{
+	NautilusFileAttributes attributes;
+
+	cancel_activation (view);
+
+	view->details->activation_file = nautilus_file_ref (file);
+	view->details->activation_in_new_window = open_in_new_window;
+		
+	attributes = NAUTILUS_FILE_ATTRIBUTE_ACTIVATION_URI;
+	nautilus_file_call_when_ready (view->details->activation_file, attributes,
+				       got_activation_uri_callback, view);
+}
+
+static void
+fm_tree_view_open_cb (GtkWidget *menu_item,
+		      FMTreeView *view)
+{
+	fm_tree_view_activate_file (view, view->details->popup_file, FALSE);
+}
+
+static void
+fm_tree_view_open_in_new_window_cb (GtkWidget *menu_item,
+				    FMTreeView *view)
+{
+	fm_tree_view_activate_file (view, view->details->popup_file, TRUE);
+}
+
+static void
+new_folder_done (const char *new_folder_uri, gpointer data)
+{
+	GList *list;
+
+	/* show the properties window for the newly created
+	 * folder so the user can change its name
+	 */
+	list = g_list_prepend (NULL, nautilus_file_get (new_folder_uri));
+
+	fm_properties_window_present (list, GTK_WIDGET (data));
+
+        nautilus_file_list_free (list);
+}
+
+static void
+fm_tree_view_create_folder_cb (GtkWidget *menu_item,
+			       FMTreeView *view)
+{
+	char *parent_uri;
+
+	parent_uri = nautilus_file_get_uri (view->details->popup_file);
+	nautilus_file_operations_new_folder (GTK_WIDGET (view->details->tree_widget),
+					     parent_uri,
+					     new_folder_done, view->details->tree_widget);
+
+	g_free (parent_uri);
+}
+
+static void
+get_clipboard_callback (GtkClipboard	 *clipboard,
+			GtkSelectionData *selection_data,
+			guint		  info,
+			gpointer	  user_data_or_owner)
+{
+	char *str = user_data_or_owner;
+	
+	gtk_selection_data_set (selection_data,
+				copied_files_atom,
+				8,
+				str,
+				strlen (str));
+}
+
+static void
+clear_clipboard_callback (GtkClipboard *clipboard,
+			  gpointer	user_data_or_owner)
+{
+	g_free (user_data_or_owner);
+}
+
+static char *
+convert_file_to_string (NautilusFile *file,
+			gboolean cut)
+{
+	GString *uris;
+	char *uri, *result;
+
+	uris = g_string_new (cut ? "cut" : "copy");
+	
+	uri = nautilus_file_get_uri (file);
+	g_string_append_c (uris, '\n');
+	g_string_append (uris, uri);
+	g_free (uri);
+
+	result = uris->str;
+	g_string_free (uris, FALSE);
+
+	return result;
+}
+
+static void
+copy_or_cut_files (FMTreeView *view,
+		   gboolean cut)
+{
+	char *status_string, *name;
+	char *clipboard_string;
+	
+	clipboard_string = convert_file_to_string (view->details->popup_file, cut);
+	
+	gtk_clipboard_set_with_data (get_clipboard (GTK_WIDGET (view->details->tree_widget)),
+				     clipboard_targets, G_N_ELEMENTS (clipboard_targets),
+				     get_clipboard_callback, clear_clipboard_callback,
+				     clipboard_string);
+	
+	name = nautilus_file_get_display_name (view->details->popup_file);
+	if (cut) {
+		status_string = g_strdup_printf (_("\"%s\" will be moved "
+						   "if you select the Paste Files command"),
+						 name);
+	} else {
+		status_string = g_strdup_printf (_("\"%s\" will be copied "
+						   "if you select the Paste Files command"),
+						 name);
+	}
+	g_free (name);
+	
+	nautilus_view_report_status (NAUTILUS_VIEW (view),
+				     status_string);
+	g_free (status_string);
+}
+
+static void
+fm_tree_view_cut_cb (GtkWidget *menu_item,
+		     FMTreeView *view)
+{
+	copy_or_cut_files (view, TRUE);
+}
+
+static void
+fm_tree_view_copy_cb (GtkWidget *menu_item,
+		      FMTreeView *view)
+{
+	copy_or_cut_files (view, FALSE);
+}
+
+static GList *
+convert_lines_to_str_list (char **lines, gboolean *cut)
+{
+	int i;
+	GList *result;
+
+	if (lines[0] == NULL) {
+		return NULL;
+	}
+
+	if (strcmp (lines[0], "cut") == 0) {
+		*cut = TRUE;
+	} else if (strcmp (lines[0], "copy") == 0) {
+		*cut = FALSE;
+	} else {
+		return NULL;
+	}
+
+	result = NULL;
+	for (i = 1; lines[i] != NULL; i++) {
+		result = g_list_prepend (result, g_strdup (lines[i]));
+	}
+	return g_list_reverse (result);
+}
+
+static void
+paste_clipboard_data (FMTreeView *view,
+		      GtkSelectionData *selection_data,
+		      char *destination_uri)
+{
+	char **lines;
+	gboolean cut;
+	GList *item_uris;
+	
+	if (selection_data->type != copied_files_atom
+	    || selection_data->length <= 0) {
+		item_uris = NULL;
+	} else {
+		/* Not sure why it's legal to assume there's an extra byte
+		 * past the end of the selection data that it's safe to write
+		 * to. But gtk_editable_selection_received does this, so I
+		 * think it is OK.
+		 */
+		selection_data->data[selection_data->length] = '\0';
+		lines = g_strsplit (selection_data->data, "\n", 0);
+		item_uris = convert_lines_to_str_list (lines, &cut);
+		g_strfreev (lines);
+	}
+
+	if (item_uris == NULL|| destination_uri == NULL) {
+		nautilus_view_report_status (NAUTILUS_VIEW (view),
+					     _("There is nothing on the clipboard to paste."));
+	} else {
+		nautilus_file_operations_copy_move
+			(item_uris, NULL, destination_uri,
+			 cut ? GDK_ACTION_MOVE : GDK_ACTION_COPY,
+			 GTK_WIDGET (view->details->tree_widget),
+			 NULL, NULL);
+	}
+}
+
+static void
+paste_into_clipboard_received_callback (GtkClipboard     *clipboard,
+					GtkSelectionData *selection_data,
+					gpointer          data)
+{
+	FMTreeView *view;
+	char *directory_uri;
+
+	view = FM_TREE_VIEW (data);
+
+	directory_uri = nautilus_file_get_uri (view->details->popup_file);
+
+	paste_clipboard_data (view, selection_data, directory_uri);
+
+	g_free (directory_uri);
+}
+
+static void
+fm_tree_view_paste_cb (GtkWidget *menu_item,
+		       FMTreeView *view)
+{
+	gtk_clipboard_request_contents (get_clipboard (GTK_WIDGET (view->details->tree_widget)),
+					copied_files_atom,
+					paste_into_clipboard_received_callback, view);
+}
+
+static void
+fm_tree_view_trash_cb (GtkWidget *menu_item,
+		       FMTreeView *view)
+{
+	GList *list;
+	char *directory_uri;
+
+	directory_uri = nautilus_file_get_uri (view->details->popup_file);
+	
+	if (can_move_uri_to_trash (directory_uri))
+	{
+		list = g_list_prepend (NULL, g_strdup (directory_uri));
+	
+		nautilus_file_operations_copy_move (list, NULL, 
+						    EEL_TRASH_URI, GDK_ACTION_MOVE, GTK_WIDGET (view->details->tree_widget),
+						    NULL, NULL);
+	}
+	
+	g_free (directory_uri);
+}
+
+static void
+fm_tree_view_properties_cb (GtkWidget *menu_item,
+			    FMTreeView *view)
+{
+	GList *list;
+        
+	list = g_list_prepend (NULL, nautilus_file_ref (view->details->popup_file));
+
+	fm_properties_window_present (list, GTK_WIDGET (view->details->tree_widget));
+
+        nautilus_file_list_free (list);
+}
+
+static void
+create_popup_menu (FMTreeView *view)
+{
+	GtkWidget *popup, *menu_item, *menu_image, *separator_item;
+	
+	popup = gtk_menu_new ();
+	
+	/* add the "open" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Open"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_open_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_open = menu_item;
+	
+	/* add the "open in new window" menu item */
+	menu_item = gtk_image_menu_item_new_with_label (_("Open in New Window"));
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_open_in_new_window_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_open_in_new_window = menu_item;
+	
+	separator_item = gtk_separator_menu_item_new ();
+	gtk_widget_show (separator_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
+	
+	/* add the "create folder" menu item */
+	menu_item = gtk_image_menu_item_new_with_label (_("Create Folder"));
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_create_folder_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_create_folder = menu_item;
+	
+	separator_item = gtk_separator_menu_item_new ();
+	gtk_widget_show (separator_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
+	
+	/* add the "cut folder" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_CUT,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Cut Folder"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_cut_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_cut = menu_item;
+	
+	/* add the "copy folder" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_COPY,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Copy Folder"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_copy_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_copy = menu_item;
+	
+	/* add the "paste files into folder" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Paste Files into Folder"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_paste_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_paste = menu_item;
+	
+	separator_item = gtk_separator_menu_item_new ();
+	gtk_widget_show (separator_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
+	
+	/* add the "move to trash" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_DELETE,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Move to Trash"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_trash_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_trash = menu_item;
+	
+	separator_item = gtk_separator_menu_item_new ();
+	gtk_widget_show (separator_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item);
+	
+	/* add the "properties" menu item */
+	menu_image = gtk_image_new_from_stock (GTK_STOCK_PROPERTIES,
+					       GTK_ICON_SIZE_MENU);
+	gtk_widget_show (menu_image);
+	menu_item = gtk_image_menu_item_new_with_label (_("Properties"));
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
+				       menu_image);
+	g_signal_connect (menu_item, "activate",
+			  G_CALLBACK (fm_tree_view_properties_cb),
+			  view);
+	gtk_widget_show (menu_item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup), menu_item);
+	view->details->popup_properties = menu_item;
+	
+	view->details->popup = popup;
+}
+
+static void
+create_tree (FMTreeView *view)
+{
+	GtkCellRenderer *cell;
+	GtkTreeViewColumn *column;
+	GnomeVFSVolumeMonitor *volume_monitor;
+	char *home_uri;
+	GList *volumes, *l;
+	
+	view->details->child_model = fm_tree_model_new ();
+	view->details->sort_model = GTK_TREE_MODEL_SORT
+		(gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (view->details->child_model)));
+	view->details->tree_widget = GTK_TREE_VIEW
+		(gtk_tree_view_new_with_model (GTK_TREE_MODEL (view->details->sort_model)));
+	g_object_unref (view->details->sort_model);
+	g_signal_connect_object
+		(view->details->child_model, "row_loaded",
+		 G_CALLBACK (row_loaded_callback),
+		 view, G_CONNECT_AFTER);
+	home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+	fm_tree_model_add_root_uri (view->details->child_model, home_uri, _("Home Folder"), "gnome-home");
+	g_free (home_uri);
+	fm_tree_model_add_root_uri (view->details->child_model, "file:///", _("Filesystem"), "gnome-folder");
+#ifdef NOT_YET_USABLE
+	fm_tree_model_add_root_uri (view->details->child_model, "network:///", _("Network Neighbourhood"), "gnome-fs-network");
+#endif
+	
+	volume_monitor = gnome_vfs_get_volume_monitor ();
+	volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
+	for (l = volumes; l != NULL; l = l->next) {
+		add_root_for_volume (view, l->data);
+		gnome_vfs_volume_unref (l->data);
+	}
+	g_list_free (volumes);
+	
+	g_signal_connect_object (volume_monitor, "volume_mounted",
+				 G_CALLBACK (volume_mounted_callback), view, 0);
+	g_signal_connect_object (volume_monitor, "volume_unmounted",
+				 G_CALLBACK (volume_unmounted_callback), view, 0);
+	
+	g_object_unref (view->details->child_model);
+
+	gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (view->details->sort_model),
+						 compare_rows, view, NULL);
+
+	gtk_tree_view_set_headers_visible (view->details->tree_widget, FALSE);
+
+	view->details->drag_dest = 
+		nautilus_tree_view_drag_dest_new (view->details->tree_widget);
+	g_signal_connect_object (view->details->drag_dest, 
+				 "get_root_uri",
+				 G_CALLBACK (get_root_uri_callback),
+				 view, 0);
+	g_signal_connect_object (view->details->drag_dest, 
+				 "get_file_for_path",
+				 G_CALLBACK (get_file_for_path_callback),
+				 view, 0);
+	g_signal_connect_object (view->details->drag_dest,
+				 "move_copy_items",
+				 G_CALLBACK (move_copy_items_callback),
+				 view, 0);
+
+	/* Create column */
+	column = gtk_tree_view_column_new ();
+
+	cell = gtk_cell_renderer_pixbuf_new ();
+	gtk_tree_view_column_pack_start (column, cell, FALSE);
+	gtk_tree_view_column_set_attributes (column, cell,
+					     "pixbuf", FM_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
+					     "pixbuf_expander_closed", FM_TREE_MODEL_CLOSED_PIXBUF_COLUMN,
+					     "pixbuf_expander_open", FM_TREE_MODEL_OPEN_PIXBUF_COLUMN,
+					     NULL);
+	
+	cell = gtk_cell_renderer_text_new ();
+	gtk_tree_view_column_pack_start (column, cell, TRUE);
+	gtk_tree_view_column_set_attributes (column, cell,
+					     "text", FM_TREE_MODEL_DISPLAY_NAME_COLUMN,
+					     "style", FM_TREE_MODEL_FONT_STYLE_COLUMN,
+					     "weight", FM_TREE_MODEL_FONT_WEIGHT_COLUMN,
+					     NULL);
+
+	gtk_tree_view_append_column (view->details->tree_widget, column);
+
+	gtk_widget_show (GTK_WIDGET (view->details->tree_widget));
+
+	gtk_container_add (GTK_CONTAINER (view->details->scrolled_window),
+			   GTK_WIDGET (view->details->tree_widget));
+
+	g_signal_connect_object (gtk_tree_view_get_selection (GTK_TREE_VIEW (view->details->tree_widget)), "changed",
+				 G_CALLBACK (selection_changed_callback), view, 0);
+
+	g_signal_connect (G_OBJECT (view->details->tree_widget), 
+			  "row-activated", G_CALLBACK (row_activated_callback),
+			  view);
+
+	g_signal_connect (G_OBJECT (view->details->tree_widget), 
+			  "button_press_event", G_CALLBACK (button_pressed_callback),
+			  view);
+
+	schedule_show_selection (view);
+}
+
+static void
+update_filtering_from_preferences (FMTreeView *view)
+{
+	if (view->details->child_model == NULL) {
+		return;
+	}
+
+	fm_tree_model_set_show_hidden_files
+		(view->details->child_model,
+		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES));
+	fm_tree_model_set_show_backup_files
+		(view->details->child_model,
+		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES));
+	fm_tree_model_set_show_only_directories
+		(view->details->child_model,
+		 eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES));
+}
+
+static void
+tree_activate_callback (BonoboControl *control, gboolean activating, gpointer user_data)
+{
+	FMTreeView *view;
+
+	view = FM_TREE_VIEW (user_data);
+
+	if (activating && view->details->tree_widget == NULL) {
+		create_tree (view);
+		update_filtering_from_preferences (view);
+	}
+}
+
+static void
+filtering_changed_callback (gpointer callback_data)
+{
+	update_filtering_from_preferences (FM_TREE_VIEW (callback_data));
+}
+
+static void
+load_location_callback (FMTreeView *view, char *location)
+{
+	if (view->details->selection_location != NULL) {
+		g_free (view->details->selection_location);
+	}
+	view->details->selection_location = g_strdup (location);
+
+	schedule_show_selection (view);
+}
+
+static void
+fm_tree_view_instance_init (FMTreeView *view)
+{
+	BonoboControl *control;
+	
+	view->details = g_new0 (FMTreeViewDetails, 1);
+	
+	view->details->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+	
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->scrolled_window), 
+					GTK_POLICY_AUTOMATIC,
+					GTK_POLICY_AUTOMATIC);
+	
+	gtk_widget_show (view->details->scrolled_window);
+
+	control = bonobo_control_new (view->details->scrolled_window);
+	g_signal_connect_object (control, "activate",
+				 G_CALLBACK (tree_activate_callback), view, 0);
+
+	nautilus_view_construct_from_bonobo_control (NAUTILUS_VIEW (view), control);
+
+	view->details->selection_location = NULL;
+	g_signal_connect_object (view, "load_location",
+				 G_CALLBACK (load_location_callback), view, 0);
+	view->details->selecting = FALSE;
+
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
+				      filtering_changed_callback, view);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
+				      filtering_changed_callback, view);
+	eel_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
+				      filtering_changed_callback, view);
+
+	g_signal_connect_object (nautilus_icon_factory_get(), "icons_changed",
+				 G_CALLBACK (theme_changed_callback), view, 0);  
+
+	view->details->popup_file = NULL;
+	create_popup_menu (view);
+}
+
+static void
+fm_tree_view_dispose (GObject *object)
+{
+	FMTreeView *view;
+	
+	view = FM_TREE_VIEW (object);
+	
+	if (view->details->drag_dest) {
+		g_object_unref (view->details->drag_dest);
+		view->details->drag_dest = NULL;
+	}
+
+	if (view->details->show_selection_idle_id) {
+		g_source_remove (view->details->show_selection_idle_id);
+		view->details->show_selection_idle_id = 0;
+	}
+
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+fm_tree_view_finalize (GObject *object)
+{
+	FMTreeView *view;
+
+	view = FM_TREE_VIEW (object);
+
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
+					 filtering_changed_callback, view);
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
+					 filtering_changed_callback, view);
+	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
+					 filtering_changed_callback, view);
+
+	cancel_activation (view);
+
+	if (view->details->selection_location != NULL) {
+		g_free (view->details->selection_location);
+	}
+
+	g_free (view->details);
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+fm_tree_view_class_init (FMTreeViewClass *class)
+{
+	G_OBJECT_CLASS (class)->dispose = fm_tree_view_dispose;
+	G_OBJECT_CLASS (class)->finalize = fm_tree_view_finalize;
+	
+	copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE);
+}
diff --git a/components/tree/nautilus-tree-view.h b/src/file-manager/fm-tree-view.h
index aef643080..31ec9da54 100644
--- a/components/tree/nautilus-tree-view.h
+++ b/src/file-manager/fm-tree-view.h
@@ -23,31 +23,31 @@
  *          Anders Carlsson <andersca@gnu.org> 
  */
 
-/* nautilus-tree-view.h - tree view. */
+/* fm-tree-view.h - tree view. */
 
 
-#ifndef NAUTILUS_TREE_VIEW_H
-#define NAUTILUS_TREE_VIEW_H
+#ifndef FM_TREE_VIEW_H
+#define FM_TREE_VIEW_H
 
 #include <libnautilus/nautilus-view.h>
 
-#define NAUTILUS_TYPE_TREE_VIEW	           (nautilus_tree_view_get_type ())
-#define NAUTILUS_TREE_VIEW(obj)	           (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_TREE_VIEW, NautilusTreeView))
-#define NAUTILUS_TREE_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_TREE_VIEW, NautilusTreeViewClass))
-#define NAUTILUS_IS_TREE_VIEW(obj)	   (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_TREE_VIEW))
-#define NAUTILUS_IS_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_TREE_VIEW))
+#define FM_TYPE_TREE_VIEW	           (fm_tree_view_get_type ())
+#define FM_TREE_VIEW(obj)	           (GTK_CHECK_CAST ((obj), FM_TYPE_TREE_VIEW, FMTreeView))
+#define FM_TREE_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), FM_TYPE_TREE_VIEW, FMTreeViewClass))
+#define FM_IS_TREE_VIEW(obj)	   (GTK_CHECK_TYPE ((obj), FM_TYPE_TREE_VIEW))
+#define FM_IS_TREE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), FM_TYPE_TREE_VIEW))
 
-typedef struct NautilusTreeViewDetails NautilusTreeViewDetails;
+typedef struct FMTreeViewDetails FMTreeViewDetails;
 
 typedef struct {
 	NautilusView parent;
-	NautilusTreeViewDetails *details;
-} NautilusTreeView;
+	FMTreeViewDetails *details;
+} FMTreeView;
 
 typedef struct {
 	NautilusViewClass parent_class;
-} NautilusTreeViewClass;
+} FMTreeViewClass;
 
-GType nautilus_tree_view_get_type (void);
+GType fm_tree_view_get_type (void);
 
-#endif /* NAUTILUS_TREE_VIEW_H */
+#endif /* FM_TREE_VIEW_H */
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index 58f8c20ad..dbceac809 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -18,6 +18,9 @@
 	<cmd name="New Folder"
          _label="Create _Folder"
 	 _tip="Create a new empty folder inside this folder"/>
+	<cmd name="New Empty File"
+         _label="_Empty File"
+	 _tip="Create a new empty file inside this folder"/>
         <cmd name="New Launcher"
          _label="Create L_auncher"
          _tip="Create a new launcher"/>
@@ -92,6 +95,7 @@
 	<accel name="Delete" verb="Trash"/>
 	<accel name="*Shift*KP_Delete" verb="Delete"/>
         <accel name="*Alt*Down" verb="Open"/>
+        <accel name="*Alt**Shift*Down" verb="OpenCloseParent"/>
 </keybindings>
 <menu>
 	<submenu name="File">
@@ -100,6 +104,16 @@
 			<menuitem name="New Folder"
 			  	  accel="*Shift**Control*n"
 				  verb="New Folder"/>
+			<submenu name="New Documents"
+				 _label="Create _Document">
+			         <menuitem name="No Templates"
+                                       _label="No templates Installed"
+                                       sensitive="0"/>
+				 <placeholder name="New Documents Placeholder" delimit="none"/>
+				 <separator name="After New Documents"/>
+				 <menuitem name="New Empty File" 
+				 	   verb="New Empty File"/>
+			</submenu>
 			<menuitem name="New Launcher"
 				  pixtype="stock" pixname="gtk-new"
 				  verb="New Launcher"/>
@@ -210,6 +224,16 @@
 				 pixtype="stock" pixname="gtk-new"
 				 verb="New Launcher"/>
 			</placeholder>
+			<submenu name="New Documents"
+				 _label="Create _Document">
+			         <menuitem name="No Templates"
+                                       _label="No templates Installed"
+                                       sensitive="0"/>
+				 <placeholder name="New Documents Placeholder" delimit="none"/>
+				 <separator name="After New Documents"/>
+				 <menuitem name="New Empty File" 
+				 	   verb="New Empty File"/>
+			</submenu>
                         <submenu name="Scripts"
 				 _label="_Scripts"
 				 _tip="Run or manage scripts from ~/Nautilus/scripts"
diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c
index f570856a3..85e445e12 100644
--- a/src/file-manager/nautilus-indexing-info.c
+++ b/src/file-manager/nautilus-indexing-info.c
@@ -161,23 +161,18 @@ last_index_time_dialog_new (void)
         GtkWidget *label;
         GtkDialog *dialog;
 
-        dialog = eel_create_info_dialog (_("Once a day your files and text content are indexed so "
+        time_str = nautilus_indexing_info_get_last_index_time ();
+        label_str = g_strdup_printf (_("Your files were last indexed at %s."),
+                                     time_str);
+        g_free (time_str);
+	
+        dialog = eel_create_info_dialog (label_str,
+	                                 _("Once a day your files and text content are indexed so "
                                            "your searches are fast. "),
                                          _("Indexing Status"),
                                          NULL);
         set_close_hides_for_dialog (dialog);
 
-        time_str = nautilus_indexing_info_get_last_index_time ();
-        label_str = g_strdup_printf (_("Your files were last indexed at %s"),
-                                     time_str);
-        g_free (time_str);
-        
-        label = gtk_label_new (label_str);
-        gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-        eel_gtk_label_make_bold (GTK_LABEL (label));
-        gtk_box_pack_start (GTK_BOX (dialog->vbox), label,
-                            FALSE, FALSE, 0);
-
         return dialog;
 }
 
@@ -199,8 +194,9 @@ index_progress_dialog_new (void)
         ProgressChangeData *progress_data;
         guint timeout_id;
                 
-        dialog = eel_create_info_dialog (_("Once a day your files and text content are indexed so "
-                                           "your searches are fast.  Your files are currently being indexed."),
+        dialog = eel_create_info_dialog (_("Your files are currently being indexed."),
+                                         _("Once a day your files and text content are indexed so "
+                                           "your searches are fast."), 
                                          _("Indexing Status"), NULL);
         set_close_hides_for_dialog (dialog);        
         percentage_complete = get_index_percentage_complete ();
@@ -258,11 +254,12 @@ show_indexing_info_dialog (void)
 
         if (!medusa_system_services_are_enabled ()) {
                 details_string = nautilus_medusa_get_explanation_of_enabling ();
-                dialog_shown = eel_show_info_dialog_with_details (_("When Fast Search is enabled, Find creates an "
+                dialog_shown = eel_show_info_dialog_with_details (_("There is no index of your files right now."),
+                                                                    _("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."),
-                                                                  _("There is no index of your files right now."),
+								    _("No Index of Files"),
                                                                     details_string,
                                                                   NULL);
                 g_free (details_string);
@@ -300,6 +297,7 @@ static void
 show_search_service_not_available_dialog (void)
 {
         eel_show_error_dialog (_("Sorry, but the medusa search service is not available."),
+                                    _("Please verify medusa has been setup correctly."),
                                     _("Search Service Not Available"),
                                     NULL);
 }
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index bdae8db1c..a5df8da7e 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -34,6 +34,7 @@
 #include "file-manager/fm-icon-view.h"
 #include "file-manager/fm-list-view.h"
 #include "file-manager/fm-search-list-view.h"
+#include "file-manager/fm-tree-view.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -86,6 +87,7 @@
 #define FACTORY_IID	     "OAFIID:Nautilus_Factory"
 #define SEARCH_LIST_VIEW_IID "OAFIID:Nautilus_File_Manager_Search_List_View"
 #define SHELL_IID	     "OAFIID:Nautilus_Shell"
+#define TREE_VIEW_IID         "OAFIID:Nautilus_File_Manager_Tree_View"
 
 /* Keeps track of all the desktop windows. */
 static GList *nautilus_application_desktop_windows;
@@ -138,6 +140,8 @@ create_object (PortableServer_Servant servant,
 		object = BONOBO_OBJECT (nautilus_shell_new (application));
 	} else if (strcmp (iid, METAFILE_FACTORY_IID) == 0) {
 		object = BONOBO_OBJECT (nautilus_metafile_factory_get_instance ());
+	} else if (strcmp (iid, TREE_VIEW_IID) == 0) {
+		object = BONOBO_OBJECT (g_object_new (fm_tree_view_get_type (), NULL));
 	} else {
 		object = CORBA_OBJECT_NIL;
 	}
@@ -184,6 +188,7 @@ nautilus_application_instance_init (NautilusApplication *application)
 	nautilus_bonobo_register_activation_shortcut (NAUTILUS_DESKTOP_ICON_VIEW_IID, create_object_shortcut, application);
 	nautilus_bonobo_register_activation_shortcut (NAUTILUS_LIST_VIEW_IID, create_object_shortcut, application);
 	nautilus_bonobo_register_activation_shortcut (SEARCH_LIST_VIEW_IID, create_object_shortcut, application);
+	nautilus_bonobo_register_activation_shortcut (TREE_VIEW_IID, create_object_shortcut, application);
 }
 
 NautilusApplication *
@@ -211,6 +216,7 @@ nautilus_application_destroy (BonoboObject *object)
 	nautilus_bonobo_unregister_activation_shortcut (NAUTILUS_DESKTOP_ICON_VIEW_IID);
 	nautilus_bonobo_unregister_activation_shortcut (NAUTILUS_LIST_VIEW_IID);
 	nautilus_bonobo_unregister_activation_shortcut (SEARCH_LIST_VIEW_IID);
+	nautilus_bonobo_unregister_activation_shortcut (TREE_VIEW_IID);
 	
 	nautilus_bookmarks_exiting ();
 	
@@ -227,6 +233,7 @@ check_required_directories (NautilusApplication *application)
 	EelStringList *directories;
 	char *directories_as_string;
 	char *error_string;
+	char *detail_string;
 	char *dialog_title;
 	GtkDialog *dialog;
 	int failed_count;
@@ -251,30 +258,28 @@ check_required_directories (NautilusApplication *application)
 	failed_count = eel_string_list_get_length (directories);
 
 	if (failed_count != 0) {
-		directories_as_string = eel_string_list_as_string (directories, "\n", EEL_STRING_LIST_ALL_STRINGS);
+		directories_as_string = eel_string_list_as_string (directories, ", ", EEL_STRING_LIST_ALL_STRINGS);
 
 		if (failed_count == 1) {
-			dialog_title = g_strdup (_("Couldn't Create Required Folder"));
-			error_string = g_strdup_printf (_("Nautilus could not create the required folder \"%s\". "
-							  "Before running Nautilus, please create this folder, or "
-							  "set permissions such that Nautilus can create it."),
+			dialog_title = _("Couldn't Create Required Folder");
+			error_string = g_strdup_printf (_("Nautilus could not create the required folder \"%s\"."),
 							directories_as_string);
+			detail_string = _("Before running Nautilus, please create the following folder, or "
+					  "set permissions such that Nautilus can create it.");
 		} else {
-			dialog_title = g_strdup (_("Couldn't Create Required Folders"));
-			error_string = g_strdup_printf (_("Nautilus could not create the following required folders:\n\n"
-							  "%s\n\n"
-							  "Before running Nautilus, please create these folders, or "
-							  "set permissions such that Nautilus can create them."),
-							directories_as_string);
+			dialog_title = _("Couldn't Create Required Folders");
+			error_string = g_strdup_printf (_("Nautilus could not create the following required folders: "
+							  "%s."), directories_as_string);
+  			detail_string = _("Before running Nautilus, please create these folders, or "
+					  "set permissions such that Nautilus can create them.");
 		}
 		
-		dialog = eel_show_error_dialog (error_string, dialog_title, NULL);
+		dialog = eel_show_error_dialog (error_string, detail_string, dialog_title, NULL);
 		/* We need the main event loop so the user has a chance to see the dialog. */
 		nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 
 		g_free (directories_as_string);
 		g_free (error_string);
-		g_free (dialog_title);
 	}
 
 	eel_string_list_free (directories);
@@ -349,10 +354,10 @@ migrate_old_nautilus_files (void)
 			close (fd);
 		}
 		
-		eel_show_info_dialog (_("The location of the desktop directory has changed in GNOME 2.4. "
-					"A link called \"Link To Old Desktop\" has been created on the desktop. "
-					"You can open this to move over the files you want, then delete the link."),
-				      _("Migrated old desktop"),
+		eel_show_info_dialog (_("A link called \"Link To Old Desktop\" has been created on the desktop."),
+				      _("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."),
+				      _("Migrated Old Desktop"),
 				      NULL);
 	}
 	g_free (old_desktop_dir);
@@ -597,7 +602,7 @@ nautilus_application_startup (NautilusApplication *application,
 		}
 
 		if (message != NULL) {
-			dialog = eel_show_error_dialog_with_details (message, NULL, detailed_message, NULL);
+			dialog = eel_show_error_dialog_with_details (message, NULL, NULL, detailed_message, NULL);
 			/* We need the main event loop so the user has a chance to see the dialog. */
 			nautilus_main_event_loop_register (GTK_OBJECT (dialog));
 			goto out;
@@ -886,20 +891,20 @@ find_parent_spatial_window (NautilusSpatialWindow *window)
 }
 
 void
-nautilus_application_close_with_parent_windows (NautilusSpatialWindow *window)
+nautilus_application_close_parent_windows (NautilusSpatialWindow *window)
 {
 	NautilusSpatialWindow *parent_window;
+	NautilusSpatialWindow *new_parent_window;
 
 	g_return_if_fail (NAUTILUS_IS_SPATIAL_WINDOW (window));
 
 	parent_window = find_parent_spatial_window (window);
-	nautilus_window_close (NAUTILUS_WINDOW (window));
-	window = parent_window;
 	
 	while (parent_window) {
-		parent_window = find_parent_spatial_window (window);
-		nautilus_window_close (NAUTILUS_WINDOW (window));
-		window = parent_window;
+		
+		new_parent_window = find_parent_spatial_window (parent_window);
+		nautilus_window_close (NAUTILUS_WINDOW (parent_window));
+		parent_window = new_parent_window;
 	}
 }
 
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 6b43d2d0e..84e16333e 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -78,7 +78,7 @@ NautilusWindow *     nautilus_application_present_spatial_window     (NautilusAp
 NautilusWindow *     nautilus_application_create_navigation_window     (NautilusApplication *application,
 									GdkScreen           *screen);
 void                 nautilus_application_close_all_navigation_windows (void);
-void                 nautilus_application_close_with_parent_windows (NautilusSpatialWindow *window);
+void                 nautilus_application_close_parent_windows     (NautilusSpatialWindow *window);
 void                 nautilus_application_open_desktop      (NautilusApplication *application);
 void                 nautilus_application_close_desktop     (void);
 
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index 763fdce28..4a8d611fa 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -46,8 +46,7 @@ EEL_CLASS_BOILERPLATE (NautilusConnectServerDialog,
 		       nautilus_connect_server_dialog,
 		       GTK_TYPE_DIALOG)
 enum {
-	RESPONSE_CONNECT,
-	RESPONSE_CANCEL
+	RESPONSE_CONNECT
 };	
 
 static void
@@ -84,7 +83,9 @@ connect_to_server (NautilusConnectServerDialog *dialog)
 
 	name = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->name_entry), 0, -1);
 	if (strlen (name) == 0) {
-                eel_show_error_dialog (_("You must enter a name for the server"), _("Can't connect to server"), GTK_WINDOW (dialog));
+                eel_show_error_dialog (_("You must enter a name for the server."), 
+		                       _("Please enter a name and try again."), 
+		                       _("Can't Connect to Server"), GTK_WINDOW (dialog));
 		g_free (name);
 		return;
 	}
@@ -97,9 +98,10 @@ connect_to_server (NautilusConnectServerDialog *dialog)
 	
 	if (vfs_uri == NULL) {
 		error_message = g_strdup_printf
-			(_("\"%s\" is not a valid location. Please check the spelling and try again."),
+			(_("\"%s\" is not a valid location."),
                          uri);
-                eel_show_error_dialog (error_message, _("Can't connect to server"), GTK_WINDOW (dialog));
+                eel_show_error_dialog (error_message, _("Please check the spelling and try again."), 
+		                       _("Can't Connect to Server"), GTK_WINDOW (dialog));
 		g_free (error_message);
 	} else {
 		gnome_vfs_uri_unref (vfs_uri);
@@ -132,7 +134,7 @@ response_callback (NautilusConnectServerDialog *dialog,
 		break;
 	case GTK_RESPONSE_NONE:
 	case GTK_RESPONSE_DELETE_EVENT:
-	case RESPONSE_CANCEL:
+	case GTK_RESPONSE_CANCEL:
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		break;
 	default :
@@ -174,15 +176,19 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Connect to Server"));
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
 
 	table = gtk_table_new (2, 2, FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER (table), 5);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    table, TRUE, TRUE, 12);
+			    table, TRUE, TRUE, 0);
 	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (table), 12);
 	gtk_widget_show (table);
 	
 	label = gtk_label_new_with_mnemonic (_("_Name:"));
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
 	gtk_table_attach (GTK_TABLE (table), label,
 			  0, 1,
@@ -201,6 +207,7 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
 
 	
 	label = gtk_label_new_with_mnemonic (_("_Location:"));
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
 	gtk_table_attach (GTK_TABLE (table), label,
 			  0, 1,
@@ -223,9 +230,9 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
 
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       GTK_STOCK_CANCEL,
-			       RESPONSE_CANCEL);
+			       GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
-			       _("Connect"),
+			       _("C_onnect"),
 			       RESPONSE_CONNECT);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 					 RESPONSE_CONNECT);
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index b599150c8..4826bcf41 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -503,8 +503,8 @@ receive_dropped_uri_list (NautilusInformationPanel *information_panel,
 		
 		if (!exactly_one) {
 			eel_show_error_dialog (
-				_("You can't assign more than one custom icon at a time! "
-				  "Please drag just one image to set a custom icon."), 
+				_("You can't assign more than one custom icon at a time."),
+				_("Please drag just one image to set a custom icon."), 
 				_("More Than One Image"),
 				window);
 			break;
@@ -524,15 +524,15 @@ receive_dropped_uri_list (NautilusInformationPanel *information_panel,
 		} else {	
 			if (eel_is_remote_uri (uris[0])) {
 				eel_show_error_dialog (
-					_("The file that you dropped is not local.  "
-					  "You can only use local images as custom icons."), 
+					_("The file that you dropped is not local."),
+					_("You can only use local images as custom icons."), 
 					_("Local Images Only"),
 					window);
 			
 			} else {
 				eel_show_error_dialog (
-					_("The file that you dropped is not an image.  "
-					  "You can only use local images as custom icons."),
+					_("The file that you dropped is not an image."),
+					_("You can only use images as custom icons."),
 					_("Images Only"),
 					window);
 			}
@@ -982,7 +982,6 @@ burn_cd_callback (GtkWidget *button, gpointer data)
 {
 	GError *error;
 	char *argv[] = { "nautilus-cd-burner", NULL};
-	char *text;
 
 	error = NULL;
 	if (!g_spawn_async (NULL,
@@ -991,11 +990,9 @@ burn_cd_callback (GtkWidget *button, gpointer data)
 			    NULL, NULL,
 			    NULL,
 			    &error)) {
-		text = g_strdup_printf (_("Unable to launch the cd burner application:\n%s"), error->message);
-		eel_show_error_dialog (text,
-				       _("Can't launch cd burner"),
+		eel_show_error_dialog (_("Unable to launch the cd burner application."), error->message,
+				       _("Can't Launch CD Burner"),
 				       GTK_WINDOW (gtk_widget_get_toplevel (button)));
-		g_free (text);
 		g_error_free (error);
 	}
 }
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index fd4092dfd..12fe82b23 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -39,7 +39,6 @@
 #include <eel/eel-accessibility.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-input-event-box.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
@@ -130,6 +129,7 @@ drag_data_received_callback (GtkWidget *widget,
 	GdkScreen      *screen;
 	gboolean new_windows_for_extras;
 	char *prompt;
+	char *detail;
 
 	g_assert (NAUTILUS_IS_LOCATION_BAR (widget));
 	g_assert (data != NULL);
@@ -151,20 +151,24 @@ drag_data_received_callback (GtkWidget *widget,
 	 */
 	name_count = g_list_length (names);
 	if (name_count > 1) {
-		prompt = g_strdup_printf (_("Do you want to view these %d locations "
-					  "in separate windows?"), 
-					  name_count);
+		prompt = g_strdup_printf (_("Do you want to view %d locations?"), 
+					          name_count);	  
+		detail = g_strdup_printf (_("This will open %d separate windows."),
+		                                    name_count);			  
 		/* eel_run_simple_dialog should really take in pairs
 		 * like gtk_dialog_new_with_buttons() does. */
 		new_windows_for_extras = eel_run_simple_dialog 
 			(GTK_WIDGET (window),
 			 TRUE,
+			 GTK_MESSAGE_QUESTION,
 			 prompt,
+			 detail,
 			 _("View in Multiple Windows?"),
-			 GTK_STOCK_OK, GTK_STOCK_CANCEL,
-			 NULL) == 0 /* GNOME_OK */;
+			 GTK_STOCK_CANCEL, GTK_STOCK_OK,
+			 NULL) != 0 /* GNOME_OK */;
 
 		g_free (prompt);
+		g_free (detail);
 		
 		if (!new_windows_for_extras) {
 			gtk_drag_finish (context, FALSE, FALSE, time);
@@ -365,7 +369,9 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 
 	hbox = gtk_hbox_new (0, FALSE);
 
-	event_box = eel_input_event_box_new ();
+	event_box = gtk_event_box_new ();
+	gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
+	
 	gtk_container_set_border_width (GTK_CONTAINER (event_box),
 					GNOME_PAD_SMALL);
 	label = gtk_label_new (LOCATION_LABEL);
diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c
index ebbe30f6f..c88755781 100644
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@@ -43,8 +43,7 @@ EEL_CLASS_BOILERPLATE (NautilusLocationDialog,
 		       nautilus_location_dialog,
 		       GTK_TYPE_DIALOG)
 enum {
-	RESPONSE_OPEN,
-	RESPONSE_CANCEL
+	RESPONSE_OPEN
 };	
 
 static void
@@ -96,7 +95,7 @@ response_callback (NautilusLocationDialog *dialog,
 		break;
 	case GTK_RESPONSE_NONE :
 	case GTK_RESPONSE_DELETE_EVENT :
-	case RESPONSE_CANCEL :
+	case GTK_RESPONSE_CANCEL :
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		break;
 	default :
@@ -138,13 +137,16 @@ nautilus_location_dialog_init (NautilusLocationDialog *dialog)
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Open Location"));
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, -1);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
 	
-	box = gtk_hbox_new (FALSE, 6);
+	box = gtk_hbox_new (FALSE, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (box), 5);
 	gtk_widget_show (box);
 
-	label = gtk_label_new (_("Location:"));
+	label = gtk_label_new_with_mnemonic (_("_Location:"));
 	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
 	
 	dialog->details->entry = nautilus_location_entry_new ();
 	g_signal_connect (dialog->details->entry,
@@ -155,14 +157,14 @@ nautilus_location_dialog_init (NautilusLocationDialog *dialog)
 	gtk_widget_show (dialog->details->entry);
 	
 	gtk_box_pack_start (GTK_BOX (box), dialog->details->entry, 
-			    TRUE, TRUE, 6);
+			    TRUE, TRUE, 0);
 	
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    box, TRUE, TRUE, 12);
+			    box, TRUE, TRUE, 0);
 
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       GTK_STOCK_CANCEL,
-			       RESPONSE_CANCEL);
+			       GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       GTK_STOCK_OPEN,
 			       RESPONSE_OPEN);
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 623f2fa99..f7e4a4463 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -39,7 +39,6 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-input-event-box.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtksignal.h>
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 69c2d4a79..374a03a02 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -130,22 +130,23 @@ nautilus_main_event_loop_quit (void)
 static void
 register_icons (void)
 {
-	GnomeIconTheme *icon_theme;
-	char *icon;
+	GtkIconTheme *icon_theme;
+	GtkIconInfo *info;
+	const char *icon;
 	GtkIconSource *source;
 	GtkIconSet *set;
 	GtkIconFactory *factory;
 
 	icon_theme = nautilus_icon_factory_get_icon_theme ();
-	icon = gnome_icon_theme_lookup_icon (icon_theme, "gnome-fs-client", 48,
-					     NULL, NULL);
-	if (icon != NULL) {
+	info = gtk_icon_theme_lookup_icon (icon_theme, "gnome-fs-client", 48,
+					   0);
+	if (info != NULL) {
+		icon = gtk_icon_info_get_filename (info);
 		factory = gtk_icon_factory_new ();
 		gtk_icon_factory_add_default (factory);
 		
 		source = gtk_icon_source_new ();
 		gtk_icon_source_set_filename (source, icon);
-		g_free (icon);
 		
 		set = gtk_icon_set_new ();
 		gtk_icon_set_add_source (set, source);
@@ -155,12 +156,12 @@ register_icons (void)
 		
 		gtk_icon_source_free (source);
 
+		gtk_icon_info_free (info);
 		g_object_unref (factory);
 	}
 	
 	g_object_unref (icon_theme);
 	
-	
 }
 
 int
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 8307da47e..65709d395 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -43,7 +43,7 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_navigation_bar_class_init (NautilusNavigationBarClass *class);
 static void nautilus_navigation_bar_init       (NautilusNavigationBar      *bar);
 
-EEL_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN)
+EEL_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, GTK_TYPE_HBOX)
 
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
diff --git a/src/nautilus-navigation-bar.h b/src/nautilus-navigation-bar.h
index 97e3ccdfa..a5bcd8fc5 100644
--- a/src/nautilus-navigation-bar.h
+++ b/src/nautilus-navigation-bar.h
@@ -29,7 +29,7 @@
 #ifndef NAUTILUS_NAVIGATION_BAR_H
 #define NAUTILUS_NAVIGATION_BAR_H
 
-#include <eel/eel-generous-bin.h>
+#include <gtk/gtkhbox.h>
 
 #define NAUTILUS_TYPE_NAVIGATION_BAR (nautilus_navigation_bar_get_type ())
 #define NAUTILUS_NAVIGATION_BAR(obj) \
@@ -40,11 +40,11 @@
 	GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_NAVIGATION_BAR)
 
 typedef struct {
-	EelGenerousBin parent;
+	GtkHBox parent;
 } NautilusNavigationBar;
 
 typedef struct {
-	EelGenerousBinClass parent_class;
+	GtkHBoxClass parent_class;
 
 	/* signals */
 	void         (* location_changed) (NautilusNavigationBar *bar,
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 4d8055887..2c32d0cb5 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -174,6 +174,7 @@ forget_history_if_confirmed (NautilusWindow *window)
 {
 	GtkDialog *dialog;
 	char *prompt;
+	char *detail;
 
 	/* Confirm before forgetting history because it's a rare operation that
 	 * is hard to recover from. We don't want people doing it accidentally
@@ -183,22 +184,23 @@ forget_history_if_confirmed (NautilusWindow *window)
 		/* This is a little joke, shows up occasionally. I only
 		 * implemented this feature so I could use this joke. 
 		 */
-		prompt = g_strdup (_("Are you sure you want to forget history? "
-				     "If you do, you will be doomed to repeat it."));
+		prompt = _("Are you sure you want to forget history?");
+		detail = _("If you do, you will be doomed to repeat it.");
 	} else {
-		prompt = g_strdup (_("Are you sure you want to clear the list "
-				     "of locations you have visited?"));
+		prompt = _("Are you sure you want to clear the list "
+			   "of locations you have visited?");
+		detail = _("If you clear the list of locations,"
+			   " they will be permanently deleted."); 
 	}
 					   
 	dialog = eel_create_question_dialog (prompt,
+					     detail,
 					     _("Clear History"), 
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_STOCK_CLEAR, RESPONSE_FORGET,
 					     GTK_WINDOW (window));
 
 	gtk_widget_show (GTK_WIDGET (dialog));
-
-	g_free (prompt);					 
 	
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (forget_history_if_yes), NULL);
@@ -417,14 +419,16 @@ show_bogus_bookmark_window (NautilusWindow *window,
 	char *uri;
 	char *uri_for_display;
 	char *prompt;
+	char *detail;
 
 	uri = nautilus_bookmark_get_uri (bookmark);
 	uri_for_display = eel_format_uri_for_display (uri);
 	
-	prompt = g_strdup_printf (_("The location \"%s\" does not exist. Do you "
-				    "want to remove any bookmarks with this "
-				    "location from your list?"), uri_for_display);
-	dialog = eel_show_yes_no_dialog (prompt,
+	prompt = _("Do you want to remove any bookmarks with the "
+		   "non-existing location from your list?");
+	detail = g_strdup_printf (_("The location \"%s\" does not exist."), uri_for_display);
+	
+	dialog = eel_show_yes_no_dialog (prompt, detail,
 					 _("Bookmark for Nonexistent Location"),
 					 _("Remove"), GTK_STOCK_CANCEL,
 					 GTK_WINDOW (window));
@@ -439,7 +443,7 @@ show_bogus_bookmark_window (NautilusWindow *window,
 
 	g_free (uri);
 	g_free (uri_for_display);
-	g_free (prompt);
+	g_free (detail);
 }
 
 static void
diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml
index 9fe89ebd2..2fba4df0c 100644
--- a/src/nautilus-navigation-window-ui.xml
+++ b/src/nautilus-navigation-window-ui.xml
@@ -81,6 +81,10 @@
 			  _label="_Computer" 
 			  pixtype="stock" pixname="gnome-fs-client"
 			  verb="Go to Computer"/>
+		<menuitem name="Go to Templates"
+			  _label="_Templates"
+			  _tip="Go to templates folder"
+			  verb="Go to Templates"/>
 		<menuitem name="Go to Trash"
 			  _label="_Trash"
 			  _tip="Go to the trash folder"
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 12cbbe3bb..d89f1ca72 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -46,7 +46,6 @@
 #include <eel/eel-debug.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
@@ -961,6 +960,11 @@ real_set_content_view_widget (NautilusWindow *nautilus_window,
 			 set_content_view_widget, 
 			 (nautilus_window, new_view));
 
+
+	if (new_view == NULL) {
+		return;	       
+	}
+
 	connect_view (window, new_view);
 
 	nautilus_horizontal_splitter_pack2 (
@@ -1103,22 +1107,22 @@ static void
 report_side_panel_failure_to_user (NautilusWindow *window, NautilusViewFrame *view_frame)
 {
 	char *message;
+	char *detail;
 	char *label;
 
 	label = nautilus_window_get_view_frame_label (view_frame);
 
         if (label == NULL) {
                 message = g_strdup
-                        (_("One of the side panels encountered an error and can't continue. "
-                           "Unfortunately I couldn't tell which one."));
+                        (_("One of the side panels encountered an error and can't continue."));
+		detail = _("Unfortunately I couldn't tell which one.");
         } else {
                 message = g_strdup_printf
-                        (_("The %s side panel encountered an error and can't continue. "
-                           "If this keeps happening, you might want to turn this panel off."),
-                         label);
+                        (_("The %s side panel encountered an error and can't continue."), label);
+                detail = _("If this keeps happening, you might want to turn this panel off.");
         }
 
-	eel_show_error_dialog (message, _("Side Panel Failed"), GTK_WINDOW (window));
+	eel_show_error_dialog (message, detail, _("Side Panel Failed"), GTK_WINDOW (window));
 
 	g_free (label);
 	g_free (message);
@@ -1466,6 +1470,19 @@ nautilus_navigation_window_show (GtkWidget *widget)
 	GTK_WIDGET_CLASS (parent_class)->show (widget);
 }
 
+static void 
+real_get_default_size(NautilusWindow *window, guint *default_width, guint *default_height)
+{
+	
+    if(default_width) {
+	   *default_width = NAUTILUS_NAVIGATION_WINDOW_DEFAULT_WIDTH;
+	}
+	
+	if(default_height) {
+       *default_height = NAUTILUS_NAVIGATION_WINDOW_DEFAULT_HEIGHT;	
+	}
+}
+
 static void
 nautilus_navigation_window_class_init (NautilusNavigationWindowClass *class)
 {
@@ -1482,4 +1499,5 @@ nautilus_navigation_window_class_init (NautilusNavigationWindowClass *class)
 	NAUTILUS_WINDOW_CLASS (class)->set_throbber_active = real_set_throbber_active;
 	NAUTILUS_WINDOW_CLASS (class)->prompt_for_location = real_prompt_for_location;
 	NAUTILUS_WINDOW_CLASS (class)->set_title = real_set_title;
+	NAUTILUS_WINDOW_CLASS(class)->get_default_size = real_get_default_size;
 }
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 7bbb8720a..81cf4fcb0 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -678,7 +678,8 @@ ensure_uri_is_image (const char *uri)
 		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
 		 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
         is_image = eel_istr_has_prefix (file_info->mime_type, "image/")
-		&& eel_strcasecmp (file_info->mime_type, "image/svg") != 0;
+		&& eel_strcasecmp (file_info->mime_type, "image/svg") != 0
+		&& eel_strcasecmp (file_info->mime_type, "image/svg+xml") != 0;
 	gnome_vfs_file_info_unref (file_info);
 	return is_image;
 }
@@ -911,7 +912,8 @@ remove_pattern(NautilusPropertyBrowser *property_browser, const char* pattern_na
 	/* delete the pattern from the pattern directory */
 	if (gnome_vfs_unlink (pattern_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but pattern %s couldn't be deleted."), pattern_name);
-		eel_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
+		char *detail = _("Check that you have permission to delete the pattern.");
+		eel_show_error_dialog (message, detail, _("Couldn't Delete Pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	
@@ -940,7 +942,8 @@ remove_emblem (NautilusPropertyBrowser *property_browser, const char* emblem_nam
 	/* delete the emblem from the emblem directory */
 	if (gnome_vfs_unlink (emblem_uri) != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but emblem %s couldn't be deleted."), emblem_name);
-		eel_show_error_dialog (message, _("Couldn't delete pattern"), GTK_WINDOW (property_browser));
+		char *detail = _("Check that you have permission to delete the emblem.");
+		eel_show_error_dialog (message, detail, _("Couldn't Delete Emblem"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 	else {
@@ -1097,12 +1100,15 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 	/* make sure that it's a valid path */
 	if (path_name == NULL || path_name[0] != '/') {
 		char *message;
+		char *detail;
 		if (path_name != NULL) {
 			message = g_strdup_printf (_("Sorry, but \"%s\" is not a valid file name."), path_name);
+			detail = _("Please check the spelling and try again.");
 		} else {
 			message = g_strdup (_("Sorry, but you did not supply a valid file name."));
+			detail = _("Please try again.");
 		}
-		eel_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, detail, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 		return;
 	}
@@ -1113,7 +1119,9 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 	/* don't allow the user to change the reset image */
 	basename = eel_uri_get_basename (path_uri);
 	if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
-		eel_show_error_dialog (_("Sorry, but you can't replace the reset image."), _("Not an Image"), NULL);
+		eel_show_error_dialog (_("Sorry, but you can't replace the reset image."), 
+		                       _("Reset is a special image that cannot be deleted."), 
+		                       _("Not an Image"), NULL);
 		g_free (path_uri);
 		g_free (basename);
 		return;
@@ -1145,7 +1153,7 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
 	result = eel_copy_uri_simple (path_name, destination_name);		
 	if (result != GNOME_VFS_OK) {
 		char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
-		eel_show_error_dialog (message, _("Couldn't install pattern"), GTK_WINDOW (property_browser));
+		eel_show_error_dialog (message, NULL, _("Couldn't Install Pattern"), GTK_WINDOW (property_browser));
 		g_free (message);
 	}
 		
@@ -1225,8 +1233,9 @@ add_color_to_browser (GtkWidget *widget, gint which_button, gpointer *data)
 		color_name = gtk_entry_get_text (GTK_ENTRY (property_browser->details->color_name));
 		stripped_color_name = g_strstrip (g_strdup (color_name));
 		if (strlen (stripped_color_name) == 0) {
-			eel_show_error_dialog (_("Sorry, but you must specify a non-blank name for the new color."), 
-						    _("Couldn't install color"), GTK_WINDOW (property_browser));
+			eel_show_error_dialog (_("The color cannot be installed."),
+					       _("Sorry, but you must specify a non-blank name for the new color."), 
+			                       _("Couldn't Install Color"), GTK_WINDOW (property_browser));
 		
 		} else {
 			add_color_to_file (property_browser, color_spec, stripped_color_name);
@@ -1315,8 +1324,8 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 					property_browser->details->image_path = emblem_path;				
 				} else {
 					char *message = g_strdup_printf
-						(_("Sorry, but '%s' is not a usable image file!"), emblem_path);
-					eel_show_error_dialog (message, _("Not an Image"), GTK_WINDOW (property_browser));
+						(_("Sorry, but \"%s\" is not a usable image file."), emblem_path);
+					eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
 					g_free (message);
 					g_free (emblem_path);
 					return;
@@ -1331,8 +1340,9 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, NautilusPropertyBrow
 
 		if (pixbuf == NULL) {
 			char *message = g_strdup_printf
-				(_("Sorry, but '%s' is not a usable image file!"), property_browser->details->image_path);
-			eel_show_error_dialog (message, _("Not an Image"), GTK_WINDOW (property_browser));
+				(_("Sorry, but \"%s\" is not a usable image file."), property_browser->details->image_path);
+			eel_show_error_dialog (_("The file is not an image."), message, _("Not an Image"), GTK_WINDOW (property_browser));
+			g_free (message);
 		}
 		
 		new_keyword = gtk_entry_get_text(GTK_ENTRY(property_browser->details->keyword));		
diff --git a/src/nautilus-server-connect.c b/src/nautilus-server-connect.c
index 858893c3e..7aba928ab 100644
--- a/src/nautilus-server-connect.c
+++ b/src/nautilus-server-connect.c
@@ -302,11 +302,10 @@ can_connect (const char *uri)
 static void
 update_icon (GtkEntry *entry, gpointer user_data)
 {
-	GnomeIconTheme *theme;
+	GtkIconTheme *theme;
 	GtkWidget *button;
-	char *uri_utf8, *uri, *filename;
-	const GnomeIconData *icon_data;
-	int base_size;
+	char *uri_utf8, *uri;
+	GdkPixbuf *pixbuf;
 
 	uri_utf8 = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
 	if (uri_utf8 == NULL)
@@ -316,9 +315,8 @@ update_icon (GtkEntry *entry, gpointer user_data)
 	g_free (uri_utf8);
 
 	button = glade_xml_get_widget (xml, "button3");
-
-	if (uri == NULL || strcmp (uri, "") == 0)
-	{
+	
+	if (uri == NULL || strcmp (uri, "") == 0) {
 		gtk_widget_set_sensitive (button, FALSE);
 		naut_icon = "gnome-fs-share";
 	} else {
@@ -337,14 +335,16 @@ update_icon (GtkEntry *entry, gpointer user_data)
 		}
 	}
 
-	theme = gnome_icon_theme_new ();
-	filename = gnome_icon_theme_lookup_icon (theme, naut_icon,
-			ICON_SIZE_STANDARD,
-			&icon_data,
-			&base_size);
+	theme = gtk_icon_theme_get_default ();
+	pixbuf = gtk_icon_theme_load_icon (theme, naut_icon,
+					   ICON_SIZE_STANDARD,
+					   0, NULL);
 
-	gtk_image_set_from_file (GTK_IMAGE (image), filename);
-	g_free (filename);
+	if (pixbuf != NULL) {
+		gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+		g_object_unref (pixbuf);
+	}
+	
 	g_free (uri);
 }
 
diff --git a/src/nautilus-spatial-window-ui.xml b/src/nautilus-spatial-window-ui.xml
index aeb8fad4b..686ebd269 100644
--- a/src/nautilus-spatial-window-ui.xml
+++ b/src/nautilus-spatial-window-ui.xml
@@ -5,6 +5,9 @@
 <commands>
 </commands>
 
+<keybindings>
+        <accel name="*Alt**Shift*Up" verb="UpCloseCurrent"/>
+</keybindings>
 <menu>
 	<submenu name="File">
 		<placeholder name="Location Placeholder">
@@ -23,10 +26,10 @@
 		</placeholder>
 		<placeholder name="Close Items Placeholder">
 			<menuitem name="Close With Parents"
-			  _label="Close _All Parents"
-			  _tip="Close all Navigation windows"
+			  _label="Close P_arent Folders"
+			  _tip="Close this folder's parents"
 			  accel="*Control**Shift*w"
-			  verb="Close With Parents"/>
+			  verb="Close Parent Folders"/>
 		</placeholder>
 	</submenu>
 
@@ -41,6 +44,10 @@
 			  _tip="Go to Computer"
 	                  pixtype="stock" pixname="gnome-fs-client"
 			  verb="Go to Computer"/>
+		<menuitem name="Go to Templates"
+			  _label="_Templates"
+			  _tip="Go to templates folder"
+			  verb="Go to Templates"/>
 		<menuitem name="Go to Trash"
 			  _label="_Trash"
 			  _tip="Go to the trash folder"
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index cf608a71b..a3d84d94d 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -46,7 +46,6 @@
 #include <eel/eel-debug.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
@@ -121,7 +120,7 @@ nautilus_spatial_window_configure_event (GtkWidget *widget,
 	GTK_WIDGET_CLASS (parent_class)->configure_event (widget, event);
 	
 	/* Only save the geometry if the user hasn't resized the window
-	 * for half a second. Otherwise delay the callback another half second.
+	 * for a second. Otherwise delay the callback another second.
 	 */
 	if (window->details->save_geometry_timeout_id != 0) {
 		g_source_remove (window->details->save_geometry_timeout_id);
@@ -149,7 +148,7 @@ nautilus_spatial_window_configure_event (GtkWidget *widget,
 		window->details->last_geometry = geometry_string;
 
 		window->details->save_geometry_timeout_id = 
-			g_timeout_add (500, save_window_geometry_timeout, window);
+			g_timeout_add (1000, save_window_geometry_timeout, window);
 	}
 	
 	return FALSE;
@@ -239,14 +238,23 @@ nautilus_spatial_window_show (GtkWidget *widget)
 }
 
 static void
-file_menu_close_with_parent_windows_callback (BonoboUIComponent *component, 
-					      gpointer user_data, 
-					      const char *verb)
+file_menu_close_parent_windows_callback (BonoboUIComponent *component, 
+					 gpointer user_data, 
+					 const char *verb)
 {
-	nautilus_application_close_with_parent_windows (NAUTILUS_SPATIAL_WINDOW (user_data));
+	nautilus_application_close_parent_windows (NAUTILUS_SPATIAL_WINDOW (user_data));
 }
 
 static void
+go_up_close_current_window_callback (BonoboUIComponent *component, 
+				     gpointer user_data, 
+				     const char *verb)
+{
+	nautilus_window_go_up (NAUTILUS_WINDOW (user_data), TRUE);
+}
+
+
+static void
 real_prompt_for_location (NautilusWindow *window)
 {
 	GtkWidget *dialog;
@@ -275,7 +283,8 @@ real_merge_menus (NautilusWindow *nautilus_window)
 {
 	NautilusSpatialWindow *window;
 	BonoboUIVerb verbs [] = {
-		BONOBO_UI_VERB ("Close With Parents", file_menu_close_with_parent_windows_callback),
+		BONOBO_UI_VERB ("Close Parent Folders", file_menu_close_parent_windows_callback),
+		BONOBO_UI_VERB ("UpCloseCurrent", go_up_close_current_window_callback),
 		BONOBO_UI_VERB_END
 	};
 	
@@ -304,12 +313,22 @@ real_set_content_view_widget (NautilusWindow *window,
 			   GTK_WIDGET (new_view));
 }
 
-static gboolean
-real_delete_event (GtkWidget *window, GdkEventAny *event)
+static void
+real_window_close (NautilusWindow *window)
 {
+	nautilus_spatial_window_save_geometry (NAUTILUS_SPATIAL_WINDOW (window));
 	nautilus_spatial_window_save_scroll_position (NAUTILUS_SPATIAL_WINDOW (window));
+}
 
-	return FALSE;
+static void 
+real_get_default_size(NautilusWindow *window, guint *default_width, guint *default_height)
+{
+   if(default_width) {
+      *default_width = NAUTILUS_SPATIAL_WINDOW_DEFAULT_WIDTH;
+   }
+   if(default_height) {
+      *default_height = NAUTILUS_SPATIAL_WINDOW_DEFAULT_HEIGHT;	
+   }
 }
 
 static void
@@ -319,7 +338,7 @@ nautilus_spatial_window_instance_init (NautilusSpatialWindow *window)
 	window->affect_spatial_window_on_next_location_change = TRUE;
 
 	window->details->content_box = 
-		gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL);
+		gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (window->details->content_box);
 	bonobo_window_set_contents (BONOBO_WINDOW (window), 
 				    window->details->content_box);
@@ -344,6 +363,7 @@ nautilus_spatial_window_class_init (NautilusSpatialWindowClass *class)
 		real_merge_menus;
 	NAUTILUS_WINDOW_CLASS (class)->set_content_view_widget = 
 		real_set_content_view_widget;
-	GTK_WIDGET_CLASS (class)->delete_event =
-		real_delete_event;
+	NAUTILUS_WINDOW_CLASS (class)->close = 
+		real_window_close;
+	NAUTILUS_WINDOW_CLASS(class)->get_default_size = real_get_default_size;
 }
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index a7bb916f6..336350b40 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -130,7 +130,7 @@ static guint signals[LAST_SIGNAL];
 
 EEL_CLASS_BOILERPLATE (NautilusViewFrame,
 		       nautilus_view_frame,
-		       EEL_TYPE_GENEROUS_BIN)
+		       GTK_TYPE_HBOX)
 
 void
 nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant,
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 12906dd31..39b6340aa 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -35,7 +35,7 @@
 
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-zoomable-frame.h>
-#include <eel/eel-generous-bin.h>
+#include <gtk/gtkhbox.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
 #include <libnautilus/nautilus-view-component.h>
 
@@ -48,12 +48,12 @@
 typedef struct NautilusViewFrameDetails NautilusViewFrameDetails;
 
 typedef struct {
-        EelGenerousBin parent;
+        GtkHBox parent;
         NautilusViewFrameDetails *details;
 } NautilusViewFrame;
 
 typedef struct {
-        EelGenerousBinClass parent_spot;
+        GtkHBoxClass parent_spot;
         
         /* These roughly correspond to CORBA calls, but in some cases they are higher level. */
 
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 35c59be4a..af9ee03f3 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -174,25 +174,17 @@ update_title (NautilusWindow *window)
 void
 nautilus_window_update_icon (NautilusWindow *window)
 {
-	char *path;
 	GdkPixbuf *pixbuf;
-        GnomeIconTheme *icon_theme;
+        GtkIconTheme *icon_theme;
 
 	pixbuf = NULL;
 	
 	/* Desktop window special icon */
 	if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
-                icon_theme = nautilus_icon_factory_get_icon_theme();
-                path = gnome_icon_theme_lookup_icon (icon_theme,
-                                                     "gnome-fs-desktop", 48,
-                                                     NULL, NULL);
-
-		if (path != NULL) {
-			pixbuf = gdk_pixbuf_new_from_file (path, NULL);
-			
-			g_free (path);
-		}
-
+                icon_theme = nautilus_icon_factory_get_icon_theme ();
+                pixbuf = gtk_icon_theme_load_icon (icon_theme,
+						   "gnome-fs-desktop", 48,
+						   0, NULL);
                 g_object_unref(icon_theme);
 
 	} else {
@@ -736,11 +728,18 @@ nautilus_window_open_location (NautilusWindow *window,
 void
 nautilus_window_open_location_with_selection (NautilusWindow *window,
 					      const char *location,
-					      GList *selection)
+					      GList *selection,
+					      gboolean close_behind)
 {
+	Nautilus_ViewFrame_OpenFlags flags;
+
+	flags = 0;
+	if (close_behind) {
+		flags = Nautilus_ViewFrame_OPEN_FLAG_CLOSE_BEHIND;
+	}
 	open_location (window, location, 
                        Nautilus_ViewFrame_OPEN_ACCORDING_TO_MODE,
-                       0, selection);
+                       flags, selection);
 }					      
 
 
@@ -800,13 +799,14 @@ view_frame_get_id (NautilusViewFrame *view_frame)
 static void
 report_content_view_failure_to_user_internal (NautilusWindow *window,
                                      	      NautilusViewFrame *view_frame,
-                                     	      const char *message)
+                                     	      const char *message,
+					      const char *detail)
 {
 	char *label;
 
 	label = nautilus_window_get_view_frame_label (view_frame);
 	message = g_strdup_printf (message, label);
-	eel_show_error_dialog (message, _("View Failed"), GTK_WINDOW (window));
+	eel_show_error_dialog (message, detail, _("View Failed"), GTK_WINDOW (window));
 	g_free (label);
 }
 
@@ -817,8 +817,8 @@ report_current_content_view_failure_to_user (NautilusWindow *window,
 	report_content_view_failure_to_user_internal 
 		(window,
 		 view_frame,
-		 _("The %s view encountered an error and can't continue. "
-		   "You can choose another view or go to a different location."));
+		 _("The %s view encountered an error and can't continue."),
+		 _("You can choose another view or go to a different location."));
 }
 
 static void
@@ -828,7 +828,8 @@ report_nascent_content_view_failure_to_user (NautilusWindow *window,
 	report_content_view_failure_to_user_internal 
 		(window,
 		 view_frame,
-		 _("The %s view encountered an error while starting up."));
+		 _("The %s view encountered an error while starting up."),
+		 _("The location cannot be displayed with this viewer."));
 }
 
 static void
@@ -996,8 +997,9 @@ handle_view_failure (NautilusWindow *window,
         g_warning ("A view failed. The UI will handle this with a dialog but this should be debugged.");
 
         if (view == window->content_view) {
+                disconnect_view(window, window->content_view);			
                 nautilus_window_set_content_view_widget (window, NULL);
-                
+			
                 /* FIXME bugzilla.gnome.org 45039: We need a
                  * way to report the specific error that
                  * happens in this case - adapter factory not
@@ -1175,6 +1177,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
         char *full_uri_for_display;
         char *uri_for_display;
         char *error_message;
+        char *detail_message;
         char *scheme_string;
         char *type_string;
         char *dialog_title;
@@ -1228,14 +1231,18 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 
         case NAUTILUS_DETERMINE_VIEW_NOT_FOUND:
                 error_message = g_strdup_printf
-                        (_("Couldn't find \"%s\". Please check the spelling and try again."),
+                        (_("Couldn't find \"%s\"."), 
                          uri_for_display);
+                detail_message = g_strdup 
+                	(_("Please check the spelling and try again."));
                 break;
 
         case NAUTILUS_DETERMINE_VIEW_INVALID_URI:
                 error_message = g_strdup_printf
-                        (_("\"%s\" is not a valid location. Please check the spelling and try again."),
+                        (_("\"%s\" is not a valid location."),
                          uri_for_display);
+                detail_message = g_strdup 
+                	(_("Please check the spelling and try again."));
                 break;
 
         case NAUTILUS_DETERMINE_VIEW_NO_HANDLER_FOR_TYPE:
@@ -1248,16 +1255,20 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                 nautilus_file_unref (file);
                 if (type_string == NULL) {
 	                error_message = g_strdup_printf
-                                (_("Couldn't display \"%s\", because Nautilus cannot determine what type of file it is."),
+                                (_("Couldn't display \"%s\"."),
                                  uri_for_display);
+			detail_message = g_strdup 
+				(_("Nautilus cannot determine what type of file it is."));
         	} else {
         		/* FIXME bugzilla.gnome.org 44932:
         		 * Should distinguish URIs with no handlers at all from remote URIs
         		 * with local-only handlers.
         		 */
-	                error_message = g_strdup_printf
-                                (_("Nautilus has no installed viewer capable of displaying \"%s\"."),
-                                 uri_for_display);
+			error_message = g_strdup_printf
+			        (_("Couldn't display \"%s\"."),
+			         uri_for_display);
+			detail_message = g_strdup 
+			        (_("Nautilus has no installed viewer capable of displaying the file."));
 			g_free (type_string);
         	}
                 break;
@@ -1268,19 +1279,23 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                  */
                 scheme_string = eel_str_get_prefix (location, ":");
                 g_assert (scheme_string != NULL);  /* Shouldn't have gotten this error unless there's a : separator. */
-                error_message = g_strdup_printf (_("Couldn't display \"%s\", because Nautilus cannot handle %s: locations."),
-                                                 uri_for_display, scheme_string);
+                error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+                                                 uri_for_display);
+                detail_message = g_strdup_printf (_("Nautilus cannot handle %s: locations."),
+                                                 scheme_string);
                 g_free (scheme_string);
                 break;
 
 	case NAUTILUS_DETERMINE_VIEW_LOGIN_FAILED:
-                error_message = g_strdup_printf (_("Couldn't display \"%s\", because the attempt to log in failed."),
-                                                 uri_for_display);		
+                error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+                                                 uri_for_display);
+                detail_message = g_strdup (_("The attempt to log in failed."));		
 		break;
 
 	case NAUTILUS_DETERMINE_VIEW_ACCESS_DENIED:
-                error_message = g_strdup_printf (_("Couldn't display \"%s\", because access was denied."),
+                error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
                                                  uri_for_display);
+		detail_message = g_strdup (_("Access was denied."));
 		break;
 
 	case NAUTILUS_DETERMINE_VIEW_HOST_NOT_FOUND:
@@ -1290,24 +1305,25 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 		 * the proxy is set up wrong.
 		 */
 		vfs_uri = gnome_vfs_uri_new (location);
-                error_message = g_strdup_printf (_("Couldn't display \"%s\", because no host \"%s\" could be found. "
-                				   "Check that the spelling is correct and that your proxy settings are correct."),
+                error_message = g_strdup_printf (_("Couldn't display \"%s\", because no host \"%s\" could be found."),
                                                  uri_for_display,
                                                  gnome_vfs_uri_get_host_name (vfs_uri));
+                detail_message = g_strdup (_("Check that the spelling is correct and that your proxy settings are correct."));
                 gnome_vfs_uri_unref (vfs_uri);
 		break;
 
 	case NAUTILUS_DETERMINE_VIEW_HOST_HAS_NO_ADDRESS:
-                error_message = g_strdup_printf (_("Couldn't display \"%s\". "
-                				   "Check that your proxy settings are correct."),
+                error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
                                                  uri_for_display);
+                detail_message = g_strdup (_("Check that your proxy settings are correct."));
 		break;
 
         case NAUTILUS_DETERMINE_VIEW_NO_MASTER_BROWSER:
                 error_message = g_strdup_printf
-                        (_("Couldn't display \"%s\", because Nautilus cannot contact the SMB master browser.\n"
-                           "Check that an SMB server is running in the local network."),
+                        (_("Couldn't display \"%s\", because Nautilus cannot contact the SMB master browser."),
                          uri_for_display);
+                detail_message = g_strdup
+                	(_("Check that an SMB server is running in the local network."));
                 break;
 
 	case NAUTILUS_DETERMINE_VIEW_SERVICE_NOT_AVAILABLE:
@@ -1318,8 +1334,9 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                          */
 			error_message = g_strdup_printf
                                 (_("Searching is unavailable right now, because you either have no index, "
-                                   "or the search service isn't running. "
-                                   "Be sure that you have started the Medusa search service, and if you "
+                                   "or the search service isn't running."));
+			detail_message = g_strdup
+				(_("Be sure that you have started the Medusa search service, and if you "
                                    "don't have an index, that the Medusa indexer is running."));
 			dialog_title = g_strdup (_("Searching Unavailable"));
 			break;
@@ -1328,6 +1345,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
         default:
                 error_message = g_strdup_printf (_("Nautilus cannot display \"%s\"."),
                                                  uri_for_display);
+                detail_message = g_strdup (_("Please select another viewer and try again."));
         }
         
         if (dialog_title == NULL) {
@@ -1339,7 +1357,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
                  * happens when a new window cannot display its initial URI. 
                  */
 
-                dialog = eel_show_error_dialog (error_message, dialog_title, NULL);
+                dialog = eel_show_error_dialog (error_message, detail_message, dialog_title, NULL);
                 
 		/* if this is the only window, we don't want to quit, so we redirect it to home */
 		if (just_one_window ()) {
@@ -1368,7 +1386,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
         } else {
                 /* Clean up state of already-showing window */
                 nautilus_window_allow_stop (window, FALSE);
-                eel_show_error_dialog (error_message, dialog_title, GTK_WINDOW (window));
+                eel_show_error_dialog (error_message, detail_message, dialog_title, GTK_WINDOW (window));
 
                 /* Leave the location bar showing the bad location that the user
                  * typed (or maybe achieved by dragging or something). Many times
@@ -1380,6 +1398,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
 	g_free (dialog_title);
 	g_free (uri_for_display);
         g_free (error_message);
+        g_free (detail_message);
 }
 
 /*
diff --git a/src/nautilus-window-manage-views.h b/src/nautilus-window-manage-views.h
index b5826beee..8aefc7258 100644
--- a/src/nautilus-window-manage-views.h
+++ b/src/nautilus-window-manage-views.h
@@ -36,7 +36,8 @@ void                    nautilus_window_open_location                (NautilusWi
                                                                       const char             *location);
 void                    nautilus_window_open_location_with_selection (NautilusWindow         *window,
                                                                       const char             *location,
-                                                                      GList                  *selection);
+                                                                      GList                  *selection,
+                                                                      gboolean                close_behind);
 void                    nautilus_window_stop_loading                 (NautilusWindow         *window);
 void                    nautilus_window_set_content_view             (NautilusWindow         *window,
                                                                       NautilusViewIdentifier *id);
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index d0b9d6cfb..56956690d 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -349,7 +349,7 @@ go_menu_up_callback (BonoboUIComponent *component,
 		     gpointer user_data, 
 		     const char *verb) 
 {
-	nautilus_window_go_up (NAUTILUS_WINDOW (user_data));
+	nautilus_window_go_up (NAUTILUS_WINDOW (user_data), FALSE);
 }
 
 static void
@@ -379,6 +379,20 @@ go_menu_go_to_computer_callback (BonoboUIComponent *component,
 }
 
 static void
+go_menu_go_to_templates_callback (BonoboUIComponent *component, 
+				 gpointer user_data, 
+				 const char *verb) 
+{
+	char *uri;
+
+	nautilus_create_templates_directory ();
+	uri = nautilus_get_templates_directory_uri ();
+	nautilus_window_go_to (NAUTILUS_WINDOW (user_data),
+			       uri);
+	g_free (uri);
+}
+
+static void
 go_menu_go_to_trash_callback (BonoboUIComponent *component, 
 			      gpointer user_data, 
 			      const char *verb) 
@@ -658,6 +672,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
 		BONOBO_UI_VERB ("Home", go_menu_home_callback),
 		BONOBO_UI_VERB ("Start Here", go_menu_start_here_callback),
 		BONOBO_UI_VERB ("Go to Computer", go_menu_go_to_computer_callback),
+		BONOBO_UI_VERB ("Go to Templates", go_menu_go_to_templates_callback),
 		BONOBO_UI_VERB ("Go to Trash", go_menu_go_to_trash_callback),
 		BONOBO_UI_VERB ("Go to Burn CD", go_menu_go_to_burn_cd_callback),
 		BONOBO_UI_VERB ("Go to Location", go_menu_location_callback),
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index ade48b2d0..e451c7686 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -139,8 +139,11 @@ struct _NautilusNavigationWindowDetails {
 #define NAUTILUS_WINDOW_MIN_WIDTH			200
 #define NAUTILUS_WINDOW_MIN_HEIGHT			200
 
-#define NAUTILUS_WINDOW_DEFAULT_WIDTH			500
-#define NAUTILUS_WINDOW_DEFAULT_HEIGHT			300
+#define NAUTILUS_SPATIAL_WINDOW_DEFAULT_WIDTH			500
+#define NAUTILUS_SPATIAL_WINDOW_DEFAULT_HEIGHT			300
+
+#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_WIDTH        800
+#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_HEIGHT       550
 
 typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window,
                                                 NautilusBookmark *bookmark);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 187f66a9b..aa0e5bba4 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -44,11 +44,11 @@
 #include <eel/eel-debug.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-generous-bin.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
+#include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkmain.h>
@@ -354,7 +354,7 @@ nautilus_window_go_to (NautilusWindow *window, const char *uri)
 }
 
 void
-nautilus_window_go_up (NautilusWindow *window)
+nautilus_window_go_up (NautilusWindow *window, gboolean close_behind)
 {
 	GnomeVFSURI *current_uri;
 	GnomeVFSURI *parent_uri;
@@ -379,7 +379,7 @@ nautilus_window_go_up (NautilusWindow *window)
 
 	selection = g_list_prepend (NULL, g_strdup (window->details->location));
 	
-	nautilus_window_open_location_with_selection (window, parent_uri_string, selection);
+	nautilus_window_open_location_with_selection (window, parent_uri_string, selection, close_behind);
 	
 	g_free (parent_uri_string);
 	eel_g_list_free_deep (selection);
@@ -523,7 +523,8 @@ set_initial_window_geometry (NautilusWindow *window)
 {
 	GdkScreen *screen;
 	guint max_width_for_screen, max_height_for_screen;
-
+	guint default_width, default_height;
+	
 	screen = gtk_window_get_screen (GTK_WINDOW (window));
 	
 	/* Don't let GTK determine the minimum size
@@ -550,11 +551,14 @@ set_initial_window_geometry (NautilusWindow *window)
 					  max_width_for_screen),
 				     MIN (NAUTILUS_WINDOW_MIN_HEIGHT, 
 					  max_height_for_screen));
-
+					  
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+			 get_default_size, (window, &default_width, &default_height));
+			 
 	gtk_window_set_default_size (GTK_WINDOW (window), 
-				     MIN (NAUTILUS_WINDOW_DEFAULT_WIDTH, 
+				     MIN (default_width, 
 				          max_width_for_screen), 
-				     MIN (NAUTILUS_WINDOW_DEFAULT_HEIGHT, 
+				     MIN (default_height, 
 				          max_height_for_screen));
 }
 
@@ -747,6 +751,9 @@ nautilus_window_close (NautilusWindow *window)
 {
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
+	EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+			 close, (window));
+	
 	gtk_widget_destroy (GTK_WIDGET (window));
 }
 
@@ -1126,27 +1133,29 @@ compute_default_title (const char *text_uri)
 {
 	NautilusFile *file;
 	char *title;
-
-	if (text_uri == NULL) {
+	char *canonical_uri;
+	
+	canonical_uri = eel_make_uri_canonical (text_uri);
+	
+	if (canonical_uri == NULL) {
 		title = g_strdup ("");
-	} else if (strcmp (text_uri, "computer://") == 0 ||
-		   strcmp (text_uri, "computer:///") == 0) {
+	} else if (strcmp (canonical_uri, "computer:///") == 0 ) {
 		title = g_strdup (_("Computer"));
-	} else if (strcmp (text_uri, "network://") == 0 ||
-		   strcmp (text_uri, "network:///") == 0) {
+	} else if (strcmp (canonical_uri, "network:///") == 0 ) {
 		title = g_strdup (_("Network"));
-	} else if (strcmp (text_uri, "fonts://") == 0 ||
-		   strcmp (text_uri, "fonts:///") == 0) {
+	} else if (strcmp (canonical_uri, "fonts:///") == 0 ) {
 		title = g_strdup (_("Fonts"));
-	} else if (strcmp (text_uri, "burn://") == 0 ||
-		   strcmp (text_uri, "burn:///") == 0) {
+	} else if (strcmp (canonical_uri, "themes:///") == 0 ) {
+		title = g_strdup (_("Themes"));
+	} else if (strcmp (canonical_uri, "burn:///") == 0 ) {
 		title = g_strdup (_("CD Creator"));
 	} else {
 		file = nautilus_file_get (text_uri);
 		title = nautilus_file_get_display_name (file);
 		nautilus_file_unref (file);
 	}
-
+	
+	g_free (canonical_uri);
 	return title;
 }
 
@@ -1385,11 +1394,18 @@ nautilus_window_set_viewed_file (NautilusWindow *window,
 	cancel_chose_component_callback (window);
 
 	if (window->details->viewed_file != NULL) {
+		if (NAUTILUS_IS_SPATIAL_WINDOW (window)) {
+			nautilus_file_set_has_open_window (window->details->viewed_file,
+							   FALSE);
+		}
 		nautilus_file_monitor_remove (window->details->viewed_file,
 					      window);
 	}
 
 	if (file != NULL) {
+		if (NAUTILUS_IS_SPATIAL_WINDOW (window)) {
+			nautilus_file_set_has_open_window (file, TRUE);
+		}
 		attributes = NAUTILUS_FILE_ATTRIBUTE_DISPLAY_NAME;
 		nautilus_file_monitor_add (file, window, attributes);
 	}
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index a9be2a192..cd4791600 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -76,6 +76,8 @@ typedef struct {
         void   (* set_throbber_active) (NautilusWindow *window,
                                         gboolean active);
         void   (* prompt_for_location) (NautilusWindow *window);
+        void   (* get_default_size) (NautilusWindow *window, guint *default_width, guint *default_height);
+        void   (* close) (NautilusWindow *window);
 } NautilusWindowClass;
 
 typedef enum {
@@ -121,7 +123,8 @@ char *           nautilus_window_get_location         (NautilusWindow    *window
 void             nautilus_window_go_to                (NautilusWindow    *window,
                                                        const char        *location);
 void             nautilus_window_go_home              (NautilusWindow    *window);
-void             nautilus_window_go_up                (NautilusWindow    *window);
+void             nautilus_window_go_up                (NautilusWindow    *window,
+                                                       gboolean           close_behind);
 void             nautilus_window_prompt_for_location  (NautilusWindow    *window);
 void             nautilus_window_launch_cd_burner     (NautilusWindow    *window);
 void             nautilus_window_update_title         (NautilusWindow    *window);
diff --git a/test/Makefile.am b/test/Makefile.am
index cd7e973b0..739b213c5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -17,13 +17,11 @@ LDADD =\
 noinst_PROGRAMS =\
 	test-nautilus-mime-actions \
 	test-nautilus-mime-actions-set \
-	test-nautilus-preferences-change \
 	test-nautilus-wrap-table \
 	$(NULL)
 
 test_nautilus_mime_actions_SOURCES = test-nautilus-mime-actions.c test.c
 test_nautilus_mime_actions_set_SOURCES = test-nautilus-mime-actions-set.c test.c
-test_nautilus_preferences_change_SOURCES = test-nautilus-preferences-change.c test.c
 test_nautilus_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c
 
 EXTRA_DIST = \
diff --git a/test/test.h b/test/test.h
index 42d09f321..bb97aa076 100644
--- a/test/test.h
+++ b/test/test.h
@@ -20,8 +20,6 @@
 #include <eel/eel-string.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 
-#include <eel/eel-string-picker.h>
-
 void       test_init                            (int                         *argc,
 						 char                      ***argv);
 int        test_quit                            (int                          exit_code);